Skip to content

Commit

Permalink
runtime builds successfully
Browse files Browse the repository at this point in the history
  • Loading branch information
chexware committed Mar 21, 2024
1 parent 426468d commit 0427013
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 55 deletions.
62 changes: 31 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ fc-rpc-core = { git = "https://github.com/justinphamnz/frontier", branch = "polk
fc-consensus = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0" }
fc-mapping-sync = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0" }
fc-db = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0" }
fp-self-contained = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0", default-features = false }
fp-self-contained = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["serde"] }
fp-rpc = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0", default-features = false }
fp-evm = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0", default-features = false }
pallet-evm = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v1.1.0", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions pallets/estate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { workspace = true, package = "parity-scale-codec" }
serde = { workspace = true, optional = true }
serde = { workspace = true }
scale-info = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
Expand Down Expand Up @@ -50,7 +50,7 @@ default = ["std"]
std = [
"codec/std",
"log/std",
"serde",
"serde/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
9 changes: 4 additions & 5 deletions pallets/estate/src/rate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

use codec::{Decode, Encode};
use scale_info::TypeInfo;
#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};
use sp_runtime::{Perbill, RuntimeDebug};

Expand Down Expand Up @@ -72,8 +71,8 @@ pub fn round_issuance_range<T: Config>(config: MintingRateInfo) -> Range<u64> {
}
}

#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Default, RuntimeDebug, TypeInfo, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Range<T> {
pub min: T,
pub ideal: T,
Expand All @@ -96,8 +95,8 @@ impl<T: Ord + Copy> From<T> for Range<T> {
}
}

#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
#[derive(Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo)]
#[derive(Eq, PartialEq, Clone, Encode, Decode, Default, RuntimeDebug, TypeInfo, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct MintingRateInfo {
/// Number of metaverse expectations
pub expect: Range<u64>,
Expand Down
16 changes: 15 additions & 1 deletion primitives/metaverse/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,21 @@ impl<Balance: AtLeast32Bit + Copy> ItemId<Balance> {
}
}

#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, MaxEncodedLen, PartialOrd, Ord, TypeInfo, 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 {
Expand Down
4 changes: 2 additions & 2 deletions traits/core-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = 'https://github.com/bit-country'
version = '2.0.0-rc6'

[dependencies]
serde = { workspace = true, optional = true, features = ["derive"] }
serde = { workspace = true }
codec = { workspace = true, package = "parity-scale-codec" }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
Expand All @@ -20,7 +20,7 @@ scale-info = { workspace = true }
[features]
default = ['std']
std = [
'serde',
'serde/std',
'primitives/std',
'codec/std',
'sp-runtime/std',
Expand Down
Loading

0 comments on commit 0427013

Please sign in to comment.