starknet_committer,starknet_patricia: move db_layout

Author: ArielElp

crates/starknet_committer/src/db.rs

@@ -1,4 +1,3 @@
-mod db_layout;
 #[cfg(any(feature = "testing", test))]
 pub mod external_test_utils;
 pub mod facts_db;

crates/starknet_committer/src/db/facts_db/db.rs

@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use async_trait::async_trait;
 use starknet_api::core::ContractAddress;
 use starknet_api::hash::HashOutput;
+use starknet_patricia::db_layout::{NodeLayout, TrieType};
 use starknet_patricia::patricia_merkle_tree::filled_tree::node::{FactDbFilledNode, FilledNode};
 use starknet_patricia::patricia_merkle_tree::filled_tree::node_serde::FactNodeDeserializationContext;
 use starknet_patricia::patricia_merkle_tree::filled_tree::tree::FilledTree;
@@ -21,10 +22,8 @@ use starknet_patricia_storage::storage_trait::{
 };
 
 use crate::block_committer::input::{FactsDbInitialRead, ReaderConfig, StarknetStorageValue};
-use crate::db::db_layout::NodeLayout;
 use crate::db::facts_db::types::FactsSubTree;
 use crate::db::forest_trait::{ForestMetadata, ForestMetadataType, ForestReader, ForestWriter};
-use crate::db::index_db::leaves::TrieType;
 use crate::db::trie_traversal::{create_classes_trie, create_contracts_trie, create_storage_tries};
 use crate::forest::filled_forest::FilledForest;
 use crate::forest::forest_errors::ForestResult;

crates/starknet_committer/src/db/index_db/db.rs

@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use async_trait::async_trait;
 use starknet_api::core::ContractAddress;
 use starknet_api::hash::HashOutput;
+use starknet_patricia::db_layout::{NodeLayout, TrieType};
 use starknet_patricia::patricia_merkle_tree::filled_tree::node::FilledNode;
 use starknet_patricia::patricia_merkle_tree::filled_tree::tree::FilledTree;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::{Leaf, LeafModifications};
@@ -13,13 +14,11 @@ use starknet_patricia_storage::errors::SerializationResult;
 use starknet_patricia_storage::storage_trait::{DbHashMap, DbKey, Storage};
 
 use crate::block_committer::input::{FactsDbInitialRead, ReaderConfig, StarknetStorageValue};
-use crate::db::db_layout::NodeLayout;
 use crate::db::forest_trait::{ForestMetadata, ForestMetadataType, ForestReader, ForestWriter};
 use crate::db::index_db::leaves::{
     IndexLayoutCompiledClassHash,
     IndexLayoutContractState,
     IndexLayoutStarknetStorageValue,
-    TrieType,
 };
 use crate::db::index_db::types::{IndexFilledNode, IndexLayoutSubTree, IndexNodeContext};
 use crate::db::trie_traversal::{create_classes_trie, create_contracts_trie, create_storage_tries};

crates/starknet_committer/src/db/index_db/leaves.rs

@@ -1,5 +1,6 @@
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, Nonce};
 use starknet_api::hash::HashOutput;
+use starknet_patricia::db_layout::TrieType;
 use starknet_patricia::patricia_merkle_tree::node_data::errors::LeafResult;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::Leaf;
 use starknet_patricia_storage::db_object::{
@@ -14,7 +15,6 @@ use starknet_types_core::felt::Felt;
 use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use crate::patricia_merkle_tree::types::CompiledClassHash;
-
 // Wrap the leaves types so that we can implement the [DBObject] trait differently in index
 // layout.
 #[derive(
@@ -28,27 +28,6 @@ pub struct IndexLayoutCompiledClassHash(pub CompiledClassHash);
 #[derive(Clone, Debug, Default, Eq, PartialEq, derive_more::From)]
 pub struct IndexLayoutStarknetStorageValue(pub StarknetStorageValue);
 
-// TODO(Ariel): Delete this enum and use `CommitmentType` instead.
-#[derive(Debug, PartialEq)]
-pub enum TrieType {
-    ContractsTrie,
-    ClassesTrie,
-    StorageTrie(ContractAddress),
-}
-
-impl TrieType {
-    fn db_prefix(&self) -> DbKeyPrefix {
-        match self {
-            TrieType::ContractsTrie => DbKeyPrefix::new(b"CONTRACTS_TREE_PREFIX".into()),
-            TrieType::ClassesTrie => DbKeyPrefix::new(b"CLASSES_TREE_PREFIX".into()),
-            TrieType::StorageTrie(contract_address) => {
-                let prefix = contract_address.to_bytes_be().to_vec();
-                DbKeyPrefix::new(prefix.into())
-            }
-        }
-    }
-}
-
 macro_rules! impl_has_static_prefix_for_index_layouts {
     ($($ty:ty),* $(,)?) => {
         $(

crates/starknet_committer/src/db/trie_traversal.rs

@@ -4,6 +4,7 @@ use std::fmt::Debug;
 
 use starknet_api::core::ContractAddress;
 use starknet_api::hash::HashOutput;
+use starknet_patricia::db_layout::{NodeLayout, TrieType};
 use starknet_patricia::patricia_merkle_tree::filled_tree::node::FilledNode;
 use starknet_patricia::patricia_merkle_tree::node_data::inner_node::{
     BinaryData,
@@ -33,8 +34,6 @@ use crate::block_committer::input::{
     Config,
     StarknetStorageValue,
 };
-use crate::db::db_layout::NodeLayout;
-use crate::db::index_db::leaves::TrieType;
 use crate::forest::forest_errors::{ForestError, ForestResult};
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use crate::patricia_merkle_tree::tree::{

…s/starknet_committer/src/db/db_layout.rs crates/starknet_patricia/src/db_layout.rscrates/starknet_committer/src/db/db_layout.rs renamed to crates/starknet_patricia/src/db_layout.rs crates/starknet_committer/src/db/db_layout.rs renamed to crates/starknet_patricia/src/db_layout.rs

@@ -1,11 +1,33 @@
+use starknet_api::core::ContractAddress;
 use starknet_api::hash::HashOutput;
-use starknet_patricia::patricia_merkle_tree::filled_tree::node::FilledNode;
-use starknet_patricia::patricia_merkle_tree::node_data::leaf::Leaf;
-use starknet_patricia::patricia_merkle_tree::traversal::SubTreeTrait;
-use starknet_patricia::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndices};
 use starknet_patricia_storage::db_object::{DBObject, HasStaticPrefix};
+use starknet_patricia_storage::storage_trait::DbKeyPrefix;
+
+use crate::patricia_merkle_tree::filled_tree::node::FilledNode;
+use crate::patricia_merkle_tree::node_data::leaf::Leaf;
+use crate::patricia_merkle_tree::traversal::SubTreeTrait;
+use crate::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndices};
+
+// TODO(Ariel): Delete this enum and use `CommitmentType` instead.
+#[derive(Debug, PartialEq)]
+pub enum TrieType {
+    ContractsTrie,
+    ClassesTrie,
+    StorageTrie(ContractAddress),
+}
 
-use crate::db::index_db::leaves::TrieType;
+impl TrieType {
+    pub fn db_prefix(&self) -> DbKeyPrefix {
+        match self {
+            TrieType::ContractsTrie => DbKeyPrefix::new(b"CONTRACTS_TREE_PREFIX".into()),
+            TrieType::ClassesTrie => DbKeyPrefix::new(b"CLASSES_TREE_PREFIX".into()),
+            TrieType::StorageTrie(contract_address) => {
+                let prefix = contract_address.to_bytes_be().to_vec();
+                DbKeyPrefix::new(prefix.into())
+            }
+        }
+    }
+}
 
 /// Specifies the trie db layout.
 pub trait NodeLayout<'a, L: Leaf> {

crates/starknet_patricia/src/lib.rs

@@ -1,2 +1,3 @@
+pub mod db_layout;
 pub mod felt;
 pub mod patricia_merkle_tree;