rm AnyClientState and AnyConsensusState deps in TestHost

Author: rnbguy

ibc-testkit/src/context.rs

@@ -24,7 +24,9 @@ use ibc::primitives::Timestamp;
 
 use super::testapp::ibc::core::types::{LightClientState, MockIbcStore};
 use crate::fixtures::core::context::TestContextConfig;
-use crate::hosts::{HostClientState, MockHost, TendermintHost, TestBlock, TestHeader, TestHost};
+use crate::hosts::{
+    HostClientState, HostConsensusState, MockHost, TendermintHost, TestBlock, TestHeader, TestHost,
+};
 use crate::relayer::error::RelayerError;
 use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 use crate::testapp::ibc::core::router::MockRouter;
@@ -36,6 +38,8 @@ pub struct StoreGenericTestContext<S, H>
 where
     S: ProvableStore + Debug,
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
 {
     /// The multi store of the context.
@@ -68,6 +72,8 @@ impl<S, H> Default for StoreGenericTestContext<S, H>
 where
     S: ProvableStore + Debug + Default,
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
 {
     fn default() -> Self {
@@ -82,6 +88,8 @@ where
     S: ProvableStore + Debug,
     H: TestHost,
     HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
 {
     /// Returns an immutable reference to the IBC store.
     pub fn ibc_store(&self) -> &MockIbcStore<S> {
@@ -170,12 +178,12 @@ where
     /// and consensus, and prepares the context for the next block. This includes
     /// the latest consensus state and the latest IBC commitment proof.
     pub fn begin_block(&mut self) {
-        let consensus_state = self
-            .host
-            .latest_block()
-            .into_header()
-            .into_consensus_state()
-            .into();
+        let consensus_state = AnyConsensusState::from(
+            self.host
+                .latest_block()
+                .into_header()
+                .into_consensus_state(),
+        );
 
         let ibc_commitment_proof = self
             .multi_store
@@ -347,11 +355,17 @@ where
     ) -> Self
     where
         RH: TestHost,
+        AnyClientState: From<HostClientState<RH>>,
+        AnyConsensusState: From<HostConsensusState<RH>>,
     {
-        self = self.with_client_state(client_id, light_client.client_state.into());
+        self = self.with_client_state(client_id, AnyClientState::from(light_client.client_state));
 
         for (height, consensus_state) in light_client.consensus_states {
-            self = self.with_consensus_state(client_id, height, consensus_state.into());
+            self = self.with_consensus_state(
+                client_id,
+                height,
+                AnyConsensusState::from(consensus_state),
+            );
 
             self.ibc_store
                 .store_update_meta(
@@ -512,6 +526,8 @@ mod tests {
         pub struct Test<H: TestHost>
         where
             H: TestHost,
+            AnyClientState: From<HostClientState<H>>,
+            AnyConsensusState: From<HostConsensusState<H>>,
             HostConsensusState<H>: ConsensusState,
             HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
         {
@@ -522,6 +538,8 @@ mod tests {
         fn run_tests<H>(sub_title: &str)
         where
             H: TestHost,
+            AnyClientState: From<HostClientState<H>>,
+            AnyConsensusState: From<HostConsensusState<H>>,
             HostConsensusState<H>: ConsensusState,
             HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
         {

ibc-testkit/src/fixtures/core/context.rs

@@ -9,7 +9,8 @@ use ibc::core::primitives::Timestamp;
 use typed_builder::TypedBuilder;
 
 use crate::context::StoreGenericTestContext;
-use crate::hosts::{HostClientState, TestBlock, TestHost};
+use crate::hosts::{HostClientState, HostConsensusState, TestBlock, TestHost};
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 use crate::testapp::ibc::core::router::MockRouter;
 use crate::testapp::ibc::core::types::{MockIbcStore, DEFAULT_BLOCK_TIME_SECS};
 use crate::utils::year_2023;
@@ -41,6 +42,8 @@ impl<S, H> From<TestContextConfig<H>> for StoreGenericTestContext<S, H>
 where
     S: ProvableStore + Debug + Default,
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
 {
     fn from(params: TestContextConfig<H>) -> Self {

ibc-testkit/src/hosts/mod.rs

@@ -13,7 +13,6 @@ use ibc::primitives::proto::Any;
 
 pub use self::mock::MockHost;
 pub use self::tendermint::TendermintHost;
-use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 
 pub type HostClientState<H> = <H as TestHost>::ClientState;
 pub type HostBlock<H> = <H as TestHost>::Block;
@@ -28,7 +27,7 @@ pub trait TestHost: Default + Debug + Sized {
     type Block: TestBlock;
 
     /// The type of client state produced by the host.
-    type ClientState: Into<AnyClientState> + Debug;
+    type ClientState: Debug;
 
     /// The type of block parameter to produce a block.
     type BlockParams: Debug + Default;
@@ -142,7 +141,7 @@ pub trait TestBlock: Clone + Debug {
 /// submitted by relayer from the host blockchain.
 pub trait TestHeader: Clone + Debug + Into<Any> {
     /// The type of consensus state can be extracted from the header.
-    type ConsensusState: ConsensusState + Into<AnyConsensusState> + From<Self> + Clone + Debug;
+    type ConsensusState: ConsensusState + From<Self> + Clone + Debug;
 
     /// The height of the block, as recorded in the header.
     fn height(&self) -> Height;

ibc-testkit/src/relayer/context.rs

@@ -6,15 +6,20 @@ use ibc::core::host::ValidationContext;
 use ibc::primitives::Signer;
 
 use crate::context::TestContext;
-use crate::hosts::{HostClientState, TestHost};
+use crate::hosts::{HostClientState, HostConsensusState, TestHost};
 use crate::relayer::utils::TypedRelayerOps;
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 use crate::testapp::ibc::core::types::DefaultIbcStore;
 
 /// A relayer context that allows interaction between two [`TestContext`] instances.
 pub struct RelayerContext<A, B>
 where
     A: TestHost,
     B: TestHost,
+    AnyClientState: From<HostClientState<A>>,
+    AnyConsensusState: From<HostConsensusState<A>>,
+    AnyClientState: From<HostClientState<B>>,
+    AnyConsensusState: From<HostConsensusState<B>>,
     HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
     HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
 {
@@ -26,6 +31,10 @@ impl<A, B> RelayerContext<A, B>
 where
     A: TestHost,
     B: TestHost,
+    AnyClientState: From<HostClientState<A>>,
+    AnyConsensusState: From<HostConsensusState<A>>,
+    AnyClientState: From<HostClientState<B>>,
+    AnyConsensusState: From<HostConsensusState<B>>,
     HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
     HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
 {

ibc-testkit/src/relayer/integration.rs

@@ -3,8 +3,9 @@ use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId};
 
 use crate::context::TestContext;
 use crate::fixtures::core::signer::dummy_account_id;
-use crate::hosts::{HostClientState, TestHost};
+use crate::hosts::{HostClientState, HostConsensusState, TestHost};
 use crate::relayer::context::RelayerContext;
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 use crate::testapp::ibc::core::types::DefaultIbcStore;
 
 /// Integration test for IBC implementation. This test creates clients,
@@ -17,6 +18,10 @@ pub fn ibc_integration_test<A, B>()
 where
     A: TestHost,
     B: TestHost,
+    AnyClientState: From<HostClientState<A>>,
+    AnyConsensusState: From<HostConsensusState<A>>,
+    AnyClientState: From<HostClientState<B>>,
+    AnyConsensusState: From<HostConsensusState<B>>,
     HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
     HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
 {

ibc-testkit/src/relayer/utils.rs

@@ -33,7 +33,8 @@ use ibc::primitives::Signer;
 use ibc_query::core::context::ProvableContext;
 
 use crate::context::TestContext;
-use crate::hosts::{HostClientState, TestBlock, TestHost};
+use crate::hosts::{HostClientState, HostConsensusState, TestBlock, TestHost};
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 use crate::testapp::ibc::core::types::{DefaultIbcStore, LightClientBuilder, LightClientState};
 
 /// Implements IBC relayer functions for a pair of [`TestHost`] implementations: `A` and `B`.
@@ -47,13 +48,21 @@ pub struct TypedRelayerOps<A, B>(PhantomData<A>, PhantomData<B>)
 where
     A: TestHost,
     B: TestHost,
+    AnyClientState: From<HostClientState<A>>,
+    AnyConsensusState: From<HostConsensusState<A>>,
+    AnyClientState: From<HostClientState<B>>,
+    AnyConsensusState: From<HostConsensusState<B>>,
     HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
     HostClientState<B>: ClientStateValidation<DefaultIbcStore>;
 
 impl<A, B> TypedRelayerOps<A, B>
 where
     A: TestHost,
     B: TestHost,
+    AnyClientState: From<HostClientState<A>>,
+    AnyConsensusState: From<HostConsensusState<A>>,
+    AnyClientState: From<HostClientState<B>>,
+    AnyConsensusState: From<HostConsensusState<B>>,
     HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
     HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
 {

ibc-testkit/src/testapp/ibc/core/types.rs

@@ -31,7 +31,7 @@ use typed_builder::TypedBuilder;
 
 use crate::context::{MockStore, TestContext};
 use crate::fixtures::core::context::TestContextConfig;
-use crate::hosts::{HostClientState, TestBlock, TestHeader, TestHost};
+use crate::hosts::{HostClientState, HostConsensusState, TestBlock, TestHeader, TestHost};
 use crate::testapp::ibc::clients::mock::header::MockHeader;
 use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 pub const DEFAULT_BLOCK_TIME_SECS: u64 = 3;
@@ -452,6 +452,8 @@ pub struct LightClientState<H: TestHost> {
 impl<H> Default for LightClientState<H>
 where
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
 {
     fn default() -> Self {
@@ -463,6 +465,8 @@ where
 impl<H> LightClientState<H>
 where
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
 {
     pub fn with_latest_height(height: Height) -> Self {
@@ -478,6 +482,8 @@ where
 pub struct LightClientBuilder<'a, H>
 where
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
 {
     context: &'a TestContext<H>,
@@ -490,6 +496,8 @@ where
 impl<'a, H> From<LightClientBuilder<'a, H>> for LightClientState<H>
 where
     H: TestHost,
+    AnyClientState: From<HostClientState<H>>,
+    AnyConsensusState: From<HostConsensusState<H>>,
     HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
 {
     fn from(builder: LightClientBuilder<'a, H>) -> Self {

tests-integration/tests/core/ics02_client/update_client.rs

@@ -30,15 +30,15 @@ use ibc_testkit::fixtures::core::context::TestContextConfig;
 use ibc_testkit::fixtures::core::signer::dummy_account_id;
 use ibc_testkit::hosts::tendermint::BlockParams;
 use ibc_testkit::hosts::{
-    HostClientState, MockHost, TendermintHost, TestBlock, TestHeader, TestHost,
+    HostClientState, HostConsensusState, MockHost, TendermintHost, TestBlock, TestHeader, TestHost,
 };
 use ibc_testkit::relayer::error::RelayerError;
 use ibc_testkit::testapp::ibc::clients::mock::client_state::{
     client_type as mock_client_type, MockClientState,
 };
 use ibc_testkit::testapp::ibc::clients::mock::header::MockHeader;
 use ibc_testkit::testapp::ibc::clients::mock::misbehaviour::Misbehaviour as MockMisbehaviour;
-use ibc_testkit::testapp::ibc::clients::AnyConsensusState;
+use ibc_testkit::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
 use ibc_testkit::testapp::ibc::core::router::MockRouter;
 use ibc_testkit::testapp::ibc::core::types::{
     DefaultIbcStore, LightClientBuilder, LightClientState, MockIbcStore,
@@ -1530,6 +1530,8 @@ pub(crate) fn build_client_update_datagram<H: TestHeader, Dst: TestHost>(
     src_header: &H,
 ) -> Result<ClientMsg, RelayerError>
 where
+    AnyClientState: From<HostClientState<Dst>>,
+    AnyConsensusState: From<HostConsensusState<Dst>>,
     HostClientState<Dst>: ClientStateValidation<DefaultIbcStore>,
 {
     // Check if client for ibc0 on ibc1 has been updated to latest height: