Merge pull request #283 from AurevoirXavier/canary

Ready for Staking Tests
darwinia-network · Feb 24, 2020 · f104129 · f104129
2 parents c094e38 + 7a24f1f
commit f104129
Show file tree

Hide file tree

Showing 7 changed files with 4,702 additions and 2,812 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs
@@ -31,6 +31,7 @@ pub mod time {
 	use node_primitives::{BlockNumber, Moment};
 	use sp_staking::SessionIndex;
 
+	// TODO doc
 	include!(concat!(env!("OUT_DIR"), "/timestamp_now.rs"));
 	pub const GENESIS_TIME: Moment = NOW;
 

diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
@@ -28,8 +28,10 @@ darwinia-support = {  default-features = false, path = "../support" }
 
 [dev-dependencies]
 substrate-test-utils = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = "pre-v2.0-3e65111" }
+pallet-timestamp = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", tag = "pre-v2.0-3e65111" }
 
-darwinia-ring = { path = "../../frame/balances/ring" }
+pallet-ring = { package = "darwinia-ring", path = "../../frame/balances/ring" }
+pallet-kton = { package = "darwinia-kton", path = "../../frame/balances/kton" }
 
 [features]
 equalize = []

diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
@@ -124,7 +124,7 @@
 //! ```
 //! use frame_support::{decl_module, dispatch};
 //! use frame_system::{self as system, ensure_signed};
-//! use pallet_staking::{self as staking};
+//! use darwinia_staking::{self as staking};
 //!
 //! pub trait Trait: staking::Trait {}
 //!