move effective_gas_price to utils

lambdaclass · Dec 2, 2024 · 3af7fb0 · 3af7fb0
1 parent bd801b7
commit 3af7fb0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/cmd/ef_tests/levm/runner/levm_runner.rs b/cmd/ef_tests/levm/runner/levm_runner.rs
@@ -2,7 +2,7 @@ use crate::{
     report::{EFTestReport, TestVector},
     runner::{EFTestRunnerError, InternalError},
     types::EFTest,
-    utils,
+    utils::{self, effective_gas_price},
 };
 use ethrex_core::{
     types::{code_hash, AccountInfo},
@@ -19,8 +19,6 @@ use ethrex_vm::db::StoreWrapper;
 use keccak_hash::keccak;
 use std::{collections::HashMap, sync::Arc};
 
-use super::revm_runner::effective_gas_price;
-
 pub fn run_ef_test(test: &EFTest) -> Result<EFTestReport, EFTestRunnerError> {
     let mut ef_test_report = EFTestReport::new(
         test.name.clone(),

diff --git a/cmd/ef_tests/levm/runner/revm_runner.rs b/cmd/ef_tests/levm/runner/revm_runner.rs
@@ -4,11 +4,11 @@ use crate::{
         levm_runner::{self, post_state_root},
         EFTestRunnerError, InternalError,
     },
-    types::{EFTest, EFTestTransaction},
-    utils::load_initial_state,
+    types::EFTest,
+    utils::{effective_gas_price, load_initial_state},
 };
 use bytes::Bytes;
-use ethrex_core::{types::TxKind, Address, H256, U256};
+use ethrex_core::{types::TxKind, Address, H256};
 use ethrex_levm::{
     errors::{TransactionReport, TxResult},
     Account, StorageSlot,
@@ -90,19 +90,6 @@ pub fn re_run_failed_ef_test_tx(
     Ok(())
 }
 
-// If gas price is not provided, calculate it with current base fee and priority fee
-pub fn effective_gas_price(test: &EFTest, tx: &&EFTestTransaction) -> U256 {
-    match tx.gas_price {
-        None => {
-            let current_base_fee = test.env.current_base_fee.unwrap();
-            let priority_fee = tx.max_priority_fee_per_gas.unwrap();
-            let max_fee_per_gas = tx.max_fee_per_gas.unwrap();
-            std::cmp::min(max_fee_per_gas, current_base_fee + priority_fee)
-        }
-        Some(price) => price,
-    }
-}
-
 pub fn prepare_revm_for_tx<'state>(
     initial_state: &'state mut EvmState,
     vector: &TestVector,

diff --git a/cmd/ef_tests/levm/utils.rs b/cmd/ef_tests/levm/utils.rs
@@ -1,5 +1,5 @@
-use crate::types::EFTest;
-use ethrex_core::{types::Genesis, H256};
+use crate::types::{EFTest, EFTestTransaction};
+use ethrex_core::{types::Genesis, H256, U256};
 use ethrex_storage::{EngineType, Store};
 use ethrex_vm::{evm_state, EvmState};
 
@@ -17,3 +17,16 @@ pub fn load_initial_state(test: &EFTest) -> (EvmState, H256) {
         genesis.get_block().header.compute_block_hash(),
     )
 }
+
+// If gas price is not provided, calculate it with current base fee and priority fee
+pub fn effective_gas_price(test: &EFTest, tx: &&EFTestTransaction) -> U256 {
+    match tx.gas_price {
+        None => {
+            let current_base_fee = test.env.current_base_fee.unwrap();
+            let priority_fee = tx.max_priority_fee_per_gas.unwrap();
+            let max_fee_per_gas = tx.max_fee_per_gas.unwrap();
+            std::cmp::min(max_fee_per_gas, current_base_fee + priority_fee)
+        }
+        Some(price) => price,
+    }
+}