From 005d37a1d497840b2b838c1f441f0f485d567982 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Thu, 10 Mar 2022 21:21:34 -0800
Subject: [PATCH] Fixes

---
 pallets/dmp-queue/src/lib.rs  |  2 +-
 primitives/utility/src/lib.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs
index 8becd30bb9..23841190d1 100644
--- a/pallets/dmp-queue/src/lib.rs
+++ b/pallets/dmp-queue/src/lib.rs
@@ -241,7 +241,7 @@ pub mod pallet {
 					Ok(0)
 				},
 				Ok(Ok(x)) => {
-					let outcome = T::XcmExecutor::execute_xcm(Parent, x, limit);
+					let outcome = T::XcmExecutor::execute_xcm(Parent, x, id, limit);
 					match outcome {
 						Outcome::Error(XcmError::WeightLimitReached(required)) =>
 							Err((id, required)),
diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs
index 0686cd05d8..f07e65a88b 100644
--- a/primitives/utility/src/lib.rs
+++ b/primitives/utility/src/lib.rs
@@ -45,18 +45,18 @@ impl<T: UpwardMessageSender, W: WrapVersion> SendXcm for ParentAsUmp<T, W> {
 		if d.contains_parents_only(1) {
 			// An upward message for the relay chain.
 			let versioned_xcm =
-				W::wrap_version(&d, msg).map_err(|()| SendError::DestinationUnsupported)?;
+				W::wrap_version(&d, xcm).map_err(|()| SendError::DestinationUnsupported)?;
 			let data = versioned_xcm.encode();
 
-			Ok(data, MultiAssets::new())
+			Ok((data, MultiAssets::new()))
 		} else {
-			*dest = Some(d.clone());
+			*dest = Some(d);
 			// Anything else is unhandled. This includes a message this is meant for us.
-			Err(SendError::NotApplicable(d, xcm))
+			Err(SendError::NotApplicable)
 		}
 	}
 
-	fn deliver(blob: Vec<u8>) -> Result<XcmHash, SendError> {
+	fn deliver(data: Vec<u8>) -> Result<XcmHash, SendError> {
 		let hash = data.using_encoded(sp_io::hashing::blake2_256);
 
 		T::send_upward_message(data).map_err(|e| match e {