From bb215364185a6137b00b268c6c56f69a08f50090 Mon Sep 17 00:00:00 2001
From: Liam Aharon <liam.aharon@hotmail.com>
Date: Wed, 17 Apr 2024 16:12:42 +0400
Subject: [PATCH] rename createpoolorigin
---
.../runtimes/assets/asset-hub-rococo/src/lib.rs | 2 +-
.../runtimes/assets/asset-hub-westend/src/lib.rs | 2 +-
substrate/bin/node/runtime/src/lib.rs | 2 +-
substrate/frame/asset-rewards/src/benchmarking.rs | 10 ++++++----
substrate/frame/asset-rewards/src/lib.rs | 12 ++++++------
substrate/frame/asset-rewards/src/mock.rs | 2 +-
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index 8df40f677f6..ed9b50fae20 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -938,7 +938,7 @@ impl pallet_asset_rewards::Config for Runtime {
type Balance = Balance;
type Assets = NativeAndAllAssets;
type AssetId = xcm::v3::Location;
- type PermissionedOrigin = EnsureWithSuccess<
+ type CreatePoolOrigin = EnsureWithSuccess<
EitherOfDiverse<
EnsureRoot<AccountId>,
EnsureXcm<IsVoiceOfBody<GovernanceLocation, TreasurerBodyId>>,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index b6b4f7eab3d..2319e6cd8a6 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -393,7 +393,7 @@ impl pallet_asset_rewards::Config for Runtime {
type Balance = Balance;
type Assets = NativeAndAllAssets;
type AssetId = xcm::v3::Location;
- type PermissionedOrigin = EnsureWithSuccess<
+ type CreatePoolOrigin = EnsureWithSuccess<
EitherOfDiverse<
EnsureRoot<AccountId>,
EnsureXcm<IsVoiceOfBody<GovernanceLocation, TreasurerBodyId>>,
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index 096b43a3739..26feeaf2813 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1782,7 +1782,7 @@ impl pallet_asset_rewards::Config for Runtime {
type Balance = u128;
type Assets = NativeAndAssets;
type PalletId = StakingRewardsPalletId;
- type PermissionedOrigin = AssetRewardsPermissionedOrigin;
+ type CreatePoolOrigin = AssetRewardsPermissionedOrigin;
type WeightInfo = ();
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = AssetRewardsBenchmarkHelper;
diff --git a/substrate/frame/asset-rewards/src/benchmarking.rs b/substrate/frame/asset-rewards/src/benchmarking.rs
index 278c2a2e7bf..2ebae50d5c7 100644
--- a/substrate/frame/asset-rewards/src/benchmarking.rs
+++ b/substrate/frame/asset-rewards/src/benchmarking.rs
@@ -17,7 +17,7 @@
//! Asset Rewards pallet benchmarking.
//!
-//! Note: these benchmarks assume that Root passes the `PermissionedOrigin` checks.
+//! Note: these benchmarks assume that Root passes the `CreatePoolOrigin` checks.
use super::*;
use crate::Pallet as AssetRewards;
@@ -87,7 +87,7 @@ mod benchmarks {
fn create_pool() {
use super::*;
- let root_acc = T::PermissionedOrigin::ensure_origin(Root.into()).unwrap();
+ let root_acc = T::CreatePoolOrigin::ensure_origin(Root.into()).unwrap();
let staked_asset = T::BenchmarkHelper::to_asset_id(1);
let reward_asset = T::BenchmarkHelper::to_asset_id(2);
create_and_mint_asset::<T>(
@@ -114,7 +114,7 @@ mod benchmarks {
assert_last_event::<T>(
Event::PoolCreated {
creator: root_acc.clone(),
- admin: root_acc,
+ admin: Some(root_acc),
staked_asset_id: staked_asset,
reward_asset_id: reward_asset,
reward_rate_per_block: 100u32.into(),
@@ -328,7 +328,9 @@ mod benchmarks {
#[extrinsic_call]
_(Root, 0u32.into(), new_admin.clone());
- assert_last_event::<T>(Event::PoolAdminModified { pool_id: 0u32.into(), new_admin }.into());
+ assert_last_event::<T>(
+ Event::PoolAdminModified { pool_id: 0u32.into(), new_admin: Some(new_admin) }.into(),
+ );
}
#[benchmark]
diff --git a/substrate/frame/asset-rewards/src/lib.rs b/substrate/frame/asset-rewards/src/lib.rs
index d15abb28d46..692d54c708b 100644
--- a/substrate/frame/asset-rewards/src/lib.rs
+++ b/substrate/frame/asset-rewards/src/lib.rs
@@ -193,7 +193,7 @@ pub mod pallet {
///
/// The Origin must return an AccountId. This can be achieved for any Origin by wrapping it
/// with `EnsureSuccess`.
- type PermissionedOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = Self::AccountId>;
+ type CreatePoolOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = Self::AccountId>;
/// Registry of assets that can be configured to either stake for rewards, or be offered as
/// rewards for staking.
@@ -333,7 +333,7 @@ pub mod pallet {
admin: Option<T::AccountId>,
) -> DispatchResult {
// Check the origin.
- let creator = T::PermissionedOrigin::ensure_origin(origin.clone())?;
+ let creator = T::CreatePoolOrigin::ensure_origin(origin.clone())?;
// Ensure the assets exist.
ensure!(
@@ -507,7 +507,7 @@ pub mod pallet {
pool_id: PoolId,
new_reward_rate_per_block: T::Balance,
) -> DispatchResult {
- let caller = T::PermissionedOrigin::ensure_origin(origin.clone())
+ let caller = T::CreatePoolOrigin::ensure_origin(origin.clone())
.or_else(|_| ensure_signed(origin))?;
let pool_info = Pools::<T>::get(pool_id).ok_or(Error::<T>::NonExistentPool)?;
@@ -537,7 +537,7 @@ pub mod pallet {
pool_id: PoolId,
new_admin: T::AccountId,
) -> DispatchResult {
- let caller = T::PermissionedOrigin::ensure_origin(origin.clone())
+ let caller = T::CreatePoolOrigin::ensure_origin(origin.clone())
.or_else(|_| ensure_signed(origin))?;
let mut pool_info = Pools::<T>::get(pool_id).ok_or(Error::<T>::NonExistentPool)?;
@@ -559,7 +559,7 @@ pub mod pallet {
pool_id: PoolId,
new_expiry_block: BlockNumberFor<T>,
) -> DispatchResult {
- let caller = T::PermissionedOrigin::ensure_origin(origin.clone())
+ let caller = T::CreatePoolOrigin::ensure_origin(origin.clone())
.or_else(|_| ensure_signed(origin))?;
ensure!(
@@ -616,7 +616,7 @@ pub mod pallet {
amount: T::Balance,
dest: T::AccountId,
) -> DispatchResult {
- let caller = T::PermissionedOrigin::ensure_origin(origin.clone())
+ let caller = T::CreatePoolOrigin::ensure_origin(origin.clone())
.or_else(|_| ensure_signed(origin))?;
let pool_info = Pools::<T>::get(pool_id).ok_or(Error::<T>::NonExistentPool)?;
diff --git a/substrate/frame/asset-rewards/src/mock.rs b/substrate/frame/asset-rewards/src/mock.rs
index 32f1c7913d9..ac643bdf685 100644
--- a/substrate/frame/asset-rewards/src/mock.rs
+++ b/substrate/frame/asset-rewards/src/mock.rs
@@ -149,7 +149,7 @@ impl Config for MockRuntime {
type Balance = <Self as pallet_balances::Config>::Balance;
type Assets = NativeAndAssets;
type PalletId = StakingRewardsPalletId;
- type PermissionedOrigin = MockPermissionedOrigin;
+ type CreatePoolOrigin = MockPermissionedOrigin;
type WeightInfo = ();
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = AssetRewardsBenchmarkHelper;
--
GitLab