move cfxcore types to independent crate

Author: Pana

Cargo.lock

@@ -14,6 +14,7 @@ use cfx_storage::{
     StorageManagerTrait,
 };
 use cfx_types::{Bloom, Space, H256};
+pub use cfxcore_types::block_data_manager::block_data_types;
 use db::SystemDB;
 use malloc_size_of::{new_malloc_size_ops, MallocSizeOf, MallocSizeOfOps};
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
@@ -30,7 +31,6 @@ use std::{
     sync::Arc,
 };
 use threadpool::ThreadPool;
-pub mod block_data_types;
 pub mod db_gc_manager;
 pub mod db_manager;
 pub mod tx_data_manager;

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

@@ -18,24 +18,23 @@ pub mod message;
 pub mod block_data_manager;
 pub mod cache_config;
 pub mod cache_manager;
-pub mod channel;
 pub mod client;
 pub mod consensus;
-mod core_error;
 pub mod db;
 pub mod errors;
 pub mod genesis_block;
 pub mod light_protocol;
-pub mod node_type;
 pub mod pos;
 pub mod pow;
-pub mod state_exposer;
 pub mod statistics;
 pub mod sync;
 pub mod transaction_pool;
-pub mod unique_id;
 pub mod verification;
 
+pub use cfxcore_types::{
+    channel, core_error, node_type, state_exposer, unique_id,
+};
+
 pub use crate::{
     block_data_manager::BlockDataManager,
     channel::Notifications,

crates/cfxcore/core/src/lib.rs

@@ -15,4 +15,21 @@ edition.workspace = true
 [dependencies]
 cfx-types = { workspace = true }
 malloc_size_of = { workspace = true }
-malloc_size_of_derive = { workspace = true }
+malloc_size_of_derive = { workspace = true }
+rlp = { workspace = true }
+rlp_derive = { workspace = true }
+cfx-internal-common = { workspace = true }
+parking_lot = { workspace = true }
+lazy_static = { workspace = true }
+primitives = { workspace = true }
+cfx-execute-helper = { workspace = true }
+smart-default = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+futures = { workspace = true, features = ["compat"] }
+log = { workspace = true }
+cfx-bytes = { workspace = true }
+thiserror = { workspace = true }
+unexpected = { workspace = true }
+
+[dev-dependencies]
+rand = { workspace = true }

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

@@ -3,7 +3,6 @@ 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;
@@ -53,25 +52,6 @@ impl Decodable for BlockExecutionResult {
     }
 }
 
-#[derive(
-    RlpEncodable, RlpDecodable, Clone, Copy, Debug, DeriveMallocSizeOf,
-)]
-pub struct BlockRewardResult {
-    pub total_reward: U256,
-    pub base_reward: U256,
-    pub tx_fee: U256,
-}
-
-impl Default for BlockRewardResult {
-    fn default() -> Self {
-        BlockRewardResult {
-            total_reward: U256::from(0),
-            base_reward: U256::from(0),
-            tx_fee: U256::from(0),
-        }
-    }
-}
-
 pub type BlockRewardsInfo = BlockDataWithMultiVersion<H256, BlockRewardResult>;
 
 #[derive(Clone, Debug, DeriveMallocSizeOf)]
@@ -339,6 +319,50 @@ impl PosRewardInfo {
     }
 }
 
+/// 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 }
+}
+
+#[derive(
+    RlpEncodable, RlpDecodable, Clone, Copy, Debug, DeriveMallocSizeOf,
+)]
+pub struct BlockRewardResult {
+    pub total_reward: U256,
+    pub base_reward: U256,
+    pub tx_fee: U256,
+}
+
+impl Default for BlockRewardResult {
+    fn default() -> Self {
+        BlockRewardResult {
+            total_reward: U256::from(0),
+            base_reward: U256::from(0),
+            tx_fee: U256::from(0),
+        }
+    }
+}
+
 pub fn db_encode_list<T>(list: &[T]) -> Vec<u8>
 where T: DatabaseEncodable {
     let mut rlp_stream = RlpStream::new();
@@ -363,6 +387,6 @@ impl_db_encoding_as_rlp!(BlockExecutionResult);
 impl_db_encoding_as_rlp!(LocalBlockInfo);
 impl_db_encoding_as_rlp!(CheckpointHashes);
 impl_db_encoding_as_rlp!(EpochExecutionContext);
-impl_db_encoding_as_rlp!(BlockRewardResult);
 impl_db_encoding_as_rlp!(BlamedHeaderVerifiedRoots);
 impl_db_encoding_as_rlp!(PosRewardInfo);
+impl_db_encoding_as_rlp!(BlockRewardResult);

crates/cfxcore/types/Cargo.toml

@@ -1,26 +1 @@
-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 }
-}
+pub mod block_data_types;

crates/cfxcore/core/src/block_data_manager/block_data_types.rs renamed to crates/cfxcore/types/src/block_data_manager/block_data_types.rs

@@ -4,6 +4,7 @@
 
 use crate::UniqueId;
 use cfx_types::H256;
+use log::warn;
 use parking_lot::RwLock;
 use std::{collections::BTreeMap, sync::Arc, time::Duration};
 use tokio::{runtime, sync::mpsc, time::timeout};

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

@@ -2,7 +2,7 @@
 // Conflux is free software and distributed under GNU General Public License.
 // See http://www.gnu.org/licenses/
 
-use crate::message::Bytes;
+use cfx_bytes::Bytes;
 use cfx_types::{Address, SpaceMap, H256, U256};
 use primitives::{filter::FilterError, transaction::TransactionError};
 use std::{error, fmt, time::SystemTime};

crates/cfxcore/core/src/channel.rs renamed to crates/cfxcore/types/src/channel.rs

@@ -1,2 +1,8 @@
 pub mod block_data_manager;
+pub mod channel;
+pub mod core_error;
+pub mod node_type;
 pub mod state_exposer;
+pub mod unique_id;
+
+pub use unique_id::UniqueId;