renames

parachains/runtimes/collectives/collectives-polkadot/src/constants.rs

@@ -17,7 +17,7 @@ pub mod account {
 	use frame_support::PalletId;
 
 	/// Relay Chain treasury pallet id, used to convert into AccountId
-	pub const RELAY_TREASURY_PALL_ID: PalletId = PalletId(*b"py/trsry");
+	pub const RELAY_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/trsry");
 	/// Alliance pallet id.
 	/// It is used as a temporarily place to deposit a slashed imbalance
 	/// before the teleport to the treasury.

parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs

@@ -25,8 +25,8 @@ pub use origins::{
 
 use crate::{
 	constants, impls::ToParentTreasury, weights, AccountId, Balance, Balances, BlockNumber,
-	DotLocation, FellowshipReferenda, Preimage, Runtime, RuntimeCall, RuntimeEvent, Scheduler,
-	DAYS,
+	DotLocation, FellowshipReferenda, Preimage, RelayTreasuryAccount, Runtime, RuntimeCall,
+	RuntimeEvent, Scheduler, DAYS,
 };
 use frame_support::{
 	parameter_types,
@@ -48,7 +48,7 @@ use self::origins::EnsureFellowship;
 pub mod ranks {
 	use pallet_ranked_collective::Rank;
 
-	pub const INITIATES: Rank = 0;
+	pub const CANDIDATES: Rank = 0;
 	pub const DAN_1: Rank = 1;
 	pub const DAN_2: Rank = 2;
 	pub const DAN_3: Rank = 3; // aka Fellows.
@@ -66,8 +66,7 @@ parameter_types! {
 	pub const UndecidingTimeout: BlockNumber = 7 * DAYS;
 	pub const TechnicalCommittee: BodyId = BodyId::Technical;
 	// Referenda pallet account, used to temporarily deposit slashed imbalance before teleporting.
-	pub ReferendaPalletAccId: AccountId = constants::account::REFERENDA_PALLET_ID.into_account_truncating();
-	pub RelayTreasuryAccId: AccountId = constants::account::RELAY_TREASURY_PALL_ID.into_account_truncating();
+	pub ReferendaPalletAccount: AccountId = constants::account::REFERENDA_PALLET_ID.into_account_truncating();
 	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
 }
 
@@ -85,7 +84,7 @@ impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
 		pallet_ranked_collective::EnsureMember<Runtime, FellowshipCollectiveInstance, 1>;
 	type CancelOrigin = FellowshipExperts;
 	type KillOrigin = FellowshipMasters;
-	type Slash = ToParentTreasury<RelayTreasuryAccId, ReferendaPalletAccId, Runtime>;
+	type Slash = ToParentTreasury<RelayTreasuryAccount, ReferendaPalletAccount, Runtime>;
 	type Votes = pallet_ranked_collective::Votes;
 	type Tally = pallet_ranked_collective::TallyOf<Runtime, FellowshipCollectiveInstance>;
 	type SubmissionDeposit = SubmissionDeposit;

parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs

@@ -93,7 +93,7 @@ pub mod pallet_origins {
 		() => {}
 	}
 	decl_unit_ensures!(
-		FellowshipInitiates: Rank = ranks::INITIATES,
+		FellowshipInitiates: Rank = ranks::CANDIDATES,
 		Fellows: Rank = ranks::DAN_3,
 		FellowshipExperts: Rank = ranks::DAN_5,
 		FellowshipMasters: Rank = ranks::DAN_7,

parachains/runtimes/collectives/collectives-polkadot/src/lib.rs

@@ -467,8 +467,8 @@ parameter_types! {
 	pub const AllyDeposit: Balance = 1_000 * UNITS; // 1,000 DOT bond to join as an Ally
 	// The Alliance pallet account, used as a temporary place to deposit a slashed imbalance
 	// before the teleport to the Treasury.
-	pub AlliancePalletAccId: AccountId = constants::account::ALLIANCE_PALLET_ID.into_account_truncating();
-	pub RelayTreasuryAccId: AccountId = constants::account::RELAY_TREASURY_PALL_ID.into_account_truncating();
+	pub AlliancePalletAccount: AccountId = constants::account::ALLIANCE_PALLET_ID.into_account_truncating();
+	pub RelayTreasuryAccount: AccountId = constants::account::RELAY_TREASURY_PALLET_ID.into_account_truncating();
 	// The number of blocks a member must wait between giving a retirement notice and retiring.
 	// Supposed to be greater than time required to `kick_member` with alliance motion.
 	pub const AllianceRetirementPeriod: BlockNumber = (90 * DAYS) + ALLIANCE_MOTION_DURATION;
@@ -481,7 +481,7 @@ impl pallet_alliance::Config for Runtime {
 	type MembershipManager = RootOrAllianceTwoThirdsMajority;
 	type AnnouncementOrigin = RootOrAllianceTwoThirdsMajority;
 	type Currency = Balances;
-	type Slashed = ToParentTreasury<RelayTreasuryAccId, AlliancePalletAccId, Runtime>;
+	type Slashed = ToParentTreasury<RelayTreasuryAccount, AlliancePalletAccount, Runtime>;
 	type InitializeMembers = AllianceMotion;
 	type MembershipChanged = AllianceMotion;
 	type RetirementPeriod = AllianceRetirementPeriod;