Feature/proposals test coverage

.gitignore

@@ -24,4 +24,10 @@ yarn*
 .vscode
 
 # Compiled WASM code
-*.wasm
+*.wasm
+
+# Chain specificaiton
+chainspec.json
+
+# Istanbul report output
+**.nyc_output/

README.md

@@ -79,14 +79,23 @@ This will build and run a fresh new local development chain purging existing one
 cargo test
 ```
 
-### API integration tests
+### Network tests
 
 ```bash
-./scripts/run-dev-chain.sh
+./scripts/run-test-chain.sh
 yarn test
 ```
 
 To run the integration tests with a different chain, you can omit step running the local development chain and set the node URL using `NODE_URL` environment variable.
+Proposal grace periods should be set to 0, otherwise proposal network tests will fail.
+
+### Rome-Constantinople migration network test
+
+Ensure Rome node is up and running, and node URL is set using `NODE_URL` environment variable (default value is `localhost:9944`).
+
+```bash
+yarn test-migration
+```
 
 ## Joystream Runtime
 

scripts/run-test-chain.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+cargo run --release -p joystream-node build-spec --chain dev > chainspec.json
+sed -i 's/"setValidatorCountProposalGracePeriod":.*/"setValidatorCountProposalGracePeriod": 0,/' chainspec.json
+sed -i 's/"runtimeUpgradeProposalGracePeriod":.*/"runtimeUpgradeProposalGracePeriod": 0,/' ./chainspec.json
+sed -i 's/"setElectionParametersProposalGracePeriod":.*/"setElectionParametersProposalGracePeriod": 0,/' ./chainspec.json
+sed -i 's/"textProposalGracePeriod":.*/"textProposalGracePeriod": 0,/' chainspec.json
+sed -i 's/"setContentWorkingGroupMintCapacityProposalGracePeriod":.*/"setContentWorkingGroupMintCapacityProposalGracePeriod": 0,/' chainspec.json
+sed -i 's/"setLeadProposalGracePeriod":.*/"setLeadProposalGracePeriod": 0,/' chainspec.json
+sed -i 's/"spendingProposalGracePeriod":.*/"spendingProposalGracePeriod": 0,/' chainspec.json
+sed -i 's/"evictStorageProviderProposalGracePeriod":.*/"evictStorageProviderProposalGracePeriod": 0,/' chainspec.json
+sed -i 's/"setStorageRoleParametersProposalGracePeriod":.*/"setStorageRoleParametersProposalGracePeriod": 0/' chainspec.json
+yes | cargo run --release -p joystream-node -- purge-chain --dev
+cargo run --release -p joystream-node -- --chain=chainspec.json --alice --validator

tests/network-tests/.env

@@ -7,16 +7,20 @@ MEMBERSHIP_CREATION_N = 2
 # ID of the membership paid terms used in membership creation test.
 MEMBERSHIP_PAID_TERMS = 0
 # Council stake amount for first K accounts in council election test.
-COUNCIL_STAKE_GREATER_AMOUNT = 1500
+COUNCIL_STAKE_GREATER_AMOUNT = 3000
 # Council stake amount for first the rest participants in council election test.
-COUNCIL_STAKE_LESSER_AMOUNT = 1000
+COUNCIL_STAKE_LESSER_AMOUNT = 2000
 # Number of members with greater stake in council election test.
 COUNCIL_ELECTION_K = 2
 # Balance to spend using spending proposal
 SPENDING_BALANCE = 1000
-# Minting capacity for content working group minting capacity test.
-MINTING_CAPACITY = 100020
+# Minting capacity increment for content working group minting capacity test.
+MINTING_CAPACITY_INCREMENT = 20
+# Minting capacity for council mint for spending proposal.
+COUNCIL_MINTING_CAPACITY = 100000
 # Stake amount for Rome runtime upgrade proposal
 RUNTIME_UPGRADE_PROPOSAL_STAKE = 100000
+# Validator count increment for Validator count test.
+VALIDATOR_COUNT_INCREMENT = 2
 # Constantinople runtime path
-RUNTIME_WASM_PATH = ../../target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm
+RUNTIME_WASM_PATH = ../../target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm

tests/network-tests/package.json

@@ -4,16 +4,16 @@
   "license": "GPL-3.0-only",
   "scripts": {
     "build": "tsc --build tsconfig.json",
-    "test": "mocha -r ts-node/register src/tests/constantinople/*",
-    "test-migration": "mocha -r ts-node/register src/tests/rome/* && mocha -r ts-node/register src/tests/constantinople/*",
+    "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": "",
-    "@rome/types@npm:@joystream/types": "^0.7.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",
     "@types/bn.js": "^4.11.5",
     "bn.js": "^4.11.8",
     "dotenv": "^8.2.0",
@@ -23,11 +23,11 @@
   "devDependencies": {
     "@polkadot/ts": "^0.3.14",
     "@types/chai": "^4.2.11",
-    "@types/mocha": "^7.0.2",
+    "@types/tap": "^14.10.0",
     "@types/uuid": "^7.0.2",
     "chai": "^4.2.0",
-    "mocha": "^7.1.1",
     "prettier": "2.0.2",
+    "tap": "^14.10.7",
     "ts-node": "^8.8.1",
     "tslint": "^6.1.0",
     "typescript": "^3.8.3"

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,13 @@
-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 BN = require('bn.js');
-import { registerJoystreamTypes, Seat } from '@joystream/types';
+import { initConfig } from '../../utils/config';
+import BN from 'bn.js';
+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[]) {
   initConfig();
@@ -17,18 +17,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;
 
-  before(async function () {
-    this.timeout(defaultTimeout);
+  tap.setTimeout(defaultTimeout);
+
+  tap.test('Electing council test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
   });
 
-  it('Electing a council test', 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();
@@ -111,17 +112,9 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]
         `Member ${seat.member} has unexpected stake ${Utils.getTotalStake(seat)}`
       )
     );
-  }).timeout(defaultTimeout);
+  });
 
-  after(() => {
+  tap.teardown(() => {
     apiWrapper.close();
   });
 }
-
-describe('Council integration tests', () => {
-  const m1KeyPairs: KeyringPair[] = new Array();
-  const m2KeyPairs: KeyringPair[] = new Array();
-  membershipTest(m1KeyPairs);
-  membershipTest(m2KeyPairs);
-  councilTest(m1KeyPairs, m2KeyPairs);
-});

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

@@ -1,12 +1,13 @@
 import { WsProvider } from '@polkadot/api';
-import { registerJoystreamTypes } from '@joystream/types';
+import { registerJoystreamTypes } from '@constantinople/types';
 import { Keyring } from '@polkadot/keyring';
 import { assert } from 'chai';
 import { KeyringPair } from '@polkadot/keyring/types';
-import BN = require('bn.js');
-import { ApiWrapper } from './utils/apiWrapper';
-import { initConfig } from './utils/config';
+import BN from 'bn.js';
+import { ApiWrapper } from '../../utils/apiWrapper';
+import { initConfig } from '../../utils/config';
 import { v4 as uuid } from 'uuid';
+import tap from 'tap';
 
 export function membershipTest(nKeyPairs: KeyringPair[]) {
   initConfig();
@@ -15,15 +16,16 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
   const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!;
   const nodeUrl: string = process.env.NODE_URL!;
   const sudoUri: string = process.env.SUDO_ACCOUNT_URI!;
-  const defaultTimeout: number = 30000;
+  const defaultTimeout: number = 75000;
   let apiWrapper: ApiWrapper;
   let sudo: KeyringPair;
   let aKeyPair: KeyringPair;
   let membershipFee: BN;
   let membershipTransactionFee: BN;
 
-  before(async function () {
-    this.timeout(defaultTimeout);
+  tap.setTimeout(defaultTimeout);
+
+  tap.test('Membership creation test setup', async () => {
     registerJoystreamTypes();
     const provider = new WsProvider(nodeUrl);
     apiWrapper = await ApiWrapper.create(provider);
@@ -42,7 +44,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee);
   });
 
-  it('Buy membeship is accepted with sufficient funds', 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)}`);
@@ -53,9 +55,9 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
         .getMemberIds(keyPair.address)
         .then(membership => assert(membership.length > 0, `Account ${keyPair.address} is not a member`))
     );
-  }).timeout(defaultTimeout);
+  });
 
-  it('Account A can not buy the membership with insufficient funds', async () => {
+  tap.test('Account A can not buy the membership with insufficient funds', async () => {
     await apiWrapper
       .getBalance(aKeyPair.address)
       .then(balance =>
@@ -68,9 +70,9 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     apiWrapper
       .getMemberIds(aKeyPair.address)
       .then(membership => assert(membership.length === 0, 'Account A is a member'));
-  }).timeout(defaultTimeout);
+  });
 
-  it('Account A was able to buy the membership with sufficient funds', 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)
@@ -81,14 +83,9 @@ export function membershipTest(nKeyPairs: KeyringPair[]) {
     apiWrapper
       .getMemberIds(aKeyPair.address)
       .then(membership => assert(membership.length > 0, 'Account A is a not member'));
-  }).timeout(defaultTimeout);
+  });
 
-  after(() => {
+  tap.teardown(() => {
     apiWrapper.close();
   });
 }
-
-describe.skip('Membership integration tests', () => {
-  const nKeyPairs: KeyringPair[] = new Array();
-  membershipTest(nKeyPairs);
-});

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);