Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Canton and reenable tests #12852

Merged
merged 6 commits into from
Feb 10, 2022
Merged

Bump Canton and reenable tests #12852

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2e5a05
Bump Canton and reenable tests
cocreature Feb 9, 2022
6705215
display names are no longer defaulted
cocreature Feb 9, 2022
b684492
topology-change-delay is redundant
cocreature Feb 9, 2022
56c9bf1
Switch away from grpcurl
cocreature Feb 9, 2022
a23a3bc
try to fix canton conformance tests
cocreature Feb 9, 2022
0c47e0e
that’s not how you scala
cocreature Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Switch away from grpcurl 
changelog_begin
changelog_end
  • Loading branch information
@cocreature
cocreature committed Feb 9, 2022
commit 56c9bf1f467a0ec113b23b0d41878f9d1cf11975
59 changes: 17 additions & 42 deletions templates/create-daml-app-test-resources/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { promises as fs } from 'fs';
import puppeteer, { Browser, Page } from 'puppeteer';
import waitOn from 'wait-on';

import Ledger from '@daml/ledger';
import Ledger, { UserRightHelper } from '@daml/ledger';
import { User } from '@daml.js/create-daml-app';
import { authConfig } from './config';

Expand All @@ -25,46 +25,31 @@ let uiProc: ChildProcess | undefined = undefined;
// Chrome browser that we run in headless mode
let browser: Browser | undefined = undefined;

let publicUser: string = '';
let publicParty: string = '';
let publicUser: string | undefined;
let publicParty: string | undefined;

const adminLedger = new Ledger({token: authConfig.makeToken("participant_admin")});

// Function to generate unique party names for us.
let nextPartyId = 1;
const getParty = async () : [string, string] => {
// TODO For now we use grpcurl to allocate parties and users.
// Once the JSON API exposes party & user management we can switch to that.
const grpcurlPartyArgs = [
"-plaintext",
"localhost:6865",
"com.daml.ledger.api.v1.admin.PartyManagementService/AllocateParty",
];
const allocResult = spawnSync('grpcurl', grpcurlPartyArgs, {"encoding": "utf8"});
const parsedResult = JSON.parse(allocResult.stdout);
const allocResult = await adminLedger.allocateParty({});
const user = `u${nextPartyId}`;
const party = parsedResult.partyDetails.party;
const createUser = {
"user": {
"id": user,
"primary_party": party,
},
"rights": [{"can_act_as": {"party": party}}, {"can_read_as": {"party": publicParty}}]
};
const grpcurlUserArgs = [
"-plaintext",
"-d",
JSON.stringify(createUser),
"localhost:6865",
"com.daml.ledger.api.v1.admin.UserManagementService/CreateUser",
];
const result = spawnSync('grpcurl', grpcurlUserArgs, {"encoding": "utf8"});
const party = allocResult.identifier;
const rights: UserRight[] = [UserRightHelper.canActAs(party)].concat(publicParty !== undefined ? [UserRightHelper.canReadAs(publicParty)] : []);
await adminLedger.createUser(user, rights, party);
nextPartyId++;
return [user, party];
};

test('Party names are unique', async () => {
const parties = new Set(await Promise.all(Array(10).fill({}).map(() => getParty())));
let r = [];
for (let i = 0; i < 10; ++i) {
r = r.concat((await getParty())[1]);
}
const parties = new Set(r);
expect(parties.size).toEqual(10);
});
}, 20_000);

const removeFile = async (path: string) => {
try {
Expand Down Expand Up @@ -420,23 +405,13 @@ test('error on non-existent user id', async () => {
const invalidUser = "nonexistent";
const page = await newUiPage();
const error = await failedLogin(page, invalidUser);
expect(error).toMatch(/cannot get user for unknown user \\"nonexistent\\"/);
expect(error).toMatch(/getting user failed for unknown user \\"nonexistent\\"/);
await page.close();
}, 40_000);

test('error on user with no primary party', async () => {
const invalidUser = "noprimary";
// TODO replace with daml-ledger once it exposes the create user endpoint.
const grpcurlUserArgs = [
"-plaintext",
"-d",
JSON.stringify({"user": {"id": invalidUser}}),
"localhost:6865",
"com.daml.ledger.api.v1.admin.UserManagementService/CreateUser",
];
const result = spawnSync('grpcurl', grpcurlUserArgs, {"encoding": "utf8"});
console.debug(result.stdout);
console.debug(result.stderr);
await adminLedger.createUser(invalidUser, []);
const page = await newUiPage();
const error = await failedLogin(page, invalidUser);
expect(error).toMatch(/User 'noprimary' has no primary party/);
Expand Down