Registrar v1 follow-ups

runtime/common/src/paras_registrar.rs

@@ -33,14 +33,15 @@ use runtime_parachains::{
 		self,
 		ParaGenesisArgs,
 	},
+	router,
 	ensure_parachain,
 	Origin,
 };
 
 type BalanceOf<T> =
 	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 
-pub trait Trait: paras::Trait {
+pub trait Trait: paras::Trait + router::Trait {
 	/// The aggregated origin type must support the `parachains` origin. We require that we can
 	/// infallibly convert between this origin and the system origin, but in reality, they're the
 	/// same type, we just can't express that to the Rust type system without writing a `where`
@@ -150,6 +151,7 @@ decl_module! {
 			let _ = <T as Trait>::Currency::unreserve(&debtor, T::ParathreadDeposit::get());
 
 			<paras::Module<T>>::schedule_para_cleanup(id);
+			<router::Module::<T>>::schedule_para_cleanup(id);
 
 			Ok(())
 		}
@@ -241,6 +243,7 @@ impl<T: Trait> Module<T> {
 		ensure!(is_parachain, Error::<T>::InvalidChainId);
 
 		<paras::Module<T>>::schedule_para_cleanup(id);
+		<router::Module::<T>>::schedule_para_cleanup(id);
 
 		Ok(())
 	}
@@ -269,7 +272,7 @@ mod tests {
 
 	impl_outer_origin! {
 		pub enum Origin for Test {
-			paras,
+			runtime_parachains,
 		}
 	}
 

runtime/parachains/src/mock.rs

@@ -30,15 +30,15 @@ use frame_support::{
 	weights::Weight, traits::Randomness as RandomnessT,
 };
 use crate::inclusion;
-use crate::paras;
+use crate as parachains;
 
 /// A test runtime struct.
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 
 impl_outer_origin! {
 	pub enum Origin for Test {
-		paras
+		parachains
 	}
 }
 

runtime/parachains/src/origin.rs

@@ -22,8 +22,7 @@ use primitives::v1::Id as ParaId;
 use codec::{Decode, Encode};
 
 /// Origin for the parachains.
-#[derive(PartialEq, Eq, Clone, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, sp_core::RuntimeDebug)]
 pub enum Origin {
 	/// It comes from a parachain.
 	Parachain(ParaId),

runtime/parachains/src/paras.rs

@@ -43,7 +43,7 @@ use sp_core::RuntimeDebug;
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 
-pub use crate::Origin;
+use crate::Origin;
 
 pub trait Trait: frame_system::Trait + configuration::Trait {
 	/// The outer origin type.