Kusama origins as xcm multi_location

runtime/kusama/constants/src/lib.rs

@@ -97,19 +97,6 @@ pub mod fee {
 	}
 }
 
-/// XCM protocol related constants.
-pub mod xcm {
-	/// Pluralistic bodies existing within the consensus.
-	pub mod body {
-		// Preallocated for the Root body.
-		#[allow(dead_code)]
-		const ROOT_INDEX: u32 = 0;
-		// The bodies corresponding to the runtime origins representing a plurality voice given via a referendum.
-		pub const STAKING_ADMIN_INDEX: u32 = 1;
-		pub const FELLOWS_INDEX: u32 = 2;
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::{

runtime/kusama/src/xcm_config.rs

@@ -21,7 +21,6 @@ use super::{
 	RuntimeCall, RuntimeEvent, RuntimeOrigin, StakingAdmin, WeightToFee, XcmPallet,
 };
 use frame_support::{match_types, parameter_types, traits::Everything};
-use kusama_runtime_constants::xcm::body::{FELLOWS_INDEX, STAKING_ADMIN_INDEX};
 use runtime_common::{xcm_sender, ToAuthor};
 use xcm::latest::prelude::*;
 use xcm_builder::{
@@ -156,9 +155,9 @@ impl xcm_executor::Config for XcmConfig {
 parameter_types! {
 	pub const CouncilBodyId: BodyId = BodyId::Executive;
 	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Index(STAKING_ADMIN_INDEX);
+	pub const StakingAdminBodyId: BodyId = BodyId::Defence;
 	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Index(FELLOWS_INDEX);
+	pub const FellowsBodyId: BodyId = BodyId::Technical;
 }
 
 /// Type to convert the council origin to a Plurality `MultiLocation` value.

xcm/src/v0/junction.rs

@@ -52,6 +52,12 @@ pub enum BodyId {
 	/// The unambiguous judicial body (this doesn't exist on Polkadot, but if it were to get a "grand oracle", it
 	/// may be considered as that).
 	Judicial,
+	/// The unambiguous defence body (for Polkadot, an opinion on the topic given via a public referendum).
+	Defence,
+	/// The unambiguous administration body (for Polkadot, an opinion on the topic given via a public referendum).
+	Administration,
+	/// The unambiguous treasury body (for Polkadot, an opinion on the topic given via a public referendum).
+	Treasury,
 }
 
 /// A part of a pluralistic body.