Improve ICS test bootstrapping (informalsystems#3657)

* Improve ICS test bootstrapping * Replace Gaia v11 with v12 in misbehaviour CI job
heliaxdev · Oct 12, 2023 · 7688db7 · 7688db7
1 parent 7742305
commit 7688db7
Show file tree

Hide file tree

Showing 9 changed files with 318 additions and 140 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia11
+          - package: gaia12
             command: gaiad
             account_prefix: cosmos
           - package: ibc-go-v4-simapp
@@ -249,7 +249,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia11
+          - package: gaia12
             command: gaiad
             account_prefix: cosmos
           - package: juno
@@ -295,7 +295,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#gaia11 .#stride-no-admin
+          - package: .#gaia12 .#stride-no-admin
             command: gaiad,strided
             account_prefix: cosmos,stride
     steps:
@@ -382,7 +382,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia11
+          - package: gaia12
             command: gaiad
             account_prefix: cosmos
     steps:
@@ -458,7 +458,7 @@ jobs:
           CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
           ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
         run: |
-          nix shell .#gaia11 .#${{ matrix.chain.package }} -c \
+          nix shell .#gaia12 .#${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features interchain-security interchain_security::
 
@@ -501,7 +501,7 @@ jobs:
           CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
           ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
         run: |
-          nix shell .#gaia11 .#${{ matrix.chain.package }} -c \
+          nix shell .#gaia12 .#${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features interchain-security,ica interchain_security::
 
@@ -543,7 +543,7 @@ jobs:
           CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
           ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
         run: |
-          nix shell .#gaia11 .#${{ matrix.chain.package }} -c \
+          nix shell .#gaia12 .#${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features interchain-security,ics31 interchain_security::
 

diff --git a/.github/workflows/misbehaviour.yml b/.github/workflows/misbehaviour.yml
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia11
+          - package: gaia12
             command: gaiad
             account_prefix: cosmos
     steps:

diff --git a/.github/workflows/multi-chains.yaml b/.github/workflows/multi-chains.yaml
@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         first-package:
-          - package: gaia11
+          - package: gaia12
             command: gaiad
             account_prefix: cosmos
           - package: ibc-go-v7-simapp

diff --git a/crates/relayer-cli/src/commands/tx/client.rs b/crates/relayer-cli/src/commands/tx/client.rs
@@ -435,9 +435,9 @@ impl Runnable for TxUpgradeClientsCmd {
             .chains
             .iter()
             .filter(|&chain| {
-                (self.reference_chain_id != chain.id
+                self.reference_chain_id != chain.id
                     && (self.host_chain_id.is_none()
-                        || self.host_chain_id == Some(chain.id.clone())))
+                        || self.host_chain_id == Some(chain.id.clone()))
             })
             .map(|chain| {
                 self.upgrade_clients_for_chain(