Merge pull request #170 from AurevoirXavier/patch

Patch
darwinia-network · Dec 17, 2019 · 4b0b62b · 4b0b62b
2 parents e8e39be + f2c53e7
commit 4b0b62b
Show file tree

Hide file tree

Showing 3 changed files with 196 additions and 165 deletions.
diff --git a/node/runtime/src/lib.rs b/node/runtime/src/lib.rs
@@ -426,7 +426,7 @@ construct_runtime!(
 	{
 		// Basic stuff; balances is uncallable initially.
 		RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},
-		System: system::{Module, Call, Storage, Config, Event},
+		System: system::{Module, Call, Storage, Event, Config},
 
 		// Must be before session.
 		Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
@@ -439,8 +439,8 @@ construct_runtime!(
 
 		// Consensus support.
 		Authorship: authorship::{Module, Call, Storage, Inherent},
-		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
-		ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
+		Grandpa: grandpa::{Module, Call, Storage, Event, Config},
+		ImOnline: im_online::{default, ValidateUnsigned},
 		FinalityTracker: finality_tracker::{Module, Call, Inherent},
 		Offences: offences::{Module, Call, Storage, Event},
 		Session: session::{Module, Call, Storage, Event, Config<T>},
@@ -451,7 +451,7 @@ construct_runtime!(
 		Utility: utility::{Module, Call, Event},
 
 		EthRelay: eth_relay::{Module, Call, Storage, Event<T>, Config},
-		EthBacking: eth_backing::{Module, Call, Storage, Event<T>, Config<T>},
+		EthBacking: eth_backing,
 	}
 );
 

diff --git a/srml/eth-backing/Cargo.toml b/srml/eth-backing/Cargo.toml
@@ -8,44 +8,42 @@ edition = "2018"
 
 [dependencies]
 # crates.io
-serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
+hex = { version = "0.4", default-features = false }
+serde = { version = "1.0.101", optional = true }
 
 # github.com
 rstd = { package = "sr-std", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
 support = { package = "srml-support", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
 system = { package = "srml-system",  git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
 timestamp = { package = "srml-timestamp", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
+sr-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
+primitives = { package = "substrate-primitives",  git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
+ethabi = { git = "https://github.com/darwinia-network/ethabi.git", branch = "with_no_std", default-features = false }
 
 # darwinia
 darwinia-support = { package = "darwinia-support", path = "../support", default-features = false }
 darwinia-eth-relay = { package = "darwinia-eth-relay", path = "../eth-relay", default-features = false }
 sr-eth-primitives = { path = "../../core/sr-eth-primitives", default-features = false }
 
-sr-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
-
-primitives = { package = "substrate-primitives",  git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
-
-ethabi = { git = "https://github.com/darwinia-network/ethabi.git", branch = "with_no_std", default-features = false }
-
-hex = { version = "0.4", default-features = false}
-
 [dev-dependencies]
 hex-literal = "0.2.1"
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
+	"hex/std",
     "serde/std",
-    "hex/std",
+
+   	"ethabi/std",
     "rstd/std",
+    "sr-primitives/std",
     "support/std",
     "system/std",
     "timestamp/std",
+
     "darwinia-support/std",
     "darwinia-eth-relay/std",
     "sr-eth-primitives/std",
-    "ethabi/std",
-    "sr-primitives/std",
 ]