Use 2018 edition

Author: Seulgi Kim

Cargo.toml

@@ -12,6 +12,7 @@ exclude = [
     "spec/*",
     "test/*",
 ]
+edition = "2018"
 
 [dependencies]
 app_dirs = "^1.2.1"

core/Cargo.toml

@@ -2,6 +2,7 @@
 name = "codechain-core"
 version = "0.1.0"
 authors = ["CodeChain Team <[email protected]>"]
+edition = "2018"
 
 [dependencies]
 codechain-crypto = { git = "https://github.com/CodeChain-io/rust-codechain-crypto.git", version = "0.1" }

core/src/client/client.rs

@@ -92,7 +92,7 @@ impl Client {
         message_channel: IoChannel<ClientIoMessage>,
         reseal_timer: TimerApi,
     ) -> Result<Arc<Client>, Error> {
-        let journal_db = journaldb::new(Arc::clone(&db), journaldb::Algorithm::Archive, ::db::COL_STATE);
+        let journal_db = journaldb::new(Arc::clone(&db), journaldb::Algorithm::Archive, crate::db::COL_STATE);
         let mut state_db = StateDB::new(journal_db);
         if !scheme.check_genesis_root(state_db.as_hashdb()) {
             return Err(SchemeError::InvalidState.into())
@@ -607,7 +607,7 @@ impl BlockChainTrait for Client {
         self.genesis_accounts.iter().map(|addr| PlatformAddress::new_v1(network_id, *addr)).collect()
     }
 
-    fn block_header(&self, id: &BlockId) -> Option<::encoded::Header> {
+    fn block_header(&self, id: &BlockId) -> Option<encoded::Header> {
         let chain = self.block_chain();
 
         Self::block_hash(&chain, id).and_then(|hash| chain.block_header_data(&hash))
@@ -635,7 +635,7 @@ impl BlockChainTrait for Client {
         self.transaction_address(id).map(|addr| addr.block_hash)
     }
 
-    fn transaction_header(&self, tracker: &Tracker) -> Option<::encoded::Header> {
+    fn transaction_header(&self, tracker: &Tracker) -> Option<encoded::Header> {
         self.transaction_addresses(tracker).map(|addr| addr.block_hash).and_then(|hash| self.block_header(&hash.into()))
     }
 }
@@ -655,7 +655,7 @@ impl ImportBlock for Client {
     }
 
     fn import_header(&self, bytes: Bytes) -> Result<BlockHash, BlockImportError> {
-        let unverified = ::encoded::Header::new(bytes).decode();
+        let unverified = encoded::Header::new(bytes).decode();
         {
             if self.block_chain().is_known_header(&unverified.hash()) {
                 return Err(BlockImportError::Import(ImportError::AlreadyInChain))

core/src/client/importer.rs

@@ -29,6 +29,7 @@ use rlp::Encodable;
 use super::{BlockChainTrait, Client, ClientConfig};
 use crate::block::{enact, IsBlock, LockedBlock};
 use crate::blockchain::{BodyProvider, HeaderProvider, ImportRoute};
+use crate::client::EngineInfo;
 use crate::consensus::CodeChainEngine;
 use crate::error::Error;
 use crate::miner::{Miner, MinerService};
@@ -37,7 +38,6 @@ use crate::types::BlockId;
 use crate::verification::queue::{BlockQueue, HeaderQueue};
 use crate::verification::{self, PreverifiedBlock, Verifier};
 use crate::views::{BlockView, HeaderView};
-use client::EngineInfo;
 
 pub struct Importer {
     /// Lock used during block import

core/src/client/mod.rs

@@ -75,7 +75,7 @@ pub trait BlockChainTrait {
     /// Get the hash of block that contains the transaction, if any.
     fn transaction_block(&self, id: &TransactionId) -> Option<BlockHash>;
 
-    fn transaction_header(&self, tracker: &Tracker) -> Option<::encoded::Header>;
+    fn transaction_header(&self, tracker: &Tracker) -> Option<encoded::Header>;
 
     fn transaction_block_number(&self, tracker: &Tracker) -> Option<BlockNumber> {
         self.transaction_header(tracker).map(|header| header.number())

core/src/client/test_client.rs

@@ -54,10 +54,9 @@ use rlp::*;
 
 use crate::block::{ClosedBlock, OpenBlock, SealedBlock};
 use crate::blockchain_info::BlockChainInfo;
-use crate::client::ImportResult;
 use crate::client::{
-    AccountData, BlockChainClient, BlockChainTrait, BlockProducer, BlockStatus, EngineInfo, ImportBlock,
-    MiningBlockChainClient, StateInfo, StateOrBlock, TermInfo,
+    AccountData, BlockChainClient, BlockChainTrait, BlockProducer, BlockStatus, ConsensusClient, EngineInfo,
+    ImportBlock, ImportResult, MiningBlockChainClient, StateInfo, StateOrBlock, TermInfo,
 };
 use crate::consensus::stake::{Validator, Validators};
 use crate::consensus::EngineError;
@@ -68,7 +67,6 @@ use crate::miner::{Miner, MinerService, TransactionImportResult};
 use crate::scheme::Scheme;
 use crate::transaction::{LocalizedTransaction, PendingSignedTransactions, SignedTransaction};
 use crate::types::{BlockId, TransactionId, VerificationQueueInfo as QueueInfo};
-use client::ConsensusClient;
 
 /// Test client.
 pub struct TestBlockChainClient {
@@ -459,7 +457,7 @@ impl BlockChainTrait for TestBlockChainClient {
         None // Simple default.
     }
 
-    fn transaction_header(&self, _tracker: &Tracker) -> Option<::encoded::Header> {
+    fn transaction_header(&self, _tracker: &Tracker) -> Option<encoded::Header> {
         None
     }
 }

core/src/consensus/mod.rs

@@ -56,7 +56,7 @@ use crate::codechain_machine::CodeChainMachine;
 use crate::error::Error;
 use crate::transaction::UnverifiedTransaction;
 use crate::views::HeaderView;
-use Client;
+use crate::Client;
 
 pub enum Seal {
     Solo,

core/src/consensus/stake/actions.rs

@@ -18,12 +18,12 @@ use std::sync::Arc;
 
 use ccrypto::Blake;
 use ckey::{recover, Address, Signature};
-use client::ConsensusClient;
 use ctypes::errors::SyntaxError;
 use ctypes::CommonParams;
 use primitives::{Bytes, H256};
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
 
+use crate::client::ConsensusClient;
 use crate::consensus::{ConsensusMessage, ValidatorSet};
 
 const ACTION_TAG_TRANSFER_CCS: u8 = 1;
@@ -358,9 +358,9 @@ impl Decodable for Action {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::client::TestBlockChainClient;
+    use crate::consensus::{ConsensusMessage, DynamicValidator, Step, VoteOn, VoteStep};
     use ckey::sign_schnorr;
-    use client::TestBlockChainClient;
-    use consensus::{ConsensusMessage, DynamicValidator, Step, VoteOn, VoteStep};
     use ctypes::BlockHash;
     use rlp::rlp_encode_and_decode_test;
 

core/src/consensus/stake/mod.rs

@@ -547,7 +547,7 @@ mod tests {
     use super::action_data::get_account_key;
     use super::*;
 
-    use consensus::stake::action_data::{get_delegation_key, Candidate, Prisoner};
+    use crate::consensus::stake::action_data::{get_delegation_key, Candidate, Prisoner};
     use cstate::tests::helpers;
     use cstate::TopStateView;
     use rlp::Encodable;

core/src/consensus/tendermint/mod.rs

@@ -41,7 +41,7 @@ pub use self::types::{Height, Step, View};
 use super::{stake, ValidatorSet};
 use crate::client::ConsensusClient;
 use crate::codechain_machine::CodeChainMachine;
-use ChainNotify;
+use crate::ChainNotify;
 
 /// Timer token representing the consensus step timeouts.
 const ENGINE_TIMEOUT_TOKEN_NONCE_BASE: TimerToken = 23;