Skip to content

Commit ff33e6c

Browse files
committed
Remove DispatchBlobError from XcmBlobMessageDispatchResult::NotDispatched
1 parent 406cbd7 commit ff33e6c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

bin/millau/runtime/src/xcm_config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ mod tests {
353353
FromRialtoMessageDispatch::dispatch(&AccountId::from([0u8; 32]), incoming_message);
354354
assert!(matches!(
355355
dispatch_result.dispatch_level_result,
356-
XcmBlobMessageDispatchResult::NotDispatched(_),
356+
XcmBlobMessageDispatchResult::NotDispatched,
357357
));
358358
}
359359

@@ -367,7 +367,7 @@ mod tests {
367367
FromRialtoMessageDispatch::dispatch(&AccountId::from([0u8; 32]), incoming_message);
368368
assert!(matches!(
369369
dispatch_result.dispatch_level_result,
370-
XcmBlobMessageDispatchResult::NotDispatched(_),
370+
XcmBlobMessageDispatchResult::NotDispatched,
371371
));
372372
}
373373
}

bin/rialto-parachain/runtime/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ mod tests {
929929
FromMillauMessageDispatch::dispatch(&AccountId::from([0u8; 32]), incoming_message);
930930
assert!(matches!(
931931
dispatch_result.dispatch_level_result,
932-
XcmBlobMessageDispatchResult::NotDispatched(_),
932+
XcmBlobMessageDispatchResult::NotDispatched,
933933
));
934934
});
935935
}

bin/rialto/runtime/src/xcm_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ mod tests {
270270
FromMillauMessageDispatch::dispatch(&AccountId::from([0u8; 32]), incoming_message);
271271
assert!(matches!(
272272
dispatch_result.dispatch_level_result,
273-
XcmBlobMessageDispatchResult::NotDispatched(_),
273+
XcmBlobMessageDispatchResult::NotDispatched,
274274
));
275275
}
276276
}

bin/runtime-common/src/messages_xcm_extension.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use frame_support::{dispatch::Weight, CloneNoBound, EqNoBound, PartialEqNoBound}
3232
use pallet_bridge_messages::WeightInfoExt as MessagesPalletWeights;
3333
use scale_info::TypeInfo;
3434
use sp_runtime::SaturatedConversion;
35-
use xcm_builder::{DispatchBlob, DispatchBlobError, HaulBlob, HaulBlobError};
35+
use xcm_builder::{DispatchBlob, HaulBlob, HaulBlobError};
3636

3737
/// Plain "XCM" payload, which we transfer through bridge
3838
pub type XcmAsPlainPayload = sp_std::prelude::Vec<u8>;
@@ -42,7 +42,7 @@ pub type XcmAsPlainPayload = sp_std::prelude::Vec<u8>;
4242
pub enum XcmBlobMessageDispatchResult {
4343
InvalidPayload,
4444
Dispatched,
45-
NotDispatched(#[codec(skip)] Option<DispatchBlobError>),
45+
NotDispatched,
4646
}
4747

4848
/// [`XcmBlobMessageDispatch`] is responsible for dispatching received messages
@@ -111,7 +111,7 @@ impl<
111111
"[XcmBlobMessageDispatch] DispatchBlob::dispatch_blob failed, error: {:?} - message_nonce: {:?}",
112112
e, message.key.nonce
113113
);
114-
XcmBlobMessageDispatchResult::NotDispatched(Some(e))
114+
XcmBlobMessageDispatchResult::NotDispatched
115115
},
116116
};
117117
MessageDispatchResult { unspent_weight: Weight::zero(), dispatch_level_result }

0 commit comments

Comments
 (0)