ParaType -> ParaKind

paritytech · eskimor · Nov 1, 2022 · Oct 27, 2022 · Oct 27, 2022 · Oct 27, 2022
commit 06550bdd283bfb742e21f7169a2926966cd3eee7
diff --git a/node/test/service/src/lib.rs b/node/test/service/src/lib.rs
@@ -27,7 +27,7 @@ use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProt
 use polkadot_overseer::Handle;
 use polkadot_primitives::v2::{Balance, CollatorPair, HeadData, Id as ParaId, ValidationCode};
 use polkadot_runtime_common::BlockHashCount;
-use polkadot_runtime_parachains::paras::{ParaGenesisArgs, ParaType};
+use polkadot_runtime_parachains::paras::{ParaGenesisArgs, ParaKind};
 use polkadot_service::{
 	ClientHandle, Error, ExecuteWithClient, FullClient, IsCollator, NewFull, PrometheusConfig,
 };
@@ -305,7 +305,7 @@ impl PolkadotTestNode {
 			genesis: ParaGenesisArgs {
 				genesis_head: genesis_head.into(),
 				validation_code: validation_code.into(),
-				paratype: ParaType::Parachain,
+				paratype: ParaKind::Parachain,
 			},
 		};
 

diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs
@@ -35,7 +35,7 @@ use sp_std::{prelude::*, result};
 use crate::traits::{OnSwap, Registrar};
 pub use pallet::*;
 use parity_scale_codec::{Decode, Encode};
-use runtime_parachains::paras::ParaType;
+use runtime_parachains::paras::ParaKind;
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{CheckedSub, Saturating},
@@ -571,7 +571,7 @@ impl<T: Config> Pallet<T> {
 		};
 		ensure!(paras::Pallet::<T>::lifecycle(id).is_none(), Error::<T>::AlreadyRegistered);
 		let (genesis, deposit) =
-			Self::validate_onboarding_data(genesis_head, validation_code, ParaType::Parathread)?;
+			Self::validate_onboarding_data(genesis_head, validation_code, ParaKind::Parathread)?;
 		let deposit = deposit_override.unwrap_or(deposit);
 
 		if let Some(additional) = deposit.checked_sub(&deposited) {
@@ -614,7 +614,7 @@ impl<T: Config> Pallet<T> {
 	fn validate_onboarding_data(
 		genesis_head: HeadData,
 		validation_code: ValidationCode,
-		paratype: ParaType,
+		paratype: ParaKind,
 	) -> Result<(ParaGenesisArgs, BalanceOf<T>), sp_runtime::DispatchError> {
 		let config = configuration::Pallet::<T>::config();
 		ensure!(validation_code.0.len() > 0, Error::<T>::EmptyCode);

diff --git a/runtime/parachains/src/builder.rs b/runtime/parachains/src/builder.rs
@@ -16,7 +16,7 @@
 
 use crate::{
 	configuration, inclusion, initializer, paras,
-	paras::ParaType,
+	paras::ParaKind,
 	paras_inherent::{self},
 	scheduler, session_info, shared,
 };
@@ -346,7 +346,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 				paras::ParaGenesisArgs {
 					genesis_head: Self::mock_head_data(),
 					validation_code: mock_validation_code(),
-					paratype: ParaType::Parachain,
+					paratype: ParaKind::Parachain,
 				},
 			)
 			.unwrap();

diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs
@@ -17,7 +17,7 @@
 use crate::{
 	configuration::Pallet as Configuration,
 	hrmp::{Pallet as Hrmp, *},
-	paras::{Pallet as Paras, ParaType, ParachainsCache},
+	paras::{Pallet as Paras, ParaKind, ParachainsCache},
 	shared::Pallet as Shared,
 };
 use frame_support::{assert_ok, traits::Currency};
@@ -31,7 +31,7 @@ fn register_parachain_with_balance<T: Config>(id: ParaId, balance: BalanceOf<T>)
 		&mut parachains,
 		id,
 		&crate::paras::ParaGenesisArgs {
-			paratype: ParaType::Parachain,
+			paratype: ParaKind::Parachain,
 			genesis_head: vec![1].into(),
 			validation_code: vec![1].into(),
 		},

diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs
@@ -20,7 +20,7 @@ use crate::{
 		new_test_ext, Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared,
 		RuntimeEvent as MockEvent, RuntimeOrigin, System, Test,
 	},
-	paras::ParaType,
+	paras::ParaKind,
 };
 use frame_support::{assert_noop, assert_ok, traits::Currency as _};
 use primitives::v2::BlockNumber;
@@ -133,7 +133,7 @@ fn register_parachain_with_balance(id: ParaId, balance: Balance) {
 	assert_ok!(Paras::schedule_para_initialize(
 		id,
 		crate::paras::ParaGenesisArgs {
-			paratype: ParaType::Parachain,
+			paratype: ParaKind::Parachain,
 			genesis_head: vec![1].into(),
 			validation_code: vec![1].into(),
 		},

diff --git a/runtime/parachains/src/inclusion/tests.rs b/runtime/parachains/src/inclusion/tests.rs
@@ -22,7 +22,7 @@ use crate::{
 		new_test_ext, Configuration, MockGenesisConfig, ParaInclusion, Paras, ParasShared, System,
 		Test,
 	},
-	paras::{ParaGenesisArgs, ParaType},
+	paras::{ParaGenesisArgs, ParaKind},
 	paras_inherent::DisputedBitfield,
 	scheduler::AssignmentKind,
 };
@@ -51,7 +51,7 @@ fn default_config() -> HostConfiguration<BlockNumber> {
 	config
 }
 
-pub(crate) fn genesis_config(paras: Vec<(ParaId, ParaType)>) -> MockGenesisConfig {
+pub(crate) fn genesis_config(paras: Vec<(ParaId, ParaKind)>) -> MockGenesisConfig {
 	MockGenesisConfig {
 		paras: paras::GenesisConfig {
 			paras: paras
@@ -311,9 +311,9 @@ fn collect_pending_cleans_up_pending() {
 	let thread_a = ParaId::from(3_u32);
 
 	let paras = vec![
-		(chain_a, ParaType::Parachain),
-		(chain_b, ParaType::Parachain),
-		(thread_a, ParaType::Parathread),
+		(chain_a, ParaKind::Parachain),
+		(chain_b, ParaKind::Parachain),
+		(thread_a, ParaKind::Parathread),
 	];
 	new_test_ext(genesis_config(paras)).execute_with(|| {
 		let default_candidate = TestCandidateBuilder::default().build();
@@ -373,9 +373,9 @@ fn bitfield_checks() {
 	let thread_a = ParaId::from(3_u32);
 
 	let paras = vec![
-		(chain_a, ParaType::Parachain),
-		(chain_b, ParaType::Parachain),
-		(thread_a, ParaType::Parathread),
+		(chain_a, ParaKind::Parachain),
+		(chain_b, ParaKind::Parachain),
+		(thread_a, ParaKind::Parathread),
 	];
 	let validators = vec![
 		Sr25519Keyring::Alice,
@@ -720,9 +720,9 @@ fn supermajority_bitfields_trigger_availability() {
 	let thread_a = ParaId::from(3_u32);
 
 	let paras = vec![
-		(chain_a, ParaType::Parachain),
-		(chain_b, ParaType::Parachain),
-		(thread_a, ParaType::Parathread),
+		(chain_a, ParaKind::Parachain),
+		(chain_b, ParaKind::Parachain),
+		(thread_a, ParaKind::Parathread),
 	];
 	let validators = vec![
 		Sr25519Keyring::Alice,
@@ -912,9 +912,9 @@ fn candidate_checks() {
 	const RELAY_PARENT_NUM: BlockNumber = 4;
 
 	let paras = vec![
-		(chain_a, ParaType::Parachain),
-		(chain_b, ParaType::Parachain),
-		(thread_a, ParaType::Parathread),
+		(chain_a, ParaKind::Parachain),
+		(chain_b, ParaKind::Parachain),
+		(thread_a, ParaKind::Parathread),
 	];
 	let validators = vec![
 		Sr25519Keyring::Alice,
@@ -1459,9 +1459,9 @@ fn backing_works() {
 	const RELAY_PARENT_NUM: BlockNumber = 4;
 
 	let paras = vec![
-		(chain_a, ParaType::Parachain),
-		(chain_b, ParaType::Parachain),
-		(thread_a, ParaType::Parathread),
+		(chain_a, ParaKind::Parachain),
+		(chain_b, ParaKind::Parachain),
+		(thread_a, ParaKind::Parathread),
 	];
 	let validators = vec![
 		Sr25519Keyring::Alice,
@@ -1742,7 +1742,7 @@ fn can_include_candidate_with_ok_code_upgrade() {
 	// The block number of the relay-parent for testing.
 	const RELAY_PARENT_NUM: BlockNumber = 4;
 
-	let paras = vec![(chain_a, ParaType::Parachain)];
+	let paras = vec![(chain_a, ParaKind::Parachain)];
 	let validators = vec![
 		Sr25519Keyring::Alice,
 		Sr25519Keyring::Bob,
@@ -1848,9 +1848,9 @@ fn session_change_wipes() {
 	let thread_a = ParaId::from(3_u32);
 
 	let paras = vec![
-		(chain_a, ParaType::Parachain),
-		(chain_b, ParaType::Parachain),
-		(thread_a, ParaType::Parathread),
+		(chain_a, ParaKind::Parachain),
+		(chain_b, ParaKind::Parachain),
+		(thread_a, ParaKind::Parathread),
 	];
 	let validators = vec![
 		Sr25519Keyring::Alice,

diff --git a/runtime/parachains/src/initializer/tests.rs b/runtime/parachains/src/initializer/tests.rs
@@ -21,7 +21,7 @@ use crate::mock::{
 use primitives::v2::{HeadData, Id as ParaId};
 use test_helpers::dummy_validation_code;
 
-use crate::paras::ParaType;
+use crate::paras::ParaKind;
 use frame_support::{
 	assert_ok,
 	traits::{OnFinalize, OnInitialize},
@@ -91,7 +91,7 @@ fn scheduled_cleanup_performed() {
 	let c = ParaId::from(123);
 
 	let mock_genesis = crate::paras::ParaGenesisArgs {
-		paratype: ParaType::Parachain,
+		paratype: ParaKind::Parachain,
 		genesis_head: HeadData(vec![4, 5, 6]),
 		validation_code: dummy_validation_code(),
 	};

diff --git a/runtime/parachains/src/paras/benchmarking/pvf_check.rs b/runtime/parachains/src/paras/benchmarking/pvf_check.rs
@@ -140,7 +140,7 @@ where
 				&mut parachains,
 				id,
 				&ParaGenesisArgs {
-					paratype: ParaType::Parachain,
+					paratype: ParaKind::Parachain,
 					genesis_head: HeadData(vec![1, 2, 3, 4]),
 					validation_code: old_validation_code,
 				},
@@ -159,7 +159,7 @@ where
 			let r = Pallet::<T>::schedule_para_initialize(
 				id,
 				ParaGenesisArgs {
-					paratype: ParaType::Parachain,
+					paratype: ParaKind::Parachain,
 					genesis_head: HeadData(vec![1, 2, 3, 4]),
 					validation_code: validation_code(),
 				},

diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs
@@ -292,13 +292,13 @@ pub struct ParaGenesisArgs {
 	/// The initial validation code to use.
 	pub validation_code: ValidationCode,
 	/// Parachain or Parathread.
-	pub paratype: ParaType,
+	pub paratype: ParaKind,
 }
 
 /// Distinguishes between Parachain and Parathread
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-pub enum ParaType {
+pub enum ParaKind {
 	Parachain,
 	Parathread,
 }
@@ -2030,11 +2030,11 @@ impl<T: Config> Pallet<T> {
 		genesis_data: &ParaGenesisArgs,
 	) {
 		match genesis_data.paratype {
-			ParaType::Parachain => {
+			ParaKind::Parachain => {
 				parachains.add(id);
 				ParaLifecycles::<T>::insert(&id, ParaLifecycle::Parachain);
 			},
-			ParaType::Parathread => ParaLifecycles::<T>::insert(&id, ParaLifecycle::Parathread),
+			ParaKind::Parathread => ParaLifecycles::<T>::insert(&id, ParaLifecycle::Parathread),
 		}
 
 		// HACK: see the notice in `schedule_para_initialize`.