Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions bin/node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to equal spec_version. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 196,
impl_version: 196,
spec_version: 197,
impl_version: 197,
apis: RUNTIME_API_VERSIONS,
};

Expand Down Expand Up @@ -278,6 +278,8 @@ parameter_types! {
pub const MinimumDeposit: Balance = 100 * DOLLARS;
pub const EnactmentPeriod: BlockNumber = 30 * 24 * 60 * MINUTES;
pub const CooloffPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
// One cent: $10,000 / MB
pub const PreimageByteDeposit: Balance = 1 * CENTS;
}

impl democracy::Trait for Runtime {
Expand Down Expand Up @@ -305,6 +307,8 @@ impl democracy::Trait for Runtime {
// only do it once and it lasts only for the cooloff period.
type VetoOrigin = collective::EnsureMember<AccountId, TechnicalCollective>;
type CooloffPeriod = CooloffPeriod;
type PreimageByteDeposit = PreimageByteDeposit;
type Slash = Treasury;
}

type CouncilCollective = collective::Instance1;
Expand Down
4 changes: 2 additions & 2 deletions client/finality-grandpa/src/communication/gossip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ impl<N: Ord> Peers<N> {
}

fn reshuffle(&mut self) {
let mut lucky_peers : Vec<_> = self.inner
let mut lucky_peers: Vec<_> = self.inner
.iter()
.filter_map(|(id, info)| if !info.roles.is_authority() { Some(id.clone()) } else { None })
.collect();
Expand Down Expand Up @@ -670,7 +670,7 @@ impl<Block: BlockT> Inner<Block> {
let set_id = local_view.set_id;

debug!(target: "afg", "Voter {} noting beginning of round {:?} to network.",
self.config.name(), (round,set_id));
self.config.name(), (round, set_id));

local_view.round = round;

Expand Down
Loading