From 65a018955bfd75525bd16bfcffd060e6dd373147 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Wed, 1 Jun 2022 11:58:08 +0200
Subject: [PATCH] Disable MBT tests on CI due to flakiness (#2253)

---
 .github/workflows/integration.yaml            | 25 ++++++++++---------
 .../src/commands/query/channel_client.rs      |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 86c10c847e..c0b92677b9 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -199,15 +199,16 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: -p ibc-integration-test --no-fail-fast --no-run
-      - env:
-          RUST_LOG: debug
-          RUST_BACKTRACE: 1
-          NO_COLOR_LOG: 1
-        run: |
-          nix shell \
-            .#${{ matrix.gaiad }} \
-            .#apalache \
-            -c cargo \
-            test -p ibc-integration-test --features mbt --no-fail-fast -- \
-            --nocapture --test-threads=1 mbt
+          args: -p ibc-integration-test --features mbt --no-fail-fast --no-run
+      # Disable running MBT tests until flakiness is addressed
+      # - env:
+      #     RUST_LOG: debug
+      #     RUST_BACKTRACE: 1
+      #     NO_COLOR_LOG: 1
+      #   run: |
+      #     nix shell \
+      #       .#${{ matrix.gaiad }} \
+      #       .#apalache \
+      #       -c cargo \
+      #       test -p ibc-integration-test --features mbt --no-fail-fast -- \
+      #       --nocapture --test-threads=1 mbt
diff --git a/relayer-cli/src/commands/query/channel_client.rs b/relayer-cli/src/commands/query/channel_client.rs
index c803e6ccb5..fef376e3a7 100644
--- a/relayer-cli/src/commands/query/channel_client.rs
+++ b/relayer-cli/src/commands/query/channel_client.rs
@@ -35,7 +35,7 @@ impl Runnable for QueryChannelClientCmd {
 
         match chain.query_channel_client_state(QueryChannelClientStateRequest {
             port_id: self.port_id.clone(),
-            channel_id: self.channel_id.clone(),
+            channel_id: self.channel_id,
         }) {
             Ok(cs) => Output::success(cs).exit(),
             Err(e) => Output::error(format!("{}", e)).exit(),