Parameterize message origin

Snowfork · Nov 23, 2023 · 57fe885 · 57fe885
1 parent bcd4a6d
commit 57fe885
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs b/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs
@@ -37,6 +37,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: asset_hub_rococo_runtime::XcmpQueue,
 			LocationToAccountId: asset_hub_rococo_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: asset_hub_rococo_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: asset_hub_rococo_runtime::PolkadotXcm,

diff --git a/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs b/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs
@@ -35,6 +35,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: asset_hub_rococo_runtime::XcmpQueue,
 			LocationToAccountId: asset_hub_rococo_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: asset_hub_rococo_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: asset_hub_rococo_runtime::PolkadotXcm,

diff --git a/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs b/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs
@@ -36,6 +36,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: bridge_hub_rococo_runtime::XcmpQueue,
 			LocationToAccountId: bridge_hub_rococo_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: bridge_hub_rococo_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm,

diff --git a/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs b/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs
@@ -34,6 +34,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: bridge_hub_rococo_runtime::XcmpQueue,
 			LocationToAccountId: bridge_hub_rococo_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: bridge_hub_rococo_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm,

diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs
@@ -38,6 +38,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: penpal_runtime::XcmpQueue,
 			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: penpal_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,
@@ -56,6 +57,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: penpal_runtime::XcmpQueue,
 			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: penpal_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,

diff --git a/cumulus/xcm/xcm-emulator/src/lib.rs b/cumulus/xcm/xcm-emulator/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-pub use codec::{Decode, Encode, EncodeLike};
+pub use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 pub use lazy_static::lazy_static;
 pub use log;
 pub use paste;
@@ -576,7 +576,7 @@ macro_rules! decl_test_parachains {
 					XcmpMessageHandler: $xcmp_message_handler:path,
 					LocationToAccountId: $location_to_account:path,
 					ParachainInfo: $parachain_info:path,
-					// MessageProcessor: $message_processor:path,
+					MessageOrigin: $message_origin:path,
 				},
 				pallets = {
 					$($pallet_name:ident: $pallet_path:path,)*
@@ -615,7 +615,7 @@ macro_rules! decl_test_parachains {
 				type LocationToAccountId = $location_to_account;
 				type ParachainSystem = $crate::ParachainSystemPallet<<Self as $crate::Chain>::Runtime>;
 				type ParachainInfo = $parachain_info;
-				type MessageProcessor = $crate::DefaultParaMessageProcessor<$name<N>>;
+				type MessageProcessor = $crate::DefaultParaMessageProcessor<$name<N>, $message_origin>;
 
 				// We run an empty block during initialisation to open HRMP channels
 				// and have them ready for the next block
@@ -1313,17 +1313,18 @@ macro_rules! decl_test_sender_receiver_accounts_parameter_types {
 	};
 }
 
-pub struct DefaultParaMessageProcessor<T>(PhantomData<T>);
+pub struct DefaultParaMessageProcessor<T, M>(PhantomData<(T, M)>);
 // Process HRMP messages from sibling paraids
-impl<T> ProcessMessage for DefaultParaMessageProcessor<T>
+impl<T, M> ProcessMessage for DefaultParaMessageProcessor<T, M>
 where
+	M: codec::FullCodec + MaxEncodedLen + Clone + Eq + PartialEq + frame_support::pallet_prelude::TypeInfo + Debug,
 	T: Parachain,
 	T::Runtime: MessageQueueConfig,
 	<<T::Runtime as MessageQueueConfig>::MessageProcessor as ProcessMessage>::Origin:
-		PartialEq<CumulusAggregateMessageOrigin>,
-	MessageQueuePallet<T::Runtime>: EnqueueMessage<CumulusAggregateMessageOrigin> + ServiceQueues,
+		PartialEq<M>,
+	MessageQueuePallet<T::Runtime>: EnqueueMessage<M> + ServiceQueues,
 {
-	type Origin = CumulusAggregateMessageOrigin;
+	type Origin = M;
 
 	fn process_message(
 		msg: &[u8],
@@ -1340,13 +1341,14 @@ where
 		Ok(true)
 	}
 }
-impl<T> ServiceQueues for DefaultParaMessageProcessor<T>
+impl<T, M> ServiceQueues for DefaultParaMessageProcessor<T, M>
 where
+	M: MaxEncodedLen,
 	T: Parachain,
 	T::Runtime: MessageQueueConfig,
 	<<T::Runtime as MessageQueueConfig>::MessageProcessor as ProcessMessage>::Origin:
-		PartialEq<CumulusAggregateMessageOrigin>,
-	MessageQueuePallet<T::Runtime>: EnqueueMessage<CumulusAggregateMessageOrigin> + ServiceQueues,
+		PartialEq<M>,
+	MessageQueuePallet<T::Runtime>: EnqueueMessage<M> + ServiceQueues,
 {
 	type OverweightMessageAddress = ();