Feat: add basic clippy (#246)

* Fix no-std dependencies to fix #243 * Add basic clippy level * Extend clippy - #245 * Extend clippy * Changed use to alloca #243 * Remove lifetime * Simplify for code consistency. Extend CI * Partly remove lifetime * Remove resolver-lifetime, and remove CI repeat-checkout * Restore CI checkout for tests
rust-ethereum · Nov 30, 2023 · 53d082f · 53d082f
1 parent c0f4a1d
commit 53d082f
Show file tree

Hide file tree

Showing 22 changed files with 147 additions and 125 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -13,22 +13,32 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Rustfmt
       run: cargo fmt --all -- --check
+    - name: clippy
+      run: cargo clippy --workspace -- -D warnings
+    - name: clippy no-std
+      run: cargo clippy --workspace --no-default-features --all-targets -- -D warnings
+    - name: clippy with features
+      run: cargo clippy --workspace --all-features --all-targets -- -D warnings
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Build
       run: cargo build --verbose
+    - name: Build no-std
+      run: cargo build --no-default-features
+    - name: Build all-features
+      run: cargo build --all-features
     - name: Run tests
       run: cargo test --verbose
   jsontests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
       with:
         path: jsontests/res/ethtests
         repository: ethereum/tests

diff --git a/interpreter/src/call_create.rs b/interpreter/src/call_create.rs
@@ -5,6 +5,7 @@ use crate::{
 	Context, ExitError, ExitException, ExitResult, Machine, Memory, Opcode, RuntimeBackend,
 	RuntimeState, Transfer,
 };
+use alloc::vec::Vec;
 use core::cmp::{max, min};
 use primitive_types::{H160, H256, U256};
 use sha3::{Digest, Keccak256};
@@ -31,7 +32,7 @@ pub enum CreateScheme {
 impl CreateScheme {
 	pub fn address<H: RuntimeBackend>(&self, handler: &H) -> H160 {
 		match self {
-			CreateScheme::Create2 {
+			Self::Create2 {
 				caller,
 				code_hash,
 				salt,
@@ -43,7 +44,7 @@ impl CreateScheme {
 				hasher.update(&code_hash[..]);
 				H256::from_slice(hasher.finalize().as_slice()).into()
 			}
-			CreateScheme::Legacy { caller } => {
+			Self::Legacy { caller } => {
 				let nonce = handler.nonce(*caller);
 				let mut stream = rlp::RlpStream::new_list(2);
 				stream.append(caller);
@@ -53,7 +54,7 @@ impl CreateScheme {
 		}
 	}
 
-	pub fn caller(&self) -> H160 {
+	pub const fn caller(&self) -> H160 {
 		match self {
 			Self::Create2 { caller, .. } => *caller,
 			Self::Legacy { caller } => *caller,
@@ -83,7 +84,7 @@ pub enum CallCreateTrapData {
 }
 
 impl CallCreateTrapData {
-	pub fn target_gas(&self) -> Option<U256> {
+	pub const fn target_gas(&self) -> Option<U256> {
 		match self {
 			Self::Call(CallTrapData { gas, .. }) => Some(*gas),
 			Self::Create(_) => None,
@@ -137,6 +138,7 @@ pub struct CallTrapData {
 }
 
 impl CallTrapData {
+	#[allow(clippy::too_many_arguments)]
 	fn new_from_params<S: AsRef<RuntimeState> + AsMut<RuntimeState>>(
 		scheme: CallScheme,
 		memory: &mut Memory,

diff --git a/interpreter/src/error.rs b/interpreter/src/error.rs
@@ -168,7 +168,7 @@ impl From<ExitException> for ExitResult {
 
 impl From<ExitException> for ExitError {
 	fn from(s: ExitException) -> Self {
-		ExitError::Exception(s)
+		Self::Exception(s)
 	}
 }
 
@@ -203,6 +203,6 @@ impl From<ExitFatal> for ExitResult {
 
 impl From<ExitFatal> for ExitError {
 	fn from(s: ExitFatal) -> Self {
-		ExitError::Fatal(s)
+		Self::Fatal(s)
 	}
 }
diff --git a/interpreter/src/eval/mod.rs b/interpreter/src/eval/mod.rs
@@ -51,7 +51,7 @@ where
 			self.0.map(|f| {
 				let fr = wrapper(f, current_opcode);
 				if current_opcode != Opcode(255) {
-					current_opcode.0 = current_opcode.0 + 1;
+					current_opcode.0 += 1;
 				}
 				fr
 			}),
@@ -62,7 +62,7 @@ where
 
 impl<S, H, Tr> Etable<S, H, Tr> {
 	/// Default core value for Etable.
-	pub const fn core() -> Etable<S, H, Tr> {
+	pub const fn core() -> Self {
 		let mut table = [eval_unknown as _; 256];
 
 		table[Opcode::STOP.as_usize()] = eval_stop as _;
@@ -186,7 +186,7 @@ impl<S: AsRef<RuntimeState>, H: RuntimeEnvironment + RuntimeBackend, Tr: CallCre
 	Etable<S, H, Tr>
 {
 	/// Runtime Etable.
-	pub const fn runtime() -> Etable<S, H, Tr> {
+	pub const fn runtime() -> Self {
 		let mut table = Self::core();
 
 		table.0[Opcode::SHA3.as_usize()] = eval_sha3 as _;

diff --git a/interpreter/src/lib.rs b/interpreter/src/lib.rs
@@ -54,7 +54,7 @@ pub struct Machine<S> {
 
 impl<S> Machine<S> {
 	/// Return a reference of the program counter.
-	pub fn position(&self) -> usize {
+	pub const fn position(&self) -> usize {
 		self.position
 	}
 

diff --git a/interpreter/src/memory.rs b/interpreter/src/memory.rs
@@ -1,4 +1,5 @@
 use crate::{ExitException, ExitFatal};
+use alloc::vec;
 use alloc::vec::Vec;
 use core::ops::{BitAnd, Not, Range};
 use core::{cmp::min, mem};
@@ -24,7 +25,7 @@ impl Memory {
 	}
 
 	/// Memory limit.
-	pub fn limit(&self) -> usize {
+	pub const fn limit(&self) -> usize {
 		self.limit
 	}
 
@@ -34,7 +35,7 @@ impl Memory {
 	}
 
 	/// Get the effective length.
-	pub fn effective_len(&self) -> U256 {
+	pub const fn effective_len(&self) -> U256 {
 		self.effective_len
 	}
 
@@ -44,7 +45,7 @@ impl Memory {
 	}
 
 	/// Return the full memory.
-	pub fn data(&self) -> &Vec<u8> {
+	pub const fn data(&self) -> &Vec<u8> {
 		&self.data
 	}
 
@@ -82,9 +83,7 @@ impl Memory {
 	/// Resize to range. Used for return value.
 	pub fn resize_to_range(&mut self, return_range: Range<U256>) {
 		let ret = if return_range.start > U256::from(usize::MAX) {
-			let mut ret = Vec::new();
-			ret.resize((return_range.end - return_range.start).as_usize(), 0);
-			ret
+			vec![0; (return_range.end - return_range.start).as_usize()]
 		} else if return_range.end > U256::from(usize::MAX) {
 			let mut ret = self.get(
 				return_range.start.as_usize(),
@@ -111,8 +110,7 @@ impl Memory {
 	/// Value of `size` is considered trusted. If they're too large,
 	/// the program can run out of memory, or it can overflow.
 	pub fn get(&self, offset: usize, size: usize) -> Vec<u8> {
-		let mut ret = Vec::new();
-		ret.resize(size, 0);
+		let mut ret = vec![0; size];
 
 		#[allow(clippy::needless_range_loop)]
 		for index in 0..size {

diff --git a/interpreter/src/runtime.rs b/interpreter/src/runtime.rs
@@ -1,5 +1,6 @@
 use crate::{ExitError, Opcode};
 use alloc::rc::Rc;
+use alloc::vec::Vec;
 use primitive_types::{H160, H256, U256};
 use sha3::{Digest, Keccak256};
 
@@ -15,13 +16,13 @@ pub struct RuntimeState {
 	pub gas: U256,
 }
 
-impl AsRef<RuntimeState> for RuntimeState {
+impl AsRef<Self> for RuntimeState {
 	fn as_ref(&self) -> &Self {
 		self
 	}
 }
 
-impl AsMut<RuntimeState> for RuntimeState {
+impl AsMut<Self> for RuntimeState {
 	fn as_mut(&mut self) -> &mut Self {
 		self
 	}

diff --git a/interpreter/src/stack.rs b/interpreter/src/stack.rs
@@ -48,7 +48,7 @@ macro_rules! impl_perform_popn_pushn {
 
 impl Stack {
 	/// Create a new stack with given limit.
-	pub fn new(limit: usize) -> Self {
+	pub const fn new(limit: usize) -> Self {
 		Self {
 			data: Vec::new(),
 			limit,
@@ -57,7 +57,7 @@ impl Stack {
 
 	#[inline]
 	/// Stack limit.
-	pub fn limit(&self) -> usize {
+	pub const fn limit(&self) -> usize {
 		self.limit
 	}
 
@@ -75,7 +75,7 @@ impl Stack {
 
 	#[inline]
 	/// Stack data.
-	pub fn data(&self) -> &Vec<H256> {
+	pub const fn data(&self) -> &Vec<H256> {
 		&self.data
 	}
 

diff --git a/interpreter/src/utils.rs b/interpreter/src/utils.rs
@@ -46,7 +46,7 @@ pub struct I256(pub Sign, pub U256);
 
 impl I256 {
 	/// Zero value of I256.
-	pub fn zero() -> I256 {
+	pub const fn zero() -> I256 {
 		I256(Sign::Zero, U256::zero())
 	}
 	/// Minimum value of I256.

diff --git a/interpreter/tests/usability.rs b/interpreter/tests/usability.rs
@@ -11,8 +11,8 @@ const RET1: &str = "000000000000000000000000000000000000000000000000000000000000
 
 #[test]
 fn etable_wrap() {
-	let code = hex::decode(&CODE1).unwrap();
-	let data = hex::decode(&DATA1).unwrap();
+	let code = hex::decode(CODE1).unwrap();
+	let data = hex::decode(DATA1).unwrap();
 
 	let wrapped_etable = Etable::<_, _, Opcode>::core().wrap(|f, opcode_t| {
 		move |machine, handle, opcode, position| {
@@ -24,14 +24,15 @@ fn etable_wrap() {
 
 	let mut vm = Machine::new(Rc::new(code), Rc::new(data), 1024, 10000, ());
 	let result = vm.run(&mut (), &wrapped_etable);
-	assert_eq!(result, Capture::Exit(Ok(ExitSucceed::Returned.into())));
-	assert_eq!(vm.retval, hex::decode(&RET1).unwrap());
+	assert_eq!(result, Capture::Exit(Ok(ExitSucceed::Returned)));
+	assert_eq!(vm.retval, hex::decode(RET1).unwrap());
 }
 
 #[test]
+#[allow(clippy::type_complexity)]
 fn etable_wrap2() {
-	let code = hex::decode(&CODE1).unwrap();
-	let data = hex::decode(&DATA1).unwrap();
+	let code = hex::decode(CODE1).unwrap();
+	let data = hex::decode(DATA1).unwrap();
 
 	let wrapped_etable = Etable::core().wrap(
 		|f, opcode_t| -> Box<dyn Fn(&mut Machine<()>, &mut (), Opcode, usize) -> Control<Opcode>> {
@@ -87,7 +88,7 @@ impl RuntimeEnvironment for UnimplementedHandler {
 	}
 }
 
-impl<'a> RuntimeBaseBackend for UnimplementedHandler {
+impl RuntimeBaseBackend for UnimplementedHandler {
 	fn balance(&self, _address: H160) -> U256 {
 		unimplemented!()
 	}
@@ -113,7 +114,7 @@ impl<'a> RuntimeBaseBackend for UnimplementedHandler {
 	}
 }
 
-impl<'a> RuntimeBackend for UnimplementedHandler {
+impl RuntimeBackend for UnimplementedHandler {
 	fn original_storage(&self, _address: H160, _index: H256) -> H256 {
 		unimplemented!()
 	}
@@ -167,8 +168,8 @@ static RUNTIME_ETABLE: Etable<RuntimeState, UnimplementedHandler, Opcode> = Etab
 
 #[test]
 fn etable_runtime() {
-	let code = hex::decode(&CODE1).unwrap();
-	let data = hex::decode(&DATA1).unwrap();
+	let code = hex::decode(CODE1).unwrap();
+	let data = hex::decode(DATA1).unwrap();
 	let mut handler = UnimplementedHandler;
 
 	let mut vm = Machine::new(
@@ -193,6 +194,6 @@ fn etable_runtime() {
 	);
 
 	let res = vm.run(&mut handler, &RUNTIME_ETABLE).exit().unwrap();
-	assert_eq!(res, Ok(ExitSucceed::Returned.into()));
-	assert_eq!(vm.retval, hex::decode(&RET1).unwrap());
+	assert_eq!(res, Ok(ExitSucceed::Returned));
+	assert_eq!(vm.retval, hex::decode(RET1).unwrap());
 }
diff --git a/jsontests/src/error.rs b/jsontests/src/error.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::upper_case_acronyms)]
 use thiserror::Error;
 
 #[derive(Error, Debug)]

diff --git a/jsontests/src/main.rs b/jsontests/src/main.rs
@@ -48,7 +48,7 @@ fn run_file(filename: &str, debug: bool) -> Result<(), Error> {
 				}
 			}
 			if debug {
-				println!("");
+				println!();
 			}
 		}
 	}
@@ -57,14 +57,14 @@ fn run_file(filename: &str, debug: bool) -> Result<(), Error> {
 }
 
 fn run_single(filename: &str, debug: bool) -> Result<(), Error> {
-	if fs::metadata(&filename)?.is_dir() {
-		for filename in fs::read_dir(&filename)? {
+	if fs::metadata(filename)?.is_dir() {
+		for filename in fs::read_dir(filename)? {
 			let filepath = filename?.path();
 			let filename = filepath.to_str().ok_or(Error::NonUtf8Filename)?;
 			run_file(filename, debug)?;
 		}
 	} else {
-		run_file(&filename, debug)?;
+		run_file(filename, debug)?;
 	}
 
 	Ok(())

diff --git a/jsontests/src/types.rs b/jsontests/src/types.rs
@@ -26,7 +26,7 @@ impl TestMulti {
 				tests.push(Test {
 					info: self.info.clone(),
 					env: self.env.clone(),
-					fork: fork.clone(),
+					fork: *fork,
 					index,
 					post: post_state.clone(),
 					pre: self.pre.clone(),

diff --git a/precompile/src/modexp.rs b/precompile/src/modexp.rs
@@ -179,6 +179,7 @@ impl<G: StaticGasometer> PurePrecompile<G> for Modexp {
 
 		// always true except in the case of zero-length modulus, which leads to
 		// output of length and value 1.
+		#[allow(clippy::comparison_chain)]
 		if bytes.len() == mod_len {
 			(ExitSucceed::Returned.into(), bytes.to_vec())
 		} else if bytes.len() < mod_len {

diff --git a/precompile/src/simple.rs b/precompile/src/simple.rs
@@ -65,7 +65,7 @@ impl<G: StaticGasometer> PurePrecompile<G> for Sha256 {
 		)))));
 
 		let mut ret = [0u8; 32];
-		let hash = ripemd::Ripemd160::digest(&input[..]);
+		let hash = ripemd::Ripemd160::digest(input);
 		ret[12..32].copy_from_slice(&hash);
 
 		(ExitSucceed::Returned.into(), ret.to_vec())
@@ -89,7 +89,7 @@ impl<G: StaticGasometer> PurePrecompile<G> for Ripemd160 {
 			COST_WORD
 		)))));
 
-		let hash = sha2::Sha256::digest(&input[..]);
+		let hash = sha2::Sha256::digest(input);
 
 		(ExitSucceed::Returned.into(), hash.to_vec())
 	}