fix: refactor 1

node_core/src/executions/de.rs

@@ -1,14 +1,14 @@
 use bincode;
+use common::{
+    commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree,
+    nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
+};
 use k256::Scalar;
 use monotree::hasher::Blake3;
 use monotree::{Hasher, Monotree};
 use rand::thread_rng;
 use secp256k1_zkp::{CommitmentSecrets, Generator, PedersenCommitment, Tag, Tweak, SECP256K1};
 use sha2::{Digest, Sha256};
-use storage::{
-    commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree,
-    nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
-};
 use utxo::utxo_core::UTXO;
 
 #[allow(unused)]

node_core/src/executions/private_exec.rs

@@ -1,12 +1,12 @@
 use bincode;
+use common::{
+    commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree,
+    nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
+};
 use k256::Scalar;
 use monotree::hasher::Blake3;
 use monotree::{Hasher, Monotree};
 use sha2::{Digest, Sha256};
-use storage::{
-    commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree,
-    nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
-};
 use utxo::utxo_core::UTXO;
 
 fn hash(input: &[u8]) -> Vec<u8> {

node_core/src/executions/se.rs

@@ -1,14 +1,14 @@
 use bincode;
+use common::{
+    commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree,
+    nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
+};
 use k256::Scalar;
 use monotree::hasher::Blake3;
 use monotree::{Hasher, Monotree};
 use rand::thread_rng;
 use secp256k1_zkp::{CommitmentSecrets, Generator, PedersenCommitment, Tag, Tweak, SECP256K1};
 use sha2::{Digest, Sha256};
-use storage::{
-    commitment::Commitment, commitments_sparse_merkle_tree::CommitmentsSparseMerkleTree,
-    nullifier::UTXONullifier, nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
-};
 use utxo::utxo_core::UTXO;
 
 #[allow(unused)]

node_core/src/lib.rs

@@ -5,9 +5,9 @@ use std::sync::{
 
 use common::ExecutionFailureKind;
 
-use ::storage::transaction::{Transaction, TransactionPayload, TxKind};
 use accounts::account_core::{Account, AccountAddress};
 use anyhow::Result;
+use common::transaction::{Transaction, TransactionPayload, TxKind};
 use config::NodeConfig;
 use executions::private_exec::{generate_commitments, generate_nullifiers};
 use log::info;

node_core/src/sequencer_client/json.rs

@@ -1,5 +1,5 @@
+use common::transaction::Transaction;
 use serde::{Deserialize, Serialize};
-use storage::transaction::Transaction;
 
 //Requests
 

node_core/src/sequencer_client/mod.rs

@@ -1,15 +1,15 @@
 use accounts::account_core::Account;
 use anyhow::Result;
+use common::rpc_primitives::requests::{
+    GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse,
+    RegisterAccountRequest, RegisterAccountResponse,
+};
+use common::transaction::Transaction;
 use common::{SequencerClientError, SequencerRpcError};
 use json::{SendTxRequest, SendTxResponse, SequencerRpcRequest, SequencerRpcResponse};
 use k256::elliptic_curve::group::GroupEncoding;
 use reqwest::Client;
-use rpc_primitives::requests::{
-    GetBlockDataRequest, GetBlockDataResponse, GetGenesisIdRequest, GetGenesisIdResponse,
-    RegisterAccountRequest, RegisterAccountResponse,
-};
 use serde_json::Value;
-use storage::transaction::Transaction;
 
 use crate::config::NodeConfig;
 

node_core/src/storage/block_store.rs

@@ -1,8 +1,9 @@
 use std::path::Path;
 
 use anyhow::{anyhow, Result};
+use common::block::Block;
 use storage::sc_db_utils::DataBlob;
-use storage::{block::Block, RocksDBIO};
+use storage::RocksDBIO;
 
 pub struct NodeBlockStore {
     dbio: RocksDBIO,
@@ -51,7 +52,7 @@ impl NodeBlockStore {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use storage::block::{Block, Data};
+    use common::block::Data;
     use tempfile::tempdir;
 
     fn create_genesis_block() -> Block {

node_core/src/storage/mod.rs

@@ -6,15 +6,15 @@ use std::{
 use accounts::account_core::{Account, AccountAddress};
 use anyhow::Result;
 use block_store::NodeBlockStore;
-use k256::AffinePoint;
-use public_context::PublicSCContext;
-use storage::{
+use common::{
     block::Block,
     merkle_tree_public::merkle_tree::{PublicTransactionMerkleTree, UTXOCommitmentsMerkleTree},
     nullifier::UTXONullifier,
     nullifier_sparse_merkle_tree::NullifierSparseMerkleTree,
     utxo_commitment::UTXOCommitment,
 };
+use k256::AffinePoint;
+use public_context::PublicSCContext;
 use utxo::utxo_core::UTXO;
 
 use crate::ActionData;

node_core/src/storage/public_context.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
 
 use accounts::account_core::{AccountAddress, AccountPublicMask};
+use common::merkle_tree_public::TreeHashType;
 use serde::{ser::SerializeStruct, Serialize};
-use storage::merkle_tree_public::TreeHashType;
 
 ///Strucutre, representing context, given to a smart contract on a call
 pub struct PublicSCContext {