git.delta.rocks / unique-network / refs/commits / 35ede417a4d0

difftreelog

Merge branch 'develop' into feature/CORE-180-v2

Igor Kozyrev2021-10-08parents: #1d17111 #f4ecaab.patch.diff
in: master

96 files changed

deleteddeploy/dev/host_vars/chain-specs/nft-rococo-local-v0.9.10-source.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/chain-specs/nft-rococo-local-v0.9.9-source.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/chain-specs/nft-westend-local-v0.9.9-source.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/chain-specs/rococo-local-v0.9.10-source.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/chain-specs/rococo-local-v0.9.9-source.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/chain-specs/westend-local-v0.9.9-source.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-alice-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-alice-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-bob-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-bob-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-charlie-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-charlie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-dave-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-dave-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-eve-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-eve-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-ferdie-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-ferdie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-greg-aura-key.jsondiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-rococo-greg-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-alice-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-bob-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-charlie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-dave-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-eve-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-ferdie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/nft-westend-greg-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-rococo-alice-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-rococo-bob-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-rococo-charlie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-rococo-dave-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-rococo-eve-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-rococo-ferdie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-westend-alice-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-westend-bob-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-westend-charlie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-westend-dave-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-westend-eve-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/keys/relay-westend-ferdie-node-keydiffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-alice.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-bob.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-charlie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-dave.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-eve.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-ferdie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-rococo-greg.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-alice.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-bob.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-charlie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-dave.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-eve.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-ferdie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/parachain-westend-greg.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-rococo-alice.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-rococo-bob.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-rococo-charlie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-rococo-dave.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-rococo-eve.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-rococo-ferdie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-westend-alice.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-westend-bob.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-westend-charlie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-westend-dave.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-westend-eve.servicediffbeforeafterboth

no changes

deleteddeploy/dev/host_vars/services/relay-westend-ferdie.servicediffbeforeafterboth

no changes

deleteddeploy/dev/put-keys-parachain-rococo.shdiffbeforeafterboth

no changes

deleteddeploy/dev/put-keys-parachain-westend.shdiffbeforeafterboth

no changes

deleteddeploy/dev/start-parachain-rococo.shdiffbeforeafterboth

no changes

deleteddeploy/dev/start-parachain-westend.shdiffbeforeafterboth

no changes

deleteddeploy/dev/start-relay-rococo.shdiffbeforeafterboth

no changes

deleteddeploy/dev/start-relay-westend.shdiffbeforeafterboth

no changes

deleteddeploy/dev/stop-parachain-rococo.shdiffbeforeafterboth

no changes

deleteddeploy/dev/stop-parachain-westend.shdiffbeforeafterboth

no changes

deleteddeploy/dev/stop-relay-rococo.shdiffbeforeafterboth

no changes

deleteddeploy/dev/stop-relay-westend.shdiffbeforeafterboth

no changes

deleteddeploy/docker-compose-tests.ymldiffbeforeafterboth

no changes

deleteddeploy/node_build_test.ymldiffbeforeafterboth

no changes

deleteddeploy/old/Dockerfile-testnetdiffbeforeafterboth

no changes

deleteddeploy/old/ci_node.shdiffbeforeafterboth

no changes

deleteddeploy/old/deploy-testnet.shdiffbeforeafterboth

no changes

deleteddeploy/old/docker-compose-testnet.ymldiffbeforeafterboth

no changes

deleteddeploy/old/purge-running-node.shdiffbeforeafterboth

no changes

deleteddeploy/old/run-testnet-local-node.shdiffbeforeafterboth

no changes

deleteddeploy/old/run-testnet.shdiffbeforeafterboth

no changes

deleteddeploy/old/upload_secrets.shdiffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/chain-specs/nft-westend-v0.9.9-source.jsondiffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/chain-specs/nft-westend-v0.9.9.jsondiffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/chain-specs/westend-v0.9.9.jsondiffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/services/parachain-westend-alice.servicediffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/services/parachain-westend-bob.servicediffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/services/parachain-westend-charlie.servicediffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/services/parachain-westend-dave.servicediffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/services/parachain-westend-eve.servicediffbeforeafterboth

no changes

deleteddeploy/westend/host_vars/services/parachain-westend-ferdie.servicediffbeforeafterboth

no changes

modifiedtests/src/util/helpers.tsdiffbeforeafterboth
1142 });1142 });
1143}1143}
1144
1145export async function addToWhiteListAgainExpectSuccess(sender: IKeyringPair, collectionId: number, address: string | AccountId) {
1146 await usingApi(async (api) => {
1147
1148 const whiteListedBefore = (await api.query.nft.whiteList(collectionId, address)).toJSON();
1149
1150 // Run the transaction
1151 const tx = api.tx.nft.addToWhiteList(collectionId, normalizeAccountId(address));
1152 const events = await submitTransactionAsync(sender, tx);
1153 const result = getGenericResult(events);
1154
1155 const whiteListedAfter = (await api.query.nft.whiteList(collectionId, address)).toJSON();
1156
1157 // What to expect
1158 // tslint:disable-next-line:no-unused-expression
1159 expect(result.success).to.be.true;
1160 // tslint:disable-next-line: no-unused-expression
1161 expect(whiteListedBefore).to.be.true;
1162 // tslint:disable-next-line: no-unused-expression
1163 expect(whiteListedAfter).to.be.true;
1164 });
1165}
11441166
1145export async function addToWhiteListExpectFail(sender: IKeyringPair, collectionId: number, address: string | AccountId) {1167export async function addToWhiteListExpectFail(sender: IKeyringPair, collectionId: number, address: string | AccountId) {
1146 await usingApi(async (api) => {1168 await usingApi(async (api) => {
1169
1147 // Run the transaction1170 // Run the transaction
1148 const tx = api.tx.nft.addToWhiteList(collectionId, normalizeAccountId(address));1171 const tx = api.tx.nft.addToWhiteList(collectionId, normalizeAccountId(address));
1149 const events = await expect(submitTransactionAsync(sender, tx)).to.be.rejected;1172 const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
1150 const result = getGenericResult(events);1173 const result = getGenericResult(events);
11511174
1152 // What to expect1175 // What to expect
addedtests/src/whiteLists.test.tsdiffbeforeafterboth

no changes