diff --git a/rust/chains/hyperlane-ethereum/src/interchain_security_module.rs b/rust/chains/hyperlane-ethereum/src/interchain_security_module.rs index 1395eb454..f317659a2 100644 --- a/rust/chains/hyperlane-ethereum/src/interchain_security_module.rs +++ b/rust/chains/hyperlane-ethereum/src/interchain_security_module.rs @@ -96,7 +96,7 @@ impl InterchainSecurityModule for EthereumInterchainSecurityModule where M: Middleware + 'static, { - #[instrument(err, ret)] + #[instrument] async fn module_type(&self) -> ChainResult { let module = self.contract.module_type().call().await?; if let Some(module_type) = ModuleType::from_u8(module) { diff --git a/rust/chains/hyperlane-ethereum/src/mailbox.rs b/rust/chains/hyperlane-ethereum/src/mailbox.rs index 11bbd1433..980f890d9 100644 --- a/rust/chains/hyperlane-ethereum/src/mailbox.rs +++ b/rust/chains/hyperlane-ethereum/src/mailbox.rs @@ -291,7 +291,7 @@ impl Mailbox for EthereumMailbox where M: Middleware + 'static, { - #[instrument(level = "debug", err, ret, skip(self))] + #[instrument(skip(self))] async fn count(&self, maybe_lag: Option) -> ChainResult { let base_call = self.contract.count(); let call_with_lag = if let Some(lag) = maybe_lag { @@ -309,12 +309,12 @@ where Ok(count) } - #[instrument(level = "debug", err, ret, skip(self))] + #[instrument(skip(self))] async fn delivered(&self, id: H256) -> ChainResult { Ok(self.contract.delivered(id.into()).call().await?) } - #[instrument(level = "debug", err, ret, skip(self))] + #[instrument(skip(self))] async fn latest_checkpoint(&self, maybe_lag: Option) -> ChainResult { let base_call = self.contract.latest_checkpoint(); let call_with_lag = match maybe_lag { @@ -338,7 +338,7 @@ where }) } - #[instrument(level = "debug", err, ret, skip(self))] + #[instrument(skip(self))] #[allow(clippy::needless_range_loop)] async fn tree(&self, lag: Option) -> ChainResult { let lag = lag.map(|v| v.get()).unwrap_or(0).into(); @@ -399,12 +399,12 @@ where Ok(tree) } - #[instrument(err, ret, skip(self))] + #[instrument(skip(self))] async fn default_ism(&self) -> ChainResult { Ok(self.contract.default_ism().call().await?.into()) } - #[instrument(err, ret, skip(self))] + #[instrument(skip(self))] async fn recipient_ism(&self, recipient: H256) -> ChainResult { Ok(self .contract @@ -414,7 +414,7 @@ where .into()) } - #[instrument(err, ret, skip(self), fields(metadata=%fmt_bytes(metadata)))] + #[instrument(skip(self), fields(metadata=%fmt_bytes(metadata)))] async fn process( &self, message: &HyperlaneMessage, @@ -428,7 +428,7 @@ where Ok(receipt.into()) } - #[instrument(err, ret, skip(self), fields(msg=%message, metadata=%fmt_bytes(metadata)))] + #[instrument(skip(self), fields(msg=%message, metadata=%fmt_bytes(metadata)))] async fn process_estimate_costs( &self, message: &HyperlaneMessage, diff --git a/rust/chains/hyperlane-ethereum/src/multisig_ism.rs b/rust/chains/hyperlane-ethereum/src/multisig_ism.rs index 679543de6..e9d62451b 100644 --- a/rust/chains/hyperlane-ethereum/src/multisig_ism.rs +++ b/rust/chains/hyperlane-ethereum/src/multisig_ism.rs @@ -97,7 +97,7 @@ impl MultisigIsm for EthereumMultisigIsm where M: Middleware + 'static, { - #[instrument(err, ret)] + #[instrument(err)] async fn validators_and_threshold( &self, message: &HyperlaneMessage, diff --git a/rust/chains/hyperlane-ethereum/src/routing_ism.rs b/rust/chains/hyperlane-ethereum/src/routing_ism.rs index 885115cdf..9b398b159 100644 --- a/rust/chains/hyperlane-ethereum/src/routing_ism.rs +++ b/rust/chains/hyperlane-ethereum/src/routing_ism.rs @@ -86,7 +86,7 @@ impl RoutingIsm for EthereumRoutingIsm where M: Middleware + 'static, { - #[instrument(err, ret)] + #[instrument(err)] async fn route(&self, message: &HyperlaneMessage) -> ChainResult { let ism = self .contract