From 791bb0657f133dfc881f2b9e902be8bf2f36e989 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 16 Dec 2023 14:11:36 +0200 Subject: [PATCH 1/4] initial --- parachain/runtime/tests/src/lib.rs | 6 +++--- parachain/runtime/tests/src/test_cases.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parachain/runtime/tests/src/lib.rs b/parachain/runtime/tests/src/lib.rs index fdde587008..91238e54a1 100644 --- a/parachain/runtime/tests/src/lib.rs +++ b/parachain/runtime/tests/src/lib.rs @@ -5,7 +5,7 @@ mod test_cases; -use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::BridgeHubEthereumBaseFeeInROC; +use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFeeInROC; use bridge_hub_rococo_runtime::{xcm_config::XcmConfig, Runtime, RuntimeEvent, SessionKeys}; use codec::Decode; use parachains_common::{AccountId, AuraId}; @@ -28,7 +28,7 @@ pub fn transfer_token_to_ethereum_works() { 1000, H160::random(), H160::random(), - BridgeHubEthereumBaseFeeInROC::get(), + DefaultBridgeHubEthereumBaseFeeInROC::get(), Box::new(|runtime_event_encoded: Vec| { match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) { Ok(RuntimeEvent::EthereumOutboundQueue(event)) => Some(event), @@ -70,6 +70,6 @@ pub fn transfer_token_to_ethereum_insufficient_fund() { 1000, H160::random(), H160::random(), - BridgeHubEthereumBaseFeeInROC::get(), + DefaultBridgeHubEthereumBaseFeeInROC::get(), ) } diff --git a/parachain/runtime/tests/src/test_cases.rs b/parachain/runtime/tests/src/test_cases.rs index a5e5cccdae..4a77d36e71 100644 --- a/parachain/runtime/tests/src/test_cases.rs +++ b/parachain/runtime/tests/src/test_cases.rs @@ -3,7 +3,7 @@ //! Module contains predefined test-case scenarios for `Runtime` with bridging capabilities. -use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::BridgeHubEthereumBaseFeeInROC; +use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFeeInROC; use codec::Encode; use frame_support::{assert_err, assert_ok, traits::fungible::Mutate}; use parachains_runtimes_test_utils::{ @@ -133,7 +133,7 @@ pub fn send_transfer_token_message_success( // fund asset hub sovereign account enough so it can pay fees initial_fund::( assethub_parachain_id, - BridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000, + DefaultBridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000, ); let outcome = send_transfer_token_message::( @@ -269,7 +269,7 @@ pub fn send_transfer_token_message_fee_not_enough( // fund asset hub sovereign account enough so it can pay fees initial_fund::( assethub_parachain_id, - BridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000, + DefaultBridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000, ); let outcome = send_transfer_token_message::( From 6ee36eb6806533ca3a1c6035cdc198d09b5f9578 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 16 Dec 2023 15:17:40 +0200 Subject: [PATCH 2/4] update polkadot --- polkadot-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-sdk b/polkadot-sdk index a866123912..0043e6a456 160000 --- a/polkadot-sdk +++ b/polkadot-sdk @@ -1 +1 @@ -Subproject commit a866123912d081e595bac361fb19d5480bc9c344 +Subproject commit 0043e6a456bb0e47b44e49bd00ffe18ccc93a68d From 336af8f35e86b1022138d25afdd14782a1e3d242 Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 16 Dec 2023 15:21:06 +0200 Subject: [PATCH 3/4] rename default --- parachain/runtime/tests/src/lib.rs | 6 +++--- parachain/runtime/tests/src/test_cases.rs | 6 +++--- polkadot-sdk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/parachain/runtime/tests/src/lib.rs b/parachain/runtime/tests/src/lib.rs index 91238e54a1..7375f84c80 100644 --- a/parachain/runtime/tests/src/lib.rs +++ b/parachain/runtime/tests/src/lib.rs @@ -5,7 +5,7 @@ mod test_cases; -use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFeeInROC; +use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFee; use bridge_hub_rococo_runtime::{xcm_config::XcmConfig, Runtime, RuntimeEvent, SessionKeys}; use codec::Decode; use parachains_common::{AccountId, AuraId}; @@ -28,7 +28,7 @@ pub fn transfer_token_to_ethereum_works() { 1000, H160::random(), H160::random(), - DefaultBridgeHubEthereumBaseFeeInROC::get(), + DefaultBridgeHubEthereumBaseFee::get(), Box::new(|runtime_event_encoded: Vec| { match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) { Ok(RuntimeEvent::EthereumOutboundQueue(event)) => Some(event), @@ -70,6 +70,6 @@ pub fn transfer_token_to_ethereum_insufficient_fund() { 1000, H160::random(), H160::random(), - DefaultBridgeHubEthereumBaseFeeInROC::get(), + DefaultBridgeHubEthereumBaseFee::get(), ) } diff --git a/parachain/runtime/tests/src/test_cases.rs b/parachain/runtime/tests/src/test_cases.rs index 4a77d36e71..c2c2274517 100644 --- a/parachain/runtime/tests/src/test_cases.rs +++ b/parachain/runtime/tests/src/test_cases.rs @@ -3,7 +3,7 @@ //! Module contains predefined test-case scenarios for `Runtime` with bridging capabilities. -use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFeeInROC; +use asset_hub_rococo_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFee; use codec::Encode; use frame_support::{assert_err, assert_ok, traits::fungible::Mutate}; use parachains_runtimes_test_utils::{ @@ -133,7 +133,7 @@ pub fn send_transfer_token_message_success( // fund asset hub sovereign account enough so it can pay fees initial_fund::( assethub_parachain_id, - DefaultBridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000, + DefaultBridgeHubEthereumBaseFee::get() + 1_000_000_000, ); let outcome = send_transfer_token_message::( @@ -269,7 +269,7 @@ pub fn send_transfer_token_message_fee_not_enough( // fund asset hub sovereign account enough so it can pay fees initial_fund::( assethub_parachain_id, - DefaultBridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000, + DefaultBridgeHubEthereumBaseFee::get() + 1_000_000_000, ); let outcome = send_transfer_token_message::( diff --git a/polkadot-sdk b/polkadot-sdk index 0043e6a456..dd10459131 160000 --- a/polkadot-sdk +++ b/polkadot-sdk @@ -1 +1 @@ -Subproject commit 0043e6a456bb0e47b44e49bd00ffe18ccc93a68d +Subproject commit dd10459131a03a1a60a7b96181e0b9538f148b28 From 8c8360b8280f661ec9cca3976a15fc5734e4c89d Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sat, 16 Dec 2023 15:24:58 +0200 Subject: [PATCH 4/4] update polkadot-sdk --- polkadot-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-sdk b/polkadot-sdk index dd10459131..85470f8b06 160000 --- a/polkadot-sdk +++ b/polkadot-sdk @@ -1 +1 @@ -Subproject commit dd10459131a03a1a60a7b96181e0b9538f148b28 +Subproject commit 85470f8b062e356a80d2b47c4c3cd68281811caf