From 4a53d88957b687e431a3ffb94e33ecc8fd65df52 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Wed, 02 Jun 2021 17:55:41 +0000 Subject: [PATCH] fix: serde no_std usage --- --- a/pallets/inflation/Cargo.toml +++ b/pallets/inflation/Cargo.toml @@ -19,7 +19,7 @@ version = '2.0.0' [dependencies] -serde = { version = "1.0.119" } +serde = { default-features = false, version = "1.0.119", features = ["derive"] } frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } --- a/pallets/inflation/src/lib.rs +++ b/pallets/inflation/src/lib.rs @@ -10,8 +10,7 @@ #[cfg(feature = "std")] pub use std::*; -#[cfg(feature = "std")] -pub use serde::*; +pub use serde::{Serialize, Deserialize}; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -19,7 +19,7 @@ version = '2.0.0' [dependencies] -serde = { version = "1.0.119" } +serde = { default-features = false, version = "1.0.119", features = ["derive"] } frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" } --- a/pallets/nft/src/eth/account.rs +++ b/pallets/nft/src/eth/account.rs @@ -2,7 +2,6 @@ use codec::{Encode, EncodeLike, Decode}; use sp_core::{H160, H256, crypto::AccountId32}; use core::cmp::Ordering; -#[cfg(feature = "std")] use serde::{Serialize, Deserialize}; use pallet_evm::AddressMapping; use sp_std::vec::Vec; @@ -21,7 +20,7 @@ } #[derive(Eq)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Serialize, Deserialize)] pub struct BasicCrossAccountId { /// If true - then ethereum is canonical encoding from_ethereum: bool, --- a/pallets/nft/src/lib.rs +++ b/pallets/nft/src/lib.rs @@ -7,9 +7,9 @@ #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "std")] -pub use serde::*; +pub use serde::{Serialize, Deserialize}; + use core::ops::{Deref, DerefMut}; use codec::{Decode, Encode}; pub use frame_support::{ @@ -71,7 +71,7 @@ pub type DecimalPoints = u8; #[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Serialize, Deserialize)] pub enum CollectionMode { Invalid, NFT, --- a/pallets/nft/src/types.rs +++ b/pallets/nft/src/types.rs @@ -1,8 +1,7 @@ #[cfg(feature = "std")] pub use std::*; -#[cfg(feature = "std")] -pub use serde::*; +pub use serde::{Serealize, Deserialize}; use codec::{Decode, Encode}; -- gitstuff