Skip to content

Commit

Permalink
Added xcmp_queue_send_xcm_works test (#1422)
Browse files Browse the repository at this point in the history
This PR adds test case for successful `send_xcm` for `XcmpQueue`
according to the opened HRMP channel to the sibling parachain.
  • Loading branch information
bkontur authored Sep 15, 2023
1 parent b35b28c commit 11088bc
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 9 deletions.
6 changes: 3 additions & 3 deletions cumulus/pallets/parachain-system/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1400,12 +1400,12 @@ impl<T: Config> Pallet<T> {
CustomValidationHeadData::<T>::put(head_data);
}

/// Open HRMP channel for using it in benchmarks.
/// Open HRMP channel for using it in benchmarks or tests.
///
/// The caller assumes that the pallet will accept regular outbound message to the sibling
/// `target_parachain` after this call. No other assumptions are made.
#[cfg(feature = "runtime-benchmarks")]
pub fn open_outbound_hrmp_channel_for_benchmarks(target_parachain: ParaId) {
#[cfg(any(feature = "runtime-benchmarks", feature = "std"))]
pub fn open_outbound_hrmp_channel_for_benchmarks_or_tests(target_parachain: ParaId) {
RelevantMessagingState::<T>::put(MessagingStateSnapshot {
dmq_mqc_head: Default::default(),
relay_dispatch_queue_remaining_capacity: Default::default(),
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/xcmp-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pallet-balances = { path = "../../../substrate/frame/balances" }
xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder" }

# Cumulus
cumulus-pallet-parachain-system = { path = "../parachain-system" }
cumulus-pallet-parachain-system = { path = "../parachain-system", features = ["parameterized-consensus-hook"] }

[features]
default = [ "std" ]
Expand Down
33 changes: 31 additions & 2 deletions cumulus/pallets/xcmp-queue/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
// limitations under the License.

use super::*;
use cumulus_primitives_core::XcmpMessageHandler;
use cumulus_primitives_core::{ParaId, XcmpMessageHandler};
use frame_support::{assert_noop, assert_ok};
use mock::{new_test_ext, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
use mock::{new_test_ext, ParachainSystem, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
use sp_runtime::traits::BadOrigin;

#[test]
Expand Down Expand Up @@ -341,3 +341,32 @@ fn xcmp_queue_consumes_dest_and_msg_on_ok_validate() {
);
});
}

#[test]
fn xcmp_queue_send_xcm_works() {
new_test_ext().execute_with(|| {
let sibling_para_id = ParaId::from(12345);
let dest = (Parent, X1(Parachain(sibling_para_id.into()))).into();
let msg = Xcm(vec![ClearOrigin]);

// try to send without opened HRMP channel to the sibling_para_id
assert_eq!(
send_xcm::<XcmpQueue>(dest, msg.clone()),
Err(SendError::Transport("NoChannel")),
);

// open HRMP channel to the sibling_para_id
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(sibling_para_id);

// check empty outbound queue
assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());

// now send works
assert_ok!(send_xcm::<XcmpQueue>(dest, msg));

// check outbound queue contains message/page for sibling_para_id
assert!(XcmpQueue::take_outbound_messages(usize::MAX)
.iter()
.any(|(para_id, _)| para_id == &sibling_para_id));
})
}
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ impl_runtime_apis! {
) -> (bridge_hub_rococo_config::FromWococoBridgeHubMessagesProof, Weight) {
use cumulus_primitives_core::XcmpMessageSource;
assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(42.into());
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
prepare_message_proof_from_parachain::<
Runtime,
BridgeGrandpaWococoInstance,
Expand Down Expand Up @@ -1113,7 +1113,7 @@ impl_runtime_apis! {
) -> (bridge_hub_wococo_config::FromRococoBridgeHubMessagesProof, Weight) {
use cumulus_primitives_core::XcmpMessageSource;
assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(42.into());
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
prepare_message_proof_from_parachain::<
Runtime,
BridgeGrandpaRococoInstance,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ pub mod benchmarks {
impl<I: Get<u32>> EnsureSuccessful for OpenHrmpChannel<I> {
fn ensure_successful() {
if let ChannelStatus::Closed = ParachainSystem::get_channel_status(I::get().into()) {
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks(I::get().into())
ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(I::get().into())
}
}
}
Expand Down

0 comments on commit 11088bc

Please sign in to comment.