From eda223ed3d4c6a6f258e0a79f0f078eb24e2c00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 25 Apr 2023 09:53:11 +0100 Subject: [PATCH] Resolved beta clippy complaints (#3351) --- contracts/mixnet/src/gateways/transactions.rs | 2 ++ contracts/mixnet/src/mixnodes/transactions.rs | 4 ++++ contracts/vesting/src/transactions.rs | 12 ++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contracts/mixnet/src/gateways/transactions.rs b/contracts/mixnet/src/gateways/transactions.rs index 193fe99252..2b96304e86 100644 --- a/contracts/mixnet/src/gateways/transactions.rs +++ b/contracts/mixnet/src/gateways/transactions.rs @@ -226,6 +226,8 @@ pub(crate) fn _try_update_gateway_config( let cfg_update_event = new_gateway_config_update_event(&owner, &proxy, &new_config); + // clippy beta 1.70.0-beta.1 false positive + #[allow(clippy::redundant_clone)] let mut updated_bond = existing_bond.clone(); updated_bond.gateway.host = new_config.host; updated_bond.gateway.mix_port = new_config.mix_port; diff --git a/contracts/mixnet/src/mixnodes/transactions.rs b/contracts/mixnet/src/mixnodes/transactions.rs index 9a7d2ac895..0fefee8448 100644 --- a/contracts/mixnet/src/mixnodes/transactions.rs +++ b/contracts/mixnet/src/mixnodes/transactions.rs @@ -355,6 +355,8 @@ pub(crate) fn _try_remove_mixnode( ensure_no_pending_pledge_changes(&pending_changes)?; // set `is_unbonding` field + // clippy beta 1.70.0-beta.1 false positive + #[allow(clippy::redundant_clone)] let mut updated_bond = existing_bond.clone(); updated_bond.is_unbonding = true; storage::mixnode_bonds().replace( @@ -416,6 +418,8 @@ pub(crate) fn _try_update_mixnode_config( let cfg_update_event = new_mixnode_config_update_event(existing_bond.mix_id, &owner, &proxy, &new_config); + // clippy beta 1.70.0-beta.1 false positive + #[allow(clippy::redundant_clone)] let mut updated_bond = existing_bond.clone(); updated_bond.mix_node.host = new_config.host; updated_bond.mix_node.mix_port = new_config.mix_port; diff --git a/contracts/vesting/src/transactions.rs b/contracts/vesting/src/transactions.rs index d4168fa79a..bab50ec369 100644 --- a/contracts/vesting/src/transactions.rs +++ b/contracts/vesting/src/transactions.rs @@ -135,8 +135,8 @@ pub fn try_withdraw_vested_coins( return Err(ContractError::WrongDenom(amount.denom, mix_denom)); } - let address = info.sender.clone(); - let account = account_from_address(info.sender.as_str(), deps.storage, deps.api)?; + let address = info.sender; + let account = account_from_address(address.as_str(), deps.storage, deps.api)?; if address != account.owner_address() { return Err(ContractError::NotOwner(account.owner_address().to_string())); } @@ -170,9 +170,9 @@ pub fn try_transfer_ownership( info: MessageInfo, deps: DepsMut<'_>, ) -> Result { - let address = info.sender.clone(); + let address = info.sender; let to_address = deps.api.addr_validate(&to_address)?; - let mut account = account_from_address(info.sender.as_str(), deps.storage, deps.api)?; + let mut account = account_from_address(address.as_str(), deps.storage, deps.api)?; if address == account.owner_address() { account.transfer_ownership(&to_address, deps.storage)?; Ok(Response::new().add_event(new_ownership_transfer_event(&address, &to_address))) @@ -194,9 +194,9 @@ pub fn try_update_staking_address( } } - let address = info.sender.clone(); + let address = info.sender; let to_address = to_address.and_then(|x| deps.api.addr_validate(&x).ok()); - let mut account = account_from_address(info.sender.as_str(), deps.storage, deps.api)?; + let mut account = account_from_address(address.as_str(), deps.storage, deps.api)?; if address == account.owner_address() { let old = account.staking_address().cloned(); account.update_staking_address(to_address.clone(), deps.storage)?;