From d02cd805fd252c727dc744c5c232d559f5263014 Mon Sep 17 00:00:00 2001 From: muharem Date: Sun, 25 Jun 2023 18:46:02 +0200 Subject: [PATCH 1/9] asset-rate rename asset_id to asset_kind --- bin/node/runtime/src/lib.rs | 2 +- frame/asset-rate/src/benchmarking.rs | 22 +++++----- frame/asset-rate/src/lib.rs | 60 ++++++++++++++-------------- frame/asset-rate/src/mock.rs | 2 +- frame/asset-rate/src/tests.rs | 8 ++-- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index e1434f0504bd3..5191568e8c70c 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -1145,7 +1145,7 @@ impl pallet_asset_rate::Config for Runtime { type UpdateOrigin = EnsureRoot; type Balance = Balance; type Currency = Balances; - type AssetId = u32; + type AssetKind = u32; type RuntimeEvent = RuntimeEvent; type WeightInfo = pallet_asset_rate::weights::SubstrateWeight; } diff --git a/frame/asset-rate/src/benchmarking.rs b/frame/asset-rate/src/benchmarking.rs index 1209f8db6693b..a8703e58e8e29 100644 --- a/frame/asset-rate/src/benchmarking.rs +++ b/frame/asset-rate/src/benchmarking.rs @@ -30,18 +30,18 @@ fn default_conversion_rate() -> FixedU128 { FixedU128::from_u32(1u32) } -#[benchmarks(where ::AssetId: From)] +#[benchmarks(where ::AssetKind: From)] mod benchmarks { use super::*; #[benchmark] fn create() -> Result<(), BenchmarkError> { - let asset_id: T::AssetId = ASSET_ID.into(); + let asset_kind: T::AssetKind = ASSET_ID.into(); #[extrinsic_call] - _(RawOrigin::Root, asset_id.clone(), default_conversion_rate()); + _(RawOrigin::Root, asset_kind.clone(), default_conversion_rate()); assert_eq!( - pallet_asset_rate::ConversionRateToNative::::get(asset_id), + pallet_asset_rate::ConversionRateToNative::::get(asset_kind), Some(default_conversion_rate()) ); Ok(()) @@ -49,18 +49,18 @@ mod benchmarks { #[benchmark] fn update() -> Result<(), BenchmarkError> { - let asset_id: T::AssetId = ASSET_ID.into(); + let asset_kind: T::AssetKind = ASSET_ID.into(); assert_ok!(AssetRate::::create( RawOrigin::Root.into(), - asset_id.clone(), + asset_kind.clone(), default_conversion_rate() )); #[extrinsic_call] - _(RawOrigin::Root, asset_id.clone(), FixedU128::from_u32(2)); + _(RawOrigin::Root, asset_kind.clone(), FixedU128::from_u32(2)); assert_eq!( - pallet_asset_rate::ConversionRateToNative::::get(asset_id), + pallet_asset_rate::ConversionRateToNative::::get(asset_kind), Some(FixedU128::from_u32(2)) ); Ok(()) @@ -68,7 +68,7 @@ mod benchmarks { #[benchmark] fn remove() -> Result<(), BenchmarkError> { - let asset_id: T::AssetId = ASSET_ID.into(); + let asset_kind: T::AssetKind = ASSET_ID.into(); assert_ok!(AssetRate::::create( RawOrigin::Root.into(), ASSET_ID.into(), @@ -76,9 +76,9 @@ mod benchmarks { )); #[extrinsic_call] - _(RawOrigin::Root, asset_id.clone()); + _(RawOrigin::Root, asset_kind.clone()); - assert!(pallet_asset_rate::ConversionRateToNative::::get(asset_id).is_none()); + assert!(pallet_asset_rate::ConversionRateToNative::::get(asset_kind).is_none()); Ok(()) } diff --git a/frame/asset-rate/src/lib.rs b/frame/asset-rate/src/lib.rs index ecc793184094b..67fa03863b68a 100644 --- a/frame/asset-rate/src/lib.rs +++ b/frame/asset-rate/src/lib.rs @@ -78,8 +78,8 @@ pub mod weights; // Type alias for `frame_system`'s account id. type AccountIdOf = ::AccountId; -// This pallet's asset id and balance type. -type AssetIdOf = ::AssetId; +// This pallet's asset kind and balance type. +type AssetKindOf = ::AssetKind; // Generic fungible balance type. type BalanceOf = <::Currency as Inspect>>::Balance; @@ -115,32 +115,32 @@ pub mod pallet { /// The currency mechanism for this pallet. type Currency: Inspect; - /// The identifier for the class of asset. - type AssetId: frame_support::traits::tokens::AssetId; + /// The type for asset kinds for which the conversion rate to native balance is set. + type AssetKind: Parameter + MaxEncodedLen; } /// Maps an asset to its fixed point representation in the native balance. /// - /// E.g. `native_amount = asset_amount * ConversionRateToNative::::get(asset_id)` + /// E.g. `native_amount = asset_amount * ConversionRateToNative::::get(asset_kind)` #[pallet::storage] pub type ConversionRateToNative = - StorageMap<_, Blake2_128Concat, T::AssetId, FixedU128, OptionQuery>; + StorageMap<_, Blake2_128Concat, T::AssetKind, FixedU128, OptionQuery>; #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { - // Some `asset_id` conversion rate was created. - AssetRateCreated { asset_id: T::AssetId, rate: FixedU128 }, - // Some `asset_id` conversion rate was removed. - AssetRateRemoved { asset_id: T::AssetId }, - // Some existing `asset_id` conversion rate was updated from `old` to `new`. - AssetRateUpdated { asset_id: T::AssetId, old: FixedU128, new: FixedU128 }, + // Some `asset_kind` conversion rate was created. + AssetRateCreated { asset_kind: T::AssetKind, rate: FixedU128 }, + // Some `asset_kind` conversion rate was removed. + AssetRateRemoved { asset_kind: T::AssetKind }, + // Some existing `asset_kind` conversion rate was updated from `old` to `new`. + AssetRateUpdated { asset_kind: T::AssetKind, old: FixedU128, new: FixedU128 }, } #[pallet::error] pub enum Error { /// The given asset ID is unknown. - UnknownAssetId, + UnknownAssetKind, /// The given asset ID already has an assigned conversion rate and cannot be re-created. AlreadyExists, } @@ -155,18 +155,18 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::create())] pub fn create( origin: OriginFor, - asset_id: T::AssetId, + asset_kind: T::AssetKind, rate: FixedU128, ) -> DispatchResult { T::CreateOrigin::ensure_origin(origin)?; ensure!( - !ConversionRateToNative::::contains_key(asset_id.clone()), + !ConversionRateToNative::::contains_key(asset_kind.clone()), Error::::AlreadyExists ); - ConversionRateToNative::::set(asset_id.clone(), Some(rate)); + ConversionRateToNative::::set(asset_kind.clone(), Some(rate)); - Self::deposit_event(Event::AssetRateCreated { asset_id, rate }); + Self::deposit_event(Event::AssetRateCreated { asset_kind, rate }); Ok(()) } @@ -178,24 +178,24 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::update())] pub fn update( origin: OriginFor, - asset_id: T::AssetId, + asset_kind: T::AssetKind, rate: FixedU128, ) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; let mut old = FixedU128::zero(); - ConversionRateToNative::::mutate(asset_id.clone(), |maybe_rate| { + ConversionRateToNative::::mutate(asset_kind.clone(), |maybe_rate| { if let Some(r) = maybe_rate { old = *r; *r = rate; Ok(()) } else { - Err(Error::::UnknownAssetId) + Err(Error::::UnknownAssetKind) } })?; - Self::deposit_event(Event::AssetRateUpdated { asset_id, old, new: rate }); + Self::deposit_event(Event::AssetRateUpdated { asset_kind, old, new: rate }); Ok(()) } @@ -205,23 +205,23 @@ pub mod pallet { /// - O(1) #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::remove())] - pub fn remove(origin: OriginFor, asset_id: T::AssetId) -> DispatchResult { + pub fn remove(origin: OriginFor, asset_kind: T::AssetKind) -> DispatchResult { T::RemoveOrigin::ensure_origin(origin)?; ensure!( - ConversionRateToNative::::contains_key(asset_id.clone()), - Error::::UnknownAssetId + ConversionRateToNative::::contains_key(asset_kind.clone()), + Error::::UnknownAssetKind ); - ConversionRateToNative::::remove(asset_id.clone()); + ConversionRateToNative::::remove(asset_kind.clone()); - Self::deposit_event(Event::AssetRateRemoved { asset_id }); + Self::deposit_event(Event::AssetRateRemoved { asset_kind }); Ok(()) } } } /// Exposes conversion of an arbitrary balance of an asset to native balance. -impl ConversionFromAssetBalance, AssetIdOf, BalanceOf> for Pallet +impl ConversionFromAssetBalance, AssetKindOf, BalanceOf> for Pallet where T: Config, BalanceOf: FixedPointOperand + Zero, @@ -230,10 +230,10 @@ where fn from_asset_balance( balance: BalanceOf, - asset_id: AssetIdOf, + asset_kind: AssetKindOf, ) -> Result, pallet::Error> { - let rate = pallet::ConversionRateToNative::::get(asset_id) - .ok_or(pallet::Error::::UnknownAssetId.into())?; + let rate = pallet::ConversionRateToNative::::get(asset_kind) + .ok_or(pallet::Error::::UnknownAssetKind.into())?; Ok(rate.saturating_mul_int(balance)) } } diff --git a/frame/asset-rate/src/mock.rs b/frame/asset-rate/src/mock.rs index 2d90fcfecd79e..4e6fa87542a63 100644 --- a/frame/asset-rate/src/mock.rs +++ b/frame/asset-rate/src/mock.rs @@ -91,7 +91,7 @@ impl pallet_asset_rate::Config for Test { type UpdateOrigin = frame_system::EnsureRoot; type Balance = u64; type Currency = Balances; - type AssetId = u32; + type AssetKind = u32; } // Build genesis storage according to the mock runtime. diff --git a/frame/asset-rate/src/tests.rs b/frame/asset-rate/src/tests.rs index 4e5a3167bef21..8990ba9fc28d6 100644 --- a/frame/asset-rate/src/tests.rs +++ b/frame/asset-rate/src/tests.rs @@ -66,7 +66,7 @@ fn remove_unknown_throws() { new_test_ext().execute_with(|| { assert_noop!( AssetRate::remove(RuntimeOrigin::root(), ASSET_ID,), - Error::::UnknownAssetId + Error::::UnknownAssetKind ); }); } @@ -89,7 +89,7 @@ fn update_unknown_throws() { new_test_ext().execute_with(|| { assert_noop!( AssetRate::update(RuntimeOrigin::root(), ASSET_ID, FixedU128::from_float(0.5)), - Error::::UnknownAssetId + Error::::UnknownAssetKind ); }); } @@ -101,7 +101,7 @@ fn convert_works() { let conversion = , - ::AssetId, + ::AssetKind, BalanceOf, >>::from_asset_balance(10, ASSET_ID); assert_eq!(conversion.expect("Conversion rate exists for asset"), 25); @@ -113,7 +113,7 @@ fn convert_unknown_throws() { new_test_ext().execute_with(|| { let conversion = , - ::AssetId, + ::AssetKind, BalanceOf, >>::from_asset_balance(10, ASSET_ID); assert!(conversion.is_err()); From ccaee5a1fdc36ba8725d855c54d743e9d662a312 Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 4 Jul 2023 16:36:06 +0200 Subject: [PATCH 2/9] asset-rate pallet benchmarks asset kind factory --- bin/node/runtime/src/lib.rs | 2 ++ frame/asset-rate/Cargo.toml | 2 +- frame/asset-rate/src/benchmarking.rs | 26 +++++++++++++++++++++----- frame/asset-rate/src/lib.rs | 8 +++++++- frame/asset-rate/src/mock.rs | 2 ++ 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 5191568e8c70c..d66bb825f9707 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -1148,6 +1148,8 @@ impl pallet_asset_rate::Config for Runtime { type AssetKind = u32; type RuntimeEvent = RuntimeEvent; type WeightInfo = pallet_asset_rate::weights::SubstrateWeight; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); } parameter_types! { diff --git a/frame/asset-rate/Cargo.toml b/frame/asset-rate/Cargo.toml index 565f658024e6a..215bd25934d52 100644 --- a/frame/asset-rate/Cargo.toml +++ b/frame/asset-rate/Cargo.toml @@ -22,10 +22,10 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" } sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime" } sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" } +sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" } [dev-dependencies] pallet-balances = { version = "4.0.0-dev", path = "../balances" } -sp-core = { version = "21.0.0", path = "../../primitives/core" } sp-io = { version = "23.0.0", path = "../../primitives/io" } [features] diff --git a/frame/asset-rate/src/benchmarking.rs b/frame/asset-rate/src/benchmarking.rs index a8703e58e8e29..411dbf63a220b 100644 --- a/frame/asset-rate/src/benchmarking.rs +++ b/frame/asset-rate/src/benchmarking.rs @@ -20,9 +20,24 @@ use super::*; use crate::{pallet as pallet_asset_rate, Pallet as AssetRate}; +use codec::Encode; use frame_benchmarking::v2::*; use frame_support::assert_ok; use frame_system::RawOrigin; +use sp_core::crypto::FromEntropy; + +/// Trait describing the factory function for AssetKind parameter +pub trait AssetKindFactory { + fn create_asset_kind(seed: u32) -> AssetKind; +} +impl AssetKindFactory for () +where + AssetKind: FromEntropy, +{ + fn create_asset_kind(seed: u32) -> AssetKind { + AssetKind::from_entropy(&mut seed.encode().as_slice()).unwrap() + } +} const ASSET_ID: u32 = 1; @@ -30,13 +45,13 @@ fn default_conversion_rate() -> FixedU128 { FixedU128::from_u32(1u32) } -#[benchmarks(where ::AssetKind: From)] +#[benchmarks] mod benchmarks { use super::*; #[benchmark] fn create() -> Result<(), BenchmarkError> { - let asset_kind: T::AssetKind = ASSET_ID.into(); + let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(ASSET_ID); #[extrinsic_call] _(RawOrigin::Root, asset_kind.clone(), default_conversion_rate()); @@ -49,7 +64,8 @@ mod benchmarks { #[benchmark] fn update() -> Result<(), BenchmarkError> { - let asset_kind: T::AssetKind = ASSET_ID.into(); + let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(ASSET_ID); + let asset_id: T::AssetId = assert_ok!(AssetRate::::create( RawOrigin::Root.into(), asset_kind.clone(), @@ -68,10 +84,10 @@ mod benchmarks { #[benchmark] fn remove() -> Result<(), BenchmarkError> { - let asset_kind: T::AssetKind = ASSET_ID.into(); + let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(ASSET_ID); assert_ok!(AssetRate::::create( RawOrigin::Root.into(), - ASSET_ID.into(), + asset_id.clone(), default_conversion_rate() )); diff --git a/frame/asset-rate/src/lib.rs b/frame/asset-rate/src/lib.rs index 67fa03863b68a..834ea18034004 100644 --- a/frame/asset-rate/src/lib.rs +++ b/frame/asset-rate/src/lib.rs @@ -69,12 +69,14 @@ pub use pallet::*; pub use weights::WeightInfo; #[cfg(feature = "runtime-benchmarks")] -pub mod benchmarking; +mod benchmarking; #[cfg(test)] mod mock; #[cfg(test)] mod tests; pub mod weights; +#[cfg(feature = "runtime-benchmarks")] +pub use benchmarking::AssetKindFactory; // Type alias for `frame_system`'s account id. type AccountIdOf = ::AccountId; @@ -117,6 +119,10 @@ pub mod pallet { /// The type for asset kinds for which the conversion rate to native balance is set. type AssetKind: Parameter + MaxEncodedLen; + + /// Helper type for benchmarks. + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper: crate::AssetKindFactory; } /// Maps an asset to its fixed point representation in the native balance. diff --git a/frame/asset-rate/src/mock.rs b/frame/asset-rate/src/mock.rs index 4e6fa87542a63..9297a445073dc 100644 --- a/frame/asset-rate/src/mock.rs +++ b/frame/asset-rate/src/mock.rs @@ -92,6 +92,8 @@ impl pallet_asset_rate::Config for Test { type Balance = u64; type Currency = Balances; type AssetKind = u32; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); } // Build genesis storage according to the mock runtime. From 0ee9e819dc32a4e7b2fb351da4a347c6dcb1b99d Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 4 Jul 2023 18:42:46 +0200 Subject: [PATCH 3/9] rename to SEED --- frame/asset-rate/src/benchmarking.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frame/asset-rate/src/benchmarking.rs b/frame/asset-rate/src/benchmarking.rs index 411dbf63a220b..50cbe0f97271a 100644 --- a/frame/asset-rate/src/benchmarking.rs +++ b/frame/asset-rate/src/benchmarking.rs @@ -39,7 +39,7 @@ where } } -const ASSET_ID: u32 = 1; +const SEED: u32 = 1; fn default_conversion_rate() -> FixedU128 { FixedU128::from_u32(1u32) @@ -51,7 +51,7 @@ mod benchmarks { #[benchmark] fn create() -> Result<(), BenchmarkError> { - let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(ASSET_ID); + let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED); #[extrinsic_call] _(RawOrigin::Root, asset_kind.clone(), default_conversion_rate()); @@ -64,9 +64,8 @@ mod benchmarks { #[benchmark] fn update() -> Result<(), BenchmarkError> { - let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(ASSET_ID); - let asset_id: T::AssetId = - assert_ok!(AssetRate::::create( + let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED); + let asset_id: T::AssetId = assert_ok!(AssetRate::::create( RawOrigin::Root.into(), asset_kind.clone(), default_conversion_rate() @@ -84,7 +83,7 @@ mod benchmarks { #[benchmark] fn remove() -> Result<(), BenchmarkError> { - let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(ASSET_ID); + let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED); assert_ok!(AssetRate::::create( RawOrigin::Root.into(), asset_id.clone(), From 7a7b17a0744d1b4f69f851c74ee1dff60eae8893 Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 4 Jul 2023 18:54:20 +0200 Subject: [PATCH 4/9] fixes --- frame/asset-rate/src/benchmarking.rs | 4 ++-- frame/asset-rate/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frame/asset-rate/src/benchmarking.rs b/frame/asset-rate/src/benchmarking.rs index 50cbe0f97271a..72b4f3264a806 100644 --- a/frame/asset-rate/src/benchmarking.rs +++ b/frame/asset-rate/src/benchmarking.rs @@ -65,7 +65,7 @@ mod benchmarks { #[benchmark] fn update() -> Result<(), BenchmarkError> { let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED); - let asset_id: T::AssetId = assert_ok!(AssetRate::::create( + assert_ok!(AssetRate::::create( RawOrigin::Root.into(), asset_kind.clone(), default_conversion_rate() @@ -86,7 +86,7 @@ mod benchmarks { let asset_kind: T::AssetKind = T::BenchmarkHelper::create_asset_kind(SEED); assert_ok!(AssetRate::::create( RawOrigin::Root.into(), - asset_id.clone(), + asset_kind.clone(), default_conversion_rate() )); diff --git a/frame/asset-rate/src/lib.rs b/frame/asset-rate/src/lib.rs index 834ea18034004..94ee0565bcf19 100644 --- a/frame/asset-rate/src/lib.rs +++ b/frame/asset-rate/src/lib.rs @@ -122,7 +122,7 @@ pub mod pallet { /// Helper type for benchmarks. #[cfg(feature = "runtime-benchmarks")] - type BenchmarkHelper: crate::AssetKindFactory; + type BenchmarkHelper: crate::AssetKindFactory; } /// Maps an asset to its fixed point representation in the native balance. From 0864d1fb490ed74bba1b519d815f45fec262ee90 Mon Sep 17 00:00:00 2001 From: Muharem Ismailov Date: Thu, 20 Jul 2023 17:15:10 +0200 Subject: [PATCH 5/9] Update frame/asset-rate/src/benchmarking.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> --- frame/asset-rate/src/benchmarking.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/asset-rate/src/benchmarking.rs b/frame/asset-rate/src/benchmarking.rs index 72b4f3264a806..0e13697806043 100644 --- a/frame/asset-rate/src/benchmarking.rs +++ b/frame/asset-rate/src/benchmarking.rs @@ -26,7 +26,7 @@ use frame_support::assert_ok; use frame_system::RawOrigin; use sp_core::crypto::FromEntropy; -/// Trait describing the factory function for AssetKind parameter +/// Trait describing the factory function for the `AssetKind` parameter. pub trait AssetKindFactory { fn create_asset_kind(seed: u32) -> AssetKind; } From 4acb5c8ef3c425921cbafd271cf4156070a6ceb3 Mon Sep 17 00:00:00 2001 From: muharem Date: Wed, 26 Jul 2023 14:48:42 +0200 Subject: [PATCH 6/9] sp-core optional dep --- frame/asset-rate/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/asset-rate/Cargo.toml b/frame/asset-rate/Cargo.toml index 215bd25934d52..d941b1ea57786 100644 --- a/frame/asset-rate/Cargo.toml +++ b/frame/asset-rate/Cargo.toml @@ -22,7 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" } sp-runtime = { version = "24.0.0", default-features = false, path = "../../primitives/runtime" } sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" } -sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" } +sp-core = { version = "21.0.0", default-features = false, optional = true, path = "../../primitives/core" } [dev-dependencies] pallet-balances = { version = "4.0.0-dev", path = "../balances" } From d757e00e28ecec288bc835b545d9af140a7cb80c Mon Sep 17 00:00:00 2001 From: muharem Date: Wed, 26 Jul 2023 15:00:59 +0200 Subject: [PATCH 7/9] sp-core included for benchmarks --- frame/asset-rate/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frame/asset-rate/Cargo.toml b/frame/asset-rate/Cargo.toml index d941b1ea57786..bf43b67bb93ce 100644 --- a/frame/asset-rate/Cargo.toml +++ b/frame/asset-rate/Cargo.toml @@ -38,12 +38,14 @@ std = [ "scale-info/std", "sp-runtime/std", "sp-std/std", + "sp-core?/std", ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", + "sp-core", ] try-runtime = [ "frame-support/try-runtime", From cda78520bbf935fa34a41cf4911bf86cca2e0642 Mon Sep 17 00:00:00 2001 From: muharem Date: Wed, 26 Jul 2023 15:30:58 +0200 Subject: [PATCH 8/9] sp-core to dev dep --- frame/asset-rate/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/frame/asset-rate/Cargo.toml b/frame/asset-rate/Cargo.toml index bf43b67bb93ce..6b220879cc595 100644 --- a/frame/asset-rate/Cargo.toml +++ b/frame/asset-rate/Cargo.toml @@ -27,6 +27,7 @@ sp-core = { version = "21.0.0", default-features = false, optional = true, path [dev-dependencies] pallet-balances = { version = "4.0.0-dev", path = "../balances" } sp-io = { version = "23.0.0", path = "../../primitives/io" } +sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" } [features] default = ["std"] From ec728ca7a732e9ab6dcd3c4b6993340bf65a69c6 Mon Sep 17 00:00:00 2001 From: muharem Date: Wed, 26 Jul 2023 15:44:44 +0200 Subject: [PATCH 9/9] sp-core add dep prefix --- frame/asset-rate/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/asset-rate/Cargo.toml b/frame/asset-rate/Cargo.toml index 6b220879cc595..d7bb314e05964 100644 --- a/frame/asset-rate/Cargo.toml +++ b/frame/asset-rate/Cargo.toml @@ -46,7 +46,7 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "sp-core", + "dep:sp-core", ] try-runtime = [ "frame-support/try-runtime",