Merge pull request #119 from hammeWang/develop

fix error while compling no_std wasm
darwinia-network · Nov 27, 2019 · 6a7ecde · 6a7ecde
2 parents d5a1d6d + d50742c
commit 6a7ecde
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/sr-eth-primitives/Cargo.toml b/core/sr-eth-primitives/Cargo.toml
@@ -10,14 +10,14 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
 #substrate-primitives = {git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
 rlp = { package = "rlp", git = "https://github.com/darwinia-network/parity-common.git", default-features = false}
-rlp_derive = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false }
+rlp_derive = { git = "https://github.com/darwinia-network/parity-common.git" }
 primitive-types = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false, features = ["codec", "rlp"] }
-ethereum-types = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false, features = ["serialize"] }
+ethereum-types = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false }
 keccak-hash = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false}
 impl-codec = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false}
 fixed-hash = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false}
 impl-rlp = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false}
-ethbloom = { git ="https://github.com/darwinia-network/parity-common.git", default-features = false, features = ["serialize"]}
+ethbloom = { git ="https://github.com/darwinia-network/parity-common.git", default-features = false}
 
 [dev-dependencies]
 support = { package = "srml-support", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop"}

diff --git a/srml/ethereum-bridge/Cargo.toml b/srml/ethereum-bridge/Cargo.toml
@@ -15,7 +15,7 @@ rstd = { package = "sr-std", git = "https://github.com/darwinia-network/substrat
 system = { package = "srml-system",  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 }
 support = { package = "srml-support", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
-#sr-eth-primitives = { path = "../../core/sr-eth-primitives", default-features = false }
+sr-eth-primitives = { path = "../../core/sr-eth-primitives", default-features = false }
 #merkle-mountain-range = { path = "../../core/merkle-mountain-range", default-features = false }
 
 #web3 = {git = "https://github.com/ABMatrix/rust-web3.git", branch = "develop", default-features = false }
@@ -30,5 +30,5 @@ std = [
 #    "sr-primitives/std",
     "support/std",
     "system/std",
-#    "sr-eth-primitives/std"
+    "sr-eth-primitives/std"
 ]
diff --git a/srml/ethereum-bridge/src/lib.rs b/srml/ethereum-bridge/src/lib.rs
@@ -6,9 +6,9 @@
 // use blake2::Blake2b;
 use codec::{Decode, Encode};
 use rstd::vec::Vec;
+use sr_eth_primitives::pow::EthHeader;
 use support::{decl_event, decl_module, decl_storage, dispatch::Result, traits::Currency};
 use system::ensure_signed;
-
 //use sr_eth_primitives::{pow::EthHeader, H160, H256, H64, U128, U256, U512};
 
 //use sr_primitives::RuntimeDebug;