Merge pull request #53 from confio/51-update-comswasm-1-0-0-beta-cwpl…

…us-0-10 Update to cosmwasm 1.0-beta and cw-plus 0.10
confio · Oct 14, 2021 · bffa83d · bffa83d
2 parents a5be916 + de29455
commit bffa83d
Show file tree

Hide file tree

Showing 14 changed files with 164 additions and 120 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -229,7 +229,7 @@ jobs:
       - run:
           name: Install check_contract
           # Uses --debug for compilation speed
-          command: cargo install --debug --version 0.16.0-rc5 --features iterator --example check_contract -- cosmwasm-vm
+          command: cargo install --debug --version 1.0.0-beta --features iterator --example check_contract -- cosmwasm-vm
       - save_cache:
           paths:
             - /usr/local/cargo/registry

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/dso-token/Cargo.toml b/contracts/dso-token/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dso-token"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
 edition = "2018"
 
@@ -20,19 +20,19 @@ crate-type = ["cdylib", "rlib"]
 backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
-cosmwasm-std = { version = "0.16.0" }
-cw-storage-plus = "0.8.0"
-cw20-base = { version = "0.8.0", features = ["library"] }
-cw2 = "0.8.0"
-cw4 = "0.8.0"
-cw20 = "0.8.0"
+cosmwasm-std = "=1.0.0-beta"
+cw-storage-plus = "=0.10"
+cw20-base = { version = "=0.10", features = ["library"] }
+cw2 = "=0.10"
+cw4 = "=0.10"
+cw20 = "=0.10"
 schemars = "0.8.1"
 serde = { version = "1.0.125", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.24" }
 
 [dev-dependencies]
 anyhow = "1"
-cosmwasm-schema = { version = "0.16.0" }
-cw-multi-test = "0.8.1"
-cw4-group = "0.8.0"
+cosmwasm-schema = "=1.0.0-beta"
+cw-multi-test = "=0.10"
+cw4-group = "=0.10"
 derivative = "2"
diff --git a/contracts/dso-token/src/contract.rs b/contracts/dso-token/src/contract.rs
@@ -392,6 +392,8 @@ mod tests {
     use cw4::{Cw4QueryMsg, MemberListResponse};
     use cw_storage_plus::Map;
 
+    use std::marker::PhantomData;
+
     const MEMBERS: Map<&Addr, u64> = Map::new(cw4::MEMBERS_KEY);
 
     struct GroupQuerier {
@@ -514,6 +516,7 @@ mod tests {
             storage,
             api,
             querier,
+            custom_query_type: PhantomData,
         };
 
         BALANCES
@@ -566,6 +569,7 @@ mod tests {
             storage,
             api,
             querier,
+            custom_query_type: PhantomData,
         };
 
         TOKEN_INFO
@@ -614,6 +618,7 @@ mod tests {
             storage,
             api,
             querier,
+            custom_query_type: PhantomData,
         };
 
         BALANCES
@@ -679,6 +684,7 @@ mod tests {
             storage: MockStorage::new(),
             api: MockApi::default(),
             querier: GroupQuerier::new(&whitelist_addr, &[]),
+            custom_query_type: PhantomData::<Empty>,
         };
 
         let info = MessageInfo {

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>> {