fix clippy warnings

testing/ef-tests/src/ethtests.rs

@@ -35,7 +35,7 @@ pub fn read_eth_test(path: PathBuf) -> Vec<EthTestCase> {
     root.as_object_mut()
         .unwrap()
         .into_iter()
-        .map(|(name, test)| {
+        .filter_map(|(name, test)| {
             println!("test '{}'", name);
             let json: TestJson = serde_json::from_value(test.take()).unwrap();
 
@@ -56,6 +56,5 @@ pub fn read_eth_test(path: PathBuf) -> Vec<EthTestCase> {
                 chain_spec,
             })
         })
-        .flatten()
         .collect()
 }

testing/ef-tests/src/lib.rs

@@ -31,6 +31,7 @@ use zeth_lib::{
 };
 use zeth_primitives::{
     access_list::{AccessList, AccessListItem},
+    alloy_rlp,
     block::Header,
     ethers::from_ethers_h160,
     keccak::keccak,
@@ -43,7 +44,7 @@ use zeth_primitives::{
     },
     trie::{self, MptNode, MptNodeData, StateAccount},
     withdrawal::Withdrawal,
-    Address, Bloom, Bytes, RlpBytes, StorageKey, B256, B64, U256, U64,
+    Address, Bloom, Bytes, StorageKey, B256, B64, U256, U64,
 };
 
 use crate::ethers::TestProvider;
@@ -96,8 +97,8 @@ impl From<DbAccount> for TestAccount {
         TestAccount {
             balance: account.info.balance,
             nonce: U64::from(account.info.nonce),
-            code: account.info.code.unwrap().bytecode.into(),
-            storage: account.storage.into_iter().map(|(k, v)| (k, v)).collect(),
+            code: account.info.code.unwrap().bytecode,
+            storage: account.storage.into_iter().collect(),
         }
     }
 }
@@ -278,7 +279,7 @@ pub fn mpt_proof(root: &MptNode, key: impl AsRef<[u8]>) -> Result<Vec<Vec<u8>>,
 
 fn proof_internal(node: &MptNode, key_nibs: &[u8]) -> Result<Vec<Vec<u8>>, anyhow::Error> {
     if key_nibs.is_empty() {
-        return Ok(vec![node.to_rlp()]);
+        return Ok(vec![alloy_rlp::encode(node)]);
     }
 
     let mut path: Vec<Vec<u8>> = match node.as_data() {
@@ -299,7 +300,7 @@ fn proof_internal(node: &MptNode, key_nibs: &[u8]) -> Result<Vec<Vec<u8>>, anyho
         }
         MptNodeData::Digest(_) => bail!("Cannot descend pointer!"),
     };
-    path.push(node.to_rlp());
+    path.push(alloy_rlp::encode(node));
 
     Ok(path)
 }
@@ -349,7 +350,7 @@ pub fn create_input(
     };
 
     // create and run the block builder once to create the initial DB
-    let mut builder = BlockBuilder::new(&chain_spec, input, None)
+    let mut builder = BlockBuilder::new(chain_spec, input, None)
         .with_db(provider_db)
         .prepare_header::<<EthereumStrategy as BlockBuilderStrategy>::HeaderPrepStrategy>()
         .unwrap()