From 40bdf8a8168f29d3d2bd6766c6b1263eeec40f16 Mon Sep 17 00:00:00 2001
From: zqh <zqhxuyuan@gmail.com>
Date: Thu, 30 Dec 2021 16:16:13 +0800
Subject: [PATCH 1/3] expose handler

---
 xcm-emulator/example/src/lib.rs | 6 ++++++
 xcm-emulator/src/lib.rs         | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xcm-emulator/example/src/lib.rs b/xcm-emulator/example/src/lib.rs
index a6ff889..5286c30 100644
--- a/xcm-emulator/example/src/lib.rs
+++ b/xcm-emulator/example/src/lib.rs
@@ -15,6 +15,8 @@ decl_test_parachain! {
 	pub struct YayoiPumpkin {
 		Runtime = yayoi::Runtime,
 		Origin = yayoi::Origin,
+		XcmpMessageHandler = yayoi::XcmpQueue,
+		DmpMessageHandler = yayoi::DmpQueue,
 		new_ext = yayoi_ext(1),
 	}
 }
@@ -23,6 +25,8 @@ decl_test_parachain! {
 	pub struct YayoiMushroom {
 		Runtime = yayoi::Runtime,
 		Origin = yayoi::Origin,
+		XcmpMessageHandler = yayoi::XcmpQueue,
+		DmpMessageHandler = yayoi::DmpQueue,
 		new_ext = yayoi_ext(2),
 	}
 }
@@ -31,6 +35,8 @@ decl_test_parachain! {
 	pub struct YayoiOctopus {
 		Runtime = yayoi::Runtime,
 		Origin = yayoi::Origin,
+		XcmpMessageHandler = yayoi::XcmpQueue,
+		DmpMessageHandler = yayoi::DmpQueue,
 		new_ext = yayoi_ext(3),
 	}
 }
diff --git a/xcm-emulator/src/lib.rs b/xcm-emulator/src/lib.rs
index d1856c5..9fa217b 100644
--- a/xcm-emulator/src/lib.rs
+++ b/xcm-emulator/src/lib.rs
@@ -71,6 +71,8 @@ macro_rules! decl_test_parachain {
 		pub struct $name:ident {
 			Runtime = $runtime:path,
 			Origin = $origin:path,
+			XcmpMessageHandler = $xcmp_message_handler:path,
+			DmpMessageHandler = $dmp_message_handler:path,
 			new_ext = $new_ext:expr,
 		}
 	) => {
@@ -86,7 +88,8 @@ macro_rules! decl_test_parachain {
 				use $crate::{TestExt, XcmpMessageHandler};
 
 				$name::execute_with(|| {
-					$crate::cumulus_pallet_xcmp_queue::Pallet::<$runtime>::handle_xcmp_messages(iter, max_weight)
+					// $crate::cumulus_pallet_xcmp_queue::Pallet::<$runtime>::handle_xcmp_messages(iter, max_weight)
+					<$xcmp_message_handler>::handle_xcmp_messages(iter, max_weight)
 				})
 			}
 		}
@@ -99,7 +102,8 @@ macro_rules! decl_test_parachain {
 				use $crate::{DmpMessageHandler, TestExt};
 
 				$name::execute_with(|| {
-					$crate::cumulus_pallet_dmp_queue::Pallet::<$runtime>::handle_dmp_messages(iter, max_weight)
+					// $crate::cumulus_pallet_dmp_queue::Pallet::<$runtime>::handle_dmp_messages(iter, max_weight)
+					<$dmp_message_handler>::handle_dmp_messages(iter, max_weight)
 				})
 			}
 		}

From e4fe7211f89e2e0533d48c5303e10945b4ce9d50 Mon Sep 17 00:00:00 2001
From: zqh <zqhxuyuan@gmail.com>
Date: Thu, 30 Dec 2021 16:32:02 +0800
Subject: [PATCH 2/3] rm useless code

---
 xcm-emulator/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xcm-emulator/src/lib.rs b/xcm-emulator/src/lib.rs
index 9fa217b..9c35550 100644
--- a/xcm-emulator/src/lib.rs
+++ b/xcm-emulator/src/lib.rs
@@ -88,7 +88,6 @@ macro_rules! decl_test_parachain {
 				use $crate::{TestExt, XcmpMessageHandler};
 
 				$name::execute_with(|| {
-					// $crate::cumulus_pallet_xcmp_queue::Pallet::<$runtime>::handle_xcmp_messages(iter, max_weight)
 					<$xcmp_message_handler>::handle_xcmp_messages(iter, max_weight)
 				})
 			}
@@ -102,7 +101,6 @@ macro_rules! decl_test_parachain {
 				use $crate::{DmpMessageHandler, TestExt};
 
 				$name::execute_with(|| {
-					// $crate::cumulus_pallet_dmp_queue::Pallet::<$runtime>::handle_dmp_messages(iter, max_weight)
 					<$dmp_message_handler>::handle_dmp_messages(iter, max_weight)
 				})
 			}

From 2d419d42d33de02e757f5a05542f8b00188708b3 Mon Sep 17 00:00:00 2001
From: zqh <zqhxuyuan@gmail.com>
Date: Fri, 31 Dec 2021 13:17:22 +0800
Subject: [PATCH 3/3] fmt

---
 xcm-emulator/src/lib.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/xcm-emulator/src/lib.rs b/xcm-emulator/src/lib.rs
index 9c35550..b632f01 100644
--- a/xcm-emulator/src/lib.rs
+++ b/xcm-emulator/src/lib.rs
@@ -87,9 +87,7 @@ macro_rules! decl_test_parachain {
 			) -> $crate::Weight {
 				use $crate::{TestExt, XcmpMessageHandler};
 
-				$name::execute_with(|| {
-					<$xcmp_message_handler>::handle_xcmp_messages(iter, max_weight)
-				})
+				$name::execute_with(|| <$xcmp_message_handler>::handle_xcmp_messages(iter, max_weight))
 			}
 		}
 
@@ -100,9 +98,7 @@ macro_rules! decl_test_parachain {
 			) -> $crate::Weight {
 				use $crate::{DmpMessageHandler, TestExt};
 
-				$name::execute_with(|| {
-					<$dmp_message_handler>::handle_dmp_messages(iter, max_weight)
-				})
+				$name::execute_with(|| <$dmp_message_handler>::handle_dmp_messages(iter, max_weight))
 			}
 		}
 	};