Update to latest substrate master (#197)

This commit is contained in:
Bastian Köcher
2019-03-29 16:35:39 +01:00
committed by DemiMarie-parity
parent 0b726e7605
commit c12ed7d8ac
12 changed files with 246 additions and 241 deletions
+2 -2
View File
@@ -141,7 +141,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
enact_delay_period: 0,
}),
timestamp: Some(TimestampConfig {
period: SECS_PER_BLOCK / 2, // due to the nature of aura the slots are 2*period
minimum_period: SECS_PER_BLOCK / 2, // due to the nature of aura the slots are 2*period
}),
treasury: Some(TreasuryConfig {
proposal_bond: Permill::from_percent(5),
@@ -283,7 +283,7 @@ pub fn testnet_genesis(
}),
parachains: Some(Default::default()),
timestamp: Some(TimestampConfig {
period: 2, // 2*2=4 second block time.
minimum_period: 2, // 2*2=4 second block time.
}),
treasury: Some(TreasuryConfig {
proposal_bond: Permill::from_percent(5),
+2
View File
@@ -304,6 +304,7 @@ construct_service_factory! {
client,
NothingExtra,
config.custom.inherent_data_providers.clone(),
true,
).map_err(Into::into)
}},
LightImportQueue = AuraImportQueue<
@@ -319,6 +320,7 @@ construct_service_factory! {
client,
NothingExtra,
config.custom.inherent_data_providers.clone(),
true,
).map_err(Into::into)
}},
}