fixed FungibleTokenId serialization/deserialization error

bit-country · Mar 21, 2024 · 426468d · 426468d
1 parent 79a12f8
commit 426468d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ resolver = "2"
 # General 
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["max-encoded-len"] }
 serde_json = { version = "=1.0.105", default-features = false }
-serde = { version = "=1.0.193", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "=1.0.194", default-features = false, features = ["derive", "alloc"] }
 scale-info = { version = "2.9.0", features = ["derive"], default-features = false }
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }

diff --git a/primitives/metaverse/Cargo.toml b/primitives/metaverse/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["Metaverse.Network & Bit.Country Developers"]
 edition = '2021'
 
 [dependencies]
-serde = { workspace = true, optional = true, features = ["derive"] }
-serde_json = { workspace = true }
+serde = { workspace = true, features = ["derive", "alloc"] }
 codec = { workspace = true, package = "parity-scale-codec" }
 scale-info = { workspace = true }
 hex-literal = { workspace = true }
@@ -20,11 +19,13 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 xcm = { workspace = true }
 
+[dev-dependencies]
+serde_json = { workspace = true }
+
 [features]
 default = ["std"]
 std = [
-    "serde",
-    "serde_json/std",
+    "serde/std",
     "num_enum/std",
     "codec/std",
     "scale-info/std",

diff --git a/primitives/metaverse/src/lib.rs b/primitives/metaverse/src/lib.rs
@@ -19,7 +19,7 @@
 
 use codec::{Decode, Encode, HasCompact, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+//#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::traits::AtLeast32Bit;
 use sp_runtime::RuntimeDebug;
@@ -171,8 +171,9 @@ impl<Balance: AtLeast32Bit + Copy> ItemId<Balance> {
 	}
 }
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, MaxEncodedLen, PartialOrd, Ord, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, MaxEncodedLen, PartialOrd, Ord, TypeInfo, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+//#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum FungibleTokenId {
 	NativeToken(TokenId),
 	FungibleToken(TokenId),