Move query_balance to ChainEndpoint

relayer/src/chain.rs

@@ -38,6 +38,7 @@ use ibc_proto::ibc::core::connection::v1::{
 use tendermint::block::Height;
 use tendermint_rpc::endpoint::broadcast::tx_sync::Response as TxResponse;
 
+use crate::account::Balance;
 use crate::config::ChainConfig;
 use crate::connection::ConnectionMsgType;
 use crate::error::Error;
@@ -152,6 +153,9 @@ pub trait ChainEndpoint: Sized {
 
     // Queries
 
+    /// Query the balance of the current account for the denom used to pay tx fees.
+    fn query_balance(&self) -> Result<Balance, Error>;
+
     fn query_commitment_prefix(&self) -> Result<CommitmentPrefix, Error>;
 
     fn query_compatible_versions(&self) -> Result<Vec<Version>, Error> {

relayer/src/chain/cosmos.rs

@@ -375,19 +375,6 @@ impl CosmosSdkChain {
         Ok(status)
     }
 
-    /// Query the balance of the current account for the denom used to pay tx fees.
-    pub fn query_balance(&self) -> Result<Balance, Error> {
-        let key = self.key()?;
-
-        let balance = self.block_on(query_balance(
-            &self.grpc_addr,
-            &key.account,
-            &self.config.gas_price.denom,
-        ))?;
-
-        Ok(balance)
-    }
-
     /// Query the chain's latest height
     pub fn query_chain_latest_height(&self) -> Result<ICSHeight, Error> {
         crate::time!("query_latest_height");
@@ -648,6 +635,18 @@ impl ChainEndpoint for CosmosSdkChain {
         Ok(version_specs.ibc_go_version)
     }
 
+    fn query_balance(&self) -> Result<Balance, Error> {
+        let key = self.key()?;
+
+        let balance = self.block_on(query_balance(
+            &self.grpc_addr,
+            &key.account,
+            &self.config.gas_price.denom,
+        ))?;
+
+        Ok(balance)
+    }
+
     fn query_commitment_prefix(&self) -> Result<CommitmentPrefix, Error> {
         crate::time!("query_commitment_prefix");
         crate::telemetry!(query, self.id(), "query_commitment_prefix");

relayer/src/chain/mock.rs

@@ -39,6 +39,7 @@ use ibc_proto::ibc::core::connection::v1::{
     QueryClientConnectionsRequest, QueryConnectionsRequest,
 };
 
+use crate::account::Balance;
 use crate::chain::client::ClientSettings;
 use crate::chain::{ChainEndpoint, ChainStatus};
 use crate::config::ChainConfig;
@@ -166,6 +167,10 @@ impl ChainEndpoint for MockChain {
         Ok(Some(semver::Version::new(3, 0, 0)))
     }
 
+    fn query_balance(&self) -> Result<Balance, Error> {
+        unimplemented!()
+    }
+
     fn query_commitment_prefix(&self) -> Result<CommitmentPrefix, Error> {
         unimplemented!()
     }