(ranked_collective) adapt paritytech/polkadot-sdk#2587 (ExchangeOrigin)

bkontur · Feb 19, 2024 · 7272865 · 7272865
1 parent 502808b
commit 7272865
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/relay/kusama/src/governance/fellowship.rs b/relay/kusama/src/governance/fellowship.rs
@@ -352,6 +352,12 @@ impl pallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime
 			TryMapSuccess<origins::EnsureFellowship, CheckedReduceBy<ConstU16<2>>>,
 		>,
 	>;
+	// TODO:(PR#187)(PR#2587): check ExchangeOrigin
+	// Exchange is by any of:
+	// - Root can exchange arbitrarily.
+	// - the Fellows origin
+	type ExchangeOrigin =
+		EitherOf<frame_system::EnsureRootWithSuccess<Self::AccountId, ConstU16<65535>>, Fellows>;
 	type Polls = FellowshipReferenda;
 	type MinRankOfClass = sp_runtime::traits::Identity;
 	type VoteWeight = pallet_ranked_collective::Geometric;

diff --git a/relay/kusama/src/weights/pallet_ranked_collective.rs b/relay/kusama/src/weights/pallet_ranked_collective.rs
diff --git a/system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs b/system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs
@@ -140,6 +140,12 @@ impl pallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime
 			Replace<ConstU16<{ ranks::DAN_9 }>>,
 		>,
 	>;
+	// TODO:(PR#187)(PR#2587): check ExchangeOrigin
+	// Exchange is by any of:
+	// - Root can exchange arbitrarily.
+	// - the Fellows origin
+	type ExchangeOrigin =
+		EitherOf<frame_system::EnsureRootWithSuccess<Self::AccountId, ConstU16<65535>>>;
 	type Polls = FellowshipReferenda;
 	type MinRankOfClass = tracks::MinRankOfClass;
 	type VoteWeight = pallet_ranked_collective::Geometric;

diff --git a/system-parachains/collectives/collectives-polkadot/src/weights/pallet_ranked_collective.rs b/system-parachains/collectives/collectives-polkadot/src/weights/pallet_ranked_collective.rs