Resolve lint errors

in line with upstream:

polkadot-evm@511768e#diff-fca170f5db588c1e67cffebdb426a8cc88b871d7f8219f871cc5c1ef53e7a20e
polkadot-evm@064955a#diff-33da185d821c2df8279916184aea8664aba5bcf80e76ce9e02508ce921ae54c2

client/db/src/kv/upgrade.rs

@@ -440,9 +440,9 @@ mod tests {
 					// happened in case of fork or equivocation.
 					let eth_tx_hash = H256::random();
 					let mut metadata = vec![];
-					for hash in vec![next_canon_block_hash, orphan_block_hash].iter() {
+					for hash in [next_canon_block_hash, orphan_block_hash] {
 						metadata.push(crate::kv::TransactionMetadata::<OpaqueBlock> {
-							substrate_block_hash: *hash,
+							substrate_block_hash: hash,
 							ethereum_block_hash: ethhash,
 							ethereum_index: 0u32,
 						});

client/db/src/kv/utils.rs

@@ -74,7 +74,7 @@ fn open_kvdb_rocksdb<Block: BlockT, C: HeaderBackend<Block>>(
 	// write database version only after the database is successfully opened
 	#[cfg(not(test))]
 	super::upgrade::update_version(path).map_err(|_| "Cannot update db version".to_string())?;
-	return Ok(sp_database::as_database(db));
+	Ok(sp_database::as_database(db))
 }
 
 #[cfg(not(feature = "rocksdb"))]

client/db/src/sql/mod.rs

@@ -545,6 +545,7 @@ where
 			let transaction_index = transaction_index as i32;
 			log_count += receipt_logs.len();
 			for (log_index, log) in receipt_logs.iter().enumerate() {
+				#[allow(clippy::get_first)]
 				logs.push(Log {
 					address: log.address.as_bytes().to_owned(),
 					topic_1: log.topics.get(0).map(|l| l.as_bytes().to_owned()),

client/rpc/src/eth/filter.rs

@@ -97,10 +97,11 @@ where
 					self.max_stored_filters
 				)));
 			}
-			let last_key = match {
+			let next_back = {
 				let mut iter = locked.iter();
 				iter.next_back()
-			} {
+			};
+			let last_key = match next_back {
 				Some((k, _)) => *k,
 				None => U256::zero(),
 			};

client/rpc/src/eth/state.rs

@@ -144,7 +144,7 @@ where
 			for tx in self.pool.ready() {
 				// since transactions in `ready()` need to be ordered by nonce
 				// it's fine to continue with current iterator.
-				if tx.provides().get(0) == Some(&current_tag) {
+				if tx.provides().first() == Some(&current_tag) {
 					current_nonce = current_nonce.saturating_add(1.into());
 					current_tag = (address, current_nonce).encode();
 				}

client/rpc/src/eth/submit.rs

@@ -61,7 +61,7 @@ where
 					Err(e) => return Err(e),
 				};
 
-				match accounts.get(0) {
+				match accounts.first() {
 					Some(account) => *account,
 					None => return Err(internal_err("no signer available")),
 				}

client/rpc/src/eth_pubsub.rs

@@ -129,7 +129,7 @@ impl EthSubscriptionResult {
 		receipts: Vec<ethereum::ReceiptV3>,
 		params: &FilteredParams,
 	) -> Vec<Log> {
-		let block_hash = Some(H256::from(keccak_256(&rlp::encode(&block.header))));
+		let block_hash = H256::from(keccak_256(&rlp::encode(&block.header)));
 		let mut logs: Vec<Log> = vec![];
 		let mut log_index: u32 = 0;
 		for (receipt_index, receipt) in receipts.into_iter().enumerate() {
@@ -145,12 +145,12 @@ impl EthSubscriptionResult {
 				None
 			};
 			for log in receipt_logs {
-				if Self::add_log(block_hash.unwrap(), &log, &block, params) {
+				if Self::add_log(block_hash, &log, &block, params) {
 					logs.push(Log {
 						address: log.address,
 						topics: log.topics,
 						data: Bytes(log.data),
-						block_hash,
+						block_hash: Some(block_hash),
 						block_number: Some(block.header.number),
 						transaction_hash,
 						transaction_index: Some(U256::from(receipt_index)),

client/rpc/src/txpool.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use std::{collections::HashMap, marker::PhantomData, sync::Arc};
+use std::{marker::PhantomData, sync::Arc};
 
 use ethereum::TransactionV2;
 use ethereum_types::{H160, H256, U256};
@@ -86,7 +86,7 @@ where
 			};
 			pending
 				.entry(from_address)
-				.or_insert_with(HashMap::new)
+				.or_default()
 				.insert(nonce, T::get(hash, from_address, txn));
 		}
 		let mut queued = TransactionMap::<T>::new();
@@ -103,7 +103,7 @@ where
 			};
 			queued
 				.entry(from_address)
-				.or_insert_with(HashMap::new)
+				.or_default()
 				.insert(nonce, T::get(hash, from_address, txn));
 		}
 		Ok(TxPoolResult { pending, queued })

frame/evm/src/lib.rs

@@ -540,7 +540,10 @@ pub mod pallet {
 					frame_system::Pallet::<T>::inc_account_nonce(&account_id);
 				}
 
-				T::Currency::deposit_creating(&account_id, account.balance.unique_saturated_into());
+				let _ = T::Currency::deposit_creating(
+					&account_id,
+					account.balance.unique_saturated_into(),
+				);
 
 				Pallet::<T>::create_account(*address, account.code.clone());
 

frame/evm/src/tests.rs

@@ -135,7 +135,7 @@ mod proof_size_test {
 		assert_eq!(
 			ACCOUNT_BASIC_PROOF_SIZE,
 			frame_system::Account::<Test>::storage_info()
-				.get(0)
+				.first()
 				.expect("item")
 				.max_size
 				.expect("size") as u64
@@ -147,7 +147,7 @@ mod proof_size_test {
 		assert_eq!(
 			ACCOUNT_STORAGE_PROOF_SIZE,
 			AccountStorages::<Test>::storage_info()
-				.get(0)
+				.first()
 				.expect("item")
 				.max_size
 				.expect("size") as u64
@@ -159,7 +159,7 @@ mod proof_size_test {
 		assert_eq!(
 			ACCOUNT_CODES_METADATA_PROOF_SIZE,
 			AccountCodesMetadata::<Test>::storage_info()
-				.get(0)
+				.first()
 				.expect("item")
 				.max_size
 				.expect("size") as u64

precompiles/src/testing/account.rs

@@ -119,6 +119,7 @@ macro_rules! mock_account {
 	(# $name:ident, $convert:expr) => {
 		impl From<$name> for MockAccount {
 			fn from(value: $name) -> MockAccount {
+				#[allow(clippy::redundant_closure_call)]
 				$convert(value)
 			}
 		}

template/node/src/rpc/eth.rs

@@ -20,7 +20,7 @@ use sp_core::H256;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::traits::Block as BlockT;
 // Frontier
-pub use fc_rpc::{EthBlockDataCacheTask, EthConfig, OverrideHandle, StorageOverride};
+pub use fc_rpc::{EthBlockDataCacheTask, EthConfig, OverrideHandle};
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 pub use fc_storage::overrides_handle;
 use fp_rpc::{ConvertTransaction, ConvertTransactionRuntimeApi, EthereumRuntimeRPCApi};

template/node/src/service.rs

@@ -620,7 +620,7 @@ where
 		telemetry.as_ref().map(|x| x.handle()),
 	);
 
-	thread_local!(static TIMESTAMP: RefCell<u64> = RefCell::new(0));
+	thread_local!(static TIMESTAMP: RefCell<u64> = const { RefCell::new(0) });
 
 	/// Provide a mock duration starting at 0 in millisecond for timestamp inherent.
 	/// Each call will increment timestamp by slot_duration making Aura think time has passed.