Move Header to codechain-types

Author: Seulgi Kim

Cargo.lock

@@ -37,7 +37,6 @@ rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
 snap = "0.2"
 table = { path = "../util/table" }
-time = "0.1"
 util-error = { path = "../util/error" }
 
 [dev-dependencies]

core/Cargo.toml

@@ -21,6 +21,7 @@ use ckey::Address;
 use cmerkle::skewed_merkle_root;
 use cstate::{FindActionHandler, StateDB, StateError, StateWithCache, TopLevelState};
 use ctypes::errors::HistoryError;
+use ctypes::header::{Header, Seal};
 use ctypes::util::unexpected::Mismatch;
 use ctypes::{BlockNumber, CommonParams};
 use cvm::ChainTimeInfo;
@@ -31,7 +32,6 @@ use super::invoice::Invoice;
 use crate::client::EngineInfo;
 use crate::consensus::CodeChainEngine;
 use crate::error::{BlockError, Error};
-use crate::header::{Header, Seal};
 use crate::transaction::{SignedTransaction, UnverifiedTransaction};
 
 /// A block, encoded as it is on the block chain.

core/src/block.rs

@@ -18,6 +18,7 @@ use std::collections::HashMap;
 use std::mem;
 use std::sync::Arc;
 
+use ctypes::header::{Header, Seal};
 use ctypes::BlockNumber;
 use kvdb::{DBTransaction, KeyValueDB};
 use parking_lot::{Mutex, RwLock};
@@ -30,7 +31,6 @@ use super::route::tree_route;
 use crate::consensus::CodeChainEngine;
 use crate::db::{self, CacheUpdatePolicy, Readable, Writable};
 use crate::encoded;
-use crate::header::{Header, Seal};
 use crate::views::HeaderView;
 
 const BEST_HEADER_KEY: &[u8] = b"best-header";

core/src/blockchain/headerchain.rs

@@ -20,6 +20,7 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use cio::IoChannel;
+use ctypes::header::Header;
 use kvdb::DBTransaction;
 use parking_lot::{Mutex, MutexGuard};
 use primitives::H256;
@@ -31,7 +32,6 @@ use crate::blockchain::{BodyProvider, HeaderProvider, ImportRoute};
 use crate::consensus::CodeChainEngine;
 use crate::encoded;
 use crate::error::Error;
-use crate::header::Header;
 use crate::miner::{Miner, MinerService};
 use crate::service::ClientIoMessage;
 use crate::types::BlockId;

core/src/client/importer.rs

@@ -42,7 +42,7 @@ use cnetwork::NodeId;
 use cstate::{FindActionHandler, StateDB};
 use ctimer::{TimeoutHandler, TimerToken};
 use ctypes::transaction::{Action, Transaction};
-use ctypes::{BlockNumber, CommonParams};
+use ctypes::{BlockNumber, CommonParams, Header as BlockHeader};
 use cvm::ChainTimeInfo;
 use journaldb;
 use kvdb::KeyValueDB;
@@ -61,7 +61,6 @@ use crate::client::{
 use crate::db::{COL_STATE, NUM_COLUMNS};
 use crate::encoded;
 use crate::error::BlockImportError;
-use crate::header::Header as BlockHeader;
 use crate::miner::{Miner, MinerService, TransactionImportResult};
 use crate::scheme::Scheme;
 use crate::transaction::{LocalizedTransaction, PendingSignedTransactions, SignedTransaction};

core/src/client/test_client.rs

@@ -19,12 +19,11 @@ use ckey::Address;
 use cstate::{StateError, TopState, TopStateView};
 use ctypes::errors::{HistoryError, SyntaxError};
 use ctypes::transaction::{Action, AssetTransferInput, OrderOnTransfer, Timelock};
-use ctypes::CommonParams;
+use ctypes::{CommonParams, Header};
 
 use crate::block::{ExecutedBlock, IsBlock};
 use crate::client::BlockChainTrait;
 use crate::error::Error;
-use crate::header::Header;
 use crate::transaction::{SignedTransaction, UnverifiedTransaction};
 
 pub struct CodeChainMachine {

core/src/codechain_machine.rs

@@ -20,7 +20,7 @@ use std::cmp::{max, min};
 
 use ccrypto::blake256;
 use ctypes::util::unexpected::{Mismatch, OutOfBounds};
-use ctypes::CommonParams;
+use ctypes::{CommonParams, Header};
 use primitives::U256;
 use rlp::UntrustedRlp;
 
@@ -30,7 +30,6 @@ use crate::block::ExecutedBlock;
 use crate::codechain_machine::CodeChainMachine;
 use crate::consensus::EngineType;
 use crate::error::{BlockError, Error};
-use crate::header::Header;
 
 /// BlakePoW specific seal
 #[derive(Debug, PartialEq)]

core/src/consensus/blake_pow/mod.rs

@@ -20,7 +20,7 @@ use std::cmp::{max, min};
 
 use ccrypto::blake256;
 use ctypes::util::unexpected::{Mismatch, OutOfBounds};
-use ctypes::CommonParams;
+use ctypes::{CommonParams, Header};
 use cuckoo::Cuckoo as CuckooVerifier;
 use primitives::U256;
 use rlp::UntrustedRlp;
@@ -31,7 +31,6 @@ use crate::block::ExecutedBlock;
 use crate::codechain_machine::CodeChainMachine;
 use crate::consensus::EngineType;
 use crate::error::{BlockError, Error};
-use crate::header::Header;
 
 /// Cuckoo specific seal
 #[derive(Debug, PartialEq)]

core/src/consensus/cuckoo/mod.rs

@@ -43,7 +43,7 @@ use cstate::ActionHandler;
 use ctypes::errors::SyntaxError;
 use ctypes::transaction::Action;
 use ctypes::util::unexpected::{Mismatch, OutOfBounds};
-use ctypes::CommonParams;
+use ctypes::{CommonParams, Header};
 use primitives::{Bytes, H256, U256};
 
 use self::tendermint::types::{BitSet, View};