Last clippy run

WHELP-project · Dec 1, 2023 · 343ec25 · 343ec25
1 parent 6e6441a
commit 343ec25
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/contracts/pool/src/mock_querier.rs b/contracts/pool/src/mock_querier.rs
@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 use coreum_wasm_sdk::core::CoreumQueries;
 use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR};
 use cosmwasm_std::{
-    from_json, from_json, to_json_binary, Addr, Coin, Decimal, OwnedDeps, Querier, QuerierResult,
+    from_json, to_json_binary, Addr, Coin, Decimal, OwnedDeps, Querier, QuerierResult,
     QueryRequest, SystemError, SystemResult, Uint128, WasmQuery,
 };
 

diff --git a/contracts/pool_stable/src/mock_querier.rs b/contracts/pool_stable/src/mock_querier.rs
@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 use coreum_wasm_sdk::core::CoreumQueries;
 use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR};
 use cosmwasm_std::{
-    from_json, from_json, to_json_binary, Addr, Coin, Decimal, OwnedDeps, Querier, QuerierResult,
+    from_json, to_json_binary, Addr, Coin, Decimal, OwnedDeps, Querier, QuerierResult,
     QueryRequest, SystemError, SystemResult, Uint128, WasmQuery,
 };
 

diff --git a/contracts/pool_stable/src/testing.rs b/contracts/pool_stable/src/testing.rs
@@ -1,26 +1,25 @@
 use coreum_wasm_sdk::{assetft, core::CoreumMsg};
-use cosmwasm_std::testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR};
 use cosmwasm_std::{
-    coin, to_json_binary, Addr, BlockInfo, Coin, Decimal, Env, ReplyOn, Timestamp, Uint128,
+    testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR},
+    {coin, to_json_binary, Addr, BlockInfo, Coin, Decimal, Env, ReplyOn, Timestamp, Uint128},
 };
 use cw20::Cw20ReceiveMsg;
 
-use dex::asset::{Asset, AssetInfo, AssetInfoValidated, MINIMUM_LIQUIDITY_AMOUNT};
-
-use dex::fee_config::FeeConfig;
-
-use dex::pool::MigrateMsg;
-use dex::pool::{
-    ContractError, Cw20HookMsg, ExecuteMsg, InstantiateMsg, StablePoolParams, StakeConfig,
-    LP_TOKEN_PRECISION,
+use dex::{
+    asset::{Asset, AssetInfo, AssetInfoValidated, MINIMUM_LIQUIDITY_AMOUNT},
+    fee_config::FeeConfig,
+    pool::{
+        ContractError, Cw20HookMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, StablePoolParams,
+        StakeConfig, LP_TOKEN_PRECISION,
+    },
 };
 
-use crate::contract::{execute, instantiate, migrate};
-use crate::state::CONFIG;
-// TODO: Copied here just as a temporary measure
-use crate::mock_querier::mock_dependencies;
+use crate::{
+    contract::{execute, instantiate, migrate},
+    mock_querier::mock_dependencies,
+    state::CONFIG,
+};
 
-pub type Response = cosmwasm_std::Response<CoreumMsg>;
 pub type SubMsg = cosmwasm_std::SubMsg<CoreumMsg>;
 
 fn default_stake_config() -> StakeConfig {

diff --git a/contracts/stake/src/contract.rs b/contracts/stake/src/contract.rs
@@ -1401,7 +1401,7 @@ mod tests {
 
         // make sure distribution logic is set up properly
         let raw = query(deps.as_ref(), mock_env(), QueryMsg::DistributionData {}).unwrap();
-        let res: DistributionDataResponse = from_json(&raw).unwrap();
+        let res: DistributionDataResponse = from_json(raw).unwrap();
         assert_eq!(
             res.distributions,
             vec![(
@@ -1426,7 +1426,7 @@ mod tests {
             },
         )
         .unwrap();
-        let res: WithdrawAdjustmentDataResponse = from_json(&raw).unwrap();
+        let res: WithdrawAdjustmentDataResponse = from_json(raw).unwrap();
         assert_eq!(
             res,
             WithdrawAdjustment {