Fixes for integration compilation

AstarNetwork · Sep 28, 2023 · 79a21a4 · 79a21a4
1 parent cd1e8e3
commit 79a21a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/tests/integration/src/setup.rs b/tests/integration/src/setup.rs
@@ -211,12 +211,16 @@ pub fn run_to_block(n: u32) {
     while System::block_number() < n {
         let block_number = System::block_number();
         Timestamp::set_timestamp(block_number as u64 * BLOCK_TIME);
+        TransactionPayment::on_finalize(block_number);
         DappsStaking::on_finalize(block_number);
         Authorship::on_finalize(block_number);
         Session::on_finalize(block_number);
         AuraExt::on_finalize(block_number);
         PolkadotXcm::on_finalize(block_number);
         Ethereum::on_finalize(block_number);
+        #[cfg(any(feature = "shiden", features = "astar"))]
+        BaseFee::on_finalize(block_number);
+        #[cfg(any(feature = "shibuya"))]
         DynamicEvmBaseFee::on_finalize(block_number);
 
         System::set_block_number(block_number + 1);
@@ -227,6 +231,9 @@ pub fn run_to_block(n: u32) {
         Aura::on_initialize(block_number);
         AuraExt::on_initialize(block_number);
         Ethereum::on_initialize(block_number);
+        #[cfg(any(feature = "shiden", features = "astar"))]
+        BaseFee::on_initialize(block_number);
+        #[cfg(any(feature = "shibuya"))]
         DynamicEvmBaseFee::on_initialize(block_number);
         #[cfg(any(feature = "shibuya", feature = "shiden", features = "astar"))]
         RandomnessCollectiveFlip::on_initialize(block_number);

diff --git a/tests/integration/src/xvm.rs b/tests/integration/src/xvm.rs
@@ -762,7 +762,7 @@ fn calling_wasm_from_evm_works_if_sufficient_storage_deposit_limit() {
         let wasm_callee_addr = deploy_wasm_contract(WASM_SIMPLE_STORAGE_NAME);
         let evm_caller_addr = deploy_evm_contract(CALL_XVM_PAYABLE_WITH_SDL);
 
-        // Fund the EVM caller to pay for storage deposit.
+        // Fund the EVM contract to pay for storage deposit.
         let _ = Balances::deposit_creating(&account_id_from(evm_caller_addr.clone()), UNIT);
 
         assert_ok!(EVM::call(