Skip to content

Commit 2e32487

Browse files
author
Grigoriy Simonov
committed
fix governance tests
1 parent 8fc6a4d commit 2e32487

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

‎js-packages/tests/sub/governance/council.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describeGov('Governance: Council tests', () => {
3939
moreThanHalfCouncilThreshold,
4040
);
4141

42-
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult.result.events);
42+
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult);
4343
const proposalIndex = councilProposedEvent.proposalIndex;
4444
const proposalHash = councilProposedEvent.proposalHash;
4545

@@ -61,7 +61,7 @@ describeGov('Governance: Council tests', () => {
6161
moreThanHalfCouncilThreshold,
6262
);
6363

64-
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult.result.events);
64+
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult);
6565
const proposalIndex = councilProposedEvent.proposalIndex;
6666
const proposalHash = councilProposedEvent.proposalHash;
6767

@@ -92,7 +92,7 @@ describeGov('Governance: Council tests', () => {
9292
moreThanHalfCouncilThreshold,
9393
);
9494

95-
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult.result.events);
95+
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult);
9696
const proposalIndex = councilProposedEvent.proposalIndex;
9797
const proposalHash = councilProposedEvent.proposalHash;
9898

@@ -145,15 +145,15 @@ describeGov('Governance: Council tests', () => {
145145
moreThanHalfCouncilThreshold,
146146
);
147147

148-
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult.result.events);
148+
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult);
149149
const proposalIndex = councilProposedEvent.proposalIndex;
150150
const proposalHash = councilProposedEvent.proposalHash;
151151

152152
await helper.council.collective.vote(counselors.alex, proposalHash, proposalIndex, true);
153153

154154
await helper.wait.newBlocks(councilMotionDuration);
155155
const closeResult = await helper.council.collective.close(counselors.filip, proposalHash, proposalIndex);
156-
const closeEvent = Event.Council.Closed.expect(closeResult.result.events);
156+
const closeEvent = Event.Council.Closed.expect(closeResult);
157157
const members = (await helper.callRpc('api.query.councilMembership.members')).toJSON() as string[];
158158
expect(closeEvent.yes).to.be.equal(members.length);
159159
});
@@ -396,7 +396,7 @@ describeGov('Governance: Council tests', () => {
396396

397397
itSub('[Negative] Council cannot cancel Democracy proposals', async ({helper}) => {
398398
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
399-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
399+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
400400

401401
await expect(proposalFromAllCouncil(helper.democracy.cancelProposalCall(proposalIndex)))
402402
.to.be.rejectedWith(/BadOrigin/);
@@ -405,7 +405,7 @@ describeGov('Governance: Council tests', () => {
405405
itSub('[Negative] Council member cannot cancel Democracy proposals', async ({helper}) => {
406406

407407
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
408-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
408+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
409409

410410
await expect(helper.council.collective.execute(
411411
counselors.alex,
@@ -445,7 +445,7 @@ describeGov('Governance: Council tests', () => {
445445
defaultEnactmentMoment,
446446
);
447447

448-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
448+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
449449

450450
await expect(proposalFromAllCouncil(helper.fellowship.referenda.cancelCall(referendumIndex)))
451451
.to.be.rejectedWith(/BadOrigin/);
@@ -462,7 +462,7 @@ describeGov('Governance: Council tests', () => {
462462
proposal,
463463
defaultEnactmentMoment,
464464
);
465-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
465+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
466466
await expect(helper.council.collective.execute(
467467
counselors.alex,
468468
helper.fellowship.referenda.cancelCall(referendumIndex),
@@ -478,7 +478,7 @@ describeGov('Governance: Council tests', () => {
478478
councilSize,
479479
);
480480

481-
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult.result.events);
481+
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult);
482482
const proposalIndex = councilProposedEvent.proposalIndex;
483483
const proposalHash = councilProposedEvent.proposalHash;
484484

‎js-packages/tests/sub/governance/democracy.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describeGov('Governance: Democracy tests', () => {
3535
{After: 0},
3636
);
3737

38-
const fellowshipReferendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
38+
const fellowshipReferendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
3939
await voteUnanimouslyInFellowship(helper, fellows, democracyTrackMinRank, fellowshipReferendumIndex);
4040
await helper.fellowship.referenda.placeDecisionDeposit(donor, fellowshipReferendumIndex);
4141

‎js-packages/tests/sub/governance/electsudo.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describeGov('Governance: Elect Sudo', () => {
6262
moreThanHalfCouncilThreshold,
6363
);
6464

65-
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult.result.events);
65+
const councilProposedEvent = Event.Council.Proposed.expect(proposeResult);
6666
const proposalIndex = councilProposedEvent.proposalIndex;
6767
const proposalHash = councilProposedEvent.proposalHash;
6868

‎js-packages/tests/sub/governance/fellowship.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describeGov('Governance: Fellowship tests', () => {
3030
defaultEnactmentMoment,
3131
);
3232

33-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
33+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
3434
await voteUnanimouslyInFellowship(helper, members, democracyTrackMinRank, referendumIndex);
3535
await helper.fellowship.referenda.placeDecisionDeposit(donor, referendumIndex);
3636

@@ -85,7 +85,7 @@ describeGov('Governance: Fellowship tests', () => {
8585
defaultEnactmentMoment,
8686
);
8787

88-
const fellowshipReferendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
88+
const fellowshipReferendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
8989
await voteUnanimouslyInFellowship(helper, members, democracyTrackMinRank, fellowshipReferendumIndex);
9090
await helper.fellowship.referenda.placeDecisionDeposit(donor, fellowshipReferendumIndex);
9191

@@ -116,7 +116,7 @@ describeGov('Governance: Fellowship tests', () => {
116116
defaultEnactmentMoment,
117117
);
118118

119-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
119+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
120120
const referendumInfo = await helper.fellowship.referenda.referendumInfo(referendumIndex);
121121
expect(referendumInfo.ongoing.track, `${memberIdx}-th member of rank #${rank}: proposal #${referendumIndex} is on invalid track`)
122122
.to.be.equal(democracyTrackId);
@@ -134,7 +134,7 @@ describeGov('Governance: Fellowship tests', () => {
134134
defaultEnactmentMoment,
135135
);
136136

137-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
137+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
138138

139139
let expectedAyes = 0;
140140
for(let rank = democracyTrackMinRank; rank < fellowshipRankLimit; rank++) {
@@ -171,7 +171,7 @@ describeGov('Governance: Fellowship tests', () => {
171171
defaultEnactmentMoment,
172172
);
173173

174-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
174+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
175175

176176
for(let rank = democracyTrackMinRank; rank < fellowshipRankLimit; rank++) {
177177
const rankMembers = members[rank];
@@ -253,7 +253,7 @@ describeGov('Governance: Fellowship tests', () => {
253253
defaultEnactmentMoment,
254254
);
255255

256-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
256+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
257257

258258
for(let rank = 0; rank < democracyTrackMinRank; rank++) {
259259
for(const member of members[rank]) {
@@ -304,7 +304,7 @@ describeGov('Governance: Fellowship tests', () => {
304304

305305
itSub('[Negative] FellowshipProposition cannot cancel Democracy proposals', async ({helper}) => {
306306
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
307-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
307+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
308308

309309
await testBadFellowshipProposal(helper, helper.democracy.cancelProposalCall(proposalIndex));
310310
});

‎js-packages/tests/sub/governance/financialCouncil.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describeGov('Governance: Financial Council tests', () => {
3636
moreThanHalfCouncilThreshold,
3737
);
3838

39-
const councilProposedEvent = Event.FinCouncil.Proposed.expect(proposeResult.result.events);
39+
const councilProposedEvent = Event.FinCouncil.Proposed.expect(proposeResult);
4040
const proposalIndex = councilProposedEvent.proposalIndex;
4141
const proposalHash = councilProposedEvent.proposalHash;
4242

@@ -56,7 +56,7 @@ describeGov('Governance: Financial Council tests', () => {
5656
moreThanHalfCouncilThreshold,
5757
);
5858

59-
const councilProposedEvent = Event.FinCouncil.Proposed.expect(proposeResult.result.events);
59+
const councilProposedEvent = Event.FinCouncil.Proposed.expect(proposeResult);
6060
const proposalIndex = councilProposedEvent.proposalIndex;
6161
const proposalHash = councilProposedEvent.proposalHash;
6262

@@ -118,15 +118,15 @@ describeGov('Governance: Financial Council tests', () => {
118118

119119
itSub('[Negative] FinCouncil can\'t cancel Democracy proposals', async ({helper}) => {
120120
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
121-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
121+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
122122

123123
await expect(proposalFromAllFinCouncil(helper.democracy.cancelProposalCall(proposalIndex)))
124124
.rejectedWith('BadOrigin');
125125
});
126126

127127
itSub('[Negative] FinCouncil member cannot cancel Democracy proposals', async ({helper}) => {
128128
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
129-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
129+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
130130

131131
await expect(helper.finCouncil.collective.execute(
132132
finCounselors.andy,
@@ -201,7 +201,7 @@ describeGov('Governance: Financial Council tests', () => {
201201
proposal,
202202
defaultEnactmentMoment,
203203
);
204-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
204+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
205205
await expect(proposalFromAllFinCouncil(helper.fellowship.referenda.cancelCall(referendumIndex)))
206206
.rejectedWith('BadOrigin');
207207
});
@@ -218,7 +218,7 @@ describeGov('Governance: Financial Council tests', () => {
218218
defaultEnactmentMoment,
219219
);
220220

221-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
221+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
222222

223223
await expect(helper.finCouncil.collective.execute(
224224
finCounselors.andy,

‎js-packages/tests/sub/governance/technicalCommittee.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describeGov('Governance: Technical Committee tests', () => {
4646
allTechCommitteeThreshold,
4747
);
4848

49-
const commiteeProposedEvent = Event.TechnicalCommittee.Proposed.expect(proposeResult.result.events);
49+
const commiteeProposedEvent = Event.TechnicalCommittee.Proposed.expect(proposeResult);
5050
const proposalIndex = commiteeProposedEvent.proposalIndex;
5151
const proposalHash = commiteeProposedEvent.proposalHash;
5252

@@ -56,9 +56,9 @@ describeGov('Governance: Technical Committee tests', () => {
5656
await helper.technicalCommittee.collective.vote(techcomms.greg, proposalHash, proposalIndex, true);
5757

5858
const closeResult = await helper.technicalCommittee.collective.close(techcomms.andy, proposalHash, proposalIndex);
59-
Event.TechnicalCommittee.Closed.expect(closeResult.result.events);
60-
Event.TechnicalCommittee.Approved.expect(closeResult.result.events);
61-
const {result} = Event.TechnicalCommittee.Executed.expect(closeResult.result.events);
59+
Event.TechnicalCommittee.Closed.expect(closeResult);
60+
Event.TechnicalCommittee.Approved.expect(closeResult);
61+
const {result} = Event.TechnicalCommittee.Executed.expect(closeResult);
6262
expect(result).to.eq('Ok');
6363

6464
return closeResult;
@@ -72,15 +72,15 @@ describeGov('Governance: Technical Committee tests', () => {
7272
await helper.getSudo().democracy.externalProposeDefaultWithPreimage(sudoer, preimageHash);
7373

7474
const fastTrackProposal = await proposalFromAllCommittee(helper.democracy.fastTrackCall(preimageHash, democracyFastTrackVotingPeriod, 0));
75-
Event.Democracy.Started.expect(fastTrackProposal.result.events);
75+
Event.Democracy.Started.expect(fastTrackProposal);
7676
});
7777

7878
itSub('TechComm can cancel Democracy proposals', async ({helper}) => {
7979
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
80-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
80+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
8181

8282
const cancelProposal = await proposalFromAllCommittee(helper.democracy.cancelProposalCall(proposalIndex));
83-
Event.Democracy.ProposalCanceled.expect(cancelProposal.result.events);
83+
Event.Democracy.ProposalCanceled.expect(cancelProposal);
8484
});
8585

8686
itSub('TechComm can cancel ongoing Democracy referendums', async ({helper}) => {
@@ -89,7 +89,7 @@ describeGov('Governance: Technical Committee tests', () => {
8989
const referendumIndex = startedEvent.referendumIndex;
9090

9191
const emergencyCancelProposal = await proposalFromAllCommittee(helper.democracy.emergencyCancelCall(referendumIndex));
92-
Event.Democracy.Cancelled.expect(emergencyCancelProposal.result.events);
92+
Event.Democracy.Cancelled.expect(emergencyCancelProposal);
9393
});
9494

9595
itSub('TechComm member can veto Democracy proposals', async ({helper}) => {
@@ -100,7 +100,7 @@ describeGov('Governance: Technical Committee tests', () => {
100100
techcomms.andy,
101101
helper.democracy.vetoExternalCall(preimageHash),
102102
);
103-
Event.Democracy.Vetoed.expect(vetoExternalCall.result.events);
103+
Event.Democracy.Vetoed.expect(vetoExternalCall);
104104
});
105105

106106
itSub('TechComm can cancel Fellowship referendums', async ({helper}) => {
@@ -114,9 +114,9 @@ describeGov('Governance: Technical Committee tests', () => {
114114
proposal,
115115
defaultEnactmentMoment,
116116
);
117-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
117+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
118118
const cancelProposal = await proposalFromAllCommittee(helper.fellowship.referenda.cancelCall(referendumIndex));
119-
Event.FellowshipReferenda.Cancelled.expect(cancelProposal.result.events);
119+
Event.FellowshipReferenda.Cancelled.expect(cancelProposal);
120120
});
121121

122122
itSub('TechComm member can add a Fellowship member', async ({helper}) => {
@@ -369,7 +369,7 @@ describeGov('Governance: Technical Committee tests', () => {
369369

370370
itSub('[Negative] TechComm member cannot cancel Democracy proposals', async ({helper}) => {
371371
const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
372-
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult.result.events).proposalIndex;
372+
const proposalIndex = Event.Democracy.Proposed.expect(proposeResult).proposalIndex;
373373

374374
await expect(helper.technicalCommittee.collective.execute(
375375
techcomms.andy,
@@ -422,7 +422,7 @@ describeGov('Governance: Technical Committee tests', () => {
422422
defaultEnactmentMoment,
423423
);
424424

425-
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult.result.events).referendumIndex;
425+
const referendumIndex = Event.FellowshipReferenda.Submitted.expect(submitResult).referendumIndex;
426426

427427
await expect(helper.technicalCommittee.collective.execute(
428428
techcomms.andy,
@@ -439,7 +439,7 @@ describeGov('Governance: Technical Committee tests', () => {
439439
committeeSize,
440440
);
441441

442-
const committeeProposedEvent = Event.TechnicalCommittee.Proposed.expect(proposeResult.result.events);
442+
const committeeProposedEvent = Event.TechnicalCommittee.Proposed.expect(proposeResult);
443443
const proposalIndex = committeeProposedEvent.proposalIndex;
444444
const proposalHash = committeeProposedEvent.proposalHash;
445445

0 commit comments

Comments
 (0)