Переглянути джерело

refactored to use node-tap instead of mocha

Gleb Urvanov 4 роки тому
батько
коміт
ff42ae699a

+ 2 - 2
tests/network-tests/package.json

@@ -5,12 +5,12 @@
   "scripts": {
     "build": "tsc --build tsconfig.json",
     "test": "tap --files ts-node/register src/tests/constantinople/proposals/*",
-    "test-migration": "tap src/tests/rome/* && tap src/tests/constantinople/*",
+    "test-migration": "tap --files src/tests/rome/romeRuntimeUpgradeTest.ts --files src/tests/constantinople/electingCouncilTest.ts",
     "lint": "tslint --project tsconfig.json",
     "prettier": "prettier --write ./src"
   },
   "dependencies": {
-    "@joystream/types": "",
+    "@joystream/types": "^0.8.0",
     "@polkadot/api": "^0.96.1",
     "@polkadot/keyring": "^1.7.0-beta.5",
     "@rome/types@npm:@joystream/types": "^0.7.0",

+ 3 - 10
tests/network-tests/src/tests/constantinople/electingCouncilTest.ts

@@ -18,19 +18,19 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]
   const K: number = +process.env.COUNCIL_ELECTION_K!;
   const greaterStake: BN = new BN(+process.env.COUNCIL_STAKE_GREATER_AMOUNT!);
   const lesserStake: BN = new BN(+process.env.COUNCIL_STAKE_LESSER_AMOUNT!);
-  const defaultTimeout: number = 120000;
+  const defaultTimeout: number = 300000;
   let sudo: KeyringPair;
   let apiWrapper: ApiWrapper;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Electing council test setup', { bail: true }, async () => {
+  tap.test('Electing council test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Electing a council test', { bail: true }, async () => {
+  tap.test('Electing a council test', async () => {
     // Setup goes here because M keypairs are generated after before() function
     sudo = keyring.addFromUri(sudoUri);
     let now = await apiWrapper.getBestBlock();
@@ -119,10 +119,3 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]
     apiWrapper.close();
   });
 }
-
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
-
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);

+ 4 - 8
tests/network-tests/src/tests/constantinople/membershipCreationTest.ts

@@ -25,7 +25,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Membership creation test setup', { bail: true }, async () => {
+  tap.test('Membership creation test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
@@ -44,7 +44,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee);
   });
 
-  tap.test('Buy membeship is accepted with sufficient funds', { bail: true }, async () => {
+  tap.test('Buy membeship is accepted with sufficient funds', async () => {
     await Promise.all(
       nKeyPairs.map(async (keyPair, index) => {
         await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}${keyPair.address.substring(0, 8)}`);
@@ -57,7 +57,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     );
   });
 
-  tap.test('Account A can not buy the membership with insufficient funds', { bail: true }, async () => {
+  tap.test('Account A can not buy the membership with insufficient funds', async () => {
     await apiWrapper
       .getBalance(aKeyPair.address)
       .then(balance =>
@@ -72,7 +72,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
       .then(membership => assert(membership.length === 0, 'Account A is a member'));
   });
 
-  tap.test('Account A was able to buy the membership with sufficient funds', { bail: true }, async () => {
+  tap.test('Account A was able to buy the membership with sufficient funds', async () => {
     await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee));
     apiWrapper
       .getBalance(aKeyPair.address)
@@ -89,7 +89,3 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     apiWrapper.close();
   });
 }
-
-const nKeyPairs: KeyringPair[] = new Array();
-
-membershipTest(nKeyPairs);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/electionParametersProposalTest.ts

@@ -15,20 +15,20 @@ export function electionParametersProposalTest(m1KeyPairs: KeyringPair[], m2KeyP
   const keyring = new Keyring({ type: 'sr25519' });
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Election parameters proposal test setup', { bail: true }, async () => {
+  tap.test('Election parameters proposal test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Election parameters proposal test', { bail: true }, async () => {
+  tap.test('Election parameters proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8);
@@ -132,10 +132,10 @@ export function electionParametersProposalTest(m1KeyPairs: KeyringPair[], m2KeyP
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-electionParametersProposalTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+electionParametersProposalTest(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/evictStoraveProviderTest.ts

@@ -16,20 +16,20 @@ export function evictStorageProviderTest(m1KeyPairs: KeyringPair[], m2KeyPairs:
   const keyring = new Keyring({ type: 'sr25519' });
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Evict storage provider proposal test setup', { bail: true }, async () => {
+  tap.test('Evict storage provider proposal test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Evict storage provider proposal test', { bail: true }, async () => {
+  tap.test('Evict storage provider proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8);
@@ -78,10 +78,10 @@ export function evictStorageProviderTest(m1KeyPairs: KeyringPair[], m2KeyPairs:
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-evictStorageProviderTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+evictStorageProviderTest(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/setLeadProposalTest.ts

@@ -15,20 +15,20 @@ export function setLeadProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyri
   const keyring = new Keyring({ type: 'sr25519' });
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Set lead proposal test', { bail: true }, async () => {
+  tap.test('Set lead proposal test', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Lead proposal test', { bail: true }, async () => {
+  tap.test('Lead proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8);
@@ -62,10 +62,10 @@ export function setLeadProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyri
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-setLeadProposalTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+setLeadProposalTest(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/spendingProposalTest.ts

@@ -17,20 +17,20 @@ export function spendingProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyr
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
   const spendingBalance: BN = new BN(+process.env.SPENDING_BALANCE!);
   const mintCapacity: BN = new BN(+process.env.COUNCIL_MINTING_CAPACITY!);
-  const defaultTimeout: number = 120000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Spending proposal test setup', { bail: true }, async () => {
+  tap.test('Spending proposal test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Spending proposal test', { bail: true }, async () => {
+  tap.test('Spending proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const description: string = 'spending proposal which is used for API network testing with some mock data';
@@ -80,10 +80,10 @@ export function spendingProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyr
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-spendingProposalTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+spendingProposalTest(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/storageRoleParametersProposalTest.ts

@@ -16,20 +16,20 @@ export function storageRoleParametersProposalTest(m1KeyPairs: KeyringPair[], m2K
   const keyring = new Keyring({ type: 'sr25519' });
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Storage role parameters proposal test setup', { bail: true }, async () => {
+  tap.test('Storage role parameters proposal test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Storage role parameters proposal test', { bail: true }, async () => {
+  tap.test('Storage role parameters proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8);
@@ -143,10 +143,10 @@ export function storageRoleParametersProposalTest(m1KeyPairs: KeyringPair[], m2K
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-storageRoleParametersProposalTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+storageRoleParametersProposalTest(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/textProposalTest.ts

@@ -14,20 +14,20 @@ export function textProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringP
   const keyring = new Keyring({ type: 'sr25519' });
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Text proposal test setup', { bail: true }, async () => {
+  tap.test('Text proposal test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Text proposal test', { bail: true }, async () => {
+  tap.test('Text proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8);
@@ -62,10 +62,10 @@ export function textProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringP
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-textProposalTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+textProposalTest(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/updateRuntimeTest.ts

@@ -15,20 +15,20 @@ export function updateRuntimeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyring
   const keyring = new Keyring({ type: 'sr25519' });
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 120000;
+  const defaultTimeout: number = 900000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Update runtime test setup', { bail: true }, async () => {
+  tap.test('Update runtime test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('\n\tUpgrading the runtime test', { bail: true }, async () => {
+  tap.test('\n\tUpgrading the runtime test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const runtime: Bytes = await apiWrapper.getRuntime();
@@ -68,11 +68,11 @@ export function updateRuntimeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyring
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-updateRuntimeTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+updateRuntimeTest(m1Keys, m2Keys);
 membershipTest(new Array<KeyringPair>());

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/validatorCountProposalTest.ts

@@ -16,20 +16,20 @@ export function validatorCountProposal(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
   const validatorCountIncrement: BN = new BN(+process.env.VALIDATOR_COUNT_INCREMENT!);
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Validator count proposal test setup', { bail: true }, async () => {
+  tap.test('Validator count proposal test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Validator count proposal test', { bail: true }, async () => {
+  tap.test('Validator count proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8);
@@ -72,10 +72,10 @@ export function validatorCountProposal(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-validatorCountProposal(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+validatorCountProposal(m1Keys, m2Keys);

+ 9 - 9
tests/network-tests/src/tests/constantinople/proposals/workingGroupMintCapacityProposalTest.ts

@@ -16,20 +16,20 @@ export function workingGroupMintCapacityProposalTest(m1KeyPairs: KeyringPair[],
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
   const mintingCapacityIncrement: BN = new BN(+process.env.MINTING_CAPACITY_INCREMENT!);
-  const defaultTimeout: number = 120000;
+  const defaultTimeout: number = 600000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Working group mint capacity proposal test', { bail: true }, async () => {
+  tap.test('Working group mint capacity proposal test', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Mint capacity proposal test', { bail: true }, async () => {
+  tap.test('Mint capacity proposal test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const description: string = 'spending proposal which is used for API network testing';
@@ -76,10 +76,10 @@ export function workingGroupMintCapacityProposalTest(m1KeyPairs: KeyringPair[],
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-workingGroupMintCapacityProposalTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+workingGroupMintCapacityProposalTest(m1Keys, m2Keys);

+ 8 - 8
tests/network-tests/src/tests/rome/electingCouncilTest.ts

@@ -18,19 +18,19 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]
   const K: number = +process.env.COUNCIL_ELECTION_K!;
   const greaterStake: BN = new BN(+process.env.COUNCIL_STAKE_GREATER_AMOUNT!);
   const lesserStake: BN = new BN(+process.env.COUNCIL_STAKE_LESSER_AMOUNT!);
-  const defaultTimeout: number = 120000;
+  const defaultTimeout: number = 300000;
   let sudo: KeyringPair;
   let apiWrapper: ApiWrapper;
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Electing council test setup', { bail: true }, async () => {
+  tap.test('Electing council test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Electing a council test', { bail: true }, async () => {
+  tap.test('Electing a council test', async () => {
     // Setup goes here because M keypairs are generated after before() function
     sudo = keyring.addFromUri(sudoUri);
     let now = await apiWrapper.getBestBlock();
@@ -120,9 +120,9 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);

+ 6 - 6
tests/network-tests/src/tests/rome/membershipCreationTest.ts

@@ -25,7 +25,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Membership creation test setup', { bail: true }, async () => {
+  tap.test('Membership creation test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
@@ -44,7 +44,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee);
   });
 
-  tap.test('Buy membeship is accepted with sufficient funds', { bail: true }, async () => {
+  tap.test('Buy membeship is accepted with sufficient funds', async () => {
     await Promise.all(
       nKeyPairs.map(async (keyPair, index) => {
         await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}${keyPair.address.substring(0, 8)}`);
@@ -57,7 +57,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     );
   });
 
-  tap.test('Account A can not buy the membership with insufficient funds', { bail: true }, async () => {
+  tap.test('Account A can not buy the membership with insufficient funds', async () => {
     await apiWrapper
       .getBalance(aKeyPair.address)
       .then(balance =>
@@ -72,7 +72,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
       .then(membership => assert(membership.length === 0, 'Account A is a member'));
   });
 
-  tap.test('Account A was able to buy the membership with sufficient funds', { bail: true }, async () => {
+  tap.test('Account A was able to buy the membership with sufficient funds', async () => {
     await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee));
     apiWrapper
       .getBalance(aKeyPair.address)
@@ -90,6 +90,6 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
   });
 }
 
-const nKeyPairs: KeyringPair[] = new Array();
+const nKeys: KeyringPair[] = new Array();
 
-membershipTest(nKeyPairs);
+membershipTest(nKeys);

+ 9 - 9
tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts

@@ -16,7 +16,7 @@ export function romeRuntimeUpgradeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
   const proposalStake: BN = new BN(+process.env.RUNTIME_UPGRADE_PROPOSAL_STAKE!);
   const runtimePath: string = process.env.RUNTIME_WASM_PATH!;
-  const defaultTimeout: number = 180000;
+  const defaultTimeout: number = 1200000;
 
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
@@ -24,13 +24,13 @@ export function romeRuntimeUpgradeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
 
   tap.setTimeout(defaultTimeout);
 
-  tap.test('Rome runtime upgrade test setup', { bail: true }, async () => {
+  tap.test('Rome runtime upgrade test setup', async () => {
     registerJoystreamTypes();
     provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  tap.test('Upgrading the runtime test', { bail: true }, async () => {
+  tap.test('Upgrading the runtime test', async () => {
     // Setup
     sudo = keyring.addFromUri(sudoUri);
     const runtime: string = Utils.readRuntimeFromFile(runtimePath);
@@ -69,10 +69,10 @@ export function romeRuntimeUpgradeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
   });
 }
 
-const m1KeyPairs: KeyringPair[] = new Array();
-const m2KeyPairs: KeyringPair[] = new Array();
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
 
-membershipTest(m1KeyPairs);
-membershipTest(m2KeyPairs);
-councilTest(m1KeyPairs, m2KeyPairs);
-romeRuntimeUpgradeTest(m1KeyPairs, m2KeyPairs);
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+romeRuntimeUpgradeTest(m1Keys, m2Keys);