chore(executor): De-duplicate TrieAccount type (#977)

op-rs · Jan 29, 2025 · 71a02cc · 71a02cc
1 parent c8b6b95
commit 71a02cc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
@@ -23,6 +23,7 @@ alloy-consensus = { workspace = true, features = ["k256"] }
 alloy-primitives = { workspace = true, features = ["rlp"] }
 alloy-eips.workspace = true
 alloy-rlp.workspace = true
+alloy-trie.workspace = true
 
 # Op Alloy
 op-alloy-consensus.workspace = true

diff --git a/crates/executor/src/db/account.rs b/crates/executor/src/db/account.rs
diff --git a/crates/executor/src/db/mod.rs b/crates/executor/src/db/mod.rs
@@ -6,16 +6,14 @@ use alloc::{string::ToString, vec::Vec};
 use alloy_consensus::{Header, Sealed, EMPTY_ROOT_HASH};
 use alloy_primitives::{keccak256, Address, B256, U256};
 use alloy_rlp::{Decodable, Encodable};
+use alloy_trie::TrieAccount;
 use kona_mpt::{Nibbles, TrieHinter, TrieNode, TrieNodeError};
 use revm::{
     db::{states::StorageSlot, BundleState},
     primitives::{AccountInfo, Bytecode, HashMap, BLOCK_HASH_HISTORY},
     Database,
 };
 
-mod account;
-pub use account::TrieAccount;
-
 mod traits;
 pub use traits::{NoopTrieDBProvider, TrieDBProvider};
 

diff --git a/crates/executor/src/lib.rs b/crates/executor/src/lib.rs
@@ -22,7 +22,7 @@ pub use executor::{
 };
 
 mod db;
-pub use db::{NoopTrieDBProvider, TrieAccount, TrieDB, TrieDBProvider};
+pub use db::{NoopTrieDBProvider, TrieDB, TrieDBProvider};
 
 mod constants;
 mod syscalls;