Refactor send_tx methods into plain functions

relayer-cli/src/commands/tx/transfer.rs

@@ -1,6 +1,7 @@
 use abscissa_core::clap::Parser;
 use abscissa_core::{config::Override, Command, FrameworkErrorKind, Runnable};
 
+use core::time::Duration;
 use ibc::{
     core::{
         ics02_client::client_state::ClientState,
@@ -141,7 +142,7 @@ impl TxIcs20MsgTransferCmd {
             denom,
             receiver: self.receiver.clone(),
             timeout_height_offset: self.timeout_height_offset,
-            timeout_seconds: core::time::Duration::from_secs(self.timeout_seconds),
+            timeout_duration: Duration::from_secs(self.timeout_seconds),
             number_msgs,
         };
 
@@ -226,7 +227,7 @@ impl Runnable for TxIcs20MsgTransferCmd {
         // Checks pass, build and send the tx
         let res: Result<Vec<IbcEvent>, Error> =
             build_and_send_transfer_messages(&chains.src, &chains.dst, &opts)
-                .map_err(Error::packet);
+                .map_err(Error::transfer);
 
         match res {
             Ok(ev) => Output::success(ev).exit(),

relayer-cli/src/error.rs

@@ -7,7 +7,7 @@ use ibc_relayer::error::Error as RelayerError;
 use ibc_relayer::foreign_client::ForeignClientError;
 use ibc_relayer::link::error::LinkError;
 use ibc_relayer::supervisor::Error as SupervisorError;
-use ibc_relayer::transfer::PacketError;
+use ibc_relayer::transfer::TransferError;
 use ibc_relayer::upgrade_chain::UpgradeChainError;
 use tendermint::Error as TendermintError;
 
@@ -69,9 +69,9 @@ define_error! {
             [ ConnectionError ]
             |_| { "connection error" },
 
-        Packet
-            [ PacketError ]
-            |_| { "packet error" },
+        Transfer
+            [ TransferError ]
+            |_| { "transfer error" },
 
         Channel
             [ ChannelError ]

relayer/src/chain.rs

@@ -67,7 +67,7 @@ pub enum HealthCheck {
 
 /// The result of a chain status query.
 #[derive(Clone, Debug)]
-pub struct StatusResponse {
+pub struct ChainStatus {
     pub height: ICSHeight,
     pub timestamp: Timestamp,
 }
@@ -160,7 +160,7 @@ pub trait ChainEndpoint: Sized {
     }
 
     /// Query the latest height and timestamp the chain is at
-    fn query_status(&self) -> Result<StatusResponse, Error>;
+    fn query_status(&self) -> Result<ChainStatus, Error>;
 
     /// Performs a query to retrieve the state of all clients that a chain hosts.
     fn query_clients(