setTimeout renamed and made synchronous

tests/network-tests/src/constantinople/tests/electingCouncilTest.ts

@@ -3,7 +3,7 @@ import { membershipTest } from './impl/membershipCreation';
 import { councilTest } from './impl/electingCouncil';
 import { initConfig } from '../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
-import { setTimeout } from './impl/setTimeout';
+import { setTestTimeout } from '../utils/setTestTimeout';
 import BN from 'bn.js';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
@@ -13,6 +13,7 @@ import { closeApi } from './impl/closeApi';
 tap.mocha.describe('Electing council scenario', async () => {
   initConfig();
   registerJoystreamTypes();
+  registerJoystreamTypes();
 
   const m1KeyPairs: KeyringPair[] = new Array();
   const m2KeyPairs: KeyringPair[] = new Array();
@@ -30,7 +31,7 @@ tap.mocha.describe('Electing council scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

tests/network-tests/src/constantinople/tests/impl/setTimeout.ts

@@ -1,9 +0,0 @@
-import tap from 'tap';
-import { ApiWrapper } from '../../utils/apiWrapper';
-
-export async function setTimeout(apiWrapper: ApiWrapper, durationInBlocks: number) {
-  tap.test('retrieving time necessary for the test', async () => {
-    const durationInMillis = (await apiWrapper.getBlockDuration()).muln(durationInBlocks).toNumber();
-    tap.setTimeout(durationInMillis);
-  });
-}

tests/network-tests/src/constantinople/tests/membershipCreationTest.ts

@@ -2,7 +2,7 @@ import { KeyringPair } from '@polkadot/keyring/types';
 import { membershipTest } from './impl/membershipCreation';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { initConfig } from '../utils/config';
-import { setTimeout } from './impl/setTimeout';
+import { setTestTimeout } from '../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { ApiWrapper } from '../utils/apiWrapper';
@@ -23,7 +23,7 @@ tap.mocha.describe('Membership creation scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, nKeyPairs, keyring, N, paidTerms, sudoUri);
   closeApi(apiWrapper);
 });

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

@@ -5,7 +5,7 @@ import { electionParametersProposalTest } from './impl/electionParametersProposa
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -31,7 +31,7 @@ tap.mocha.describe('Election parameters proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

tests/network-tests/src/constantinople/tests/proposals/evictStorageProviderTest.ts

@@ -5,7 +5,7 @@ import { evictStorageProviderTest } from './impl/evictStoraveProvider';
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -31,7 +31,7 @@ tap.mocha.describe('Evict Storage provider scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { setLeadProposalTest } from './impl/setLeadProposal';
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -31,7 +31,7 @@ tap.mocha.describe('Set lead proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { spendingProposalTest } from './impl/spendingProposal';
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -33,7 +33,7 @@ tap.mocha.describe('Spending proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { storageRoleParametersProposalTest } from './impl/storageRoleParametersP
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -31,7 +31,7 @@ tap.mocha.describe('Storage role parameters proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { textProposalTest } from './impl/textProposal';
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -31,7 +31,7 @@ tap.mocha.describe('Text proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { updateRuntimeTest } from './impl/updateRuntime';
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -31,7 +31,7 @@ tap.mocha.describe('Update runtime scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { validatorCountProposal } from './impl/validatorCountProposal';
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -32,7 +32,7 @@ tap.mocha.describe('Validator count proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

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

@@ -5,7 +5,7 @@ import { workingGroupMintCapacityProposalTest } from './impl/workingGroupMintCap
 import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import BN from 'bn.js';
-import { setTimeout } from '../impl/setTimeout';
+import { setTestTimeout } from '../../utils/setTestTimeout';
 import tap from 'tap';
 import { registerJoystreamTypes } from '@constantinople/types';
 import { closeApi } from '../impl/closeApi';
@@ -32,7 +32,7 @@ tap.mocha.describe('Validator count proposal scenario', async () => {
   const provider = new WsProvider(nodeUrl);
   const apiWrapper: ApiWrapper = await ApiWrapper.create(provider);
 
-  setTimeout(apiWrapper, durationInBlocks);
+  setTestTimeout(apiWrapper, durationInBlocks);
   membershipTest(apiWrapper, m1KeyPairs, keyring, N, paidTerms, sudoUri);
   membershipTest(apiWrapper, m2KeyPairs, keyring, N, paidTerms, sudoUri);
   councilTest(apiWrapper, m1KeyPairs, m2KeyPairs, keyring, K, sudoUri, greaterStake, lesserStake);

tests/network-tests/src/constantinople/utils/setTestTimeout.ts

@@ -0,0 +1,7 @@
+import tap from 'tap';
+import { ApiWrapper } from './apiWrapper';
+
+export function setTestTimeout(apiWrapper: ApiWrapper, durationInBlocks: number) {
+  const durationInMillis = apiWrapper.getBlockDuration().muln(durationInBlocks).toNumber();
+  tap.setTimeout(durationInMillis);
+}