Merge pull request #301 from uint/v0.7.x

Upgrade packages to cosmwasm 0.15.0
CosmWasm · Jun 28, 2021 · 62916ad · 62916ad
2 parents 3678c0c + 3264c72
commit 62916ad
Show file tree

Hide file tree

Showing 29 changed files with 175 additions and 132 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/controllers/Cargo.toml b/packages/controllers/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = { version = "0.14.0" }
+cosmwasm-std = { version = "0.15.0" }
 cw0 = { path = "../cw0", version = "0.6.2" }
 cw-storage-plus = { path = "../storage-plus", version = "0.6.2", features = ["iterator"] }
 schemars = "0.8.1"

diff --git a/packages/controllers/src/admin.rs b/packages/controllers/src/admin.rs
@@ -79,9 +79,9 @@ impl<'a> Admin<'a> {
         self.set(deps, new_admin)?;
 
         Ok(Response {
-            submessages: vec![],
             messages: vec![],
             attributes,
+            events: vec![],
             data: None,
         })
     }

diff --git a/packages/controllers/src/claim.rs b/packages/controllers/src/claim.rs
@@ -62,7 +62,7 @@ impl<'a> Claims<'a> {
         block: &BlockInfo,
         cap: Option<Uint128>,
     ) -> StdResult<Uint128> {
-        let mut to_send = Uint128(0);
+        let mut to_send = Uint128::zero();
         self.0.update(storage, addr, |claim| -> StdResult<_> {
             let (_send, waiting): (Vec<_>, _) =
                 claim.unwrap_or_default().iter().cloned().partition(|c| {

diff --git a/packages/controllers/src/hooks.rs b/packages/controllers/src/hooks.rs
@@ -88,9 +88,9 @@ impl<'a> Hooks<'a> {
             attr("sender", info.sender),
         ];
         Ok(Response {
-            submessages: vec![],
             messages: vec![],
             attributes,
+            events: vec![],
             data: None,
         })
     }
@@ -111,9 +111,9 @@ impl<'a> Hooks<'a> {
             attr("sender", info.sender),
         ];
         Ok(Response {
-            submessages: vec![],
             messages: vec![],
             attributes,
+            events: vec![],
             data: None,
         })
     }

diff --git a/packages/cw0/Cargo.toml b/packages/cw0/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = { version = "0.14.0" }
+cosmwasm-std = { version = "0.15.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21" }