Merge pull request #398 from CosmWasm/mt-msg-handling

Implementing all messages handling in mutlitest App
CosmWasm · Sep 7, 2021 · a918a0f · a918a0f
2 parents ee7fd08 + a3e574b
commit a918a0f
Show file tree

Hide file tree

Showing 10 changed files with 478 additions and 205 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/cw20-escrow/src/integration_test.rs b/contracts/cw20-escrow/src/integration_test.rs
@@ -1,18 +1,13 @@
 #![cfg(test)]
 
-use cosmwasm_std::testing::{mock_env, MockApi, MockStorage};
 use cosmwasm_std::{coins, to_binary, Addr, Empty, Uint128};
 use cw20::{Cw20Coin, Cw20Contract, Cw20ExecuteMsg};
-use cw_multi_test::{App, BankKeeper, Contract, ContractWrapper, Executor};
+use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper, Executor};
 
 use crate::msg::{CreateMsg, DetailsResponse, ExecuteMsg, InstantiateMsg, QueryMsg, ReceiveMsg};
 
 fn mock_app() -> App {
-    let env = mock_env();
-    let api = MockApi::default();
-    let bank = BankKeeper::new();
-
-    App::new(api, env.block, bank, MockStorage::new())
+    AppBuilder::new().build()
 }
 
 pub fn contract_escrow() -> Box<dyn Contract<Empty>> {

diff --git a/contracts/cw3-fixed-multisig/src/integration_tests.rs b/contracts/cw3-fixed-multisig/src/integration_tests.rs
@@ -2,20 +2,15 @@
 
 use crate::contract::{execute, instantiate, query};
 use crate::msg::{ExecuteMsg, InstantiateMsg, Voter};
-use cosmwasm_std::testing::{mock_env, MockApi, MockStorage};
 use cosmwasm_std::{to_binary, Addr, Empty, Uint128, WasmMsg};
 use cw0::Duration;
 use cw20::{BalanceResponse, MinterResponse};
 use cw20_base::msg::QueryMsg;
 use cw3::Vote;
-use cw_multi_test::{App, BankKeeper, Contract, ContractWrapper, Executor};
+use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper, Executor};
 
 fn mock_app() -> App {
-    let env = mock_env();
-    let api = MockApi::default();
-    let bank = BankKeeper::new();
-
-    App::new(api, env.block, bank, MockStorage::new())
+    AppBuilder::new().build()
 }
 
 pub fn contract_cw3_fixed_multisig() -> Box<dyn Contract<Empty>> {

diff --git a/contracts/cw3-flex-multisig/src/contract.rs b/contracts/cw3-flex-multisig/src/contract.rs
@@ -424,14 +424,13 @@ fn list_voters(
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::testing::{mock_env, MockApi, MockStorage};
     use cosmwasm_std::{coin, coins, Addr, BankMsg, Coin, Decimal, Timestamp};
 
     use cw0::Duration;
     use cw2::{query_contract_info, ContractVersion};
     use cw4::{Cw4ExecuteMsg, Member};
     use cw4_group::helpers::Cw4GroupContract;
-    use cw_multi_test::{next_block, App, BankKeeper, Contract, ContractWrapper, Executor};
+    use cw_multi_test::{next_block, App, AppBuilder, Contract, ContractWrapper, Executor};
 
     use super::*;
     use crate::msg::Threshold;
@@ -470,11 +469,7 @@ mod tests {
     }
 
     fn mock_app() -> App {
-        let env = mock_env();
-        let api = MockApi::default();
-        let bank = BankKeeper::new();
-
-        App::new(api, env.block, bank, MockStorage::new())
+        AppBuilder::new().build()
     }
 
     // uploads code and returns address of group contract

diff --git a/packages/multi-test/Cargo.toml b/packages/multi-test/Cargo.toml
@@ -27,3 +27,4 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 prost = "0.8.0"
 anyhow = "1"
 thiserror = "1"
+derivative = "2"