store genesis host consensus state

Author: rnbguy

ibc-testkit/src/context.rs

@@ -20,8 +20,7 @@ use ibc::core::host::types::path::{
     ChannelEndPath, ClientConsensusStatePath, ClientStatePath, CommitmentPath, ConnectionPath,
     SeqAckPath, SeqRecvPath, SeqSendPath,
 };
-use ibc::core::host::ExecutionContext;
-use ibc::core::host::ValidationContext;
+use ibc::core::host::{ExecutionContext, ValidationContext};
 use ibc::primitives::prelude::*;
 use ibc::primitives::proto::Any;
 use ibc::primitives::Timestamp;

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

@@ -1,15 +1,15 @@
 use alloc::fmt::Debug;
 use core::time::Duration;
-use ibc::core::client::context::client_state::ClientStateExecution;
-use ibc::core::client::context::ClientExecutionContext;
-use ibc::core::client::types::error::ClientError;
-use ibc::primitives::proto::Any;
 
 use basecoin_store::context::ProvableStore;
+use ibc::core::client::context::client_state::ClientStateExecution;
 use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::context::ClientExecutionContext;
+use ibc::core::client::types::error::ClientError;
 use ibc::core::client::types::Height;
 use ibc::core::primitives::prelude::*;
 use ibc::core::primitives::Timestamp;
+use ibc::primitives::proto::Any;
 use typed_builder::TypedBuilder;
 
 use crate::context::StoreGenericTestContext;

ibc-testkit/src/relayer/integration.rs

@@ -2,6 +2,7 @@ use core::fmt::Debug;
 
 use basecoin_store::context::ProvableStore;
 use ibc::core::client::context::client_state::ClientStateExecution;
+use ibc::core::client::context::consensus_state::ConsensusState;
 use ibc::core::client::context::ClientExecutionContext;
 use ibc::core::client::types::error::ClientError;
 use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId};
@@ -12,7 +13,6 @@ use crate::fixtures::core::signer::dummy_account_id;
 use crate::hosts::{HostClientState, HostConsensusState, TestHost};
 use crate::relayer::context::RelayerContext;
 use crate::testapp::ibc::core::types::MockIbcStore;
-use ibc::core::client::context::consensus_state::ConsensusState;
 
 /// Integration test for IBC implementation. This test creates clients,
 /// connections, channels between two [`TestHost`]s.

ibc-testkit/src/relayer/utils.rs

@@ -2,9 +2,6 @@ use alloc::string::String;
 use core::fmt::Debug;
 use core::marker::PhantomData;
 use core::time::Duration;
-use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext};
-use ibc::core::client::types::error::ClientError;
-use ibc::primitives::proto::Any;
 
 use basecoin_store::context::ProvableStore;
 use ibc::core::channel::types::acknowledgement::Acknowledgement;
@@ -19,6 +16,8 @@ use ibc::core::channel::types::timeout::TimeoutHeight;
 use ibc::core::channel::types::Version as ChannelVersion;
 use ibc::core::client::context::client_state::ClientStateExecution;
 use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext};
+use ibc::core::client::types::error::ClientError;
 use ibc::core::client::types::msgs::{ClientMsg, MsgCreateClient, MsgUpdateClient};
 use ibc::core::connection::types::msgs::{
     ConnectionMsg, MsgConnectionOpenAck, MsgConnectionOpenConfirm, MsgConnectionOpenInit,
@@ -34,6 +33,7 @@ use ibc::core::host::types::path::{
     ConnectionPath, ReceiptPath,
 };
 use ibc::core::host::ValidationContext;
+use ibc::primitives::proto::Any;
 use ibc::primitives::Signer;
 use ibc_query::core::context::ProvableContext;
 

ibc-testkit/src/testapp/ibc/clients/mod.rs

@@ -15,8 +15,10 @@ use ibc::core::client::types::Height;
 use ibc::core::primitives::prelude::*;
 use ibc::derive::{ClientState, ConsensusState};
 use ibc::primitives::proto::{Any, Protobuf};
+use mock::header::MockHeader;
 
 use super::core::types::MockIbcStore;
+use crate::hosts::TestHeader;
 use crate::testapp::ibc::clients::mock::client_state::{
     MockClientState, MOCK_CLIENT_STATE_TYPE_URL,
 };
@@ -111,6 +113,12 @@ impl TryFrom<Any> for AnyConsensusState {
     }
 }
 
+impl Default for AnyConsensusState {
+    fn default() -> Self {
+        Self::Mock(MockHeader::default().into_consensus_state())
+    }
+}
+
 impl From<AnyConsensusState> for Any {
     fn from(host_consensus_state: AnyConsensusState) -> Self {
         match host_consensus_state {

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

@@ -2,8 +2,6 @@
 
 use alloc::sync::Arc;
 use core::fmt::Debug;
-use ibc::core::client::context::ClientExecutionContext;
-use ibc::core::client::types::error::ClientError;
 
 use basecoin_store::context::{ProvableStore, Store};
 use basecoin_store::impls::SharedStore;
@@ -12,6 +10,8 @@ use ibc::core::channel::types::channel::ChannelEnd;
 use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
 use ibc::core::client::context::client_state::{ClientStateExecution, ClientStateValidation};
 use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::context::ClientExecutionContext;
+use ibc::core::client::types::error::ClientError;
 use ibc::core::client::types::Height;
 use ibc::core::connection::types::ConnectionEnd;
 use ibc::core::handler::types::events::IbcEvent;
@@ -180,16 +180,12 @@ impl<S, ACL, ACS> Default for MockIbcStore<S, ACL, ACS>
 where
     S: ProvableStore + Debug + Default,
     ACL: ClientStateValidation<Self> + Clone,
-    ACS: ConsensusState + Clone,
+    ACS: ConsensusState + Clone + Default,
 {
     fn default() -> Self {
         let mut ibc_store = Self::new(0, S::default());
         ibc_store.store.commit().expect("no error");
-        // // FIXME(rano): store a consensus state.
-        // ibc_store.store_host_consensus_state(
-        //     ibc_store.store.current_height(),
-        //     MockHeader::default().into_consensus_state().into(),
-        // );
+        ibc_store.store_host_consensus_state(ibc_store.store.current_height(), ACS::default());
         ibc_store.store_ibc_commitment_proof(
             ibc_store.store.current_height(),
             CommitmentProof::default(),