nits + bump version

paritytech · Nov 3, 2023 · 9f72e7e · 9f72e7e
1 parent e95b7ea
commit 9f72e7e
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 72 deletions.
diff --git a/examples/asset-hub-kusama/config.toml b/examples/asset-hub-kusama/config.toml
@@ -12,26 +12,23 @@ chain_spec_command = "./bin/chain-spec-generator {% raw %} {{chainName}} {% endr
 
     [[relaychain.nodes]]
     name = "bob"
-    ws_port = 9901
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
     [[relaychain.nodes]]
     name = "charlie"
-    ws_port = 9902
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
     [[relaychain.nodes]]
     name = "dave"
-    ws_port = 9903
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
 [[parachains]]
 id = 1000
 chain = "asset-hub-kusama-local"
-chain_spec_command = "./bin/chain-spec-generator --chain {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "./bin/chain-spec-generator {% raw %} {{chainName}} {% endraw %}"
 cumulus_based = true
 
     [[parachains.collators]]
@@ -42,7 +39,6 @@ cumulus_based = true
 
     [[parachains.collators]]
     name = "collator2"
-    ws_port = 9911
     command = "./bin/polkadot-parachain"
     args = [ "-lxcm=trace", "--state-cache-size=0"]
 
@@ -59,7 +55,6 @@ cumulus_based = true
 
     [[parachains.collators]]
     name = "collator4"
-    ws_port = 9921
     command = "./bin/polkadot-parachain"
     args = [ "-lxcm=trace", "--state-cache-size=0"]
 

diff --git a/examples/asset-hub-polkadot/config.toml b/examples/asset-hub-polkadot/config.toml
@@ -6,25 +6,22 @@ chain_spec_command = "./bin/chain-spec-generator {% raw %} {{chainName}} {% endr
 
     [[relaychain.nodes]]
     name = "alice"
-    ws_port = 9800
+    ws_port = 9900
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
     [[relaychain.nodes]]
     name = "bob"
-    ws_port = 9801
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
     [[relaychain.nodes]]
     name = "charlie"
-    ws_port = 9802
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
     [[relaychain.nodes]]
     name = "dave"
-    ws_port = 9803
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
@@ -36,13 +33,12 @@ cumulus_based = true
 
     [[parachains.collators]]
     name = "collator1"
-    ws_port = 9810
+    ws_port = 9910
     command = "./bin/polkadot-parachain"
     args = [ "-lxcm=trace", "--state-cache-size=0" ]
 
     [[parachains.collators]]
     name = "collator2"
-    ws_port = 9811
     command = "./bin/polkadot-parachain"
     args = [ "-lxcm=trace", "--state-cache-size=0"]
 
@@ -54,13 +50,12 @@ cumulus_based = true
 
     [[parachains.collators]]
     name = "collator3"
-    ws_port = 9820
+    ws_port = 9920
     command = "./bin/polkadot-parachain"
     args = [ "-lxcm=trace", "--state-cache-size=0" ]
 
     [[parachains.collators]]
     name = "collator4"
-    ws_port = 9821
     command = "./bin/polkadot-parachain"
     args = [ "-lxcm=trace", "--state-cache-size=0"]
 

diff --git a/examples/collectives-polkadot/2_opengov/0_assethub.yml b/examples/collectives-polkadot/2_opengov/0_assethub.yml
@@ -74,16 +74,16 @@ tests:
                   call: submit
                   args: [
                     {
-                      "Origins": "StakingAdmin",
+                      Origins: StakingAdmin,
                     },
                     {
-                      "Lookup": {
-                        "hash_": $send_set_candidates_rc.hash,
-                        "len": $send_set_candidates_rc.len,
+                      Lookup: {
+                        hash_: $send_set_candidates_rc.hash,
+                        len: $send_set_candidates_rc.len,
                       },
                     },
                     {
-                      "After": 1,
+                      After: 1,
                     },
                   ]
                   events:
@@ -102,12 +102,12 @@ tests:
                   args: [
                     *proposal_index,
                     {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
+                      Standard: {
+                        vote: {
+                          aye: true,
+                          conviction: Locked1x,
                         },
-                        "balance": 200000000000000,
+                        balance: 200000000000000,
                       }
                     },
                   ] # TODO no event to catch
@@ -121,10 +121,10 @@ tests:
                   args: [
                     *proposal_index,
                     {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
+                      Standard: {
+                        vote: {
+                          aye: true,
+                          conviction: Locked1x,
                         },
                         "balance": 200000000000000,
                       }

diff --git a/examples/collectives-polkadot/3_fellowship/0_init.yml b/examples/collectives-polkadot/3_fellowship/0_init.yml
@@ -125,16 +125,16 @@ tests:
                   call: submit
                   args: [
                     {
-                      "Origins": "FellowshipAdmin",
+                      Origins: FellowshipAdmin,
                     },
                     {
-                      "Lookup": {
-                        "hash_": $send_init_fellowship_rc.hash,
-                        "len": $send_init_fellowship_rc.len,
+                      Lookup: {
+                        hash_: $send_init_fellowship_rc.hash,
+                        len: $send_init_fellowship_rc.len,
                       },
                     },
                     {
-                      "After": 1,
+                      After: 1,
                     },
                   ]
                   events:
@@ -153,12 +153,12 @@ tests:
                   args: [
                     *proposal_index,
                     {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
+                      Standard: {
+                        vote: {
+                          aye: true,
+                          conviction: Locked1x,
                         },
-                        "balance": 200000000000000,
+                        balance: 200000000000000,
                       }
                     },
                   ] # TODO no Aye event to catch
@@ -172,12 +172,12 @@ tests:
                   args: [
                     *proposal_index,
                     {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
+                      Standard: {
+                        vote: {
+                          aye: true,
+                          conviction: Locked1x,
                         },
-                        "balance": 200000000000000,
+                        balance: 200000000000000,
                       }
                     },
                   ] # TODO no Aye event to catch

diff --git a/examples/collectives-polkadot/3_fellowship/1_whitelist_call.yml b/examples/collectives-polkadot/3_fellowship/1_whitelist_call.yml
@@ -95,16 +95,16 @@ tests:
                   call: submit
                   args: [
                     {
-                      "FellowshipOrigins": "Fellows",
+                      FellowshipOrigins: "Fellows",
                     },
                     {
-                      "Lookup": { # TODO obtain from the call https://github.com/paritytech/parachains-integration-tests/issues/103
-                        "hash_": $send_whitelist_remark_cp.hash,
-                        "len": $send_whitelist_remark_cp.len,
+                      Lookup: { # TODO obtain from the call https://github.com/paritytech/parachains-integration-tests/issues/103
+                        hash_: $send_whitelist_remark_cp.hash,
+                        len: $send_whitelist_remark_cp.len,
                       },
                     },
                     {
-                      "After": 1,
+                      After: 1,
                     },
                   ]
                   events:

diff --git a/examples/collectives-polkadot/3_fellowship/2_assethub.yml b/examples/collectives-polkadot/3_fellowship/2_assethub.yml
@@ -76,16 +76,16 @@ tests:
                   call: submit
                   args: [
                     {
-                      "FellowshipOrigins": "Fellows",
+                      FellowshipOrigins: Fellows,
                     },
                     {
-                      "Lookup": {
-                        "hash_": $send_xcmp_resume_execution_cp.hash,
-                        "len": $send_xcmp_resume_execution_cp.len,
+                      Lookup: {
+                        hash_: $send_xcmp_resume_execution_cp.hash,
+                        len: $send_xcmp_resume_execution_cp.len,
                       },
                     },
                     {
-                      "After": 1,
+                      After: 1,
                     },
                   ]
                   events:

diff --git a/examples/collectives-polkadot/config.toml b/examples/collectives-polkadot/config.toml
@@ -6,7 +6,7 @@ chain_spec_command = "./bin/chain-spec-generator {% raw %} {{chainName}} {% endr
 
     [[relaychain.nodes]]
     name = "alice"
-    ws_port = 9700
+    ws_port = 9900
     validator = true
     args = ["--state-cache-size=0", "--disable-worker-version-check"]
 
@@ -28,7 +28,7 @@ cumulus_based = true
 
     [[parachains.collators]]
     name = "collator1"
-    ws_port = 9710
+    ws_port = 9910
     command = "./bin/polkadot-parachain"
     args = ["-lxcm=trace",  "--state-cache-size=0"]
 
@@ -46,7 +46,7 @@ cumulus_based = true
 
     [[parachains.collators]]
     name = "collator3"
-    ws_port = 9810
+    ws_port = 9910
     command = "./bin/polkadot-parachain"
     args = ["-lxcm=trace", "--state-cache-size=0"]
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@parity/parachains-integration-tests",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "main": "index.js",
   "author": "Ignacio Palacios Santos <ignacio.palacios.santos@gmail.com>",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "lint:write": "prettier --write ."
   },
   "dependencies": {
-    "@zombienet/cli": "1.3.76",
+    "@zombienet/cli": "1.3.77",
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.7.10",

diff --git a/yarn.lock b/yarn.lock
@@ -517,13 +517,13 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@zombienet/cli@1.3.76":
-  version "1.3.76"
-  resolved "https://registry.yarnpkg.com/@zombienet/cli/-/cli-1.3.76.tgz#20d0704dd53a770c8bcc914e46cb935014ca980d"
-  integrity sha512-oibPoAX3dL8Qu7DrfAPf65ZnOybEoxhS7yAlu+FXpvCbKO82FHGDwWv3W8633nLZOAO7fDSJZ54IyBjV+iFBnA==
+"@zombienet/cli@1.3.77":
+  version "1.3.77"
+  resolved "https://registry.yarnpkg.com/@zombienet/cli/-/cli-1.3.77.tgz#2a6bdd2c905d1b2da1f782a90cba4e2fc9c04930"
+  integrity sha512-Mv6/c2VnSXxrwt24D2h33+cQ6x4CGcukmooCTl8oRwnH/ynsCUfFa8/6hMGeKxOUm4T0+nF48dEnZVF4DhxhBA==
   dependencies:
     "@zombienet/dsl-parser-wrapper" "^0.1.10"
-    "@zombienet/orchestrator" "^0.0.59"
+    "@zombienet/orchestrator" "^0.0.60"
     "@zombienet/utils" "^0.0.23"
     cli-progress "^3.12.0"
     commander "^11.1.0"
@@ -536,10 +536,10 @@
   resolved "https://registry.yarnpkg.com/@zombienet/dsl-parser-wrapper/-/dsl-parser-wrapper-0.1.10.tgz#f003bd7add76e87cb9c6464a135905d9c9c57184"
   integrity sha512-2r2SjanMcNTQiiwTtj/TRO89ek4KoIKGKhgcdHm8+uXPVWuU3tIh/unN8+m51Jnm2jhCLkQQwa5aidvSC02wOg==
 
-"@zombienet/orchestrator@^0.0.59":
-  version "0.0.59"
-  resolved "https://registry.yarnpkg.com/@zombienet/orchestrator/-/orchestrator-0.0.59.tgz#0afc9e73c9009633c045979e7c9718a9f165a22a"
-  integrity sha512-8QfhKTDwlOK/mP6UJWQVYch/UZF2A1FQ6EH1hq1oGkw6kC8sOX6GqaI6IPooEQFK5bDff1Cfrxl1Kvf1ku3wjQ==
+"@zombienet/orchestrator@^0.0.60":
+  version "0.0.60"
+  resolved "https://registry.yarnpkg.com/@zombienet/orchestrator/-/orchestrator-0.0.60.tgz#2c7486e1dfa29887762b355cce319e4c5e81680f"
+  integrity sha512-KaWQhmxu7d7ts7DMuplT0FQnUxxKwSnbbEFeG2KPlJLkbNCnMWWcplM10aJ1aTI0gs4IAXdmiS9czOkdtS3dKA==
   dependencies:
     "@polkadot/api" "^10.10.1"
     "@polkadot/keyring" "^12.5.1"
@@ -559,7 +559,7 @@
     peer-id "^0.16.0"
     tmp-promise "^3.0.3"
     typescript "^5.2.2"
-    yaml "^2.3.3"
+    yaml "^2.3.4"
 
 "@zombienet/utils@^0.0.23":
   version "0.0.23"
@@ -2164,10 +2164,10 @@ yaml@2.1.3:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.3.tgz#9b3a4c8aff9821b696275c79a8bee8399d945207"
   integrity sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==
 
-yaml@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.3.tgz#01f6d18ef036446340007db8e016810e5d64aad9"
-  integrity sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==
+yaml@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
+  integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
 
 yargs-parser@20.2.4:
   version "20.2.4"