split cfxcore types into standard alone crate

Author: Pana

Cargo.lock

@@ -109,6 +109,7 @@ members = [
     "crates/tasks",
     "crates/eest_types",
     "crates/config",
+    "crates/cfxcore/types",
 ]
 
 resolver = "2"
@@ -181,6 +182,7 @@ secret-store = { path = "./crates/secret_store" }
 cfxstore = { path = "./crates/cfx_store" }
 network = { path = "./crates/network" }
 cfxcore = { path = "./crates/cfxcore/core" }
+cfxcore-types = { path = "./crates/cfxcore/types" }
 cfx-parameters = { path = "./crates/parameters" }
 cfx-execute-helper = { path = "./crates/execution/execute-helper" }
 cfx-executor = { path = "./crates/execution/executor" }
@@ -453,4 +455,4 @@ influx_db_client = "0.5.1"
 rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "7dbd66f507db1d0cfdf5334ad56ca0b24a768740" }
 
 [patch.crates-io]
-sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }
+sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }

Cargo.toml

@@ -117,6 +117,7 @@ cfx-rpc-eth-types = { workspace = true }
 jsonrpsee = { workspace = true, features = ["jsonrpsee-types"] }
 cfx-rpc-utils = { workspace = true }
 cfx-util-macros = { workspace = true }
+cfxcore-types = { workspace = true }
 
 [dev-dependencies]
 cfx-storage = { workspace = true, features = ["testonly_code"] }

crates/cfxcore/core/Cargo.toml

@@ -3,6 +3,7 @@ use cfx_internal_common::{
     impl_db_encoding_as_rlp, DatabaseDecodable, DatabaseEncodable,
 };
 use cfx_types::{Address, Bloom, H256, U256};
+pub use cfxcore_types::block_data_manager::BlockStatus;
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use primitives::BlockReceipts;
@@ -276,31 +277,6 @@ impl Decodable for LocalBlockInfo {
     }
 }
 
-/// The validity status of a block. If a block's status among all honest nodes
-/// is guaranteed to have no conflict, which means if some honest nodes think a
-/// block is not `Pending`, their decision will be the same status.
-#[derive(Copy, Clone, PartialEq, DeriveMallocSizeOf)]
-pub enum BlockStatus {
-    Valid = 0,
-    Invalid = 1,
-    PartialInvalid = 2,
-    Pending = 3,
-}
-
-impl BlockStatus {
-    fn from_db_status(db_status: u8) -> Self {
-        match db_status {
-            0 => BlockStatus::Valid,
-            1 => BlockStatus::Invalid,
-            2 => BlockStatus::PartialInvalid,
-            3 => BlockStatus::Pending,
-            _ => panic!("Read unknown block status from db"),
-        }
-    }
-
-    pub fn to_db_status(&self) -> u8 { *self as u8 }
-}
-
 /// The checkpoint information stored in the database
 #[derive(RlpEncodable, RlpDecodable, Clone)]
 pub struct CheckpointHashes {

crates/cfxcore/core/src/block_data_manager/block_data_types.rs

@@ -2,18 +2,17 @@
 // Conflux is free software and distributed under GNU General Public License.
 // See http://www.gnu.org/licenses/
 
-mod consensus_graph_exposer;
 mod network_exposer;
 mod sync_graph_exposer;
 
 pub use self::{
-    consensus_graph_exposer::{
-        ConsensusGraphBlockExecutionState, ConsensusGraphBlockState,
-        ConsensusGraphStates,
-    },
     network_exposer::NetworkExposer,
     sync_graph_exposer::{SyncGraphBlockState, SyncGraphStates},
 };
+pub use cfxcore_types::state_exposer::consensus_graph_exposer::{
+    ConsensusGraphBlockExecutionState, ConsensusGraphBlockState,
+    ConsensusGraphStates,
+};
 
 use parking_lot::Mutex;
 use std::sync::Arc;

crates/cfxcore/core/src/state_exposer/mod.rs

@@ -0,0 +1,18 @@
+[package]
+name = "cfxcore-types"
+version.workspace = true
+authors.workspace = true
+description.workspace = true
+documentation.workspace = true
+homepage.workspace = true
+keywords.workspace = true
+repository.workspace = true
+license-file.workspace = true
+edition.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cfx-types = { workspace = true }
+malloc_size_of = { workspace = true }
+malloc_size_of_derive = { workspace = true }

crates/cfxcore/types/Cargo.toml

@@ -0,0 +1,26 @@
+use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
+
+/// The validity status of a block. If a block's status among all honest nodes
+/// is guaranteed to have no conflict, which means if some honest nodes think a
+/// block is not `Pending`, their decision will be the same status.
+#[derive(Copy, Clone, PartialEq, DeriveMallocSizeOf)]
+pub enum BlockStatus {
+    Valid = 0,
+    Invalid = 1,
+    PartialInvalid = 2,
+    Pending = 3,
+}
+
+impl BlockStatus {
+    pub fn from_db_status(db_status: u8) -> Self {
+        match db_status {
+            0 => BlockStatus::Valid,
+            1 => BlockStatus::Invalid,
+            2 => BlockStatus::PartialInvalid,
+            3 => BlockStatus::Pending,
+            _ => panic!("Read unknown block status from db"),
+        }
+    }
+
+    pub fn to_db_status(&self) -> u8 { *self as u8 }
+}

crates/cfxcore/types/src/block_data_manager/mod.rs

@@ -0,0 +1,2 @@
+pub mod block_data_manager;
+pub mod state_exposer;

crates/cfxcore/types/src/lib.rs

@@ -2,7 +2,7 @@
 // Conflux is free software and distributed under GNU General Public License.
 // See http://www.gnu.org/licenses/
 
-use crate::block_data_manager::block_data_types::BlockStatus;
+use crate::block_data_manager::BlockStatus;
 use cfx_types::H256;
 use std::mem;
 

crates/cfxcore/core/src/state_exposer/consensus_graph_exposer.rs renamed to crates/cfxcore/types/src/state_exposer/consensus_graph_exposer.rs

@@ -0,0 +1,6 @@
+pub mod consensus_graph_exposer;
+
+pub use consensus_graph_exposer::{
+    ConsensusGraphBlockExecutionState, ConsensusGraphBlockState,
+    ConsensusGraphStates,
+};