revive new message queue integration

pallets/parachain-system/src/mock.rs

@@ -178,6 +178,7 @@ impl ProcessMessage for SaveIntoThreadLocal {
 		message: &[u8],
 		origin: Self::Origin,
 		_meter: &mut WeightMeter,
+		_id: &mut [u8; 32],
 	) -> Result<bool, ProcessMessageError> {
 		assert_eq!(origin, Self::Origin::Parent); // FAIL-CI use transformed origin
 

parachains/runtimes/assets/statemint/src/lib.rs

@@ -105,7 +105,7 @@ use parachains_common::{
 };
 use xcm_config::{
 	DotLocation, FellowshipLocation, ForeignAssetsConvertedConcreteId, GovernanceLocation,
-	TrustBackedAssetsConvertedConcreteId, XcmConfig, XcmOriginToTransactDispatchOrigin,
+	TrustBackedAssetsConvertedConcreteId, XcmOriginToTransactDispatchOrigin,
 };
 
 #[cfg(any(feature = "std", test))]

parachains/runtimes/test-utils/src/lib.rs

@@ -295,7 +295,7 @@ impl<Runtime: pallet_xcm::Config + cumulus_pallet_parachain_system::Config> Runt
 	}
 }
 
-impl<Runtime: cumulus_pallet_parachain_system::Config> RuntimeHelper<Runtime> {
+impl<Runtime: cumulus_pallet_parachain_system::Config + pallet_xcm::Config> RuntimeHelper<Runtime> {
 	pub fn execute_as_governance(call: Vec<u8>, require_weight_at_most: Weight) -> Outcome {
 		// prepare xcm as governance will do
 		let xcm = Xcm::<<Runtime as frame_system::Config>::RuntimeCall>(vec![
@@ -309,14 +309,13 @@ impl<Runtime: cumulus_pallet_parachain_system::Config> RuntimeHelper<Runtime> {
 
 		// execute xcm as parent origin
 		let hash = xcm.using_encoded(sp_io::hashing::blake2_256);
-		// CI-FAIL: we need some sort of a way to `execute_xcm` here.
-		todo!();
-		// <<Runtime as cumulus_pallet_dmp_queue::Config>::XcmExecutor>::execute_xcm(
-		// 	MultiLocation::parent(),
-		// 	xcm,
-		// 	hash,
-		// 	Self::xcm_max_weight(XcmReceivedFrom::Parent),
-		// )
+		// CI-FAIL: is this correct, or should I have enqueued the message for later processing?
+		<<Runtime as pallet_xcm::Config>::XcmExecutor>::execute_xcm(
+			MultiLocation::parent(),
+			xcm,
+			hash,
+			Self::xcm_max_weight(XcmReceivedFrom::Parent),
+		)
 	}
 }