rebase

crates/mpt/src/test_util.rs

@@ -1,6 +1,6 @@
 //! Testing utilities for `kona-mpt`
 
-use crate::{ordered_trie_with_encoder, TrieDBFetcher};
+use crate::{ordered_trie_with_encoder, TrieProvider};
 use alloc::{collections::BTreeMap, vec::Vec};
 use alloy_consensus::{Receipt, ReceiptEnvelope, ReceiptWithBloom, TxEnvelope, TxType};
 use alloy_primitives::{keccak256, Bytes, Log, B256};

crates/preimage/src/test_utils.rs

@@ -1,7 +1,5 @@
 //! Test utilities for the `kona-preimage` crate.
 
-extern crate std;
-
 use os_pipe::{PipeReader, PipeWriter};
 use std::io::Result;