From 3f0d4846dfdc406f72041736abee3e3ec3c1414e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Mon, 24 Apr 2023 10:30:22 +0200 Subject: [PATCH] Fix a few clippy warnings in contract test code (#3340) * ci: don't fail fast for contracts * contracts: fix clippy in tests --- .github/workflows/contracts.yml | 1 + .../src/decrease_mixnode_pledge.rs | 8 ++++---- .../src/support/helpers.rs | 2 +- contracts/mixnet/src/mixnodes/transactions.rs | 18 +++++++++--------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml index 80f0abde7f..9de2cab348 100644 --- a/.github/workflows/contracts.yml +++ b/.github/workflows/contracts.yml @@ -30,6 +30,7 @@ jobs: continue-on-error: ${{ matrix.rust == 'nightly' }} needs: matrix_prep strategy: + fail-fast: false matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} steps: - uses: actions/checkout@v2 diff --git a/contracts/mixnet-vesting-integration-tests/src/decrease_mixnode_pledge.rs b/contracts/mixnet-vesting-integration-tests/src/decrease_mixnode_pledge.rs index 383dcd7e5c..c2ec5bd71b 100644 --- a/contracts/mixnet-vesting-integration-tests/src/decrease_mixnode_pledge.rs +++ b/contracts/mixnet-vesting-integration-tests/src/decrease_mixnode_pledge.rs @@ -38,7 +38,7 @@ fn decrease_mixnode_pledge_from_vesting_account_with_minimum_pledge() { vesting_owner(), test.vesting_contract(), &create_msg, - &mix_coins(1000_000_000), + &mix_coins(1_000_000_000), ) .unwrap(); @@ -136,7 +136,7 @@ fn decrease_mixnode_pledge_from_vesting_account_with_sufficient_pledge() { vesting_owner(), test.vesting_contract(), &create_msg, - &mix_coins(10000_000_000), + &mix_coins(10_000_000_000), ) .unwrap(); @@ -186,7 +186,7 @@ fn decrease_mixnode_pledge_from_vesting_account_with_sufficient_pledge() { .wrap() .query_balance(test.vesting_contract(), MIX_DENOM) .unwrap(); - assert_eq!(balance_before.amount.u128(), 9850_000_000); + assert_eq!(balance_before.amount.u128(), 9_850_000_000); let decrease_pledge_msg = VestingExecuteMsg::DecreasePledge { amount: mix_coin(50_000_000), @@ -236,5 +236,5 @@ fn decrease_mixnode_pledge_from_vesting_account_with_sufficient_pledge() { .wrap() .query_balance(test.vesting_contract(), MIX_DENOM) .unwrap(); - assert_eq!(balance_after.amount.u128(), 9900_000_000); + assert_eq!(balance_after.amount.u128(), 9_900_000_000); } diff --git a/contracts/mixnet-vesting-integration-tests/src/support/helpers.rs b/contracts/mixnet-vesting-integration-tests/src/support/helpers.rs index 27e252bef7..f739d8556a 100644 --- a/contracts/mixnet-vesting-integration-tests/src/support/helpers.rs +++ b/contracts/mixnet-vesting-integration-tests/src/support/helpers.rs @@ -21,7 +21,7 @@ pub fn rewarding_validator() -> Addr { } pub fn mix_coins(amount: u128) -> Vec { - coins(amount.into(), MIX_DENOM) + coins(amount, MIX_DENOM) } pub fn mix_coin(amount: u128) -> Coin { diff --git a/contracts/mixnet/src/mixnodes/transactions.rs b/contracts/mixnet/src/mixnodes/transactions.rs index b75f977143..d8dc0ce974 100644 --- a/contracts/mixnet/src/mixnodes/transactions.rs +++ b/contracts/mixnet/src/mixnodes/transactions.rs @@ -837,7 +837,7 @@ pub mod tests { let sender = mock_info(owner, &[test.coin(1000)]); try_increase_pledge(test.deps_mut(), env.clone(), sender.clone()).unwrap(); - let res = try_remove_mixnode(test.deps_mut(), env.clone(), sender.clone()); + let res = try_remove_mixnode(test.deps_mut(), env.clone(), sender); assert_eq!( res, Err(MixnetContractError::PendingPledgeChange { @@ -850,10 +850,10 @@ pub mod tests { test.add_dummy_mixnode(owner, Some(Uint128::new(10000000000))); let sender = mock_info(owner, &[]); let amount = test.coin(1000); - try_decrease_pledge(test.deps_mut(), env.clone(), sender.clone(), amount).unwrap(); + try_decrease_pledge(test.deps_mut(), env.clone(), sender, amount).unwrap(); let sender = mock_info(owner, &[test.coin(1000)]); - let res = try_remove_mixnode(test.deps_mut(), env.clone(), sender.clone()); + let res = try_remove_mixnode(test.deps_mut(), env.clone(), sender); assert_eq!( res, Err(MixnetContractError::PendingPledgeChange { @@ -1392,7 +1392,7 @@ pub mod tests { let sender = mock_info(owner, &[test.coin(1000)]); try_increase_pledge(test.deps_mut(), env.clone(), sender.clone()).unwrap(); - let res = try_increase_pledge(test.deps_mut(), env.clone(), sender.clone()); + let res = try_increase_pledge(test.deps_mut(), env.clone(), sender); assert_eq!( res, Err(MixnetContractError::PendingPledgeChange { @@ -1405,10 +1405,10 @@ pub mod tests { test.add_dummy_mixnode(owner, Some(Uint128::new(10000000000))); let sender = mock_info(owner, &[]); let amount = test.coin(1000); - try_decrease_pledge(test.deps_mut(), env.clone(), sender.clone(), amount).unwrap(); + try_decrease_pledge(test.deps_mut(), env.clone(), sender, amount).unwrap(); let sender = mock_info(owner, &[test.coin(1000)]); - let res = try_increase_pledge(test.deps_mut(), env.clone(), sender.clone()); + let res = try_increase_pledge(test.deps_mut(), env.clone(), sender); assert_eq!( res, Err(MixnetContractError::PendingPledgeChange { @@ -1710,7 +1710,7 @@ pub mod tests { }) ); - let res = try_decrease_pledge(test.deps_mut(), env.clone(), sender, valid_decrease); + let res = try_decrease_pledge(test.deps_mut(), env, sender, valid_decrease); assert!(res.is_ok()) } @@ -1726,7 +1726,7 @@ pub mod tests { test.add_dummy_mixnode(owner, Some(stake)); let sender = mock_info(owner, &[]); - let res = try_decrease_pledge(test.deps_mut(), env, sender, decrease.clone()); + let res = try_decrease_pledge(test.deps_mut(), env, sender, decrease); assert_eq!(res, Err(MixnetContractError::ZeroCoinAmount)) } @@ -1756,7 +1756,7 @@ pub mod tests { test.add_dummy_mixnode(owner, Some(stake)); let sender = mock_info(owner, &[]); let amount = test.coin(1000); - try_decrease_pledge(test.deps_mut(), env.clone(), sender.clone(), amount).unwrap(); + try_decrease_pledge(test.deps_mut(), env.clone(), sender, amount).unwrap(); let sender = mock_info(owner, &[test.coin(1000)]); let res = try_decrease_pledge(test.deps_mut(), env.clone(), sender, decrease.clone());