align cw20-base

Author: uint

Cargo.lock

@@ -8,13 +8,14 @@ resolver = "2"
 version = "1.1.2"
 
 [workspace.dependencies]
-cosmwasm-schema = "1.5"
-cosmwasm-std = "1.5"
-cw2 = "1.1"
-cw-controllers = "1.1"
-cw-multi-test = "1.0.0-rc.0"
-cw-storage-plus = "1.2"
-cw-utils = "1"
+cosmwasm-schema = "2.0.0-rc.1"
+cosmwasm-std = "2.0.0-rc.1"
+cw2 = "2.0.0-rc.0"
+cw-controllers = "2.0.0-rc.0"
+# temporary git source
+cw-multi-test = { git = "https://github.com/CosmWasm/cw-multi-test.git", branch = "v2" }
+cw-storage-plus = "2.0.0-rc.0"
+cw-utils = "2.0.0-rc.0"
 schemars = "0.8.15"
 semver = "1"
 serde = { version = "1.0.188", default-features = false, features = ["derive"] }
@@ -32,6 +33,7 @@ cw3-fixed-multisig = { path = "contracts/cw3-fixed-multisig", version = "1.1.2",
 ] }
 cw4 = { path = "packages/cw4", version = "1.1.2" }
 cw4-group = { path = "contracts/cw4-group", version = "1.1.2" }
+easy-addr = { path = "packages/easy-addr" }
 
 [profile.release.package.cw1-subkeys]
 codegen-units = 1

Cargo.toml

@@ -18,13 +18,13 @@ library = []
 test-utils = []
 
 [dependencies]
-cosmwasm-schema = "2.0.0-rc.1"
-cw-utils = "2.0.0-rc.0"
+cosmwasm-schema = { workspace = true }
+cw-utils = { workspace = true }
 cw1 = { workspace = true }
-cw2 = "2.0.0-rc.0"
+cw2 = { workspace = true }
 cw1-whitelist = { workspace = true }
-cosmwasm-std = { version = "2.0.0-rc.1", features = ["staking"] }
-cw-storage-plus = "2.0.0-rc.0"
+cosmwasm-std = { workspace = true, features = ["staking"] }
+cw-storage-plus = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
@@ -35,4 +35,4 @@ cw1-whitelist = { workspace = true, features = [
   "library",
   "test-utils",
 ] }
-easy-addr = { path = "../../packages/easy-addr" }
+easy-addr = { workspace = true }

contracts/cw1-subkeys/Cargo.toml

@@ -18,20 +18,18 @@ library = []
 test-utils = []
 
 [dependencies]
-cosmwasm-schema = "2.0.0-rc.1"
-cw-utils = "2.0.0-rc.0"
+cosmwasm-schema = { workspace = true }
+cw-utils = { workspace = true }
 cw1 = { workspace = true }
-cw2 = "2.0.0-rc.0"
-cosmwasm-std = { version = "2.0.0-rc.1", features = ["staking"] }
-cw-storage-plus = "2.0.0-rc.0"
+cw2 = { workspace = true }
+cosmwasm-std = { workspace = true, features = ["staking"] }
+cw-storage-plus = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 anyhow = "1"
 assert_matches = "1"
-# temporary
-cw-multi-test = { git = "https://github.com/CosmWasm/cw-multi-test.git", branch = "v2" }
+cw-multi-test = { workspace = true }
 derivative = "2"
-easy-addr = { path = "../../packages/easy-addr" }

contracts/cw1-whitelist/Cargo.toml

@@ -294,8 +294,8 @@ mod tests {
     fn increase_decrease_allowances() {
         let mut deps = mock_dependencies_with_balance(&coins(2, "token"));
 
-        let owner = String::from("addr0001");
-        let spender = String::from("addr0002");
+        let owner = deps.api.addr_make("addr0001").to_string();
+        let spender = deps.api.addr_make("addr0002").to_string();
         let info = mock_info(owner.as_ref(), &[]);
         let env = mock_env();
         do_instantiate(deps.as_mut(), owner.clone(), Uint128::new(12340000));
@@ -376,9 +376,9 @@ mod tests {
     fn allowances_independent() {
         let mut deps = mock_dependencies_with_balance(&coins(2, "token"));
 
-        let owner = String::from("addr0001");
-        let spender = String::from("addr0002");
-        let spender2 = String::from("addr0003");
+        let owner = deps.api.addr_make("addr0001").to_string();
+        let spender = deps.api.addr_make("addr0002").to_string();
+        let spender2 = deps.api.addr_make("addr0003").to_string();
         let info = mock_info(owner.as_ref(), &[]);
         let env = mock_env();
         do_instantiate(deps.as_mut(), &owner, Uint128::new(12340000));
@@ -471,7 +471,7 @@ mod tests {
     fn no_self_allowance() {
         let mut deps = mock_dependencies_with_balance(&coins(2, "token"));
 
-        let owner = String::from("addr0001");
+        let owner = deps.api.addr_make("addr0001").to_string();
         let info = mock_info(owner.as_ref(), &[]);
         let env = mock_env();
         do_instantiate(deps.as_mut(), &owner, Uint128::new(12340000));
@@ -498,9 +498,9 @@ mod tests {
     #[test]
     fn transfer_from_respects_limits() {
         let mut deps = mock_dependencies_with_balance(&[]);
-        let owner = String::from("addr0001");
-        let spender = String::from("addr0002");
-        let rcpt = String::from("addr0003");
+        let owner = deps.api.addr_make("addr0001").to_string();
+        let spender = deps.api.addr_make("addr0002").to_string();
+        let rcpt = deps.api.addr_make("addr0003").to_string();
 
         let start = Uint128::new(999999);
         do_instantiate(deps.as_mut(), &owner, start);
@@ -580,8 +580,8 @@ mod tests {
     #[test]
     fn burn_from_respects_limits() {
         let mut deps = mock_dependencies_with_balance(&[]);
-        let owner = String::from("addr0001");
-        let spender = String::from("addr0002");
+        let owner = deps.api.addr_make("addr0001").to_string();
+        let spender = deps.api.addr_make("addr0002").to_string();
 
         let start = Uint128::new(999999);
         do_instantiate(deps.as_mut(), &owner, start);
@@ -658,9 +658,9 @@ mod tests {
     #[test]
     fn send_from_respects_limits() {
         let mut deps = mock_dependencies_with_balance(&[]);
-        let owner = String::from("addr0001");
-        let spender = String::from("addr0002");
-        let contract = String::from("cool-dex");
+        let owner = deps.api.addr_make("addr0001").to_string();
+        let spender = deps.api.addr_make("addr0002").to_string();
+        let contract = deps.api.addr_make("addr0003").to_string();
         let send_msg = Binary::from(r#"{"some":123}"#.as_bytes());
 
         let start = Uint128::new(999999);
@@ -764,8 +764,8 @@ mod tests {
     fn no_past_expiration() {
         let mut deps = mock_dependencies_with_balance(&coins(2, "token"));
 
-        let owner = String::from("addr0001");
-        let spender = String::from("addr0002");
+        let owner = deps.api.addr_make("addr0001").to_string();
+        let spender = deps.api.addr_make("addr0002").to_string();
         let info = mock_info(owner.as_ref(), &[]);
         let env = mock_env();
         do_instantiate(deps.as_mut(), owner.clone(), Uint128::new(12340000));