git.delta.rocks / unique-network / refs/commits / d671502bf5ed

difftreelog

CORE-302 serde_json -> serde-json-core

Trubnikov Sergey2022-05-13parent: #554134b.patch.diff
in: master

3 files changed

modifiedCargo.lockdiffbeforeafterboth
6114 "pallet-nonfungible",6114 "pallet-nonfungible",
6115 "parity-scale-codec",6115 "parity-scale-codec",
6116 "scale-info",6116 "scale-info",
6117 "serde_json",6117 "serde-json-core",
6118 "sp-core",6118 "sp-core",
6119 "sp-runtime",6119 "sp-runtime",
6120 "sp-std",6120 "sp-std",
10776 "serde_derive",10776 "serde_derive",
10777]10777]
10778
10779[[package]]
10780name = "serde-json-core"
10781version = "0.4.0"
10782source = "registry+https://github.com/rust-lang/crates.io-index"
10783checksum = "8014aeea272bca0f0779778d43253f2f3375b414185b30e6ecc4d3e4a9994781"
10784dependencies = [
10785 "ryu",
10786 "serde",
10787]
1077810788
10779[[package]]10789[[package]]
10780name = "serde_derive"10790name = "serde_derive"
modifiedpallets/evm-collection/Cargo.tomldiffbeforeafterboth
--- 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",
 ]
modifiedpallets/evm-collection/src/eth.rsdiffbeforeafterboth
--- 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::<T>)?;
 		Ok(())
 	}