From 30012071f6e4fa2da85ec369cfd4dade2105f939 Mon Sep 17 00:00:00 2001
From: 0xFable <0xfable@protonmail.com>
Date: Mon, 5 Feb 2024 18:04:14 +0000
Subject: [PATCH] fix: fmt and fix one leftover import

---
 .../epoch-manager/tests/common.rs             |  4 +++-
 .../epoch-manager/tests/epoch.rs              |  2 +-
 .../epoch-manager/tests/instantiate.rs        |  2 +-
 .../pool-manager/src/contract.rs              |  4 +++-
 .../pool-manager/src/manager/commands.rs      |  2 +-
 .../frontend_helper/src/reply/deposit_pair.rs | 12 +++++++----
 .../terraswap_pair/src/helpers.rs             |  2 +-
 .../vault-manager/src/manager/commands.rs     |  3 +--
 .../vault_router/src/execute/next_loan.rs     |  3 ++-
 .../src/epoch_manager/epoch_manager.rs        |  2 +-
 packages/white-whale-std/src/lib.rs           |  2 +-
 packages/white-whale-std/src/pool_manager.rs  | 20 +++++++------------
 .../white-whale-std/src/pool_network/asset.rs |  2 --
 .../src/pool_network/mock_querier.rs          | 14 ++++++++-----
 .../white-whale-std/src/pool_network/mod.rs   |  2 +-
 .../src/pool_network/temp_mock_api.rs         |  2 +-
 16 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/contracts/liquidity_hub/epoch-manager/tests/common.rs b/contracts/liquidity_hub/epoch-manager/tests/common.rs
index 88f785b0a..ae48d517c 100644
--- a/contracts/liquidity_hub/epoch-manager/tests/common.rs
+++ b/contracts/liquidity_hub/epoch-manager/tests/common.rs
@@ -3,7 +3,9 @@ use cosmwasm_std::{DepsMut, MessageInfo, Response, Uint64};
 
 use epoch_manager::contract::{execute, instantiate};
 use epoch_manager::ContractError;
-use white_whale_std::epoch_manager::epoch_manager::{EpochV2, EpochConfig, ExecuteMsg, InstantiateMsg};
+use white_whale_std::epoch_manager::epoch_manager::{
+    EpochConfig, EpochV2, ExecuteMsg, InstantiateMsg,
+};
 
 /// Mocks contract instantiation.
 pub(crate) fn mock_instantiation(
diff --git a/contracts/liquidity_hub/epoch-manager/tests/epoch.rs b/contracts/liquidity_hub/epoch-manager/tests/epoch.rs
index 288384ef6..efc153c2d 100644
--- a/contracts/liquidity_hub/epoch-manager/tests/epoch.rs
+++ b/contracts/liquidity_hub/epoch-manager/tests/epoch.rs
@@ -3,7 +3,7 @@ use cosmwasm_std::testing::{mock_env, mock_info};
 
 use epoch_manager::contract::{execute, query};
 use epoch_manager::ContractError;
-use white_whale_std::epoch_manager::epoch_manager::{EpochV2, EpochResponse, ExecuteMsg, QueryMsg};
+use white_whale_std::epoch_manager::epoch_manager::{EpochResponse, EpochV2, ExecuteMsg, QueryMsg};
 use white_whale_std::epoch_manager::hooks::EpochChangedHookMsg;
 use white_whale_std::pool_network::mock_querier::mock_dependencies;
 
diff --git a/contracts/liquidity_hub/epoch-manager/tests/instantiate.rs b/contracts/liquidity_hub/epoch-manager/tests/instantiate.rs
index 178c78374..0dcca6fb2 100644
--- a/contracts/liquidity_hub/epoch-manager/tests/instantiate.rs
+++ b/contracts/liquidity_hub/epoch-manager/tests/instantiate.rs
@@ -4,7 +4,7 @@ use cosmwasm_std::{from_json, Addr, Uint64};
 use epoch_manager::contract::{instantiate, query};
 use epoch_manager::ContractError;
 use white_whale_std::epoch_manager::epoch_manager::{
-    ConfigResponse, EpochV2, EpochConfig, InstantiateMsg, QueryMsg,
+    ConfigResponse, EpochConfig, EpochV2, InstantiateMsg, QueryMsg,
 };
 use white_whale_std::pool_network::mock_querier::mock_dependencies;
 
diff --git a/contracts/liquidity_hub/pool-manager/src/contract.rs b/contracts/liquidity_hub/pool-manager/src/contract.rs
index 7642dd926..8c641caed 100644
--- a/contracts/liquidity_hub/pool-manager/src/contract.rs
+++ b/contracts/liquidity_hub/pool-manager/src/contract.rs
@@ -10,7 +10,9 @@ use cosmwasm_std::{
 use cw2::set_contract_version;
 use cw20::Cw20ReceiveMsg;
 use semver::Version;
-use white_whale_std::pool_manager::{Cw20HookMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use white_whale_std::pool_manager::{
+    Cw20HookMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
+};
 use white_whale_std::pool_network::asset::{Asset, AssetInfo};
 use white_whale_std::pool_network::pair::FeatureToggle;
 
diff --git a/contracts/liquidity_hub/pool-manager/src/manager/commands.rs b/contracts/liquidity_hub/pool-manager/src/manager/commands.rs
index 8fb8fe23b..0d514ae1c 100644
--- a/contracts/liquidity_hub/pool-manager/src/manager/commands.rs
+++ b/contracts/liquidity_hub/pool-manager/src/manager/commands.rs
@@ -209,7 +209,7 @@ pub fn create_pair(
             feature = "osmosis_token_factory",
             feature = "injective"
         ))]
-        Ok(tokenfactory::create_denom::create_denom(
+        Ok(white_whale_std::tokenfactory::create_denom::create_denom(
             env.contract.address,
             lp_symbol,
         ))
diff --git a/contracts/liquidity_hub/pool-network/frontend_helper/src/reply/deposit_pair.rs b/contracts/liquidity_hub/pool-network/frontend_helper/src/reply/deposit_pair.rs
index 29f449733..ddf96cd22 100644
--- a/contracts/liquidity_hub/pool-network/frontend_helper/src/reply/deposit_pair.rs
+++ b/contracts/liquidity_hub/pool-network/frontend_helper/src/reply/deposit_pair.rs
@@ -96,11 +96,15 @@ pub fn deposit_pair(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, Con
             },
         )?;
     let has_existing_position = positions.positions.into_iter().any(|position| {
-        let QueryPosition::OpenPosition { unbonding_duration: position_unbonding_duration, .. } = position else {
-			return false;
-		};
+        let QueryPosition::OpenPosition {
+            unbonding_duration: position_unbonding_duration,
+            ..
+        } = position
+        else {
+            return false;
+        };
 
-		unbonding_duration == position_unbonding_duration
+        unbonding_duration == position_unbonding_duration
     });
 
     Ok(Response::default()
diff --git a/contracts/liquidity_hub/pool-network/terraswap_pair/src/helpers.rs b/contracts/liquidity_hub/pool-network/terraswap_pair/src/helpers.rs
index d4399cb10..13b327096 100644
--- a/contracts/liquidity_hub/pool-network/terraswap_pair/src/helpers.rs
+++ b/contracts/liquidity_hub/pool-network/terraswap_pair/src/helpers.rs
@@ -519,7 +519,7 @@ pub fn instantiate_fees(
 }
 
 /// Creates a new LP token for this pool
-pub fn  create_lp_token(
+pub fn create_lp_token(
     deps: DepsMut,
     env: &Env,
     msg: &InstantiateMsg,
diff --git a/contracts/liquidity_hub/vault-manager/src/manager/commands.rs b/contracts/liquidity_hub/vault-manager/src/manager/commands.rs
index 30e28de65..72c8da871 100644
--- a/contracts/liquidity_hub/vault-manager/src/manager/commands.rs
+++ b/contracts/liquidity_hub/vault-manager/src/manager/commands.rs
@@ -13,7 +13,7 @@ use white_whale_std::pool_network::token::InstantiateMsg as TokenInstantiateMsg;
     feature = "osmosis_token_factory",
     feature = "injective"
 ))]
-use white_whale::tokenfactory;
+use white_whale_std::tokenfactory;
 use white_whale_std::vault_manager::{LpTokenType, Vault, VaultFee};
 
 use crate::state::{get_vault_by_identifier, CONFIG, VAULTS, VAULT_COUNTER};
@@ -132,7 +132,6 @@ pub fn create_vault(
         hasher.update(seed.as_bytes());
         let salt: Binary = hasher.finalize().to_vec().into();
 
-
         let vault_lp_address = deps.api.addr_humanize(
             &instantiate2_address(&checksum, &creator, &salt)
                 .map_err(|e| StdError::generic_err(e.to_string()))?,
diff --git a/contracts/liquidity_hub/vault-network/vault_router/src/execute/next_loan.rs b/contracts/liquidity_hub/vault-network/vault_router/src/execute/next_loan.rs
index 89d78df72..f027a20dd 100644
--- a/contracts/liquidity_hub/vault-network/vault_router/src/execute/next_loan.rs
+++ b/contracts/liquidity_hub/vault-network/vault_router/src/execute/next_loan.rs
@@ -26,7 +26,8 @@ pub fn next_loan(
         &white_whale_std::vault_network::vault_factory::QueryMsg::Vault {
             asset_info: source_vault_asset,
         },
-    )? else {
+    )?
+    else {
         return Err(VaultRouterError::Unauthorized {});
     };
 
diff --git a/packages/white-whale-std/src/epoch_manager/epoch_manager.rs b/packages/white-whale-std/src/epoch_manager/epoch_manager.rs
index db5b0b76a..acaf6a8ab 100644
--- a/packages/white-whale-std/src/epoch_manager/epoch_manager.rs
+++ b/packages/white-whale-std/src/epoch_manager/epoch_manager.rs
@@ -125,4 +125,4 @@ impl Display for EpochV2 {
             self.id, self.start_time,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/packages/white-whale-std/src/lib.rs b/packages/white-whale-std/src/lib.rs
index 19434cc0c..9a491210b 100644
--- a/packages/white-whale-std/src/lib.rs
+++ b/packages/white-whale-std/src/lib.rs
@@ -6,11 +6,11 @@ pub mod fee_collector;
 pub mod fee_distributor;
 pub mod lp_common;
 pub mod migrate_guards;
+pub mod pool_manager;
 pub mod pool_network;
 pub mod token_factory;
 pub mod tokenfactory;
 pub mod traits;
-pub mod pool_manager;
 pub mod vault_manager;
 pub mod vault_network;
 pub mod whale_lair;
diff --git a/packages/white-whale-std/src/pool_manager.rs b/packages/white-whale-std/src/pool_manager.rs
index 276a4fa9a..5cb77d84e 100644
--- a/packages/white-whale-std/src/pool_manager.rs
+++ b/packages/white-whale-std/src/pool_manager.rs
@@ -1,15 +1,14 @@
 use std::fmt;
 
-use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::{Decimal, Uint128};
-use cw20::Cw20ReceiveMsg;
-use cw_ownable::{cw_ownable_execute, cw_ownable_query};
 use crate::pool_network::{
     asset::{Asset, AssetInfo, PairType},
     factory::NativeTokenDecimalsResponse,
     pair::{PoolFee, ReverseSimulationResponse, SimulationResponse},
 };
-
+use cosmwasm_schema::{cw_serde, QueryResponses};
+use cosmwasm_std::{Decimal, Uint128};
+use cw20::Cw20ReceiveMsg;
+use cw_ownable::{cw_ownable_execute, cw_ownable_query};
 
 #[cw_serde]
 pub enum Cw20HookMsg {
@@ -25,8 +24,6 @@ pub enum Cw20HookMsg {
     WithdrawLiquidity { pair_identifier: String },
 }
 
-
-
 #[cw_serde]
 pub enum SwapOperation {
     WhaleSwap {
@@ -55,7 +52,7 @@ impl fmt::Display for SwapOperation {
                 f,
                 "WhaleSwap {{ token_in_info: {token_in_info}, token_out_info: {token_out_info}, pool_identifier: {pool_identifier} }}"
             ),
-            
+
         }
     }
 }
@@ -85,7 +82,6 @@ impl fmt::Display for SwapRoute {
     }
 }
 
-
 // Define a structure for Fees which names a number of defined fee collection types, maybe leaving room for a custom room a user can use to pass a fee with a defined custom name
 #[cw_serde]
 pub enum Fee {
@@ -100,7 +96,7 @@ pub struct StableSwapParams {
     pub initial_amp: String,
     pub future_amp: String,
     pub initial_amp_block: String,
-    pub future_amp_block: String
+    pub future_amp_block: String,
 }
 
 // Store PairInfo to N
@@ -119,7 +115,6 @@ pub struct NPairInfo {
 }
 impl NPairInfo {}
 
-
 #[cw_serde]
 pub struct InstantiateMsg {
     pub fee_collector_addr: String,
@@ -195,7 +190,7 @@ pub enum ExecuteMsg {
     /// Adds swap routes to the router.
     AddSwapRoutes {
         swap_routes: Vec<SwapRoute>,
-    }, 
+    },
     // CW20 Methods
     Receive(Cw20ReceiveMsg),
 }
@@ -247,7 +242,6 @@ pub enum QueryMsg {
     //     ask_amount: Uint128,
     //     operations: Vec<SwapOperation>,
     // },
-
     #[returns(NPairInfo)]
     Pair { pair_identifier: String },
 }
diff --git a/packages/white-whale-std/src/pool_network/asset.rs b/packages/white-whale-std/src/pool_network/asset.rs
index ae71b6197..68fae153a 100644
--- a/packages/white-whale-std/src/pool_network/asset.rs
+++ b/packages/white-whale-std/src/pool_network/asset.rs
@@ -184,8 +184,6 @@ impl AssetInfo {
         }
     }
 
-    
-
     pub fn equal(&self, asset: &AssetInfo) -> bool {
         match self {
             AssetInfo::Token { contract_addr, .. } => {
diff --git a/packages/white-whale-std/src/pool_network/mock_querier.rs b/packages/white-whale-std/src/pool_network/mock_querier.rs
index 751b53f04..cd71a4e34 100644
--- a/packages/white-whale-std/src/pool_network/mock_querier.rs
+++ b/packages/white-whale-std/src/pool_network/mock_querier.rs
@@ -3,10 +3,11 @@ use std::iter::FromIterator;
 use std::marker::PhantomData;
 use std::panic;
 
-use cosmwasm_std::testing::{MockQuerier, MockApi, MockStorage, MOCK_CONTRACT_ADDR};
+use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR};
 use cosmwasm_std::{
-    from_json, to_json_binary, Coin, ContractInfoResponse, ContractResult, Empty, OwnedDeps,
-    Querier, QuerierResult, QueryRequest, SystemError, SystemResult, Uint128, WasmQuery, CodeInfoResponse, Addr, HexBinary, to_binary,
+    from_json, to_binary, to_json_binary, Addr, CodeInfoResponse, Coin, ContractInfoResponse,
+    ContractResult, Empty, HexBinary, OwnedDeps, Querier, QuerierResult, QueryRequest, SystemError,
+    SystemResult, Uint128, WasmQuery,
 };
 use cw20::{BalanceResponse as Cw20BalanceResponse, Cw20QueryMsg, TokenInfoResponse};
 
@@ -348,7 +349,7 @@ impl WasmMockQuerier {
                 SystemResult::Ok(ContractResult::Ok(
                     to_json_binary(&contract_info_response).unwrap(),
                 ))
-            },
+            }
             QueryRequest::Wasm(WasmQuery::CodeInfo { code_id }) => {
                 let mut default = CodeInfoResponse::default();
 
@@ -356,7 +357,10 @@ impl WasmMockQuerier {
                     11 => {
                         default.code_id = 67;
                         default.creator = Addr::unchecked("creator").to_string();
-                        default.checksum =HexBinary::from_hex(&sha256::digest(format!("code_checksum_{}", code_id)))
+                        default.checksum = HexBinary::from_hex(&sha256::digest(format!(
+                            "code_checksum_{}",
+                            code_id
+                        )))
                         .unwrap();
                         SystemResult::Ok(to_binary(&default).into())
                     }
diff --git a/packages/white-whale-std/src/pool_network/mod.rs b/packages/white-whale-std/src/pool_network/mod.rs
index 012f00a12..486f51a3f 100644
--- a/packages/white-whale-std/src/pool_network/mod.rs
+++ b/packages/white-whale-std/src/pool_network/mod.rs
@@ -13,9 +13,9 @@ pub mod pair;
 pub mod querier;
 pub mod router;
 pub mod swap;
+pub mod temp_mock_api;
 pub mod token;
 pub mod trio;
-pub mod temp_mock_api;
 
 #[cfg(test)]
 mod testing;
diff --git a/packages/white-whale-std/src/pool_network/temp_mock_api.rs b/packages/white-whale-std/src/pool_network/temp_mock_api.rs
index f22c82cc6..d7f69dbab 100644
--- a/packages/white-whale-std/src/pool_network/temp_mock_api.rs
+++ b/packages/white-whale-std/src/pool_network/temp_mock_api.rs
@@ -80,4 +80,4 @@ impl Api for MockSimpleApi {
     fn debug(&self, message: &str) {
         println!("{}", message);
     }
-}
\ No newline at end of file
+}