Merge branch 'diego-dancelight-xcm_ump' of github.com:moondance-labs/…

…tanssi into diego-dancelight-xcm_ump
moondance-labs · Dec 24, 2024 · 5b59a70 · 5b59a70
2 parents a9924c4 + 3a97c2e
commit 5b59a70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/solo-chains/node/tanssi-relay-service/src/dev_service.rs b/solo-chains/node/tanssi-relay-service/src/dev_service.rs
@@ -400,13 +400,12 @@ where
 
                             let mut upm_messages = UpwardMessages::new();
 
-                            client
+                            if let Some(upm_message) = client
                                 .get_aux(XMC_UPM_SELECTOR_AUX_KEY)
                                 .expect("Should be able to query aux storage; qed")
-                                .map(|upm_message| {
-                                    log::info!("upm message read from kvs {:?}", upm_message);
-                                    upm_messages.force_push(upm_message)
-                                });
+                            {
+                                upm_messages.force_push(upm_message);
+                            }
 
                             // generate a candidate with most of the values mocked
                             let candidate = CommittedCandidateReceipt::<H256> {

diff --git a/test/suites/dev-tanssi-relay/xcm/test-xcm-send-upward.ts b/test/suites/dev-tanssi-relay/xcm/test-xcm-send-upward.ts
@@ -3,7 +3,8 @@ import { KeyringPair, generateKeyringPair } from "@moonwall/util";
 import { ApiPromise, Keyring } from "@polkadot/api";
 import { u8aToHex } from "@polkadot/util";
 import { jumpToSession } from "util/block";
-import { RawXcmMessage, XcmFragment, injectUmpMessageAndSeal } from "../../../util/xcm";
+import { injectUmpMessageAndSeal, RawXcmMessage, XcmFragment } from "../../../util/xcm";
+
 
 describeSuite({
     id: "DTR1003",
@@ -75,17 +76,17 @@ describeSuite({
                     .deposit_asset_v3()
                     .as_v3();
 
+                // Enable para inherent to process xcm message
                 await customDevRpcRequest("mock_enableParaInherentCandidate", []);
 
-                // Send an XCM and create block to execute it
+                // Send ump message
                 await injectUmpMessageAndSeal(context, {
                     type: "XcmVersionedXcm",
                     payload: xcmMessage,
                 } as RawXcmMessage);
 
+                // Wait until message is processed
                 await jumpToSession(context, 3);
-
-                // Create a block in which the XCM will be executed
                 await context.createBlock();
 
                 const balanceRandomAfter = (await polkadotJs.query.system.account(random.address)).data.free.toBigInt();