From e230e2095ba99a1af393f4934160056837bf53ee Mon Sep 17 00:00:00 2001
From: Steph Sinyakov <steph.sinyakov@gmail.com>
Date: Mon, 28 Oct 2024 02:09:11 +0100
Subject: [PATCH] fix: add feature for `alloy-provider`, fix `test_util` (#738)

---
 crates/mpt/Cargo.toml       |  2 +-
 crates/mpt/src/test_util.rs | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/crates/mpt/Cargo.toml b/crates/mpt/Cargo.toml
index db50154c1..fc82d8dc9 100644
--- a/crates/mpt/Cargo.toml
+++ b/crates/mpt/Cargo.toml
@@ -23,7 +23,7 @@ alloy-primitives = { workspace = true, features = ["rlp"] }
 
 [dev-dependencies]
 # Alloy
-alloy-provider.workspace = true
+alloy-provider = { workspace = true, features = ["reqwest"] }
 alloy-consensus.workspace = true
 alloy-transport-http.workspace = true
 alloy-rpc-types = { workspace = true, features = ["eth"] }
diff --git a/crates/mpt/src/test_util.rs b/crates/mpt/src/test_util.rs
index ed8d5a12b..1564653be 100644
--- a/crates/mpt/src/test_util.rs
+++ b/crates/mpt/src/test_util.rs
@@ -21,13 +21,13 @@ pub(crate) async fn get_live_derivable_receipts_list(
     let block = provider
         .get_block(block_number.into(), BlockTransactionsKind::Full)
         .await
-        .map_err(|e| anyhow!(e))?
-        .ok_or(anyhow!("Missing block"))?;
+        .map_err(anyhow::Error::from)?
+        .ok_or_else(|| anyhow!("Missing block"))?;
     let receipts = provider
         .get_block_receipts(block_number.into())
         .await
-        .map_err(|e| anyhow!(e))?
-        .ok_or(anyhow!("Missing receipts"))?;
+        .map_err(anyhow::Error::from)?
+        .ok_or_else(|| anyhow!("Missing receipts"))?;
 
     let consensus_receipts = receipts
         .into_iter()
@@ -59,7 +59,9 @@ pub(crate) async fn get_live_derivable_receipts_list(
 
     // Compute the derivable list
     let mut list =
-        ordered_trie_with_encoder(consensus_receipts.as_ref(), |rlp, buf| rlp.encode_2718(buf));
+        ordered_trie_with_encoder(consensus_receipts.as_ref(), |rlp: &ReceiptEnvelope, buf| {
+            rlp.encode_2718(buf)
+        });
     let root = list.root();
 
     // Sanity check receipts root is correct
@@ -87,20 +89,21 @@ pub(crate) async fn get_live_derivable_transactions_list(
     let block = provider
         .get_block(block_number.into(), BlockTransactionsKind::Full)
         .await
-        .map_err(|e| anyhow!(e))?
-        .ok_or(anyhow!("Missing block"))?;
+        .map_err(anyhow::Error::from)?
+        .ok_or_else(|| anyhow!("Missing block"))?;
 
     let BlockTransactions::Full(txs) = block.transactions else {
         anyhow::bail!("Did not fetch full block");
     };
     let consensus_txs = txs
         .into_iter()
-        .map(|tx| TxEnvelope::try_from(tx).map_err(|e| anyhow!(e)))
+        .map(|tx| TxEnvelope::try_from(tx).map_err(anyhow::Error::from))
         .collect::<Result<Vec<_>>>()?;
 
     // Compute the derivable list
-    let mut list =
-        ordered_trie_with_encoder(consensus_txs.as_ref(), |rlp, buf| rlp.encode_2718(buf));
+    let mut list = ordered_trie_with_encoder(consensus_txs.as_ref(), |rlp: &TxEnvelope, buf| {
+        rlp.encode_2718(buf)
+    });
     let root = list.root();
 
     // Sanity check transaction root is correct