From 7625ffc3941ffd480d1e4366c167b82ce056f87f Mon Sep 17 00:00:00 2001 From: AvivYossef-starkware Date: Wed, 22 May 2024 17:55:05 +0300 Subject: [PATCH] refactor: serde trait file name --- .../src/patricia_merkle_tree/filled_tree/node_serde.rs | 2 +- crates/committer/src/patricia_merkle_tree/filled_tree/tree.rs | 2 +- crates/committer/src/patricia_merkle_tree/node_data/leaf.rs | 2 +- .../committer/src/patricia_merkle_tree/node_data/leaf_serde.rs | 2 +- .../patricia_merkle_tree/original_skeleton_tree/create_tree.rs | 2 +- crates/committer/src/storage.rs | 2 +- crates/committer/src/storage/{serde_trait.rs => db_object.rs} | 0 crates/committer_cli/src/tests/python_tests.rs | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename crates/committer/src/storage/{serde_trait.rs => db_object.rs} (100%) diff --git a/crates/committer/src/patricia_merkle_tree/filled_tree/node_serde.rs b/crates/committer/src/patricia_merkle_tree/filled_tree/node_serde.rs index 034310d2..cdf5c414 100644 --- a/crates/committer/src/patricia_merkle_tree/filled_tree/node_serde.rs +++ b/crates/committer/src/patricia_merkle_tree/filled_tree/node_serde.rs @@ -5,8 +5,8 @@ use crate::patricia_merkle_tree::node_data::inner_node::{ BinaryData, EdgeData, EdgePath, EdgePathLength, NodeData, PathToBottom, }; use crate::patricia_merkle_tree::node_data::leaf::{LeafData, LeafDataImpl}; +use crate::storage::db_object::{DBObject, Deserializable}; use crate::storage::errors::{DeserializationError, SerializationError}; -use crate::storage::serde_trait::{DBObject, Deserializable}; use crate::storage::storage_trait::{StorageKey, StoragePrefix, StorageValue}; use serde::{Deserialize, Serialize}; diff --git a/crates/committer/src/patricia_merkle_tree/filled_tree/tree.rs b/crates/committer/src/patricia_merkle_tree/filled_tree/tree.rs index d0df347e..c1e6dab3 100644 --- a/crates/committer/src/patricia_merkle_tree/filled_tree/tree.rs +++ b/crates/committer/src/patricia_merkle_tree/filled_tree/tree.rs @@ -17,7 +17,7 @@ use crate::patricia_merkle_tree::types::NodeIndex; use crate::patricia_merkle_tree::updated_skeleton_tree::hash_function::TreeHashFunction; use crate::patricia_merkle_tree::updated_skeleton_tree::node::UpdatedSkeletonNode; use crate::patricia_merkle_tree::updated_skeleton_tree::tree::UpdatedSkeletonTree; -use crate::storage::serde_trait::DBObject; +use crate::storage::db_object::DBObject; use crate::storage::storage_trait::StorageKey; use crate::storage::storage_trait::StorageValue; diff --git a/crates/committer/src/patricia_merkle_tree/node_data/leaf.rs b/crates/committer/src/patricia_merkle_tree/node_data/leaf.rs index c93205dd..d95809eb 100644 --- a/crates/committer/src/patricia_merkle_tree/node_data/leaf.rs +++ b/crates/committer/src/patricia_merkle_tree/node_data/leaf.rs @@ -4,7 +4,7 @@ use crate::felt::Felt; use crate::hash::hash_trait::HashOutput; use crate::patricia_merkle_tree::filled_tree::node::{ClassHash, Nonce}; use crate::patricia_merkle_tree::types::NodeIndex; -use crate::storage::serde_trait::DBObject; +use crate::storage::db_object::DBObject; pub trait LeafData: Clone + Sync + Send + DBObject { /// Returns true if leaf is empty. diff --git a/crates/committer/src/patricia_merkle_tree/node_data/leaf_serde.rs b/crates/committer/src/patricia_merkle_tree/node_data/leaf_serde.rs index 3b7f28dd..6b8f5fec 100644 --- a/crates/committer/src/patricia_merkle_tree/node_data/leaf_serde.rs +++ b/crates/committer/src/patricia_merkle_tree/node_data/leaf_serde.rs @@ -1,5 +1,5 @@ use crate::patricia_merkle_tree::node_data::leaf::{ContractState, LeafDataImpl}; -use crate::storage::serde_trait::DBObject; +use crate::storage::db_object::DBObject; use crate::storage::storage_trait::{StoragePrefix, StorageValue}; impl DBObject for LeafDataImpl { diff --git a/crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs b/crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs index 1d876be5..39ed6a6f 100644 --- a/crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs +++ b/crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs @@ -13,8 +13,8 @@ use crate::patricia_merkle_tree::types::TreeHeight; use crate::patricia_merkle_tree::{ original_skeleton_tree::node::OriginalSkeletonNode, types::NodeIndex, }; +use crate::storage::db_object::Deserializable; use crate::storage::errors::StorageError; -use crate::storage::serde_trait::Deserializable; use crate::storage::storage_trait::create_db_key; use crate::storage::storage_trait::Storage; use crate::storage::storage_trait::StorageKey; diff --git a/crates/committer/src/storage.rs b/crates/committer/src/storage.rs index cd31f0ea..2a7f1a9e 100644 --- a/crates/committer/src/storage.rs +++ b/crates/committer/src/storage.rs @@ -1,4 +1,4 @@ +pub mod db_object; pub mod errors; pub mod map_storage; -pub mod serde_trait; pub mod storage_trait; diff --git a/crates/committer/src/storage/serde_trait.rs b/crates/committer/src/storage/db_object.rs similarity index 100% rename from crates/committer/src/storage/serde_trait.rs rename to crates/committer/src/storage/db_object.rs diff --git a/crates/committer_cli/src/tests/python_tests.rs b/crates/committer_cli/src/tests/python_tests.rs index 985f009b..9bec76a2 100644 --- a/crates/committer_cli/src/tests/python_tests.rs +++ b/crates/committer_cli/src/tests/python_tests.rs @@ -14,9 +14,9 @@ use committer::patricia_merkle_tree::node_data::leaf::{ContractState, LeafDataIm use committer::patricia_merkle_tree::updated_skeleton_tree::hash_function::{ CONTRACT_CLASS_LEAF_V0, CONTRACT_STATE_HASH_VERSION, }; +use committer::storage::db_object::DBObject; use committer::storage::errors::{DeserializationError, SerializationError}; use committer::storage::map_storage::MapStorage; -use committer::storage::serde_trait::DBObject; use committer::storage::storage_trait::{Storage, StorageKey, StorageValue}; use std::fmt::Debug; use std::{collections::HashMap, io};