Consolidate to iterative overlay root

Author: BrianBland

src/account.rs

@@ -26,7 +26,7 @@ impl Account {
 /// case. An account is encoded as a list of 4 elements, with 3 of these represnting 32 byte values
 /// and the nonce being an 8 byte value. Each element has 1 extra byte of encoding overhead.
 /// The list also has 2 bytes of encoding overhead. The total length is `2 + 3*33 + 9 = 110`.
-const MAX_RLP_ENCODED_LEN: usize = 2 + 3*33 + 9;
+const MAX_RLP_ENCODED_LEN: usize = 2 + 3 * 33 + 9;
 
 unsafe impl MaxEncodedLen<MAX_RLP_ENCODED_LEN> for Account {}
 

src/node.rs

@@ -3,7 +3,7 @@ use crate::{
     pointer::Pointer,
     storage::value::{self, Value},
 };
-use alloy_primitives::{hex, StorageValue, B256, U256};
+use alloy_primitives::{StorageValue, B256, U256};
 use alloy_rlp::{
     decode_exact, encode_fixed_size, length_of_length, BufMut, Encodable, Header, MaxEncodedLen,
     EMPTY_STRING_CODE,
@@ -17,11 +17,6 @@ use proptest::{arbitrary, strategy, strategy::Strategy};
 use proptest_derive::Arbitrary;
 use std::cmp::{max, min};
 
-// This is equivalent to RlpNode::word_rlp(&EMPTY_ROOT_HASH), and is used to encode the storage root
-// of an account with no storage.
-const EMPTY_ROOT_RLP: [u8; 33] =
-    hex!("0xa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
-
 const MAX_PREFIX_LENGTH: usize = 64;
 
 /// A node in the trie.

src/overlay.rs

@@ -148,7 +148,7 @@ impl OverlayState {
 
     #[inline]
     pub fn first(&self) -> Option<(&[u8], &Option<OverlayValue>)> {
-        if self.len() == 0 {
+        if self.is_empty() {
             None
         } else {
             let (path, value) = &self.data[self.start_idx];

src/storage.rs

@@ -1,7 +1,6 @@
 pub mod debug;
 pub mod engine;
 pub mod overlay_root;
-pub mod overlay_root_iterative;
 pub mod proofs;
 mod test_utils;
 pub mod value;