Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ready for Staking Tests #283

Merged
merged 4 commits into from
Feb 24, 2020
Merged

Ready for Staking Tests #283

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dee6dfc
Merge remote-tracking branch 'origin/genesis-time' into canary
AurevoirXavier Feb 21, 2020
53838aa
update: ready for staking tests
AurevoirXavier Feb 24, 2020
545ff0d
Merge remote-tracking branch 'upstream/develop' into canary
AurevoirXavier Feb 24, 2020
7a24f1f
add: old tests template
AurevoirXavier Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions bin/node/runtime/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion frame/staking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
2 changes: 1 addition & 1 deletion frame/staking/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
//!
Expand Down
Loading