From a737bf06d4c563c77ed68723940ba79ef166ed2c Mon Sep 17 00:00:00 2001 From: Wong Heung Sang <35202375+whs-dot-hk@users.noreply.github.com> Date: Tue, 15 Oct 2024 08:23:40 +0000 Subject: [PATCH] Put clone() to where it is needed (#4209) * Put clone() to where it is needed * Fmt --------- Co-authored-by: Luca Joss <43531661+ljoss17@users.noreply.github.com> --- crates/chain-registry/src/querier.rs | 2 +- crates/relayer/src/chain/cosmos.rs | 32 +++++++++---------- .../relayer/src/chain/cosmos/query/account.rs | 2 +- .../relayer/src/chain/cosmos/query/balance.rs | 4 +-- .../src/chain/cosmos/query/connection.rs | 2 +- .../src/chain/cosmos/query/consensus_state.rs | 4 +-- .../src/chain/cosmos/query/denom_trace.rs | 2 +- crates/relayer/src/chain/cosmos/query/fee.rs | 6 ++-- crates/relayer/src/chain/cosmos/simulate.rs | 2 +- crates/relayer/src/util.rs | 4 +-- 10 files changed, 29 insertions(+), 31 deletions(-) diff --git a/crates/chain-registry/src/querier.rs b/crates/chain-registry/src/querier.rs index 3a3f1e02f6..146f9226fa 100644 --- a/crates/chain-registry/src/querier.rs +++ b/crates/chain-registry/src/querier.rs @@ -160,7 +160,7 @@ impl QueryContext for GrpcHealthCheckQuerier { info!("Querying gRPC server at {tendermint_url}"); - create_grpc_client(uri, QueryClient::new) + create_grpc_client(&uri, QueryClient::new) .await .map_err(|_| RegistryError::unable_to_connect_with_grpc())?; diff --git a/crates/relayer/src/chain/cosmos.rs b/crates/relayer/src/chain/cosmos.rs index 5e53f57fdf..e7729c7382 100644 --- a/crates/relayer/src/chain/cosmos.rs +++ b/crates/relayer/src/chain/cosmos.rs @@ -377,7 +377,7 @@ impl CosmosSdkChain { crate::telemetry!(query, self.id(), "query_ccv_consumer_chain_params"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::interchain_security::ccv::consumer::v1::query_client::QueryClient::new, ))?; @@ -1228,7 +1228,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_clients"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::client::v1::query_client::QueryClient::new, ))?; @@ -1416,7 +1416,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_client_connections"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::connection::v1::query_client::QueryClient::new, ))?; @@ -1459,7 +1459,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_connections"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::connection::v1::query_client::QueryClient::new, ))?; @@ -1513,11 +1513,9 @@ impl ChainEndpoint for CosmosSdkChain { use ibc_proto::ibc::core::connection::v1 as connection; use tonic::IntoRequest; - let mut client = create_grpc_client( - chain.grpc_addr.clone(), - connection::query_client::QueryClient::new, - ) - .await?; + let mut client = + create_grpc_client(&chain.grpc_addr, connection::query_client::QueryClient::new) + .await?; client = client.max_decoding_message_size( chain.config().max_grpc_decoding_size.get_bytes() as usize, @@ -1596,7 +1594,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_connection_channels"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, ))?; @@ -1665,7 +1663,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_channels"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, ))?; @@ -1786,7 +1784,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_channel_client_state"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, ))?; @@ -1854,7 +1852,7 @@ impl ChainEndpoint for CosmosSdkChain { let mut client = self .block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, )) .map(|client| { @@ -2025,7 +2023,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_unreceived_packets"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, ))?; @@ -2098,7 +2096,7 @@ impl ChainEndpoint for CosmosSdkChain { let mut client = self .block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, )) .map(|client| { @@ -2216,7 +2214,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_unreceived_acknowledgements"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::ibc::core::channel::v1::query_client::QueryClient::new, ))?; @@ -2554,7 +2552,7 @@ impl ChainEndpoint for CosmosSdkChain { crate::telemetry!(query, self.id(), "query_consumer_chains"); let mut client = self.block_on(create_grpc_client( - self.grpc_addr.clone(), + &self.grpc_addr, ibc_proto::interchain_security::ccv::provider::v1::query_client::QueryClient::new, ))?; diff --git a/crates/relayer/src/chain/cosmos/query/account.rs b/crates/relayer/src/chain/cosmos/query/account.rs index aeafea7529..19d9ac5b34 100644 --- a/crates/relayer/src/chain/cosmos/query/account.rs +++ b/crates/relayer/src/chain/cosmos/query/account.rs @@ -55,7 +55,7 @@ pub async fn query_account( grpc_address: &Uri, account_address: &str, ) -> Result { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); diff --git a/crates/relayer/src/chain/cosmos/query/balance.rs b/crates/relayer/src/chain/cosmos/query/balance.rs index c197b94331..2b8a93e6de 100644 --- a/crates/relayer/src/chain/cosmos/query/balance.rs +++ b/crates/relayer/src/chain/cosmos/query/balance.rs @@ -15,7 +15,7 @@ pub async fn query_balance( account_address: &str, denom: &str, ) -> Result { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); @@ -46,7 +46,7 @@ pub async fn query_all_balances( grpc_address: &Uri, account_address: &str, ) -> Result, Error> { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); diff --git a/crates/relayer/src/chain/cosmos/query/connection.rs b/crates/relayer/src/chain/cosmos/query/connection.rs index 2fbfe29650..7ae553f31e 100644 --- a/crates/relayer/src/chain/cosmos/query/connection.rs +++ b/crates/relayer/src/chain/cosmos/query/connection.rs @@ -10,7 +10,7 @@ use crate::util::create_grpc_client; /// Uses the GRPC client to retrieve the connection params pub async fn query_connection_params(grpc_address: &Uri) -> Result { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); diff --git a/crates/relayer/src/chain/cosmos/query/consensus_state.rs b/crates/relayer/src/chain/cosmos/query/consensus_state.rs index 3f95b47013..f844082ec0 100644 --- a/crates/relayer/src/chain/cosmos/query/consensus_state.rs +++ b/crates/relayer/src/chain/cosmos/query/consensus_state.rs @@ -38,7 +38,7 @@ pub async fn query_consensus_state_heights( } let mut client = create_grpc_client( - grpc_addr.clone(), + grpc_addr, ibc_proto::ibc::core::client::v1::query_client::QueryClient::new, ) .await?; @@ -108,7 +108,7 @@ pub async fn query_consensus_states( ); let mut client = create_grpc_client( - grpc_addr.clone(), + grpc_addr, ibc_proto::ibc::core::client::v1::query_client::QueryClient::new, ) .await?; diff --git a/crates/relayer/src/chain/cosmos/query/denom_trace.rs b/crates/relayer/src/chain/cosmos/query/denom_trace.rs index 050aea8c48..27f9c7ca58 100644 --- a/crates/relayer/src/chain/cosmos/query/denom_trace.rs +++ b/crates/relayer/src/chain/cosmos/query/denom_trace.rs @@ -11,7 +11,7 @@ use crate::util::create_grpc_client; // Uses the GRPC client to retrieve the denom trace for a specific hash pub async fn query_denom_trace(grpc_address: &Uri, hash: &str) -> Result { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); diff --git a/crates/relayer/src/chain/cosmos/query/fee.rs b/crates/relayer/src/chain/cosmos/query/fee.rs index e59e70bc41..79e9d8175b 100644 --- a/crates/relayer/src/chain/cosmos/query/fee.rs +++ b/crates/relayer/src/chain/cosmos/query/fee.rs @@ -20,7 +20,7 @@ pub async fn query_counterparty_payee( channel_id: &ChannelId, address: &Signer, ) -> Result, Error> { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); @@ -52,7 +52,7 @@ pub async fn query_incentivized_packets( channel_id: &ChannelId, port_id: &PortId, ) -> Result, Error> { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); @@ -84,7 +84,7 @@ pub async fn query_incentivized_packet( grpc_address: &Uri, request: QueryIncentivizedPacketRequest, ) -> Result { - let mut client = create_grpc_client(grpc_address.clone(), QueryClient::new).await?; + let mut client = create_grpc_client(grpc_address, QueryClient::new).await?; client = client.max_decoding_message_size(max_grpc_decoding_size().get_bytes() as usize); diff --git a/crates/relayer/src/chain/cosmos/simulate.rs b/crates/relayer/src/chain/cosmos/simulate.rs index c48d3027a3..6b2661363f 100644 --- a/crates/relayer/src/chain/cosmos/simulate.rs +++ b/crates/relayer/src/chain/cosmos/simulate.rs @@ -16,7 +16,7 @@ pub async fn send_tx_simulate(grpc_address: &Uri, tx: Tx) -> Result( - grpc_addr: tonic::transport::Uri, + grpc_addr: &tonic::transport::Uri, client_constructor: impl FnOnce(tonic::transport::Channel) -> T, ) -> Result { let tls_config = tonic::transport::ClientTlsConfig::new().with_native_roots(); - let channel = tonic::transport::Channel::builder(grpc_addr) + let channel = tonic::transport::Channel::builder(grpc_addr.clone()) .tls_config(tls_config) .map_err(crate::error::Error::grpc_transport)? .connect()