Merge branch 'manta' into fix_dex_ed

Manta-Network · Jul 11, 2023 · 1747050 · 1747050
2 parents 22e00b6 + 51038df
commit 1747050
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/resources/config-for-integration-test.json b/.github/resources/config-for-integration-test.json
@@ -14,17 +14,17 @@
         },
         {
           "name": "bob",
-          "wsPort": 9912,
           "port": 31332,
+          "wsPort": 9912,
           "flags": [
             "--rpc-cors=all",
             "--telemetry-url=wss://api.telemetry.manta.systems/submit 0"
           ]
         },
         {
           "name": "charlie",
-          "wsPort": 9913,
           "port": 31333,
+          "wsPort": 9913,
           "flags": [
             "--rpc-cors=all",
             "--telemetry-url=wss://api.telemetry.manta.systems/submit 0"

diff --git a/.github/resources/config-for-runtime-upgrade-test.json b/.github/resources/config-for-runtime-upgrade-test.json
@@ -23,8 +23,8 @@
       },
       {
         "name": "charlie",
-        "wsPort": 9913,
         "port": 31333,
+        "wsPort": 9913,
         "flags": [
           "--rpc-cors=all",
           "--telemetry-url=wss://api.telemetry.manta.systems/submit 0"

diff --git a/.github/workflows/integration_test_calamari.yml b/.github/workflows/integration_test_calamari.yml
@@ -17,7 +17,7 @@ env:
   AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
   AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
   AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]'
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v0.9.43/polkadot
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v0.9.42/polkadot
 jobs:
   print-rust-versions:
     if: contains(github.event.pull_request.labels.*.name, 'A-calamari' || github.ref == 'refs/heads/manta')

diff --git a/.github/workflows/integration_test_manta.yml b/.github/workflows/integration_test_manta.yml
@@ -17,7 +17,7 @@ env:
   AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
   AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
   AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]'
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v0.9.43/polkadot
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v0.9.42/polkadot
 jobs:
   print-rust-versions:
     if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')