Merge branch 'master' of github.com:paritytech/polkadot into a-wasm-authoring

This commit is contained in:
arkpar
2018-08-31 18:06:00 +02:00
18 changed files with 516 additions and 389 deletions
-1
View File
@@ -17,7 +17,6 @@ substrate-client = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-executor = { git = "https://github.com/paritytech/substrate" }
substrate-state-machine = { git = "https://github.com/paritytech/substrate" }
log = "0.3"
[dev-dependencies]
substrate-keyring = { git = "https://github.com/paritytech/substrate" }
+1 -1
View File
@@ -205,10 +205,10 @@ mod tests {
authorities: session_keys(),
}),
system: None,
balances: Some(Default::default()),
session: Some(SessionConfig {
validators: validators(),
session_length: 100,
broken_percent_late: 100,
}),
council: Some(Default::default()),
democracy: Some(Default::default()),