clippy, fmt, test

Author: markonmars

contracts/active-delta-neutral/src/contract.rs

@@ -1,10 +1,9 @@
-use cosmwasm_std::{
-    entry_point, to_binary, to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response,
-    StdResult,
+use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};
+use mars_types::active_delta_neutral::{
+    execute::ExecuteMsg, instantiate::InstantiateMsg, query::QueryMsg,
 };
-use mars_types::active_delta_neutral::{execute::ExecuteMsg, instantiate::InstantiateMsg, query::QueryMsg};
 
-use crate::{error::ContractResult, execute, state::CONFIG};
+use crate::{error::ContractResult, execute};
 
 /// Handles execution of contract messages for the delta-neutral strategy.
 ///
@@ -53,7 +52,7 @@ pub fn execute(
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(
-    deps: DepsMut,
+    _deps: DepsMut,
     _env: Env,
     _info: MessageInfo,
     _msg: InstantiateMsg,
@@ -63,7 +62,7 @@ pub fn instantiate(
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
+pub fn query(_deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
         QueryMsg::Config {} => unimplemented!(),
     }

contracts/active-delta-neutral/src/execute.rs

@@ -4,7 +4,7 @@ use cosmwasm_std::{
 };
 use mars_delta_neutral_position::types::Position;
 use mars_types::{
-    active_delta_neutral::{query::Config, execute::ExecuteMsg},
+    active_delta_neutral::{execute::ExecuteMsg, query::Config},
     adapters::{credit_manager::CreditManager, params::Params},
     credit_manager,
     credit_manager::{ActionAmount, ActionCoin},

contracts/active-delta-neutral/src/instantiate.rs

@@ -9,6 +9,5 @@ pub fn instantiate(
     _info: MessageInfo,
     _msg: InstantiateMsg,
 ) -> ContractResult<Response> {
-
     Ok(Response::new())
-}
+}

contracts/credit-manager/tests/tests/test_liquidate_vault.rs

@@ -74,7 +74,7 @@ fn liquidatee_must_have_the_request_vault_position() {
     assert_err(
         res,
         ContractError::Std(NotFound {
-            kind: "type: mars_types::adapters::vault::amount::VaultPositionAmount; key: [00, 0F, 76, 61, 75, 6C, 74, 5F, 70, 6F, 73, 69, 74, 69, 6F, 6E, 73, 00, 01, 32, 63, 6F, 6E, 74, 72, 61, 63, 74, 31, 34]".to_string(),
+            kind: "type: mars_types::adapters::vault::amount::VaultPositionAmount; key: [00, 0F, 76, 61, 75, 6C, 74, 5F, 70, 6F, 73, 69, 74, 69, 6F, 6E, 73, 00, 01, 32, 63, 6F, 6E, 74, 72, 61, 63, 74, 31, 35]".to_string(),
         }),
     )
 }

packages/testing/src/multitest/helpers/mock_env.rs

@@ -25,10 +25,7 @@ use mars_types::{
         ExecuteMsg as NftExecuteMsg, InstantiateMsg as NftInstantiateMsg, NftConfigUpdates,
         QueryMsg as NftQueryMsg, UncheckedNftConfig,
     },
-    active_delta_neutral::{
-        execute::ExecuteMsg as ActiveDeltaNeutralExecuteMsg,
-        instantiate::InstantiateMsg as ActiveDeltaNeutralInstantiateMsg,
-    },
+    active_delta_neutral::instantiate::InstantiateMsg as ActiveDeltaNeutralInstantiateMsg,
     adapters::{
         account_nft::AccountNftUnchecked,
         active_delta_neutral::ActiveDeltaNeutral,

packages/types/src/active_delta_neutral/execute.rs

@@ -1,8 +1,9 @@
-use crate::swapper::SwapperRoute;
 use cosmwasm_std::Uint128;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use crate::swapper::SwapperRoute;
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub enum ExecuteMsg {
     Increase {
@@ -20,4 +21,4 @@ pub enum ExecuteMsg {
         denom: String,
         increasing: bool,
     },
-}
+}

packages/types/src/active_delta_neutral/mod.rs

@@ -1,3 +1,3 @@
-pub mod query;
 pub mod execute;
 pub mod instantiate;
+pub mod query;

packages/types/src/active_delta_neutral/query.rs

@@ -18,4 +18,4 @@ pub struct Config {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub enum QueryMsg {
     Config {},
-}
+}