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

New Slash #267

Merged
merged 14 commits into from
Feb 18, 2020
Merged

New Slash #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
358d39d
remove: unused deps
AurevoirXavier Feb 14, 2020
773a173
add: phragmen tests
AurevoirXavier Feb 14, 2020
a4e3cb9
remove: unused code
AurevoirXavier Feb 14, 2020
4ce24fe
add: phragmen tests
AurevoirXavier Feb 14, 2020
e411c37
fix: prevent overflow
AurevoirXavier Feb 15, 2020
5b457b7
update: deps
AurevoirXavier Feb 15, 2020
519c260
try: ready for refactoring `Exposure`
AurevoirXavier Feb 15, 2020
bece565
update: new `Exposure`
AurevoirXavier Feb 15, 2020
ff7423c
fix: doc
AurevoirXavier Feb 15, 2020
58f577c
fix: missing deps
AurevoirXavier Feb 15, 2020
a0905dc
fix: `Exposure` type
AurevoirXavier Feb 15, 2020
eaeebb1
update: spec name
AurevoirXavier Feb 17, 2020
4fd94e6
fix: #222
AurevoirXavier Feb 17, 2020
b97ebef
fix: Exposure types
AurevoirXavier Feb 17, 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
41 changes: 0 additions & 41 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.

4 changes: 0 additions & 4 deletions bin/node/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ edition = "2018"
sp-core = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }
sp-runtime = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }

[dev-dependencies]
sp-serializer = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }
pretty_assertions = "0.6.1"

[features]
default = ["std"]
std = [
Expand Down
3 changes: 0 additions & 3 deletions bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ pallet-staking = { package = "darwinia-staking", default-features = false, featu
[build-dependencies]
wasm-builder-runner = { version = "1.0.4", package = "substrate-wasm-builder-runner", git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }

[dev-dependencies]
sp-io = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }

[features]
default = ["std"]
std = [
Expand Down
5 changes: 2 additions & 3 deletions bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));

/// Runtime version.
pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("node"),
spec_name: create_runtime_str!("darwinia"),
impl_name: create_runtime_str!("darwinia-node"),
authoring_version: 4,
// Per convention: if the runtime behavior changes, increment spec_version
Expand Down Expand Up @@ -240,7 +240,7 @@ impl pallet_session::Trait for Runtime {
}

impl pallet_session::historical::Trait for Runtime {
type FullIdentification = Exposure<AccountId, Power>;
type FullIdentification = Exposure<AccountId, Balance, Balance>;
type FullIdentificationOf = ExposureOf<Runtime>;
}

Expand Down Expand Up @@ -457,7 +457,6 @@ parameter_types! {

impl pallet_staking::Trait for Runtime {
type Time = Timestamp;
// type PowerToVotes = PowerToVotesHandler;
type Event = Event;
type SessionsPerEra = SessionsPerEra;
type BondingDurationInEra = BondingDurationInEra;
Expand Down
10 changes: 5 additions & 5 deletions frame/staking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ sp-staking = { version = "2.0.0", default-features = false, git = "https://githu
sp-std = { version = "2.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }

# darwinia
sp-phragmen = { package = "darwinia-phragmen", default-features = false, path = "../../primitives/phragmen" }
darwinia-support = { path = "../support", default-features = false }
darwinia-phragmen = { default-features = false, path = "../../primitives/phragmen" }
darwinia-support = { default-features = false, path = "../support" }

[dev-dependencies]
pallet-ring = { package = "darwinia-ring", path = "../../frame/balances/ring" }
pallet-staking-reward-curve = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }
substrate-test-utils = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", rev = "c2fccb36ffacd118fc3502aa93453580a07dc402" }

darwinia-ring = { path = "../../frame/balances/ring" }

[features]
equalize = []
migrate = []
Expand All @@ -48,10 +48,10 @@ std = [
"pallet-timestamp/std",
"sp-io/std",
"sp-keyring",
"sp-phragmen/std",
"sp-runtime/std",
"sp-staking/std",
"sp-std/std",

"darwinia-phragmen/std",
"darwinia-support/std",
]
Loading