fix integration tests

integration-tests/src/evm_permit.rs

@@ -1141,7 +1141,7 @@ fn dispatch_permit_should_increase_account_nonce_correctly() {
 
 		let hdx_balance = user_acc.balance(HDX);
 		let tx_fee = initial_user_hdx_balance - hdx_balance;
-		assert_eq!(tx_fee, 1_916_889_814_194);
+		assert_eq!(tx_fee, 1_930_010_523_303);
 	})
 }
 

integration-tests/src/fee_calculation.rs

@@ -4,20 +4,18 @@ use crate::{oracle::hydradx_run_to_block, polkadot_test_net::*};
 use frame_support::assert_ok;
 use frame_support::dispatch::DispatchClass;
 use frame_support::dispatch::GetDispatchInfo;
-use frame_support::weights::constants::RocksDbWeight;
 use frame_support::weights::WeightToFee as WeightToFeeTrait;
 use hydradx_runtime::evm::precompiles::DISPATCH_ADDR;
 use hydradx_runtime::TransactionPayment;
 use hydradx_runtime::EVM;
-use hydradx_runtime::{ExtrinsicBaseWeight, Runtime, Tokens, WeightToFee};
+use hydradx_runtime::{Runtime, Tokens};
 use orml_traits::MultiCurrency;
 use pallet_evm::FeeCalculator;
 use primitives::constants::chain::Weight;
 use primitives::constants::currency::UNITS;
 use primitives::constants::time::HOURS;
 use sp_core::Encode;
 use sp_core::U256;
-use sp_io::storage::changes_root;
 use sp_runtime::{FixedU128, Permill};
 use test_utils::assert_eq_approx;
 use xcm_emulator::TestExt;
@@ -207,15 +205,10 @@ fn substrate_and_evm_fee_growth_simulator_with_idle_chain() {
 			let fee = TransactionPayment::compute_fee(SWAP_ENCODED_LEN, &info, 0);
 
 			let fee_in_cent = (fee as f64 * HDX_USD_SPOT_PRICE) / 1000000000000.0;
-			let fee_in_cent = round(fee_in_cent);
 
 			let evm_fee_in_cent = round(get_evm_fee_in_cent(nonce as u128));
-			let next = TransactionPayment::next_fee_multiplier();
-
-			let gas_price = hydradx_runtime::DynamicEvmFee::min_gas_price();
 
 			println!("{b:?} - fee: {fee:?}");
-			//println!("{b:?} - fee: ${fee_in_cent:?}  - evm_fee: ${evm_fee_in_cent:?} - multiplier: {next:?} - gas {gas_price:?}");
 		}
 	});
 }

integration-tests/src/non_native_fee.rs

@@ -47,7 +47,7 @@ fn non_native_fee_payment_works_with_oracle_price_based_on_onchain_route() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 
 		assert_ok!(hydradx_runtime::Balances::force_set_balance(
 			hydradx_runtime::RuntimeOrigin::root(),
@@ -76,7 +76,7 @@ fn non_native_fee_payment_works_with_oracle_price_based_on_onchain_route() {
 		);
 
 		let dave_new_balance = hydradx_runtime::Tokens::free_balance(DAI, &AccountId::from(DAVE));
-		assert_eq!(dave_new_balance, 999_993_637_058_691_367_900);
+		assert_eq!(dave_new_balance, 999_992_750_748_267_749_500);
 	});
 }
 
@@ -109,7 +109,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 	});
 
 	TestNet::reset();
@@ -139,7 +139,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 	});
 
 	TestNet::reset();
@@ -169,7 +169,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 	});
 }