From 0cec90b7b9c31c7b2ea7054408764c4d6de10422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wo=C5=BAniak?= Date: Fri, 21 Jun 2024 11:53:56 +0200 Subject: [PATCH] chore: Update dependecies --- Cargo.lock | 70 ++++++++-------- Cargo.toml | 14 ++-- examples/Cargo.lock | 82 +++++++++---------- examples/Cargo.toml | 16 ++-- .../contracts/cw1-whitelist/src/contract.rs | 26 +++--- .../src/parser/attributes/messages.rs | 8 +- sylvia/Cargo.toml | 29 +++++-- sylvia/src/multitest.rs | 3 +- sylvia/tests/dispatching.rs | 5 +- 9 files changed, 133 insertions(+), 120 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c7bb77e..e5c20181 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "base16ct" @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b08e6670ab9e13a1a8a9cfad8fdad48bf0aaf88a6e81f39f2d9b2fc79b1890" +checksum = "c7a339f6b59ff7ad4ae05a70512a4f3c19bf8fcc845d46bfef90f4ec0810f72c" dependencies = [ "digest 0.10.7", "ed25519-zebra", @@ -127,18 +127,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b0918fc1a24b2ee08142c8d99d03f4c8e6d74244bdb304dbb29c0dab8e77e9" +checksum = "7d3bfea6af94a83880fb05478135ed0c256d9a2fcde58c595a10d64dcb9c925d" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26dbdb5800ca67f2f2f938d67db59a7c5434af133c3e508779a4df7a9b5d533b" +checksum = "101d0739564bd34cba9b84bf73665f0822487ae3b29b2dd59930608ed3aafd43" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ee47cf29f7688ebfa6ade8ddabcf51fc153f1157a3b46f5b4b1ce7a0316fdf" +checksum = "cf4be75f60158478da2c5d319ed59295bca1687ad50c18215a0485aa91a995ea" dependencies = [ "proc-macro2", "quote", @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88191bd0d4743613eb7a2f086acb0838404cb531bf658382effafc7ba91e8320" +checksum = "ded932165de44cd0717979c34fc3b84d8e8066b8dde4f5bd78f96a643b090f90" dependencies = [ "base64", "bech32 0.9.1", @@ -226,9 +226,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e403ad6ec62c8bcbcb75f7f4940712d0142b6103310da2a9375252b942358caa" +checksum = "e0034bfb4c06dfc8b50f0b1a06c3fc0f2312a1bae568a97db65930de071288ba" dependencies = [ "anyhow", "bech32 0.11.0", @@ -236,7 +236,7 @@ dependencies = [ "cw-storage-plus", "cw-utils", "derivative", - "itertools 0.12.1", + "itertools 0.13.0", "prost", "schemars", "serde", @@ -614,9 +614,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -624,9 +624,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", @@ -677,9 +677,9 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -689,14 +689,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.65", ] [[package]] @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -742,9 +742,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -753,13 +753,13 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.65", ] [[package]] @@ -925,18 +925,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index c2e9c598..c9958b1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,15 +8,15 @@ version = "1.0.2" [workspace.dependencies] sylvia-derive = { version = "1.0.2", path = "sylvia-derive" } -anyhow = "1.0.82" -cosmwasm-schema = "2.0.2" -cosmwasm-std = "2.0.2" -cw-multi-test = "2.0.1" +anyhow = "1.0.86" +cosmwasm-schema = "2.0.4" +cosmwasm-std = "2.0.4" +cw-multi-test = "2.1.0" cw-storage-plus = "2.0.0" -schemars = "0.8.16" +schemars = "0.8.21" cw-utils = "2.0.0" -serde = { version = "1.0.198", default-features = false, features = ["derive"] } -thiserror = "1.0.59" +serde = { version = "1.0.203", default-features = false, features = ["derive"] } +thiserror = "1.0.61" [workspace.metadata.docs.rs] all-features = true diff --git a/examples/Cargo.lock b/examples/Cargo.lock index b2b4e2f6..456b197b 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "assert_matches" @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b08e6670ab9e13a1a8a9cfad8fdad48bf0aaf88a6e81f39f2d9b2fc79b1890" +checksum = "c7a339f6b59ff7ad4ae05a70512a4f3c19bf8fcc845d46bfef90f4ec0810f72c" dependencies = [ "digest 0.10.7", "ed25519-zebra", @@ -139,18 +139,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b0918fc1a24b2ee08142c8d99d03f4c8e6d74244bdb304dbb29c0dab8e77e9" +checksum = "7d3bfea6af94a83880fb05478135ed0c256d9a2fcde58c595a10d64dcb9c925d" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26dbdb5800ca67f2f2f938d67db59a7c5434af133c3e508779a4df7a9b5d533b" +checksum = "101d0739564bd34cba9b84bf73665f0822487ae3b29b2dd59930608ed3aafd43" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ee47cf29f7688ebfa6ade8ddabcf51fc153f1157a3b46f5b4b1ce7a0316fdf" +checksum = "cf4be75f60158478da2c5d319ed59295bca1687ad50c18215a0485aa91a995ea" dependencies = [ "proc-macro2", "quote", @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88191bd0d4743613eb7a2f086acb0838404cb531bf658382effafc7ba91e8320" +checksum = "ded932165de44cd0717979c34fc3b84d8e8066b8dde4f5bd78f96a643b090f90" dependencies = [ "base64", "bech32 0.9.1", @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e403ad6ec62c8bcbcb75f7f4940712d0142b6103310da2a9375252b942358caa" +checksum = "e0034bfb4c06dfc8b50f0b1a06c3fc0f2312a1bae568a97db65930de071288ba" dependencies = [ "anyhow", "bech32 0.11.0", @@ -274,7 +274,7 @@ dependencies = [ "cw-storage-plus", "cw-utils", "derivative", - "itertools 0.12.1", + "itertools 0.13.0", "prost", "schemars", "serde", @@ -658,9 +658,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -796,9 +796,9 @@ checksum = "4e28ab1dc35e09d60c2b8c90d12a9a8d9666c876c10a3739a3196db0103b6043" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" @@ -878,9 +878,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -888,9 +888,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", @@ -941,9 +941,9 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -953,14 +953,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.65", ] [[package]] @@ -979,15 +979,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1012,9 +1012,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -1023,13 +1023,13 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.65", ] [[package]] @@ -1153,18 +1153,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index f4d0911f..22138576 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -27,15 +27,15 @@ version = "0.5.0" edition = "2021" [workspace.dependencies] -anyhow = "1.0.81" -cosmwasm-schema = "2.0.2" -cosmwasm-std = "2.0.2" -cw-multi-test = "2.0.1" +anyhow = "1.0.86" +cosmwasm-schema = "2.0.4" +cosmwasm-std = "2.0.4" +cw-multi-test = "2.1.0" cw-storage-plus = "2.0.0" cw-utils = "2.0.0" cw2 = "2.0.0" -getrandom = "0.2.14" -semver = "1.0.22" -serde = { version = "1.0.198", default-features = false, features = ["derive"] } -thiserror = "1.0.59" +getrandom = "0.2.15" +semver = "1.0.23" +serde = { version = "1.0.203", default-features = false, features = ["derive"] } +thiserror = "1.0.61" assert_matches = "1.5.0" diff --git a/examples/contracts/cw1-whitelist/src/contract.rs b/examples/contracts/cw1-whitelist/src/contract.rs index fd73cd7f..123e8991 100644 --- a/examples/contracts/cw1-whitelist/src/contract.rs +++ b/examples/contracts/cw1-whitelist/src/contract.rs @@ -56,12 +56,12 @@ impl<'a> Cw1WhitelistContract<'a> { #[cfg(test)] mod tests { use super::*; - use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info}; + use cosmwasm_std::testing::{message_info, mock_dependencies, mock_env}; use cosmwasm_std::{ coin, coins, to_json_binary, BankMsg, CosmosMsg, StakingMsg, SubMsg, WasmMsg, }; use cw1::Cw1; - use cw_multi_test::IntoBech32; + use cw_multi_test::{IntoAddr, IntoBech32}; use whitelist::responses::AdminListResponse; use whitelist::Whitelist; @@ -75,12 +75,12 @@ mod tests { let mut admins = vec![alice.to_string(), bob.to_string(), carl.to_string()]; admins.sort(); - let anyone = "anyone"; + let anyone = "anyone".into_addr(); let contract = Cw1WhitelistContract::new(); // instantiate the contract - let info = mock_info(anyone, &[]); + let info = message_info(&anyone, &[]); contract .instantiate( (deps.as_mut(), mock_env(), info).into(), @@ -102,7 +102,7 @@ mod tests { ); // anyone cannot modify the contract - let info = mock_info(anyone, &[]); + let info = message_info(&anyone, &[]); let err = contract .update_admins( (deps.as_mut(), mock_env(), info).into(), @@ -112,7 +112,7 @@ mod tests { assert_eq!(err, ContractError::Unauthorized); // but alice can kick out carl - let info = mock_info(alice.as_str(), &[]); + let info = message_info(&alice, &[]); contract .update_admins( (deps.as_mut(), mock_env(), info).into(), @@ -133,14 +133,14 @@ mod tests { ); // carl cannot freeze it - let info = mock_info(carl.as_str(), &[]); + let info = message_info(&carl, &[]); let err = contract .freeze((deps.as_mut(), mock_env(), info).into()) .unwrap_err(); assert_eq!(err, ContractError::Unauthorized); // but bob can - let info = mock_info(bob.as_str(), &[]); + let info = message_info(&bob, &[]); contract .freeze((deps.as_mut(), mock_env(), info).into()) .unwrap(); @@ -156,7 +156,7 @@ mod tests { ); // and now alice cannot change it again - let info = mock_info(alice.as_str(), &[]); + let info = message_info(&alice, &[]); let err = contract .update_admins( (deps.as_mut(), mock_env(), info).into(), @@ -177,7 +177,7 @@ mod tests { let contract = Cw1WhitelistContract::new(); // instantiate the contract - let info = mock_info(bob.as_str(), &[]); + let info = message_info(&bob, &[]); contract .instantiate( (deps.as_mut(), mock_env(), info).into(), @@ -202,14 +202,14 @@ mod tests { ]; // bob cannot execute them - let info = mock_info(bob.as_str(), &[]); + let info = message_info(&bob, &[]); let err = contract .execute((deps.as_mut(), mock_env(), info).into(), msgs.clone()) .unwrap_err(); assert_eq!(err, ContractError::Unauthorized); // but carl can - let info = mock_info(carl.as_str(), &[]); + let info = message_info(&carl, &[]); let res = contract .execute((deps.as_mut(), mock_env(), info).into(), msgs.clone()) .unwrap(); @@ -232,7 +232,7 @@ mod tests { let contract = Cw1WhitelistContract::new(); // instantiate the contract - let info = mock_info(anyone.as_str(), &[]); + let info = message_info(&anyone, &[]); contract .instantiate( (deps.as_mut(), mock_env(), info).into(), diff --git a/sylvia-derive/src/parser/attributes/messages.rs b/sylvia-derive/src/parser/attributes/messages.rs index c88831b0..cd09181d 100644 --- a/sylvia-derive/src/parser/attributes/messages.rs +++ b/sylvia-derive/src/parser/attributes/messages.rs @@ -2,9 +2,8 @@ use convert_case::{Case, Casing}; use proc_macro_error::emit_warning; use syn::fold::Fold; use syn::parse::{Parse, ParseStream, Parser}; -use syn::punctuated::Punctuated; use syn::spanned::Spanned; -use syn::{parenthesized, Error, GenericArgument, Ident, MetaList, Path, Result, Token}; +use syn::{parenthesized, Error, Ident, MetaList, Path, Result, Token}; use proc_macro_error::emit_error; @@ -16,7 +15,6 @@ pub struct ContractMessageAttr { pub module: Path, pub variant: Ident, pub customs: Customs, - pub generics: Punctuated, } impl ContractMessageAttr { @@ -79,7 +77,8 @@ fn interface_has_custom(content: ParseStream) -> Result { impl Parse for ContractMessageAttr { fn parse(input: ParseStream) -> Result { let module = input.parse()?; - let generics = extract_generics_from_path(&module); + // If this is not for backwards compatibility we can remove it + let _ = extract_generics_from_path(&module); let module = StripGenerics.fold_path(module); let variant = if input.parse::().is_ok() { @@ -114,7 +113,6 @@ impl Parse for ContractMessageAttr { module, variant, customs, - generics, }) } } diff --git a/sylvia/Cargo.toml b/sylvia/Cargo.toml index 4e23976c..65068448 100644 --- a/sylvia/Cargo.toml +++ b/sylvia/Cargo.toml @@ -13,18 +13,31 @@ readme = "../README.md" [features] mt = ["sylvia-derive/mt", "dep:cw-multi-test", "dep:anyhow"] -stargate = ["cosmwasm-std/stargate"] +stargate = ["cosmwasm-std/stargate", "cw-multi-test/stargate"] iterator = ["cosmwasm-std/iterator"] -cosmwasm_1_1 = ["cosmwasm-std/cosmwasm_1_1"] +cosmwasm_1_1 = ["cosmwasm-std/cosmwasm_1_1", "cw-multi-test/cosmwasm_1_1"] cosmwasm_1_2 = [ "cosmwasm-std/cosmwasm_1_2", - "dep:cw-utils", + "cw-multi-test/cosmwasm_1_2", "sylvia-derive/cosmwasm_1_2", + "dep:cw-utils", "cosmwasm_1_1", ] -cosmwasm_1_3 = ["cosmwasm-std/cosmwasm_1_3", "cosmwasm_1_2"] -cosmwasm_1_4 = ["cosmwasm-std/cosmwasm_1_4", "cosmwasm_1_3"] -cosmwasm_2_0 = ["cosmwasm-std/cosmwasm_2_0", "cosmwasm_1_4"] +cosmwasm_1_3 = [ + "cosmwasm-std/cosmwasm_1_3", + "cw-multi-test/cosmwasm_1_3", + "cosmwasm_1_2", +] +cosmwasm_1_4 = [ + "cosmwasm-std/cosmwasm_1_4", + "cw-multi-test/cosmwasm_1_4", + "cosmwasm_1_3", +] +cosmwasm_2_0 = [ + "cosmwasm-std/cosmwasm_2_0", + "cw-multi-test/cosmwasm_2_0", + "cosmwasm_1_4", +] [dependencies] sylvia-derive = { workspace = true } @@ -35,14 +48,14 @@ serde = { workspace = true } serde-cw-value = "0.7.0" serde-json-wasm = "1.0.1" konst = "0.3.8" -cw-multi-test = { workspace = true, optional = true } +cw-multi-test = { workspace = true, features = ["staking"], optional = true } anyhow = { workspace = true, optional = true } derivative = { version = "2.2.0" } cw-utils = { workspace = true, optional = true } [dev-dependencies] +cw-multi-test = { workspace = true, features = ["staking"] } anyhow = { workspace = true } -cw-multi-test = { workspace = true } cw-storage-plus = { workspace = true } cw-utils = { workspace = true } thiserror = { workspace = true } diff --git a/sylvia/src/multitest.rs b/sylvia/src/multitest.rs index 5cd090df..39ad4f85 100644 --- a/sylvia/src/multitest.rs +++ b/sylvia/src/multitest.rs @@ -54,6 +54,7 @@ use std::cell::{Ref, RefCell, RefMut}; use std::fmt::{Debug, Display}; use std::marker::PhantomData; +use cosmwasm_std::testing::MockApi; use cosmwasm_std::{ Addr, Api, BlockInfo, Coin, Empty, Querier, QuerierResult, QuerierWrapper, Storage, }; @@ -128,7 +129,7 @@ impl App> { GovFailingModule, StargateFailing, >, - &dyn Api, + &MockApi, &mut dyn Storage, ), { diff --git a/sylvia/tests/dispatching.rs b/sylvia/tests/dispatching.rs index b836f0ed..6db6b038 100644 --- a/sylvia/tests/dispatching.rs +++ b/sylvia/tests/dispatching.rs @@ -1,5 +1,6 @@ -use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info}; +use cosmwasm_std::testing::{message_info, mock_dependencies, mock_env}; use cosmwasm_std::{from_json, Addr, Decimal, Response}; +use cw_multi_test::IntoAddr; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -178,7 +179,7 @@ fn dispatch() { let mut deps = mock_dependencies(); let env = mock_env(); - let info = mock_info("owner", &[]); + let info = message_info(&"owner".into_addr(), &[]); // Instantiate the contract let resp = contract::sv::InstantiateMsg {}