Fix or adapt tests to new version of comswam-std and cw-plus

confio · Oct 13, 2021 · 69d5882 · 69d5882
1 parent b655b99
commit 69d5882
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 27 deletions.
diff --git a/contracts/dso-token/src/contract.rs b/contracts/dso-token/src/contract.rs
@@ -386,6 +386,8 @@ mod tests {
     use cw20_base::state::TokenInfo;
     use cw_storage_plus::Map;
 
+    use std::marker::PhantomData;
+
     const MEMBERS: Map<&Addr, u64> = Map::new(cw4::MEMBERS_KEY);
 
     struct GroupQuerier {
@@ -500,6 +502,7 @@ mod tests {
             storage,
             api,
             querier,
+            custom_query_type: PhantomData,
         };
 
         BALANCES
@@ -552,6 +555,7 @@ mod tests {
             storage,
             api,
             querier,
+            custom_query_type: PhantomData,
         };
 
         TOKEN_INFO
@@ -600,6 +604,7 @@ mod tests {
             storage,
             api,
             querier,
+            custom_query_type: PhantomData,
         };
 
         BALANCES

diff --git a/contracts/dso-token/src/multitest/suite.rs b/contracts/dso-token/src/multitest/suite.rs
@@ -1,11 +1,10 @@
 use cw20_base::msg::InstantiateMarketingInfo;
 
-use cosmwasm_std::testing::{mock_env, MockApi, MockStorage};
 use cosmwasm_std::{to_binary, Addr, Binary, Empty, Response, StdError, Uint128};
 use cw20::{Cw20Coin, Cw20Contract, Cw20ReceiveMsg, MinterResponse, TokenInfoResponse};
 use cw4::{Cw4Contract, Member};
 use cw4_group::msg::ExecuteMsg as Cw4ExecuteMsg;
-use cw_multi_test::{App, AppResponse, BankKeeper, Contract, ContractWrapper, Executor};
+use cw_multi_test::{App, AppResponse, Contract, ContractWrapper, Executor};
 
 use crate::msg::{ExecuteMsg, InstantiateMsg};
 
@@ -107,12 +106,7 @@ impl ReceiverContract {
 }
 
 fn mock_app() -> App {
-    let env = mock_env();
-    let api = MockApi::default();
-    let bank = BankKeeper::new();
-    let storage = MockStorage::new();
-
-    App::new(api, env.block, bank, storage)
+    App::default()
 }
 
 fn contract_group() -> Box<dyn Contract<Empty>> {

diff --git a/contracts/tfi-factory/src/mock_querier.rs b/contracts/tfi-factory/src/mock_querier.rs
@@ -3,7 +3,7 @@ use cosmwasm_std::{
     from_slice, to_binary, Coin, ContractResult, Empty, OwnedDeps, Querier, QuerierResult,
     QueryRequest, SystemError, SystemResult, WasmQuery,
 };
-use std::collections::HashMap;
+use std::{collections::HashMap, marker::PhantomData};
 use tfi::asset::{AssetInfo, PairInfo};
 
 /// mock_dependencies is a drop-in replacement for cosmwasm_std::testing::mock_dependencies
@@ -18,6 +18,7 @@ pub fn mock_dependencies(
         api: MockApi::default(),
         storage: MockStorage::default(),
         querier: custom_querier,
+        custom_query_type: PhantomData,
     }
 }
 

diff --git a/contracts/tfi-factory/src/multitest/suite.rs b/contracts/tfi-factory/src/multitest/suite.rs
@@ -1,22 +1,16 @@
 use anyhow::{anyhow, Result};
-use cosmwasm_std::testing::{mock_env, MockApi, MockStorage};
-use cosmwasm_std::{coins, to_binary, Addr, Decimal, Empty, Uint128};
+use cosmwasm_std::{coins, to_binary, Addr, BankMsg, Decimal, Empty, Uint128};
 use cw20::{Cw20Coin, Cw20Contract, Cw20ExecuteMsg};
 use cw4::{Cw4Contract, Member};
 use cw4_group::msg::ExecuteMsg as Cw4ExecuteMsg;
-use cw_multi_test::{App, BankKeeper, Contract, ContractWrapper, Executor};
+use cw_multi_test::{App, Contract, ContractWrapper, Executor};
 use derivative::Derivative;
 use tfi::asset::{Asset, AssetInfo, PairInfo};
 use tfi::factory::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use tfi::pair::{Cw20HookMsg, ExecuteMsg as PairExecuteMsg};
 
 fn mock_app() -> App {
-    let env = mock_env();
-    let api = MockApi::default();
-    let bank = BankKeeper::new();
-    let storage = MockStorage::new();
-
-    App::new(api, env.block, bank, storage)
+    App::default()
 }
 
 fn contract_factory() -> Box<dyn Contract<Empty>> {
@@ -338,6 +332,15 @@ impl Config {
             .into_iter()
             .map(|actor| -> Result<_> {
                 let addr = Addr::unchecked(&actor.addr);
+                // app.execute(
+                //     Addr::unchecked("reserve"),
+                //     BankMsg::Send {
+                //         to_address: addr.to_string(),
+                //         amount: coins(actor.btc, "btc"),
+                //     }
+                //     .into(),
+                // )
+                // .unwrap();
                 app.init_bank_balance(&addr, coins(actor.btc, "btc"))
                     .map_err(|err| anyhow!(err))?;
 

diff --git a/contracts/tfi-pair/src/multitest.rs b/contracts/tfi-pair/src/multitest.rs
@@ -1,8 +1,7 @@
 use anyhow::{anyhow, Result};
-use cosmwasm_std::testing::{mock_env, MockApi, MockStorage};
 use cosmwasm_std::{coin, coins, to_binary, Addr, Decimal, Empty, StdError, Uint128};
 use cw20::{Cw20Coin, Cw20ExecuteMsg};
-use cw_multi_test::{App, BankKeeper, Contract, ContractWrapper, Executor};
+use cw_multi_test::{App, Contract, ContractWrapper, Executor};
 use derivative::Derivative;
 
 use crate::error::ContractError;
@@ -13,12 +12,7 @@ use tfi::pair::{
 };
 
 fn mock_app() -> App {
-    let env = mock_env();
-    let api = MockApi::default();
-    let bank = BankKeeper::new();
-    let storage = MockStorage::new();
-
-    App::new(api, env.block, bank, storage)
+    App::default()
 }
 
 pub fn contract_pair() -> Box<dyn Contract<Empty>> {

diff --git a/packages/mocks/src/lib.rs b/packages/mocks/src/lib.rs
@@ -23,7 +23,7 @@ pub fn mock_dependencies(
         storage: MockStorage::default(),
         api: MockApi::default(),
         querier: custom_querier,
-        custom_query_type: PhantomData
+        custom_query_type: PhantomData,
     }
 }