Commit dfb18a23 authored by Gav's avatar Gav
Browse files

Initial stuff

parent 63d13a0c
...@@ -128,6 +128,7 @@ impl HasPublicAux for Concrete { ...@@ -128,6 +128,7 @@ impl HasPublicAux for Concrete {
} }
impl system::Trait for Concrete { impl system::Trait for Concrete {
type PublicAux = <Concrete as HasPublicAux>::PublicAux;
type Index = Index; type Index = Index;
type BlockNumber = BlockNumber; type BlockNumber = BlockNumber;
type Hash = Hash; type Hash = Hash;
...@@ -140,7 +141,6 @@ impl system::Trait for Concrete { ...@@ -140,7 +141,6 @@ impl system::Trait for Concrete {
pub type System = system::Module<Concrete>; pub type System = system::Module<Concrete>;
impl consensus::Trait for Concrete { impl consensus::Trait for Concrete {
type PublicAux = <Concrete as HasPublicAux>::PublicAux;
type SessionKey = SessionKey; type SessionKey = SessionKey;
} }
/// Consensus module for this concrete runtime. /// Consensus module for this concrete runtime.
......
...@@ -258,10 +258,10 @@ mod tests { ...@@ -258,10 +258,10 @@ mod tests {
type PublicAux = u64; type PublicAux = u64;
} }
impl consensus::Trait for Test { impl consensus::Trait for Test {
type PublicAux = <Self as HasPublicAux>::PublicAux;
type SessionKey = u64; type SessionKey = u64;
} }
impl system::Trait for Test { impl system::Trait for Test {
type PublicAux = <Self as HasPublicAux>::PublicAux;
type Index = u64; type Index = u64;
type BlockNumber = u64; type BlockNumber = u64;
type Hash = H256; type Hash = H256;
......
...@@ -63,7 +63,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig { ...@@ -63,7 +63,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(), balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
validator_count: 12, validator_count: 12,
sessions_per_era: 12, // 1 hour per era 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 { democracy: Some(DemocracyConfig {
launch_period: 12 * 60 * 24, // 1 day per public referendum launch_period: 12 * 60 * 24, // 1 day per public referendum
...@@ -136,7 +136,7 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig { ...@@ -136,7 +136,7 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(), balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(),
validator_count: 2, validator_count: 2,
sessions_per_era: 5, sessions_per_era: 5,
bonding_duration: 2, bonding_duration: 2 * 60 * 12,
early_era_slash: 0, early_era_slash: 0,
session_reward: 0, session_reward: 0,
}), }),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment