git.delta.rocks / unique-network / refs/commits / 4a53d88957b6

difftreelog

fix serde no_std usage

Yaroslav Bolyukin2021-06-02parent: #5e83d89.patch.diff
in: master

6 files changed

modifiedpallets/inflation/Cargo.tomldiffbeforeafterboth
19version = '2.0.0'19version = '2.0.0'
2020
21[dependencies]21[dependencies]
22serde = { version = "1.0.119" }22serde = { default-features = false, version = "1.0.119", features = ["derive"] }
23frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }23frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
24frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }24frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
25pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }25pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
modifiedpallets/inflation/src/lib.rsdiffbeforeafterboth
10#[cfg(feature = "std")]10#[cfg(feature = "std")]
11pub use std::*;11pub use std::*;
1212
13#[cfg(feature = "std")]
14pub use serde::*;13pub use serde::{Serialize, Deserialize};
1514
16#[cfg(feature = "runtime-benchmarks")]15#[cfg(feature = "runtime-benchmarks")]
17mod benchmarking;16mod benchmarking;
modifiedpallets/nft/Cargo.tomldiffbeforeafterboth
19version = '2.0.0'19version = '2.0.0'
2020
21[dependencies]21[dependencies]
22serde = { version = "1.0.119" }22serde = { default-features = false, version = "1.0.119", features = ["derive"] }
23frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }23frame-support = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
24frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }24frame-system = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
25pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }25pallet-balances = { default-features = false, version = '3.0.0', git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
modifiedpallets/nft/src/eth/account.rsdiffbeforeafterboth
2use codec::{Encode, EncodeLike, Decode};2use codec::{Encode, EncodeLike, Decode};
3use sp_core::{H160, H256, crypto::AccountId32};3use sp_core::{H160, H256, crypto::AccountId32};
4use core::cmp::Ordering;4use core::cmp::Ordering;
5#[cfg(feature = "std")]
6use serde::{Serialize, Deserialize};5use serde::{Serialize, Deserialize};
7use pallet_evm::AddressMapping;6use pallet_evm::AddressMapping;
8use sp_std::vec::Vec;7use sp_std::vec::Vec;
21}20}
2221
23#[derive(Eq)]22#[derive(Eq)]
24#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]23#[derive(Serialize, Deserialize)]
25pub struct BasicCrossAccountId<T: Config> {24pub struct BasicCrossAccountId<T: Config> {
26 /// If true - then ethereum is canonical encoding25 /// If true - then ethereum is canonical encoding
27 from_ethereum: bool,26 from_ethereum: bool,
modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
77
8#![cfg_attr(not(feature = "std"), no_std)]8#![cfg_attr(not(feature = "std"), no_std)]
99
10#[cfg(feature = "std")]10
11pub use serde::*;11pub use serde::{Serialize, Deserialize};
1212
13use core::ops::{Deref, DerefMut};13use core::ops::{Deref, DerefMut};
14use codec::{Decode, Encode};14use codec::{Decode, Encode};
71pub type DecimalPoints = u8;71pub type DecimalPoints = u8;
7272
73#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]73#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
74#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]74#[derive(Serialize, Deserialize)]
75pub enum CollectionMode {75pub enum CollectionMode {
76 Invalid,76 Invalid,
77 NFT,77 NFT,
modifiedpallets/nft/src/types.rsdiffbeforeafterboth
1#[cfg(feature = "std")]1#[cfg(feature = "std")]
2pub use std::*;2pub use std::*;
33
4#[cfg(feature = "std")]
5pub use serde::*;4pub use serde::{Serealize, Deserialize};
65
7use codec::{Decode, Encode};6use codec::{Decode, Encode};
87