Skip to content

Commit

Permalink
More cleanup for clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeHartnell authored and Jake Hartnell committed Mar 26, 2024
1 parent b7247f4 commit 6f80580
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 26 deletions.
9 changes: 3 additions & 6 deletions contracts/external/cw-abc/src/test_tube/test_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@ use crate::{
ClosedConfig, CommonsPhaseConfig, CurveType, HatchConfig, MinMax, OpenConfig, ReserveToken,
SupplyToken,
},
msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg},
msg::{ExecuteMsg, InstantiateMsg, QueryMsg},
ContractError,
};

use cosmwasm_std::{Coin, Decimal, Uint128};
use dao_testing::test_tube::cw_tokenfactory_issuer::TokenfactoryIssuer;
use osmosis_test_tube::{
osmosis_std::types::cosmos::bank::v1beta1::QueryAllBalancesRequest,
osmosis_std::types::cosmwasm::wasm::v1::{
MsgExecuteContractResponse, MsgMigrateContract, MsgMigrateContractResponse,
},
Account, Bank, Module, OsmosisTestApp, RunnerError, RunnerExecuteResult, RunnerResult,
SigningAccount, Wasm,
osmosis_std::types::cosmwasm::wasm::v1::MsgExecuteContractResponse, Account, Bank, Module,
OsmosisTestApp, RunnerError, RunnerExecuteResult, SigningAccount, Wasm,
};
use serde::de::DeserializeOwned;
use std::fmt::Debug;
Expand Down
21 changes: 7 additions & 14 deletions contracts/external/cw-abc/src/testing.rs
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
use cosmwasm_std::{
testing::{mock_env, mock_info, MockApi, MockQuerier, MockStorage},
CosmosMsg, Decimal, DepsMut, OwnedDeps, Uint128, WasmMsg,
Decimal, DepsMut, OwnedDeps, Uint128,
};
use speculoos::prelude::*;
use std::marker::PhantomData;
use token_bindings::{Metadata, TokenFactoryMsg, TokenFactoryQuery};
use token_bindings::{Metadata, TokenFactoryQuery};

use crate::abc::{
ClosedConfig, CommonsPhaseConfig, CurveType, HatchConfig, MinMax, OpenConfig, ReserveToken,
SupplyToken,
};
use crate::contract;
use crate::contract::CwAbcResult;
use crate::msg::InstantiateMsg;
use crate::queries::query_curve_info;
use crate::{
abc::{
ClosedConfig, CommonsPhaseConfig, CurveType, HatchConfig, MinMax, OpenConfig, ReserveToken,
SupplyToken,
},
contract::instantiate,
};
use crate::{contract, state::CURVE_TYPE};

const CREATOR: &str = "creator";

pub(crate) mod prelude {
pub use super::{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@ use dao_testing::test_tube::{
};
use dao_voting::threshold::ActiveThreshold;
use osmosis_test_tube::{
osmosis_std::types::{
cosmos::bank::v1beta1::QueryAllBalancesRequest,
cosmwasm::wasm::v1::MsgExecuteContractResponse,
},
Account, Bank, Module, OsmosisTestApp, RunnerError, RunnerExecuteResult, RunnerResult,
SigningAccount, Wasm,
osmosis_std::types::cosmwasm::wasm::v1::MsgExecuteContractResponse, Account, Bank, Module,
OsmosisTestApp, RunnerError, RunnerExecuteResult, RunnerResult, SigningAccount, Wasm,
};
use serde::de::DeserializeOwned;
use std::path::PathBuf;
Expand Down

0 comments on commit 6f80580

Please sign in to comment.