From 0f39236e541232403acc3c32005ab60395f2e38a Mon Sep 17 00:00:00 2001
From: Evgeny Ukhanov <evgeny@aurora.dev>
Date: Mon, 27 May 2024 23:00:03 +0200
Subject: [PATCH] Refactored skipped-match and clippy

---
 benches/loop.rs                    | 1 +
 evm-tests/jsontests/src/main.rs    | 7 +------
 evm-tests/jsontests/src/state.rs   | 2 +-
 evm-tests/jsontests/tests/state.rs | 1 -
 runtime/src/eval/system.rs         | 4 ++--
 src/backend/memory.rs              | 1 +
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/benches/loop.rs b/benches/loop.rs
index 227f1d64e..13ebc42dd 100644
--- a/benches/loop.rs
+++ b/benches/loop.rs
@@ -10,6 +10,7 @@ fn run_loop_contract() {
 
 	let vicinity = MemoryVicinity {
 		gas_price: U256::zero(),
+		effective_gas_price: U256::zero(),
 		origin: H160::default(),
 		block_hashes: Vec::new(),
 		block_number: Default::default(),
diff --git a/evm-tests/jsontests/src/main.rs b/evm-tests/jsontests/src/main.rs
index f463b42cb..859ee4734 100644
--- a/evm-tests/jsontests/src/main.rs
+++ b/evm-tests/jsontests/src/main.rs
@@ -205,10 +205,5 @@ fn should_skip(path: &Path) -> bool {
 			|| Path::new(dir_name) == Path::new(case)
 	};
 
-	for case in SKIPPED_CASES {
-		if matches(case) {
-			return true;
-		}
-	}
-	false
+	SKIPPED_CASES.iter().any(|case| matches(case))
 }
diff --git a/evm-tests/jsontests/src/state.rs b/evm-tests/jsontests/src/state.rs
index 60fbb5e55..8b6c88fe1 100644
--- a/evm-tests/jsontests/src/state.rs
+++ b/evm-tests/jsontests/src/state.rs
@@ -625,7 +625,7 @@ fn test_run(
 				data_max_fee,
 			);
 			if let Err(err) = &valid_tx {
-				if check_validate_exit_reason(err, &state.expect_exception, format!("{name}")) {
+				if check_validate_exit_reason(err, &state.expect_exception, name.to_string()) {
 					continue;
 				}
 			}
diff --git a/evm-tests/jsontests/tests/state.rs b/evm-tests/jsontests/tests/state.rs
index c72656f6e..d93e8af7d 100644
--- a/evm-tests/jsontests/tests/state.rs
+++ b/evm-tests/jsontests/tests/state.rs
@@ -17,7 +17,6 @@ fn short_test_file_name(name: &str) -> String {
 
 pub fn run(dir: &str) {
 	const SPEC: Option<ForkSpec> = Some(ForkSpec::Cancun);
-	//const SPEC: Option<ForkSpec> = Some(ForkSpec::Shanghai);
 
 	let _ = env_logger::try_init();
 
diff --git a/runtime/src/eval/system.rs b/runtime/src/eval/system.rs
index 9265a516b..e52ddcc08 100644
--- a/runtime/src/eval/system.rs
+++ b/runtime/src/eval/system.rs
@@ -96,7 +96,7 @@ pub fn base_fee<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
 /// EIP-7516: BLOBBASEFEE opcode
 pub fn blob_base_fee<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
 	// TODOFEE
-	println!("blob_base_fee");
+	// println!("blob_base_fee");
 	let blob_base_fee = U256::from(handler.blob_base_fee().unwrap_or_default());
 	push_u256!(runtime, blob_base_fee);
 	Control::Continue
@@ -127,7 +127,7 @@ pub fn blob_hash<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
 	// - https://eips.ethereum.org/EIPS/eip-4844#opcode-to-get-versioned-hashes
 	let blob_hash = handler.get_blob_hash(index).unwrap_or(U256::zero());
 	// TODOFEE
-	println!("\tset blob_hash: {blob_hash}");
+	// println!("\tset blob_hash: {blob_hash}");
 	// Set top stack index with `blob_hash` value
 	if let Err(e) = runtime.machine.stack_mut().set(0, blob_hash) {
 		return Control::Exit(e.into());
diff --git a/src/backend/memory.rs b/src/backend/memory.rs
index 2c7011201..541bada24 100644
--- a/src/backend/memory.rs
+++ b/src/backend/memory.rs
@@ -92,6 +92,7 @@ impl<'vicinity> MemoryBackend<'vicinity> {
 }
 
 impl<'vicinity> Backend for MemoryBackend<'vicinity> {
+	#[allow(clippy::misnamed_getters)]
 	fn gas_price(&self) -> U256 {
 		self.vicinity.effective_gas_price
 	}