Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make base fee configurable from storage. #1060

Merged
merged 4 commits into from
Dec 16, 2023
Merged

Make base fee configurable from storage. #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
791bb06
initial
alistair-singh Dec 16, 2023
6ee36eb
update polkadot
alistair-singh Dec 16, 2023
336af8f
rename default
alistair-singh Dec 16, 2023
8c8360b
update polkadot-sdk
alistair-singh Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions parachain/runtime/tests/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::DefaultBridgeHubEthereumBaseFee;
use bridge_hub_rococo_runtime::{xcm_config::XcmConfig, Runtime, RuntimeEvent, SessionKeys};
use codec::Decode;
use parachains_common::{AccountId, AuraId};
Expand All @@ -28,7 +28,7 @@ pub fn transfer_token_to_ethereum_works() {
1000,
H160::random(),
H160::random(),
BridgeHubEthereumBaseFeeInROC::get(),
DefaultBridgeHubEthereumBaseFee::get(),
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
Ok(RuntimeEvent::EthereumOutboundQueue(event)) => Some(event),
Expand Down Expand Up @@ -70,6 +70,6 @@ pub fn transfer_token_to_ethereum_insufficient_fund() {
1000,
H160::random(),
H160::random(),
BridgeHubEthereumBaseFeeInROC::get(),
DefaultBridgeHubEthereumBaseFee::get(),
)
}
6 changes: 3 additions & 3 deletions parachain/runtime/tests/src/test_cases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::DefaultBridgeHubEthereumBaseFee;
use codec::Encode;
use frame_support::{assert_err, assert_ok, traits::fungible::Mutate};
use parachains_runtimes_test_utils::{
Expand Down Expand Up @@ -133,7 +133,7 @@ pub fn send_transfer_token_message_success<Runtime, XcmConfig>(
// fund asset hub sovereign account enough so it can pay fees
initial_fund::<Runtime>(
assethub_parachain_id,
BridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000,
DefaultBridgeHubEthereumBaseFee::get() + 1_000_000_000,
);

let outcome = send_transfer_token_message::<Runtime, XcmConfig>(
Expand Down Expand Up @@ -269,7 +269,7 @@ pub fn send_transfer_token_message_fee_not_enough<Runtime, XcmConfig>(
// fund asset hub sovereign account enough so it can pay fees
initial_fund::<Runtime>(
assethub_parachain_id,
BridgeHubEthereumBaseFeeInROC::get() + 1_000_000_000,
DefaultBridgeHubEthereumBaseFee::get() + 1_000_000_000,
);

let outcome = send_transfer_token_message::<Runtime, XcmConfig>(
Expand Down
2 changes: 1 addition & 1 deletion polkadot-sdk
Open in desktop
Submodule polkadot-sdk updated 2 files
+11 −7 cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
+52 −0 cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
Loading