Initial stuff

This commit is contained in:
Gav
2018-08-29 23:56:04 +02:00
parent 79932f1975
commit e322657597
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -128,6 +128,7 @@ impl HasPublicAux for Concrete {
}
impl system::Trait for Concrete {
type PublicAux = <Concrete as HasPublicAux>::PublicAux;
type Index = Index;
type BlockNumber = BlockNumber;
type Hash = Hash;
@@ -140,7 +141,6 @@ impl system::Trait for Concrete {
pub type System = system::Module<Concrete>;
impl consensus::Trait for Concrete {
type PublicAux = <Concrete as HasPublicAux>::PublicAux;
type SessionKey = SessionKey;
}
/// Consensus module for this concrete runtime.
+1 -1
View File
@@ -258,10 +258,10 @@ mod tests {
type PublicAux = u64;
}
impl consensus::Trait for Test {
type PublicAux = <Self as HasPublicAux>::PublicAux;
type SessionKey = u64;
}
impl system::Trait for Test {
type PublicAux = <Self as HasPublicAux>::PublicAux;
type Index = u64;
type BlockNumber = u64;
type Hash = H256;
+2 -2
View File
@@ -63,7 +63,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
validator_count: 12,
sessions_per_era: 12, // 1 hour per era
bonding_duration: 24, // 1 day per bond.
bonding_duration: 24 * 60 * 12, // 1 day per bond.
}),
democracy: Some(DemocracyConfig {
launch_period: 12 * 60 * 24, // 1 day per public referendum
@@ -136,7 +136,7 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(),
validator_count: 2,
sessions_per_era: 5,
bonding_duration: 2,
bonding_duration: 2 * 60 * 12,
early_era_slash: 0,
session_reward: 0,
}),