From b4b0a0331628000bde63e35fea941f1eba43ee97 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 20 May 2025 10:20:02 +0200 Subject: [PATCH 1/2] refactor: Replace explicit serde-json-wasm with cw_std::to_json_string --- Cargo.lock | 1 - examples/Cargo.lock | 1 - sylvia-derive/src/contract/communication/wrapper_msg.rs | 2 +- sylvia/Cargo.toml | 1 - sylvia/src/lib.rs | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6b965eb6..7793a4d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1246,7 +1246,6 @@ dependencies = [ "schemars", "serde", "serde-cw-value", - "serde-json-wasm", "sylvia-derive", "thiserror 2.0.12", "trybuild", diff --git a/examples/Cargo.lock b/examples/Cargo.lock index c80c3f6e..f0c51134 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -1398,7 +1398,6 @@ dependencies = [ "schemars", "serde", "serde-cw-value", - "serde-json-wasm", "sylvia-derive", ] diff --git a/sylvia-derive/src/contract/communication/wrapper_msg.rs b/sylvia-derive/src/contract/communication/wrapper_msg.rs index 0fc8896f..f17dc5a2 100644 --- a/sylvia-derive/src/contract/communication/wrapper_msg.rs +++ b/sylvia-derive/src/contract/communication/wrapper_msg.rs @@ -217,7 +217,7 @@ impl<'a> GlueMessage<'a> { // deserialized it from JSON, not reason to expect error here. format!( "Unsupported message received: {}. Messages supported by this contract: ", - #sylvia ::serde_json::to_string(&val).unwrap_or_else(|_| String::new()) + #sylvia ::cw_std::to_json_string(&val).unwrap_or_else(|_| String::new()) ), |mut acc, message| acc + message + ", ", ); diff --git a/sylvia/Cargo.toml b/sylvia/Cargo.toml index b05258b4..32aa99e0 100644 --- a/sylvia/Cargo.toml +++ b/sylvia/Cargo.toml @@ -62,7 +62,6 @@ cosmwasm-schema = { workspace = true } schemars = { workspace = true } serde = { workspace = true } serde-cw-value = "0.7.0" -serde-json-wasm = "1.0.1" konst = "0.3.16" cw-multi-test = { workspace = true, optional = true } anyhow = { workspace = true, optional = true } diff --git a/sylvia/src/lib.rs b/sylvia/src/lib.rs index 01baa1da..0e7fcb9f 100644 --- a/sylvia/src/lib.rs +++ b/sylvia/src/lib.rs @@ -22,5 +22,5 @@ pub use cw_utils; pub use sylvia_derive::{contract, entry_points, interface}; pub use { cosmwasm_schema as cw_schema, cosmwasm_std as cw_std, schemars, serde, - serde_cw_value as serde_value, serde_json_wasm as serde_json, + serde_cw_value as serde_value, }; From 35705403746d29553c1fda4dda6928e54074cd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wo=C5=BAniak?= Date: Mon, 9 Jun 2025 11:07:18 +0200 Subject: [PATCH 2/2] chore: Rebase --- Cargo.lock | 9 --------- examples/Cargo.lock | 9 --------- 2 files changed, 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7793a4d3..c3eee914 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1146,15 +1146,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde-json-wasm" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.219" diff --git a/examples/Cargo.lock b/examples/Cargo.lock index f0c51134..c888cf68 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -1309,15 +1309,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde-json-wasm" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.219"