tests: small change - helper.getApi() instead of helper.api!

UniqueNetwork · Oct 9, 2023 · 742522c · 742522c
1 parent afc8657
commit 742522c
Show file tree

Hide file tree

Showing 18 changed files with 181 additions and 181 deletions.
diff --git a/tests/package.json b/tests/package.json
@@ -139,6 +139,8 @@
     "@openzeppelin/contracts": "^4.9.2",
     "@polkadot/api": "10.9.1",
     "@polkadot/rpc-core": "^10.9.1",
+    "@polkadot/types": "^10.9.1",
+    "@polkadot/types-codec": "^10.9.1",
     "@polkadot/util": "12.5.1",
     "@polkadot/util-crypto": "12.5.1",
     "@polkadot/wasm-crypto-asmjs": "^7.2.1",

diff --git a/tests/src/collator-selection/identity.seqtest.ts b/tests/src/collator-selection/identity.seqtest.ts
@@ -123,7 +123,7 @@ describe('Integration Test: Identities Manipulation', () => {
       const oldIdentities = await getIdentityAccounts(helper);
 
       // delete a couple, check that they are no longer there
-      const registry = helper.api!.registry;
+      const registry = helper.getApi().registry;
       const scapegoats: AccountId32[] = [new GenericAccountId(registry, crowd.pop()!.address), new GenericAccountId(registry, crowd.pop()!.address)];
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.identity.forceRemoveIdentities', [scapegoats]);
       const newIdentities = await getIdentityAccounts(helper);
@@ -155,7 +155,7 @@ describe('Integration Test: Identities Manipulation', () => {
       ]);
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.identity.forceSetSubs', [subsInfo] as any);
 
-      const registry = helper.api!.registry;
+      const registry = helper.getApi().registry;
       for(let i = 0; i < supers.length; i++) {
         // check deposit
         expect((await helper.getApi().query.identity.subsOf(supers[i].address))[0].toNumber()).to.be.equal(1000001 + i);
@@ -209,7 +209,7 @@ describe('Integration Test: Identities Manipulation', () => {
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.identity.forceSetSubs', [subsInfo2] as any);
 
       // make sure everything else is the same
-      const registry = helper.api!.registry;
+      const registry = helper.getApi().registry;
       for(let i = 0; i < supers.length - 1; i++) {
         // check deposit
         expect((await helper.getApi().query.identity.subsOf(supers[i].address))[0].toNumber()).to.be.eq(1000001 + i);

diff --git a/tests/src/createItem.test.ts b/tests/src/createItem.test.ts
@@ -69,15 +69,15 @@ describe('integration test: ext. ():', () => {
     {
       const createData = {fungible: {value: 100}};
       const events = await helper.executeExtrinsic(alice, 'api.tx.unique.createItem', [collectionId, to, createData as any]);
-      const result = helper.util.extractTokensFromCreationResult(helper.api!, events);
+      const result = helper.util.extractTokensFromCreationResult(helper.getApi(), events);
       expect(result.tokens[0].amount).to.be.equal(100n);
       expect(result.tokens[0].collectionId).to.be.equal(collectionId);
       expect(result.tokens[0].owner).to.be.deep.equal(to);
     }
     {
       const createData = {fungible: {value: 50}};
       const events = await helper.executeExtrinsic(alice, 'api.tx.unique.createItem', [collectionId, to, createData as any]);
-      const result = helper.util.extractTokensFromCreationResult(helper.api!, events);
+      const result = helper.util.extractTokensFromCreationResult(helper.getApi(), events);
       expect(result.tokens[0].amount).to.be.equal(50n);
       expect(result.tokens[0].collectionId).to.be.equal(collectionId);
       expect(result.tokens[0].owner).to.be.deep.equal(to);

diff --git a/tests/src/eth/nativeFungible.test.ts b/tests/src/eth/nativeFungible.test.ts
@@ -33,7 +33,7 @@ describe('NativeFungible: ERC20 calls', () => {
     const collectionAddress = helper.ethAddress.fromCollectionId(0);
     const contract = await helper.ethNativeContract.collection(collectionAddress, 'ft', owner);
 
-    await expect(contract.methods.approve(spender, 100).call({from: owner})).to.be.rejectedWith('Approve not supported');
+    await expect(contract.methods.approve(spender, 100).call({from: owner})).to.be.rejectedWith('approve not supported');
   });
 
   itEth('balanceOf()', async ({helper}) => {

diff --git a/tests/src/governance/council.test.ts b/tests/src/governance/council.test.ts
@@ -37,7 +37,7 @@ describeGov('Governance: Council tests', () => {
         moreThanHalfCouncilThreshold,
       );
 
-      const councilProposedEvent = proposeResult.result.events.find(helper.api!.events.council.Proposed.is);
+      const councilProposedEvent = proposeResult.result.events.find(helper.getApi().events.council.Proposed.is);
       if(!councilProposedEvent)
         throw Error('Expected event council.Proposed');
       const proposalIndex = councilProposedEvent.data.proposalIndex.toNumber();
@@ -61,7 +61,7 @@ describeGov('Governance: Council tests', () => {
         moreThanHalfCouncilThreshold,
       );
 
-      const councilProposedEvent = proposeResult.result.events.find(helper.api!.events.council.Proposed.is);
+      const councilProposedEvent = proposeResult.result.events.find(helper.getApi().events.council.Proposed.is);
       if(!councilProposedEvent)
         throw Error('Expected event council.Proposed');
       const proposalIndex = councilProposedEvent.data.proposalIndex.toNumber();
@@ -94,7 +94,7 @@ describeGov('Governance: Council tests', () => {
       moreThanHalfCouncilThreshold,
     );
 
-    const councilProposedEvent = proposeResult.result.events.find(helper.api!.events.council.Proposed.is);
+    const councilProposedEvent = proposeResult.result.events.find(helper.getApi().events.council.Proposed.is);
     if(!councilProposedEvent)
       throw Error('Expected event council.Proposed');
     const proposalIndex = councilProposedEvent.data.proposalIndex.toNumber();
@@ -106,7 +106,7 @@ describeGov('Governance: Council tests', () => {
 
     await helper.council.collective.close(counselors.filip, proposalHash, proposalIndex);
 
-    const democracyStartedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.api!.events.democracy.Started);
+    const democracyStartedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.getApi().events.democracy.Started);
     const democracyReferendumIndex = democracyStartedEvent.refIndex.toNumber();
     const democracyThreshold = democracyStartedEvent.threshold;
 
@@ -132,10 +132,10 @@ describeGov('Governance: Council tests', () => {
       },
     });
 
-    const passedReferendumEvent = await helper.wait.expectEvent(democracyVotingPeriod, helper.api!.events.democracy.Passed);
+    const passedReferendumEvent = await helper.wait.expectEvent(democracyVotingPeriod, helper.getApi().events.democracy.Passed);
     expect(passedReferendumEvent.refIndex.toNumber()).to.be.equal(democracyReferendumIndex);
 
-    await helper.wait.expectEvent(democracyEnactmentPeriod, helper.api!.events.scheduler.Dispatched);
+    await helper.wait.expectEvent(democracyEnactmentPeriod, helper.getApi().events.scheduler.Dispatched);
     const receiverBalance = await helper.balance.getSubstrate(forceSetBalanceReceiver.address);
     expect(receiverBalance).to.be.equal(forceSetBalanceTestValue);
   });
@@ -149,7 +149,7 @@ describeGov('Governance: Council tests', () => {
       moreThanHalfCouncilThreshold,
     );
 
-    const councilProposedEvent = proposeResult.result.events.find(helper.api!.events.council.Proposed.is);
+    const councilProposedEvent = proposeResult.result.events.find(helper.getApi().events.council.Proposed.is);
     if(!councilProposedEvent)
       throw Error('Expected event council.Proposed');
     const proposalIndex = councilProposedEvent.data.proposalIndex.toNumber();
@@ -159,7 +159,7 @@ describeGov('Governance: Council tests', () => {
 
     await helper.wait.newBlocks(councilMotionDuration);
     const closeResult = await helper.council.collective.close(counselors.filip, proposalHash, proposalIndex);
-    const closeEvent = closeResult.result.events.find(helper.api!.events.council.Closed.is);
+    const closeEvent = closeResult.result.events.find(helper.getApi().events.council.Closed.is);
     if(!closeEvent)
       throw Error('Expected event council.Closed');
     const members = await helper.callQuery('api.query.councilMembership.members');
@@ -371,7 +371,7 @@ describeGov('Governance: Council tests', () => {
 
   itSub('[Negative] Council cannot cancel Democracy proposals', async ({helper}) => {
     const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
-    const proposedEvent = proposeResult.result.events.find(helper.api!.events.democracy.Proposed.is);
+    const proposedEvent = proposeResult.result.events.find(helper.getApi().events.democracy.Proposed.is);
     if(!proposedEvent)
       throw Error('Expected event democracy.Proposed');
     const proposalIndex = proposedEvent.data.proposalIndex.toNumber();
@@ -383,7 +383,7 @@ describeGov('Governance: Council tests', () => {
   itSub('[Negative] Council member cannot cancel Democracy proposals', async ({helper}) => {
 
     const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
-    const proposedEvent = proposeResult.result.events.find(helper.api!.events.democracy.Proposed.is);
+    const proposedEvent = proposeResult.result.events.find(helper.getApi().events.democracy.Proposed.is);
     if(!proposedEvent)
       throw Error('Expected event democracy.Proposed');
     const proposalIndex = proposedEvent.data.proposalIndex.toNumber();
@@ -396,7 +396,7 @@ describeGov('Governance: Council tests', () => {
 
   itSub('[Negative] Council cannot cancel ongoing Democracy referendums', async ({helper}) => {
     await helper.getSudo().democracy.externalProposeDefault(sudoer, dummyProposalCall(helper));
-    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.api!.events.democracy.Started);
+    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.getApi().events.democracy.Started);
     const referendumIndex = startedEvent.refIndex.toNumber();
 
     await expect(proposalFromAllCouncil(helper.democracy.emergencyCancelCall(referendumIndex)))
@@ -405,7 +405,7 @@ describeGov('Governance: Council tests', () => {
 
   itSub('[Negative] Council member cannot cancel ongoing Democracy referendums', async ({helper}) => {
     await helper.getSudo().democracy.externalProposeDefault(sudoer, dummyProposalCall(helper));
-    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.api!.events.democracy.Started);
+    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.getApi().events.democracy.Started);
     const referendumIndex = startedEvent.refIndex.toNumber();
 
     await expect(helper.council.collective.execute(
@@ -426,7 +426,7 @@ describeGov('Governance: Council tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const referendumIndex = submittedEvent.data.index.toNumber();
@@ -447,7 +447,7 @@ describeGov('Governance: Council tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const referendumIndex = submittedEvent.data.index.toNumber();
@@ -467,7 +467,7 @@ describeGov('Governance: Council tests', () => {
       councilSize,
     );
 
-    const councilProposedEvent = proposeResult.result.events.find(helper.api!.events.council.Proposed.is);
+    const councilProposedEvent = proposeResult.result.events.find(helper.getApi().events.council.Proposed.is);
     if(!councilProposedEvent)
       throw Error('Expected event council.Proposed');
     const proposalIndex = councilProposedEvent.data.proposalIndex.toNumber();

diff --git a/tests/src/governance/democracy.test.ts b/tests/src/governance/democracy.test.ts
@@ -34,7 +34,7 @@ describeGov('Governance: Democracy tests', () => {
       {After: 0},
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event council.Proposed');
     const fellowshipReferendumIndex = submittedEvent.data.index.toNumber();
@@ -44,10 +44,10 @@ describeGov('Governance: Democracy tests', () => {
 
     await helper.wait.expectEvent(
       fellowshipPreparePeriod + fellowshipConfirmPeriod + fellowshipMinEnactPeriod,
-      helper.api!.events.democracy.Proposed,
+      helper.getApi().events.democracy.Proposed,
     );
 
-    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.api!.events.democracy.Started);
+    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.getApi().events.democracy.Started);
     const referendumIndex = startedEvent.refIndex.toNumber();
 
     const ayeBalance = 10_000n;

diff --git a/tests/src/governance/fellowship.test.ts b/tests/src/governance/fellowship.test.ts
@@ -29,7 +29,7 @@ describeGov('Governance: Fellowship tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const referendumIndex = submittedEvent.data.index.toNumber();
@@ -40,7 +40,7 @@ describeGov('Governance: Fellowship tests', () => {
     const enactmentId = await helper.fellowship.referenda.enactmentEventId(referendumIndex);
     const dispatchedEvent = await helper.wait.expectEvent(
       fellowshipPreparePeriod + fellowshipConfirmPeriod + defaultEnactmentMoment.After,
-      helper.api!.events.scheduler.Dispatched,
+      helper.getApi().events.scheduler.Dispatched,
       (event: any) => event.id == enactmentId,
     );
 
@@ -88,7 +88,7 @@ describeGov('Governance: Fellowship tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const fellowshipReferendumIndex = submittedEvent.data.index.toNumber();
@@ -98,7 +98,7 @@ describeGov('Governance: Fellowship tests', () => {
 
     const democracyProposed = await helper.wait.expectEvent(
       fellowshipPreparePeriod + fellowshipConfirmPeriod + fellowshipMinEnactPeriod,
-      helper.api!.events.democracy.Proposed,
+      helper.getApi().events.democracy.Proposed,
     );
 
     const democracyEnqueuedProposal = await helper.democracy.expectPublicProposal(democracyProposed.proposalIndex.toNumber());
@@ -122,7 +122,7 @@ describeGov('Governance: Fellowship tests', () => {
           newDummyProposal,
           defaultEnactmentMoment,
         );
-        const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+        const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
         if(!submittedEvent)
           throw Error('Expected event fellowshipReferenda.Submitted');
         const referendumIndex = submittedEvent.data.index.toNumber();
@@ -144,7 +144,7 @@ describeGov('Governance: Fellowship tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const referendumIndex = submittedEvent.data.index.toNumber();
@@ -184,7 +184,7 @@ describeGov('Governance: Fellowship tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const referendumIndex = submittedEvent.data.index.toNumber();
@@ -269,7 +269,7 @@ describeGov('Governance: Fellowship tests', () => {
       defaultEnactmentMoment,
     );
 
-    const submittedEvent = submitResult.result.events.find(helper.api!.events.fellowshipReferenda.Submitted.is);
+    const submittedEvent = submitResult.result.events.find(helper.getApi().events.fellowshipReferenda.Submitted.is);
     if(!submittedEvent)
       throw Error('Expected event fellowshipReferenda.Submitted');
     const referendumIndex = submittedEvent.data.index.toNumber();
@@ -324,7 +324,7 @@ describeGov('Governance: Fellowship tests', () => {
   itSub('[Negative] FellowshipProposition cannot cancel Democracy proposals', async ({helper}) => {
     const proposeResult = await helper.getSudo().democracy.propose(sudoer, dummyProposalCall(helper), 0n);
 
-    const proposedEvent = proposeResult.result.events.find(helper.api!.events.democracy.Proposed.is);
+    const proposedEvent = proposeResult.result.events.find(helper.getApi().events.democracy.Proposed.is);
     if(!proposedEvent)
       throw Error('Expected event democracy.Proposed');
     const proposalIndex = proposedEvent.data.proposalIndex.toNumber();
@@ -334,7 +334,7 @@ describeGov('Governance: Fellowship tests', () => {
 
   itSub('[Negative] FellowshipProposition cannot cancel ongoing Democracy referendums', async ({helper}) => {
     await helper.getSudo().democracy.externalProposeDefault(sudoer, dummyProposalCall(helper));
-    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.api!.events.democracy.Started);
+    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.getApi().events.democracy.Started);
     const referendumIndex = startedEvent.refIndex.toNumber();
 
     await testBadFellowshipProposal(helper, helper.democracy.emergencyCancelCall(referendumIndex));

diff --git a/tests/src/governance/init.test.ts b/tests/src/governance/init.test.ts
@@ -143,7 +143,7 @@ describeGov('Governance: Initialization', () => {
     );
 
     console.log('\t- The referendum is being decided');
-    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.api!.events.democracy.Started);
+    const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, helper.getApi().events.democracy.Started);
 
     await helper.democracy.vote(counselors.filip, startedEvent.refIndex.toNumber(), {
       Standard: {
@@ -155,10 +155,10 @@ describeGov('Governance: Initialization', () => {
       },
     });
 
-    const passedReferendumEvent = await helper.wait.expectEvent(democracyVotingPeriod, helper.api!.events.democracy.Passed);
+    const passedReferendumEvent = await helper.wait.expectEvent(democracyVotingPeriod, helper.getApi().events.democracy.Passed);
     expect(passedReferendumEvent.refIndex.toNumber()).to.be.equal(startedEvent.refIndex.toNumber());
 
-    await helper.wait.expectEvent(democracyEnactmentPeriod, helper.api!.events.scheduler.Dispatched);
+    await helper.wait.expectEvent(democracyEnactmentPeriod, helper.getApi().events.scheduler.Dispatched);
 
     councilMembers = await helper.council.membership.getMembers();
     const expectedCounselors = [