Merge pull request #267 from AurevoirXavier/try

New Slash
darwinia-network · Feb 18, 2020 · f75de74 · f75de74
2 parents 95518ea + b97ebef
commit f75de74
Show file tree

Hide file tree

Showing 11 changed files with 1,492 additions and 405 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
@@ -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 = [

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -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 = [

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -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
@@ -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>;
 }
 
@@ -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;

diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
@@ -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 = []
@@ -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",
 ]