revert serde change

Signed-off-by: Charles Ferrell <[email protected]>
Manta-Network · Apr 23, 2024 · 18e79c8 · 18e79c8
1 parent b28287b
commit 18e79c8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/pallets/pallet-lottery/Cargo.toml b/pallets/pallet-lottery/Cargo.toml
@@ -14,7 +14,7 @@ function_name = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"], optional = true }
 log = { workspace = true }
 scale-info = { workspace = true }
-serde = { workspace = true, optional = true }
+serde = { workspace = true }
 
 # Substrate dependencies
 frame-support = { workspace = true }

diff --git a/pallets/pallet-lottery/src/lib.rs b/pallets/pallet-lottery/src/lib.rs
@@ -107,7 +107,6 @@ pub mod pallet {
     use manta_primitives::types::PoolId;
     use orml_traits::MultiCurrency;
     use pallet_parachain_staking::BalanceOf;
-    #[cfg(feature = "std")]
     use serde::{Deserialize, Serialize};
     use sp_arithmetic::traits::SaturatedConversion;
     use sp_core::U256;
@@ -278,8 +277,7 @@ pub mod pallet {
     pub(super) type StakedCollators<T: Config> =
         StorageMap<_, Blake2_128Concat, T::AccountId, BalanceOf<T>, ValueQuery>;
 
-    #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-    #[derive(Clone, Copy, Encode, Decode, TypeInfo, Default)]
+    #[derive(Clone, Copy, Encode, Decode, TypeInfo, Default, Serialize, Deserialize)]
     pub struct FarmingParams<T: Default + Copy> {
         pub mint_farming_token: bool,
         pub destroy_farming_token: bool,

diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
@@ -10,7 +10,7 @@ version.workspace = true
 
 [dependencies]
 log = { workspace = true }
-serde = { workspace = true, optional = true }
+serde = { workspace = true }
 
 # Substrate
 codec = { workspace = true }

diff --git a/pallets/parachain-staking/src/inflation.rs b/pallets/parachain-staking/src/inflation.rs
@@ -19,7 +19,6 @@ use crate::pallet::{BalanceOf, Config, Pallet};
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::traits::Currency;
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::{PerThing, Perbill, RuntimeDebug};
 use substrate_fixed::{transcendental::pow as floatpow, types::I64F64};
@@ -33,9 +32,19 @@ fn rounds_per_year<T: Config>() -> u32 {
     BLOCKS_PER_YEAR / blocks_per_round
 }
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(
-    Eq, PartialEq, Clone, Copy, Encode, Decode, Default, RuntimeDebug, MaxEncodedLen, TypeInfo,
+    Eq,
+    PartialEq,
+    Clone,
+    Copy,
+    Encode,
+    Decode,
+    Default,
+    RuntimeDebug,
+    MaxEncodedLen,
+    TypeInfo,
+    Serialize,
+    Deserialize,
 )]
 pub struct Range<T> {
     pub min: T,
@@ -97,8 +106,9 @@ pub fn round_issuance_range<T: Config>(round: Range<Perbill>) -> Range<BalanceOf
     }
 }
 
-#[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,
+)]
 pub struct InflationInfo<Balance> {
     /// Staking expectations
     pub expect: Range<Balance>,

diff --git a/pallets/parachain-staking/src/set.rs b/pallets/parachain-staking/src/set.rs
@@ -17,14 +17,14 @@
 /* TODO: use orml_utilities::OrderedSet without leaking substrate v2.0 dependencies*/
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
 
 /// An ordered set backed by `Vec`
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(RuntimeDebug, PartialEq, Eq, Encode, Decode, Default, Clone, TypeInfo)]
+#[derive(
+    RuntimeDebug, PartialEq, Eq, Encode, Decode, Default, Clone, TypeInfo, Serialize, Deserialize,
+)]
 pub struct OrderedSet<T>(pub Vec<T>);
 
 impl<T: Ord> OrderedSet<T> {