Rename chain::tx module to chain::tracking

relayer/src/chain.rs

@@ -47,14 +47,14 @@ use crate::keyring::{KeyEntry, KeyRing};
 use crate::light_client::LightClient;
 
 use self::client::ClientSettings;
-use self::tx::TrackedMsgs;
+use self::tracking::TrackedMsgs;
 
 pub mod client;
 pub mod cosmos;
 pub mod counterparty;
 pub mod handle;
 pub mod runtime;
-pub mod tx;
+pub mod tracking;
 
 #[cfg(test)]
 pub mod mock;

relayer/src/chain/cosmos.rs

@@ -76,7 +76,7 @@ use crate::chain::cosmos::query::{abci_query, fetch_version_specs, packet_query}
 use crate::chain::cosmos::types::account::Account;
 use crate::chain::cosmos::types::config::TxConfig;
 use crate::chain::cosmos::types::gas::{default_gas_from_config, max_gas_from_config};
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::chain::{ChainEndpoint, HealthCheck};
 use crate::chain::{ChainStatus, QueryResponse};
 use crate::config::ChainConfig;

relayer/src/chain/handle.rs

@@ -53,7 +53,7 @@ use crate::{
 };
 
 use super::client::ClientSettings;
-use super::tx::TrackedMsgs;
+use super::tracking::TrackedMsgs;
 use super::{ChainStatus, HealthCheck};
 
 mod base;

relayer/src/chain/handle/base.rs

@@ -38,7 +38,7 @@ use ibc_proto::ibc::core::connection::v1::QueryConnectionsRequest;
 
 use crate::{
     account::Balance,
-    chain::{client::ClientSettings, tx::TrackedMsgs, ChainStatus},
+    chain::{client::ClientSettings, tracking::TrackedMsgs, ChainStatus},
     config::ChainConfig,
     connection::ConnectionMsgType,
     error::Error,

relayer/src/chain/handle/cache.rs

@@ -38,7 +38,7 @@ use crate::account::Balance;
 use crate::cache::{Cache, CacheStatus};
 use crate::chain::client::ClientSettings;
 use crate::chain::handle::{ChainHandle, ChainRequest, Subscription};
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::chain::{ChainStatus, HealthCheck};
 use crate::config::ChainConfig;
 use crate::error::Error;

relayer/src/chain/handle/counting.rs

@@ -38,7 +38,7 @@ use tracing::debug;
 use crate::account::Balance;
 use crate::chain::client::ClientSettings;
 use crate::chain::handle::{ChainHandle, ChainRequest, Subscription};
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::chain::{ChainStatus, HealthCheck};
 use crate::config::ChainConfig;
 use crate::error::Error;

relayer/src/chain/mock.rs

@@ -49,7 +49,7 @@ use crate::keyring::{KeyEntry, KeyRing};
 use crate::light_client::Verified;
 use crate::light_client::{mock::LightClient as MockLightClient, LightClient};
 
-use super::tx::TrackedMsgs;
+use super::tracking::TrackedMsgs;
 use super::HealthCheck;
 
 /// The representation of a mocked chain as the relayer sees it.

relayer/src/chain/runtime.rs

@@ -59,7 +59,7 @@ use crate::{
 
 use super::{
     handle::{ChainHandle, ChainRequest, ReplyTo, Subscription},
-    tx::TrackedMsgs,
+    tracking::TrackedMsgs,
     ChainEndpoint, HealthCheck,
 };
 

relayer/src/channel.rs

@@ -23,7 +23,7 @@ use ibc_proto::ibc::core::channel::v1::QueryConnectionChannelsRequest;
 
 use crate::chain::counterparty::{channel_connection_client, channel_state_on_destination};
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::connection::Connection;
 use crate::foreign_client::{ForeignClient, HasExpiredOrFrozenError};
 use crate::object::Channel as WorkerChannelObject;

relayer/src/connection.rs

@@ -1,7 +1,7 @@
 use core::time::Duration;
 
 use crate::chain::counterparty::connection_state_on_destination;
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::util::retry::RetryResult;
 use flex_error::define_error;
 use ibc_proto::google::protobuf::Any;

relayer/src/event/monitor.rs

@@ -21,7 +21,7 @@ use ibc::{
 };
 
 use crate::{
-    chain::tx::TrackingId,
+    chain::tracking::TrackingId,
     telemetry,
     util::{
         retry::{retry_count, retry_with_index, RetryResult},

relayer/src/foreign_client.rs

@@ -38,7 +38,7 @@ use ibc_proto::ibc::core::client::v1::QueryConsensusStatesRequest;
 
 use crate::chain::client::ClientSettings;
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::error::Error as RelayerError;
 
 const MAX_MISBEHAVIOUR_CHECK_DURATION: Duration = Duration::from_secs(120);

relayer/src/link/cli.rs

@@ -10,7 +10,7 @@ use ibc::Height;
 
 use crate::chain::counterparty::{unreceived_acknowledgements, unreceived_packets};
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackingId;
+use crate::chain::tracking::TrackingId;
 use crate::link::error::LinkError;
 use crate::link::operational_data::{OperationalData, TrackedEvents};
 use crate::link::packet_events::{

relayer/src/link/operational_data.rs

@@ -11,8 +11,8 @@ use ibc::events::IbcEvent;
 use ibc::Height;
 
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackedMsgs;
-use crate::chain::tx::TrackingId;
+use crate::chain::tracking::TrackedMsgs;
+use crate::chain::tracking::TrackingId;
 use crate::link::error::LinkError;
 use crate::link::RelayPath;
 

relayer/src/link/pending.rs

@@ -8,7 +8,7 @@ use ibc::core::ics24_host::identifier::{ChainId, ChannelId, PortId};
 use ibc::events::IbcEvent;
 use ibc::query::{QueryTxHash, QueryTxRequest};
 
-use crate::chain::tx::TrackingId;
+use crate::chain::tracking::TrackingId;
 use crate::error::Error as RelayerError;
 use crate::link::{error::LinkError, RelayPath};
 use crate::telemetry;

relayer/src/link/relay_path.rs

@@ -39,8 +39,8 @@ use ibc_proto::ibc::core::channel::v1::{
 
 use crate::chain::counterparty::{unreceived_acknowledgements, unreceived_packets};
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackedMsgs;
-use crate::chain::tx::TrackingId;
+use crate::chain::tracking::TrackedMsgs;
+use crate::chain::tracking::TrackingId;
 use crate::chain::ChainStatus;
 use crate::channel::error::ChannelError;
 use crate::channel::Channel;

relayer/src/link/relay_sender.rs

@@ -6,7 +6,7 @@ use tracing::info;
 use ibc::events::{IbcEvent, PrettyEvents};
 
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::link::error::LinkError;
 use crate::link::RelaySummary;
 

relayer/src/supervisor.rs

@@ -16,7 +16,7 @@ use ibc::{
 };
 
 use crate::{
-    chain::{handle::ChainHandle, tx::TrackingId, HealthCheck},
+    chain::{handle::ChainHandle, tracking::TrackingId, HealthCheck},
     config::Config,
     event::monitor::{self, Error as EventError, ErrorDetail as EventErrorDetail, EventBatch},
     object::Object,

relayer/src/transfer.rs

@@ -14,7 +14,7 @@ use ibc_proto::google::protobuf::Any;
 use uint::FromStrRadixErr;
 
 use crate::chain::handle::ChainHandle;
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::chain::ChainStatus;
 use crate::error::Error;
 use crate::util::bigint::U256;

relayer/src/upgrade_chain.rs

@@ -18,7 +18,7 @@ use ibc_proto::cosmos::upgrade::v1beta1::Plan;
 use ibc_proto::google::protobuf::Any;
 use ibc_proto::ibc::core::client::v1::UpgradeProposal;
 
-use crate::chain::tx::TrackedMsgs;
+use crate::chain::tracking::TrackedMsgs;
 use crate::chain::{ChainEndpoint, CosmosSdkChain};
 use crate::config::ChainConfig;
 use crate::error::Error;

relayer/src/worker/handle.rs

@@ -12,7 +12,7 @@ use ibc::{
     Height,
 };
 
-use crate::chain::tx::TrackingId;
+use crate::chain::tracking::TrackingId;
 use crate::util::lock::{LockExt, RwArc};
 use crate::util::task::TaskHandle;
 use crate::{event::monitor::EventBatch, object::Object};

tools/test-framework/src/relayer/chain.rs

@@ -57,7 +57,7 @@ use ibc_proto::ibc::core::connection::v1::QueryConnectionsRequest;
 use ibc_relayer::account::Balance;
 use ibc_relayer::chain::client::ClientSettings;
 use ibc_relayer::chain::handle::{ChainHandle, ChainRequest, Subscription};
-use ibc_relayer::chain::tx::TrackedMsgs;
+use ibc_relayer::chain::tracking::TrackedMsgs;
 use ibc_relayer::chain::{ChainStatus, HealthCheck};
 use ibc_relayer::config::ChainConfig;
 use ibc_relayer::error::Error;