use inner for nested types in nomination pools (#11030)

* Use nested inner type for pool

* make tests and benchmarks work

* remove feat

* all tests work now

* fix node-runtime

bin/node/runtime/src/lib.rs

@@ -698,6 +698,7 @@ impl pallet_bags_list::Config for Runtime {
 
 parameter_types! {
 	pub const PostUnbondPoolsWindow: u32 = 4;
+	pub const NominationPoolsPalletId: PalletId = PalletId(*b"py/npols");
 }
 
 use sp_runtime::traits::Convert;
@@ -723,6 +724,7 @@ impl pallet_nomination_pools::Config for Runtime {
 	type StakingInterface = pallet_staking::Pallet<Self>;
 	type PostUnbondingPoolsWindow = PostUnbondPoolsWindow;
 	type MaxMetadataLen = ConstU32<256>;
+	type PalletId = NominationPoolsPalletId;
 }
 
 parameter_types! {

frame/nomination-pools/benchmarking/Cargo.toml

@@ -54,4 +54,4 @@ std = [
 	"pallet-nomination-pools/std",
 	"sp-runtime/std",
 	"sp-staking/std"
-]
+]

frame/nomination-pools/benchmarking/src/lib.rs

@@ -11,8 +11,8 @@ use frame_election_provider_support::SortedListProvider;
 use frame_support::{ensure, traits::Get};
 use frame_system::RawOrigin as Origin;
 use pallet_nomination_pools::{
-	BalanceOf, BondedPoolStorage, BondedPools, Delegators, Metadata, MinCreateBond, MinJoinBond,
-	Pallet as Pools, PoolState, RewardPools, SubPoolsStorage,
+	BalanceOf, BondedPoolInner, BondedPools, Delegators, Metadata, MinCreateBond, MinJoinBond,
+	Pallet as Pools, PoolRoles, PoolState, RewardPools, SubPoolsStorage,
 };
 use sp_runtime::traits::{StaticLookup, Zero};
 use sp_staking::{EraIndex, StakingInterface};
@@ -67,7 +67,7 @@ fn create_pool_account<T: pallet_nomination_pools::Config>(
 	.unwrap();
 
 	let pool_account = pallet_nomination_pools::BondedPools::<T>::iter()
-		.find(|(_, bonded_pool)| bonded_pool.depositor == pool_creator)
+		.find(|(_, bonded_pool)| bonded_pool.roles.depositor == pool_creator)
 		.map(|(pool_account, _)| pool_account)
 		.expect("pool_creator created a pool above");
 
@@ -189,7 +189,7 @@ impl<T: Config> ListScenario<T> {
 		// Sanity check the delegator was added correctly
 		let delegator = Delegators::<T>::get(&joiner).unwrap();
 		assert_eq!(delegator.points, amount);
-		assert_eq!(delegator.pool, self.origin1);
+		assert_eq!(delegator.bonded_pool_account, self.origin1);
 
 		self
 	}
@@ -475,14 +475,16 @@ frame_benchmarking::benchmarks! {
 		let (pool_account, new_pool) = BondedPools::<T>::iter().next().unwrap();
 		assert_eq!(
 			new_pool,
-			BondedPoolStorage {
+			BondedPoolInner {
 				points: min_create_bond,
-				depositor: depositor.clone(),
-				root: depositor.clone(),
-				nominator: depositor.clone(),
-				state_toggler: depositor.clone(),
 				state: PoolState::Open,
-				delegator_counter: 1
+				delegator_counter: 1,
+				roles: PoolRoles {
+					depositor: depositor.clone(),
+					root: depositor.clone(),
+					nominator: depositor.clone(),
+					state_toggler: depositor.clone(),
+				},
 			}
 		);
 		assert_eq!(
@@ -516,14 +518,16 @@ frame_benchmarking::benchmarks! {
 		let (pool_account, new_pool) = BondedPools::<T>::iter().next().unwrap();
 		assert_eq!(
 			new_pool,
-			BondedPoolStorage {
+			BondedPoolInner {
 				points: min_create_bond,
-				depositor: depositor.clone(),
-				root: depositor.clone(),
-				nominator: depositor.clone(),
-				state_toggler: depositor.clone(),
 				state: PoolState::Open,
 				delegator_counter: 1,
+				roles: PoolRoles {
+					depositor: depositor.clone(),
+					root: depositor.clone(),
+					nominator: depositor.clone(),
+					state_toggler: depositor.clone(),
+				}
 			}
 		);
 		assert_eq!(

frame/nomination-pools/benchmarking/src/mock.rs

@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use frame_election_provider_support::VoteWeight;
-use frame_support::{pallet_prelude::*, parameter_types, traits::ConstU64};
+use frame_support::{pallet_prelude::*, parameter_types, traits::ConstU64, PalletId};
 use sp_runtime::traits::{Convert, IdentityLookup};
 
 type AccountId = u64;
@@ -141,6 +141,7 @@ impl Convert<sp_core::U256, Balance> for U256ToBalance {
 
 parameter_types! {
 	pub static PostUnbondingPoolsWindow: u32 = 10;
+	pub const PoolsPalletId: PalletId = PalletId(*b"py/nopls");
 }
 
 impl pallet_nomination_pools::Config for Runtime {
@@ -152,6 +153,7 @@ impl pallet_nomination_pools::Config for Runtime {
 	type StakingInterface = Staking;
 	type PostUnbondingPoolsWindow = PostUnbondingPoolsWindow;
 	type MaxMetadataLen = ConstU32<256>;
+	type PalletId = PoolsPalletId;
 }
 
 impl crate::Config for Runtime {}