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 SendXcm for ParentAsUmp { 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) -> Result { + fn deliver(data: Vec) -> Result { let hash = data.using_encoded(sp_io::hashing::blake2_256); T::send_upward_message(data).map_err(|e| match e {