code refactoring, split test code into test and test function implementation

tests/network-tests/package.json

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

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

@@ -0,0 +1,10 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from './impl/membershipCreation';
+import { councilTest } from './impl/electingCouncil';
+
+const m1KeyPairs: KeyringPair[] = new Array();
+const m2KeyPairs: KeyringPair[] = new Array();
+
+membershipTest(m1KeyPairs);
+membershipTest(m2KeyPairs);
+councilTest(m1KeyPairs, m2KeyPairs);

tests/network-tests/src/tests/constantinople/electingCouncilTest.ts → tests/network-tests/src/constantinople/tests/impl/electingCouncil.ts

@@ -1,13 +1,12 @@
-import { membershipTest } from './membershipCreationTest';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { ApiWrapper } from './utils/apiWrapper';
+import { ApiWrapper } from '../../utils/apiWrapper';
 import { WsProvider, Keyring } from '@polkadot/api';
-import { initConfig } from './utils/config';
+import { initConfig } from '../../utils/config';
 import BN from 'bn.js';
-import { registerJoystreamTypes, Seat } from '@joystream/types';
+import { registerJoystreamTypes, Seat } from '@constantinople/types';
 import { assert } from 'chai';
 import { v4 as uuid } from 'uuid';
-import { Utils } from './utils/utils';
+import { Utils } from '../../utils/utils';
 import tap from 'tap';
 
 export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) {

tests/network-tests/src/tests/rome/membershipCreationTest.ts → tests/network-tests/src/constantinople/tests/impl/membershipCreation.ts

@@ -1,11 +1,11 @@
 import { WsProvider } from '@polkadot/api';
-import { registerJoystreamTypes } from '@rome/types';
+import { registerJoystreamTypes } from '@constantinople/types';
 import { Keyring } from '@polkadot/keyring';
 import { assert } from 'chai';
 import { KeyringPair } from '@polkadot/keyring/types';
 import BN from 'bn.js';
-import { ApiWrapper } from './utils/apiWrapper';
-import { initConfig } from './utils/config';
+import { ApiWrapper } from '../../utils/apiWrapper';
+import { initConfig } from '../../utils/config';
 import { v4 as uuid } from 'uuid';
 import tap from 'tap';
 
@@ -89,7 +89,3 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     apiWrapper.close();
   });
 }
-
-const nKeys: KeyringPair[] = new Array();
-
-membershipTest(nKeys);

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

@@ -0,0 +1,6 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from './impl/membershipCreation';
+
+const nKeyPairs: KeyringPair[] = new Array();
+
+membershipTest(nKeyPairs);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { electionParametersProposalTest } from './impl/electionParametersProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+electionParametersProposalTest(m1Keys, m2Keys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { evictStorageProviderTest } from './impl/evictStoraveProvider';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+evictStorageProviderTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/electionParametersProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/electionParametersProposal.ts

@@ -1,10 +1,8 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
@@ -131,11 +129,3 @@ export function electionParametersProposalTest(m1KeyPairs: KeyringPair[], m2KeyP
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-electionParametersProposalTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/evictStoraveProviderTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/evictStoraveProvider.ts

@@ -1,14 +1,12 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
-import { Utils } from '../utils/utils';
+import { Utils } from '../../../utils/utils';
 import tap from 'tap';
 
 export function evictStorageProviderTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) {
@@ -77,11 +75,3 @@ export function evictStorageProviderTest(m1KeyPairs: KeyringPair[], m2KeyPairs:
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-evictStorageProviderTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/setLeadProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/setLeadProposal.ts

@@ -1,10 +1,8 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
@@ -61,11 +59,3 @@ export function setLeadProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyri
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-setLeadProposalTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/spendingProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/spendingProposal.ts

@@ -1,10 +1,8 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
@@ -79,11 +77,3 @@ export function spendingProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyr
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-spendingProposalTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/storageRoleParametersProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/storageRoleParametersProposal.ts

@@ -1,14 +1,12 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
-import { RoleParameters } from '@joystream/types/lib/roles';
+import { RoleParameters } from '@constantinople/types/lib/roles';
 import tap from 'tap';
 
 export function storageRoleParametersProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) {
@@ -142,11 +140,3 @@ export function storageRoleParametersProposalTest(m1KeyPairs: KeyringPair[], m2K
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-storageRoleParametersProposalTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/textProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/textProposal.ts

@@ -1,10 +1,8 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import tap from 'tap';
@@ -61,11 +59,3 @@ export function textProposalTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringP
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-textProposalTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/updateRuntimeTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/updateRuntime.ts

@@ -1,11 +1,9 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { Bytes } from '@polkadot/types';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import tap from 'tap';
@@ -67,12 +65,3 @@ export function updateRuntimeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Keyring
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-updateRuntimeTest(m1Keys, m2Keys);
-membershipTest(new Array<KeyringPair>());

tests/network-tests/src/tests/constantinople/proposals/validatorCountProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/validatorCountProposal.ts

@@ -1,10 +1,8 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
@@ -71,11 +69,3 @@ export function validatorCountProposal(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-validatorCountProposal(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/proposals/workingGroupMintCapacityProposalTest.ts → tests/network-tests/src/constantinople/tests/proposals/impl/workingGroupMintCapacityProposal.ts

@@ -1,10 +1,8 @@
-import { initConfig } from '../utils/config';
+import { initConfig } from '../../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from '../membershipCreationTest';
-import { councilTest } from '../electingCouncilTest';
-import { registerJoystreamTypes } from '@joystream/types';
-import { ApiWrapper } from '../utils/apiWrapper';
+import { registerJoystreamTypes } from '@constantinople/types';
+import { ApiWrapper } from '../../../utils/apiWrapper';
 import { v4 as uuid } from 'uuid';
 import BN from 'bn.js';
 import { assert } from 'chai';
@@ -75,11 +73,3 @@ export function workingGroupMintCapacityProposalTest(m1KeyPairs: KeyringPair[],
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-workingGroupMintCapacityProposalTest(m1Keys, m2Keys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { setLeadProposalTest } from './impl/setLeadProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+setLeadProposalTest(m1Keys, m2Keys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { spendingProposalTest } from './impl/spendingProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+spendingProposalTest(m1Keys, m2Keys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { storageRoleParametersProposalTest } from './impl/storageRoleParametersProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+storageRoleParametersProposalTest(m1Keys, m2Keys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { textProposalTest } from './impl/textProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+textProposalTest(m1Keys, m2Keys);

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

@@ -0,0 +1,17 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { updateRuntimeTest } from './impl/updateRuntime';
+import tap = require('tap');
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+updateRuntimeTest(m1Keys, m2Keys);
+membershipTest(new Array<KeyringPair>());
+
+const defaultTimeout: number = 900000;
+tap.setTimeout(defaultTimeout);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { validatorCountProposal } from './impl/validatorCountProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+validatorCountProposal(m1Keys, m2Keys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from '../impl/membershipCreation';
+import { councilTest } from '../impl/electingCouncil';
+import { workingGroupMintCapacityProposalTest } from './impl/workingGroupMintCapacityProposal';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+workingGroupMintCapacityProposalTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/utils/apiWrapper.ts → tests/network-tests/src/constantinople/utils/apiWrapper.ts

@@ -2,11 +2,11 @@ import { ApiPromise, WsProvider } from '@polkadot/api';
 import { Option, Vec, Bytes, u32 } from '@polkadot/types';
 import { Codec } from '@polkadot/types/types';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { UserInfo, PaidMembershipTerms, MemberId } from '@joystream/types/lib/members';
-import { Mint, MintId } from '@joystream/types/lib/mint';
-import { Lead, LeadId } from '@joystream/types/lib/content-working-group';
-import { RoleParameters } from '@joystream/types/lib/roles';
-import { Seat } from '@joystream/types';
+import { UserInfo, PaidMembershipTerms, MemberId } from '@constantinople/types/lib/members';
+import { Mint, MintId } from '@constantinople/types/lib/mint';
+import { Lead, LeadId } from '@constantinople/types/lib/content-working-group';
+import { RoleParameters } from '@constantinople/types/lib/roles';
+import { Seat } from '@constantinople/types';
 import { Balance, EventRecord, AccountId, BlockNumber, BalanceOf } from '@polkadot/types/interfaces';
 import BN from 'bn.js';
 import { SubmittableExtrinsic } from '@polkadot/api/types';

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

@@ -1,11 +1,10 @@
 import { IExtrinsic } from '@polkadot/types/types';
-import { Bytes } from '@polkadot/types';
 import { compactToU8a, stringToU8a } from '@polkadot/util';
 import { blake2AsHex } from '@polkadot/util-crypto';
 import BN from 'bn.js';
 import fs from 'fs';
 import { decodeAddress } from '@polkadot/keyring';
-import { Seat } from '@joystream/types';
+import { Seat } from '@constantinople/types';
 
 export class Utils {
   private static LENGTH_ADDRESS = 32 + 1; // publicKey + prefix

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

@@ -0,0 +1,10 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from './impl/membershipCreation';
+import { councilTest } from './impl/electingCouncil';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);

tests/network-tests/src/tests/rome/electingCouncilTest.ts → tests/network-tests/src/rome/tests/impl/electingCouncil.ts

@@ -1,13 +1,12 @@
-import { membershipTest } from './membershipCreationTest';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { ApiWrapper } from './utils/apiWrapper';
+import { ApiWrapper } from '../../utils/apiWrapper';
 import { WsProvider, Keyring } from '@polkadot/api';
-import { initConfig } from './utils/config';
+import { initConfig } from '../../utils/config';
 import BN from 'bn.js';
 import { registerJoystreamTypes, Seat } from '@rome/types';
 import { assert } from 'chai';
 import { v4 as uuid } from 'uuid';
-import { Utils } from './utils/utils';
+import { Utils } from '../../utils/utils';
 import tap from 'tap';
 
 export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) {
@@ -119,10 +118,3 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);

tests/network-tests/src/tests/constantinople/membershipCreationTest.ts → tests/network-tests/src/rome/tests/impl/membershipCreation.ts

@@ -1,11 +1,11 @@
 import { WsProvider } from '@polkadot/api';
-import { registerJoystreamTypes } from '@joystream/types';
+import { registerJoystreamTypes } from '@rome/types';
 import { Keyring } from '@polkadot/keyring';
 import { assert } from 'chai';
 import { KeyringPair } from '@polkadot/keyring/types';
 import BN from 'bn.js';
-import { ApiWrapper } from './utils/apiWrapper';
-import { initConfig } from './utils/config';
+import { ApiWrapper } from '../../utils/apiWrapper';
+import { initConfig } from '../../utils/config';
 import { v4 as uuid } from 'uuid';
 import tap from 'tap';
 

tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts → tests/network-tests/src/rome/tests/impl/romeRuntimeUpgrade.ts

@@ -1,12 +1,10 @@
-import { initConfig } from './utils/config';
+import { initConfig } from '../../utils/config';
 import { Keyring, WsProvider } from '@polkadot/api';
 import { KeyringPair } from '@polkadot/keyring/types';
-import { membershipTest } from './membershipCreationTest';
-import { councilTest } from './electingCouncilTest';
 import { registerJoystreamTypes } from '@rome/types';
-import { ApiWrapper } from './utils/apiWrapper';
+import { ApiWrapper } from '../../utils/apiWrapper';
 import BN from 'bn.js';
-import { Utils } from './utils/utils';
+import { Utils } from '../../utils/utils';
 import tap from 'tap';
 
 export function romeRuntimeUpgradeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) {
@@ -68,11 +66,3 @@ export function romeRuntimeUpgradeTest(m1KeyPairs: KeyringPair[], m2KeyPairs: Ke
     apiWrapper.close();
   });
 }
-
-const m1Keys: KeyringPair[] = new Array();
-const m2Keys: KeyringPair[] = new Array();
-
-membershipTest(m1Keys);
-membershipTest(m2Keys);
-councilTest(m1Keys, m2Keys);
-romeRuntimeUpgradeTest(m1Keys, m2Keys);

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

@@ -0,0 +1,6 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from './impl/membershipCreation';
+
+const nKeys: KeyringPair[] = new Array();
+
+membershipTest(nKeys);

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

@@ -0,0 +1,12 @@
+import { KeyringPair } from '@polkadot/keyring/types';
+import { membershipTest } from './impl/membershipCreation';
+import { councilTest } from './impl/electingCouncil';
+import { romeRuntimeUpgradeTest } from './impl/romeRuntimeUpgrade';
+
+const m1Keys: KeyringPair[] = new Array();
+const m2Keys: KeyringPair[] = new Array();
+
+membershipTest(m1Keys);
+membershipTest(m2Keys);
+councilTest(m1Keys, m2Keys);
+romeRuntimeUpgradeTest(m1Keys, m2Keys);