fix semantic conflicts

ibc-clients/ics07-tendermint/cw-contract/src/tests/fixture.rs

@@ -91,7 +91,7 @@ impl Fixture {
         let tm_client_state: TmClientState = ClientStateConfig::builder()
             .trusting_period(Duration::from_secs(1))
             .build()
-            .into_client_state("test-chain".parse().unwrap(), self.trusted_height)
+            .into_client_state(self.chain_id.clone(), self.trusted_height)
             .expect("never fails");
 
         let tm_consensus_state = dummy_sov_consensus_state(self.trusted_timestamp);

ibc-testkit/Cargo.toml

@@ -31,7 +31,7 @@ typed-builder     = { version = "0.18.0" }
 # ibc dependencies
 ibc       = { workspace = true, features = ["std"] }
 ibc-proto = { workspace = true }
-ibc-query = { version = "0.51.0", path = "../ibc-query" }
+ibc-query = { version = "0.52.0", path = "../ibc-query" }
 basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs", rev = "ce0d6c7" }
 
 # cosmos dependencies

ibc-testkit/src/relayer/utils.rs

@@ -75,7 +75,6 @@ where
                 .next()
                 .expect("at least one")
                 .clone()
-                .into()
                 .into(),
             signer,
         }));

ibc-testkit/tests/core/ics02_client/recover_client.rs

@@ -176,18 +176,20 @@ fn test_recover_client_ok() {
 
     // latest consensus state is copied.
     assert_eq!(
-        ctx.consensus_state(&ClientConsensusStatePath::new(
-            msg.subject_client_id,
-            substitute_height.revision_number(),
-            substitute_height.revision_height(),
-        ))
-        .unwrap(),
-        ctx.consensus_state(&ClientConsensusStatePath::new(
-            msg.substitute_client_id,
-            substitute_height.revision_number(),
-            substitute_height.revision_height(),
-        ))
-        .unwrap(),
+        ctx.ibc_store()
+            .consensus_state(&ClientConsensusStatePath::new(
+                msg.subject_client_id,
+                substitute_height.revision_number(),
+                substitute_height.revision_height(),
+            ))
+            .unwrap(),
+        ctx.ibc_store()
+            .consensus_state(&ClientConsensusStatePath::new(
+                msg.substitute_client_id,
+                substitute_height.revision_number(),
+                substitute_height.revision_height(),
+            ))
+            .unwrap(),
     );
 }