Load timer types from codechain-timer

Author: Hyunsik Jeong

Cargo.lock

@@ -14,6 +14,7 @@ codechain-logger = { path = "../util/logger" }
 codechain-merkle = { path = "../util/merkle" }
 codechain-network = { path = "../network" }
 codechain-state = { path = "../state" }
+codechain-timer = { path = "../util/timer" }
 codechain-types = { path = "../types" }
 codechain-stratum = { path = "../stratum" }
 codechain-vm = { path = "../vm" }

core/Cargo.toml

@@ -25,7 +25,8 @@ use std::sync::{Arc, Weak};
 
 use ccrypto::blake256;
 use ckey::{public_to_address, recover, Address, Message, Password, Signature};
-use cnetwork::{Api, NetworkExtension, NetworkService, NodeId, TimeoutHandler, TimerToken};
+use cnetwork::{Api, NetworkExtension, NetworkService, NodeId};
+use ctimer::{TimeoutHandler, TimerToken};
 use ctypes::machine::WithBalances;
 use ctypes::util::unexpected::{Mismatch, OutOfBounds};
 use ctypes::BlockNumber;

core/src/consensus/tendermint/mod.rs

@@ -26,6 +26,7 @@ extern crate codechain_merkle as cmerkle;
 extern crate codechain_network as cnetwork;
 extern crate codechain_state as cstate;
 extern crate codechain_stratum as cstratum;
+extern crate codechain_timer as ctimer;
 extern crate codechain_types as ctypes;
 extern crate codechain_vm as cvm;
 extern crate cuckoo;

core/src/lib.rs

@@ -8,6 +8,7 @@ codechain-crypto = { path = "../crypto" }
 codechain-key = { path = "../key" }
 codechain-logger = { path = "../util/logger" }
 codechain-network = { path = "../network" }
+codechain-timer = { path = "../util/timer" }
 log = "0.4.1"
 parking_lot = "0.5"
 primitives = { path = "../util/primitives" }

discovery/Cargo.toml

@@ -17,7 +17,8 @@
 use std::collections::HashSet;
 use std::sync::Arc;
 
-use cnetwork::{Api, DiscoveryApi, IntoSocketAddr, NetworkExtension, NodeId, RoutingTable, TimeoutHandler, TimerToken};
+use cnetwork::{Api, DiscoveryApi, IntoSocketAddr, NetworkExtension, NodeId, RoutingTable};
+use ctimer::{TimeoutHandler, TimerToken};
 use parking_lot::RwLock;
 use rlp::{Decodable, Encodable, UntrustedRlp};
 use time::Duration;

discovery/src/kademlia/extension.rs

@@ -29,6 +29,7 @@ extern crate codechain_key as ckey;
 #[macro_use]
 extern crate codechain_logger as clogger;
 extern crate codechain_network as cnetwork;
+extern crate codechain_timer as ctimer;
 
 mod kademlia;
 mod unstructured;

discovery/src/lib.rs

@@ -17,7 +17,8 @@
 use std::collections::HashSet;
 use std::sync::Arc;
 
-use cnetwork::{Api, DiscoveryApi, IntoSocketAddr, NetworkExtension, NodeId, RoutingTable, TimeoutHandler, TimerToken};
+use cnetwork::{Api, DiscoveryApi, IntoSocketAddr, NetworkExtension, NodeId, RoutingTable};
+use ctimer::{TimeoutHandler, TimerToken};
 use parking_lot::RwLock;
 use rand::{thread_rng, Rng};
 use rlp::{Decodable, Encodable, UntrustedRlp};

discovery/src/unstructured/extension.rs

@@ -22,7 +22,7 @@ use cio::IoError;
 use time::Duration;
 
 use crate::NodeId;
-pub use ctimer::{TimeoutHandler, TimerScheduleError, TimerToken};
+use ctimer::{TimeoutHandler, TimerScheduleError, TimerToken};
 
 #[derive(Debug)]
 pub enum Error {

network/src/extension.rs

@@ -62,7 +62,6 @@ pub use crate::control::{Control as NetworkControl, Error as NetworkControlError
 pub use crate::discovery::Api as DiscoveryApi;
 pub use crate::extension::{
     Api, Error as NetworkExtensionError, Extension as NetworkExtension, Result as NetworkExtensionResult,
-    TimeoutHandler, TimerToken,
 };
 pub use crate::node_id::{IntoSocketAddr, NodeId};
 pub use crate::service::{Error as NetworkServiceError, Service as NetworkService};