Fix issues related to Rust 2018, Macros, and node-template (#1742)

* Initial fix, need to remove demo

* Fix similar issue with contracts module

* Remove Demo Module for Testing

* Undo changes to Contracts module
This commit is contained in:
Shawn Tabrizi
2019-02-08 14:31:05 +01:00
committed by Gav Wood
parent 0135afd0ed
commit 7b0f82b4f0
4 changed files with 9 additions and 9 deletions
+2 -2
View File
@@ -13,7 +13,7 @@ parity-codec-derive = { version = "3.0", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default_features = false }
runtime-io = { package = "sr-io", path = "../../core/sr-io", default_features = false }
version = { package = "sr-version", path = "../../core/sr-version", default_features = false }
support = { package = "srml-support", path = "../../srml/support", default_features = false }
srml-support = { path = "../../srml/support", default_features = false }
primitives = { package = "substrate-primitives", path = "../../core/primitives", default_features = false }
balances = { package = "srml-balances", path = "../../srml/balances", default_features = false }
consensus = { package = "srml-consensus", path = "../../srml/consensus", default_features = false }
@@ -36,7 +36,7 @@ std = [
"substrate-client/std",
"rstd/std",
"runtime-io/std",
"support/std",
"srml-support/std",
"balances/std",
"executive/std",
"aura/std",
+1 -1
View File
@@ -38,7 +38,7 @@ pub use timestamp::Call as TimestampCall;
pub use balances::Call as BalancesCall;
pub use runtime_primitives::{Permill, Perbill};
pub use timestamp::BlockPeriod;
pub use support::{StorageValue, construct_runtime};
pub use srml_support::{StorageValue, construct_runtime};
/// Alias to Ed25519 pubkey that identifies an account on the chain.
pub type AccountId = primitives::H256;