Cleanup

informalsystems · Sep 13, 2023 · 0217951 · 0217951
1 parent 4f6d59c
commit 0217951
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 29 deletions.
diff --git a/crates/relayer-cli/src/cli_utils.rs b/crates/relayer-cli/src/cli_utils.rs
@@ -16,7 +16,6 @@ use ibc_relayer::{
     config::Config,
     spawn,
 };
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ChannelId, PortId};
 
 use crate::error::Error;

diff --git a/crates/relayer-cli/src/commands/create/channel.rs b/crates/relayer-cli/src/commands/create/channel.rs
@@ -11,7 +11,6 @@ use ibc_relayer::chain::requests::{
 use ibc_relayer::channel::Channel;
 use ibc_relayer::connection::Connection;
 use ibc_relayer::foreign_client::ForeignClient;
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics03_connection::connection::IdentifiedConnectionEnd;
 use ibc_relayer_types::core::ics04_channel::channel::Ordering;
 use ibc_relayer_types::core::ics04_channel::version::Version;

diff --git a/crates/relayer-cli/src/commands/create/connection.rs b/crates/relayer-cli/src/commands/create/connection.rs
@@ -7,7 +7,6 @@ use ibc_relayer::chain::handle::ChainHandle;
 use ibc_relayer::chain::requests::{IncludeProof, QueryClientStateRequest, QueryHeight};
 use ibc_relayer::connection::Connection;
 use ibc_relayer::foreign_client::ForeignClient;
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ClientId};
 
 use crate::cli_utils::{spawn_chain_runtime, ChainHandlePair};

diff --git a/crates/relayer-cli/src/commands/query/channel_ends.rs b/crates/relayer-cli/src/commands/query/channel_ends.rs
@@ -9,7 +9,6 @@ use ibc_relayer::chain::requests::{
 };
 use ibc_relayer::client_state::AnyClientState;
 use ibc_relayer::registry::Registry;
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics03_connection::connection::ConnectionEnd;
 use ibc_relayer_types::core::ics04_channel::channel::{ChannelEnd, State};
 use ibc_relayer_types::core::ics24_host::identifier::ChainId;

diff --git a/crates/relayer-cli/src/commands/query/channels.rs b/crates/relayer-cli/src/commands/query/channels.rs
@@ -11,7 +11,6 @@ use ibc_relayer::chain::requests::{
     QueryConnectionRequest, QueryHeight,
 };
 use ibc_relayer::registry::Registry;
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics04_channel::channel::{ChannelEnd, State};
 use ibc_relayer_types::core::ics24_host::identifier::{
     ChainId, ChannelId, ConnectionId, PortChannelId, PortId,

diff --git a/crates/relayer-cli/src/commands/query/clients.rs b/crates/relayer-cli/src/commands/query/clients.rs
@@ -4,7 +4,6 @@ use ibc_relayer::chain::handle::ChainHandle;
 use serde::Serialize;
 
 use ibc_relayer::chain::requests::{PageRequest, QueryClientStatesRequest};
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ClientId};
 
 use crate::cli_utils::spawn_chain_runtime;

diff --git a/crates/relayer-cli/src/commands/query/connections.rs b/crates/relayer-cli/src/commands/query/connections.rs
@@ -5,7 +5,6 @@ use ibc_relayer::chain::handle::ChainHandle;
 use ibc_relayer::chain::requests::{
     IncludeProof, PageRequest, QueryClientStateRequest, QueryConnectionsRequest, QueryHeight,
 };
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ConnectionId};
 
 use crate::cli_utils::spawn_chain_runtime;

diff --git a/crates/relayer-cli/src/commands/tx/client.rs b/crates/relayer-cli/src/commands/tx/client.rs
@@ -14,7 +14,6 @@ use ibc_relayer::config::Config;
 use ibc_relayer::event::IbcEventWithHeight;
 use ibc_relayer::foreign_client::{CreateOptions, ForeignClient};
 use ibc_relayer::{chain::handle::ChainHandle, config::GenesisRestart};
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ClientId};
 use ibc_relayer_types::events::IbcEvent;
 use ibc_relayer_types::Height;

diff --git a/crates/relayer/src/chain/counterparty.rs b/crates/relayer/src/chain/counterparty.rs
@@ -2,7 +2,6 @@ use std::collections::HashSet;
 
 use ibc_relayer_types::{
     core::{
-        ics02_client::client_state::ClientState,
         ics03_connection::connection::{
             ConnectionEnd, IdentifiedConnectionEnd, State as ConnectionState,
         },

diff --git a/crates/relayer/src/client_state.rs b/crates/relayer/src/client_state.rs
@@ -121,6 +121,17 @@ impl AnyClientState {
             AnyClientState::Mock(mock_state) => mock_state.refresh_time(),
         }
     }
+
+    pub fn expired(&self, elapsed_since_latest: Duration) -> bool {
+        match self {
+            AnyClientState::Tendermint(tm_state) => tm_state.expired(elapsed_since_latest),
+            AnyClientState::LocalhostV1(local_state) => local_state.expired(elapsed_since_latest),
+            AnyClientState::LocalhostV2(local_state) => local_state.expired(elapsed_since_latest),
+
+            #[cfg(test)]
+            AnyClientState::Mock(mock_state) => mock_state.expired(elapsed_since_latest),
+        }
+    }
 }
 
 impl Protobuf<Any> for AnyClientState {}
@@ -187,14 +198,7 @@ impl From<AnyClientState> for Any {
 
 impl ClientState for AnyClientState {
     fn chain_id(&self) -> ChainId {
-        match self {
-            AnyClientState::Tendermint(state) => state.chain_id(),
-            AnyClientState::LocalhostV1(state) => state.chain_id(),
-            AnyClientState::LocalhostV2(state) => state.chain_id(),
-
-            #[cfg(test)]
-            AnyClientState::Mock(state) => state.chain_id(),
-        }
+        self.chain_id()
     }
 
     fn client_type(&self) -> ClientType {
@@ -210,14 +214,7 @@ impl ClientState for AnyClientState {
     }
 
     fn expired(&self, elapsed_since_latest: Duration) -> bool {
-        match self {
-            AnyClientState::Tendermint(tm_state) => tm_state.expired(elapsed_since_latest),
-            AnyClientState::LocalhostV1(local_state) => local_state.expired(elapsed_since_latest),
-            AnyClientState::LocalhostV2(local_state) => local_state.expired(elapsed_since_latest),
-
-            #[cfg(test)]
-            AnyClientState::Mock(mock_state) => mock_state.expired(elapsed_since_latest),
-        }
+        self.expired(elapsed_since_latest)
     }
 }
 

diff --git a/crates/relayer/src/object.rs b/crates/relayer/src/object.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 use ibc_relayer_types::applications::ics29_fee::events::IncentivizedPacket;
 use ibc_relayer_types::core::{
-    ics02_client::{client_state::ClientState, events::UpdateClient},
+    ics02_client::events::UpdateClient,
     ics03_connection::events::Attributes as ConnectionAttributes,
     ics04_channel::events::{
         Attributes, CloseInit, SendPacket, TimeoutPacket, WriteAcknowledgement,

diff --git a/crates/relayer/src/supervisor/client_state_filter.rs b/crates/relayer/src/supervisor/client_state_filter.rs
@@ -4,7 +4,6 @@ use flex_error::define_error;
 use ibc_relayer_types::core::ics02_client::trust_threshold::TrustThreshold;
 use tracing::{debug, trace};
 
-use ibc_relayer_types::core::ics02_client::client_state::ClientState;
 use ibc_relayer_types::core::ics03_connection::connection::ConnectionEnd;
 use ibc_relayer_types::core::ics04_channel::error::Error as ChannelError;
 use ibc_relayer_types::core::ics24_host::identifier::{

diff --git a/crates/relayer/src/supervisor/scan.rs b/crates/relayer/src/supervisor/scan.rs
@@ -5,7 +5,6 @@ use itertools::Itertools;
 use tracing::{debug, error, error_span, info, warn};
 
 use ibc_relayer_types::core::{
-    ics02_client::client_state::ClientState,
     ics03_connection::connection::{IdentifiedConnectionEnd, State as ConnectionState},
     ics04_channel::{
         channel::{IdentifiedChannelEnd, State as ChannelState},

diff --git a/crates/relayer/src/supervisor/spawn.rs b/crates/relayer/src/supervisor/spawn.rs
@@ -1,7 +1,7 @@
 use tracing::{error, info};
 
 use ibc_relayer_types::core::{
-    ics02_client::client_state::ClientState, ics03_connection::connection::IdentifiedConnectionEnd,
+    ics03_connection::connection::IdentifiedConnectionEnd,
     ics04_channel::channel::State as ChannelState,
 };