Merge pull request #605 from axone-protocol/chore/bump-cosmwasm-2.0.x

⬆ Bump cosmwasm 2.0.x
axone-protocol · Aug 7, 2024 · 18e2930 · 18e2930
2 parents c8f0fa7 + 061419b
commit 18e2930
Show file tree

Hide file tree

Showing 28 changed files with 873 additions and 260 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,13 +25,13 @@ axone-objectarium = { path = "contracts/axone-objectarium", features = [
 axone-objectarium-client = { path = "packages/axone-objectarium-client" }
 axone-rdf = { path = "packages/axone-rdf" }
 axone-wasm = { path = "packages/axone-wasm" }
-cosmwasm-schema = "1.5.5"
-cosmwasm-std = { version = "1.5.5", features = ["cosmwasm_1_2"] }
+cosmwasm-schema = "2.1.1"
+cosmwasm-std = { version = "2.1.1", features = ["cosmwasm_2_1"] }
 cosmwasm-storage = "1.5.2"
-cw-multi-test = "0.20.1"
-cw-storage-plus = "1.2.0"
-cw-utils = "1.0.3"
-cw2 = "1.1.1"
+cw-multi-test = "2.1.0"
+cw-storage-plus = "2.0.0"
+cw-utils = "2.0.0"
+cw2 = "2.0.0"
 iref = "3.1.3"
 langtag = "0.3.4"
 rdf-types = "0.18.2"
@@ -41,4 +41,5 @@ rio_xml = "0.8.4"
 schemars = "0.8.21"
 serde = { version = "1.0.204", default-features = false, features = ["derive"] }
 serde-json-wasm = "1.0.1"
+testing = { path = "packages/testing" }
 thiserror = { version = "1.0.63" }
diff --git a/Makefile.toml b/Makefile.toml
@@ -624,7 +624,7 @@ install_crate = { crate_name = "cargo-llvm-cov", min_version = "0.6.9" }
 install_crate_args = ["--force"]
 
 [tasks.install-cosmwasm-check]
-install_crate = { crate_name = "cosmwasm-check", min_version = "1.5.3" }
+install_crate = { crate_name = "cosmwasm-check", min_version = "2.1.1" }
 
 [tasks.install-ffizer]
 install_script = '''

diff --git a/contracts/axone-cognitarium/Cargo.toml b/contracts/axone-cognitarium/Cargo.toml
@@ -41,10 +41,9 @@ cw-multi-test.workspace = true
 futures = "0.3.30"
 serde_json = "1.0.122"
 serde_yaml = "0.9.34"
+testing.workspace = true
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 

diff --git a/contracts/axone-cognitarium/src/contract.rs b/contracts/axone-cognitarium/src/contract.rs
@@ -443,7 +443,7 @@ mod tests {
         namespaces, triples, Namespace, Node, Object, StoreLimits, StoreStat, Subject, Triple,
     };
     use crate::{msg, state};
-    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::testing::{message_info, mock_dependencies, mock_env};
     use cosmwasm_std::{coins, from_json, Addr, Attribute, Order, Uint128};
     use cw_utils::PaymentError;
     use cw_utils::PaymentError::NonPayable;
@@ -452,6 +452,7 @@ mod tests {
     use std::io::Read;
     use std::path::Path;
     use std::{env, u128};
+    use testing::addr::{addr, OWNER, SENDER};
 
     #[test]
     fn proper_initialization() {
@@ -469,7 +470,7 @@ mod tests {
             },
         };
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         let res = instantiate(deps.as_mut(), mock_env(), info.clone(), msg).unwrap();
         assert_eq!(0, res.messages.len());
 
@@ -507,7 +508,7 @@ mod tests {
     fn funds_initialization() {
         let mut deps = mock_dependencies();
         let env = mock_env();
-        let info = mock_info("sender", &coins(10, "uaxone"));
+        let info = message_info(&addr(SENDER), &coins(10, "uaxone"));
 
         let msg = InstantiateMsg::default();
 
@@ -520,7 +521,7 @@ mod tests {
     fn execute_fail_with_funds() {
         let mut deps = mock_dependencies();
         let env = mock_env();
-        let info = mock_info("sender", &coins(10, "uaxone"));
+        let info = message_info(&addr("sender"), &coins(10, "uaxone"));
 
         let messages = vec![
             InsertData {
@@ -572,7 +573,7 @@ mod tests {
         for case in cases {
             let mut deps = mock_dependencies();
 
-            let info = mock_info("owner", &[]);
+            let info = message_info(&addr(OWNER), &[]);
             instantiate(
                 deps.as_mut(),
                 mock_env(),
@@ -667,7 +668,7 @@ mod tests {
     fn proper_insert_blank_nodes() {
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -701,7 +702,7 @@ mod tests {
     fn insert_existing_triples() {
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -763,15 +764,15 @@ mod tests {
         instantiate(
             deps.as_mut(),
             mock_env(),
-            mock_info("owner", &[]),
+            message_info(&addr(OWNER), &[]),
             InstantiateMsg::default(),
         )
         .unwrap();
 
         let res = execute(
             deps.as_mut(),
             mock_env(),
-            mock_info("not-owner", &[]),
+            message_info(&addr("not-owner"), &[]),
             InsertData {
                 format: Some(DataFormat::RDFXml),
                 data: read_test_data("sample.rdf.xml"),
@@ -870,7 +871,7 @@ mod tests {
         for case in cases {
             let mut deps = mock_dependencies();
 
-            let info = mock_info("owner", &[]);
+            let info = message_info(&addr(OWNER), &[]);
             instantiate(
                 deps.as_mut(),
                 mock_env(),
@@ -1086,7 +1087,7 @@ mod tests {
         for case in cases {
             let mut deps = mock_dependencies();
 
-            let info = mock_info("owner", &[]);
+            let info = message_info(&addr(OWNER), &[]);
             instantiate(
                 deps.as_mut(),
                 mock_env(),
@@ -1196,7 +1197,7 @@ mod tests {
         for case in cases {
             let mut deps = mock_dependencies();
 
-            let info = mock_info("owner", &[]);
+            let info = message_info(&addr(OWNER), &[]);
             instantiate(
                 deps.as_mut(),
                 mock_env(),
@@ -1230,7 +1231,7 @@ mod tests {
             .save(
                 deps.as_mut().storage,
                 &Store {
-                    owner: Addr::unchecked("owner"),
+                    owner: Addr::unchecked(OWNER),
                     limits: StoreLimits {
                         max_triple_count: 1u128.into(),
                         max_byte_size: 2u128.into(),
@@ -1254,7 +1255,7 @@ mod tests {
         assert_eq!(
             from_json::<StoreResponse>(&res.unwrap()).unwrap(),
             StoreResponse {
-                owner: "owner".to_string(),
+                owner: OWNER.to_string(),
                 limits: msg::StoreLimits {
                     max_triple_count: 1u128.into(),
                     max_byte_size: 2u128.into(),
@@ -1455,7 +1456,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -1676,7 +1677,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -1776,7 +1777,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -1928,7 +1929,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -1998,7 +1999,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -2063,7 +2064,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -2128,7 +2129,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -2197,7 +2198,7 @@ mod tests {
 
         let mut deps = mock_dependencies();
 
-        let info = mock_info("owner", &[]);
+        let info = message_info(&addr(OWNER), &[]);
         instantiate(
             deps.as_mut(),
             mock_env(),
@@ -2374,7 +2375,7 @@ mod tests {
         for (data, q, expected) in cases {
             let mut deps = mock_dependencies();
 
-            let info = mock_info("owner", &[]);
+            let info = message_info(&addr(OWNER), &[]);
             instantiate(
                 deps.as_mut(),
                 mock_env(),

diff --git a/contracts/axone-cognitarium/src/state/blank_nodes.rs b/contracts/axone-cognitarium/src/state/blank_nodes.rs
@@ -1,4 +1,4 @@
 use cw_storage_plus::Item;
 
 /// A counter serving as blank node unique identifier generator.
-pub const BLANK_NODE_IDENTIFIER_COUNTER: Item<'_, u128> = Item::new("blank_node_key");
+pub const BLANK_NODE_IDENTIFIER_COUNTER: Item<u128> = Item::new("blank_node_key");
diff --git a/contracts/axone-cognitarium/src/state/namespaces.rs b/contracts/axone-cognitarium/src/state/namespaces.rs
@@ -7,7 +7,7 @@ use std::rc::Rc;
 
 /// Store a key increment used a unique key for referencing a namespace. Given the size of an `u128`
 /// there is no need to implement a garbage collector mechanism in case some namespaces are removed.
-pub const NAMESPACE_KEY_INCREMENT: Item<'_, u128> = Item::new("namespace_key");
+pub const NAMESPACE_KEY_INCREMENT: Item<u128> = Item::new("namespace_key");
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 pub struct Namespace {
@@ -32,7 +32,7 @@ impl IndexList<Namespace> for NamespaceIndexes<'_> {
     }
 }
 
-pub fn namespaces<'a>() -> IndexedMap<'a, String, Namespace, NamespaceIndexes<'a>> {
+pub fn namespaces<'a>() -> IndexedMap<String, Namespace, NamespaceIndexes<'a>> {
     IndexedMap::new(
         "NAMESPACE",
         NamespaceIndexes {

diff --git a/contracts/axone-cognitarium/src/state/store.rs b/contracts/axone-cognitarium/src/state/store.rs
@@ -4,7 +4,7 @@ use cosmwasm_std::{Addr, Uint128};
 use cw_storage_plus::Item;
 use serde::{Deserialize, Serialize};
 
-pub const STORE: Item<'_, Store> = Item::new("store");
+pub const STORE: Item<Store> = Item::new("store");
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 pub struct Store {

diff --git a/contracts/axone-cognitarium/src/state/triples.rs b/contracts/axone-cognitarium/src/state/triples.rs
@@ -20,7 +20,7 @@ impl IndexList<Triple> for TripleIndexes<'_> {
     }
 }
 
-pub fn triples<'a>() -> IndexedMap<'a, TriplePK<'a>, Triple, TripleIndexes<'a>> {
+pub fn triples<'a>() -> IndexedMap<TriplePK<'a>, Triple, TripleIndexes<'a>> {
     IndexedMap::new(
         "TRIPLE",
         TripleIndexes {

diff --git a/contracts/axone-cognitarium/tests/e2e/main.rs b/contracts/axone-cognitarium/tests/e2e/main.rs
@@ -3,7 +3,7 @@ use axone_cognitarium::ContractError;
 use base64::engine::general_purpose;
 use base64::Engine;
 use cosmwasm_std::testing::{
-    mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
+    message_info, mock_dependencies, mock_env, MockApi, MockQuerier, MockStorage,
 };
 use cosmwasm_std::{MessageInfo, OwnedDeps, Response};
 use cucumber::parser::{Basic, Error};
@@ -13,6 +13,7 @@ use serde_yaml::Value;
 use std::fmt::Debug;
 use std::path::Path;
 use std::vec;
+use testing::addr::addr;
 
 #[derive(World)]
 #[world(init = Self::new)]
@@ -26,7 +27,7 @@ impl SmartContractWorld {
     fn new() -> Self {
         SmartContractWorld {
             deps: mock_dependencies(),
-            info: mock_info("owner", &[]),
+            info: message_info(&addr("owner"), &[]),
             response: Ok(Response::new()),
         }
     }

diff --git a/contracts/axone-dataverse/Cargo.toml b/contracts/axone-dataverse/Cargo.toml
@@ -41,10 +41,9 @@ unsigned-varint = "0.8.0"
 [dev-dependencies]
 base64 = "0.22.1"
 cw-multi-test.workspace = true
+testing.workspace = true
 url = "2.5.2"
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []