From d671502bf5eda5b3b50f9732b6478605d9bf1e06 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Fri, 13 May 2022 06:56:52 +0000 Subject: [PATCH] CORE-302 serde_json -> serde-json-core --- --- a/Cargo.lock +++ b/Cargo.lock @@ -6114,7 +6114,7 @@ "pallet-nonfungible", "parity-scale-codec", "scale-info", - "serde_json", + "serde-json-core", "sp-core", "sp-runtime", "sp-std", @@ -10777,6 +10777,16 @@ ] [[package]] +name = "serde-json-core" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8014aeea272bca0f0779778d43253f2f3375b414185b30e6ecc4d3e4a9994781" +dependencies = [ + "ryu", + "serde", +] + +[[package]] name = "serde_derive" version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" --- a/pallets/evm-collection/Cargo.toml +++ b/pallets/evm-collection/Cargo.toml @@ -10,7 +10,7 @@ ] } ethereum = { version = "0.12.0", default-features = false } log = { default-features = false, version = "0.4.14" } -serde_json = { version = "1.0.68", default-features = false, features = ["alloc"] } +serde-json-core = { version = "0.4", default-features = false } # Substrate frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' } @@ -47,4 +47,5 @@ "evm-coder/std", "pallet-evm-coder-substrate/std", "pallet-evm/std", + "serde-json-core/std", ] --- a/pallets/evm-collection/src/eth.rs +++ b/pallets/evm-collection/src/eth.rs @@ -191,9 +191,9 @@ let mut collection = collection_from_address(collection_address, &self.0)?; check_is_owner(caller, &collection)?; - let limits = serde_json::from_str(limits_json.as_ref()) + let limits = serde_json_core::from_str(limits_json.as_ref()) .map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?; - collection.limits = limits; + collection.limits = limits.0; collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::)?; Ok(()) } -- gitstuff