Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to Substrate master (paritytech#633)
Browse files Browse the repository at this point in the history
bkchr authored and gavofyork committed Nov 29, 2019

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent 3773d5c commit 6eb9c71
Showing 3 changed files with 124 additions and 121 deletions.
236 changes: 118 additions & 118 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions availability-store/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,6 +11,6 @@ parking_lot = "0.9.0"
log = "0.4.8"
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
kvdb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
kvdb = "0.1.1"
kvdb-rocksdb = "0.2"
kvdb-memorydb = "0.1.2"
3 changes: 3 additions & 0 deletions service/src/lib.rs
Original file line number Diff line number Diff line change
@@ -272,6 +272,8 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)

let client = service.client();
let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?;
let can_author_with =
consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone());

let babe_config = babe::BabeParams {
keystore: service.keystore(),
@@ -283,6 +285,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
inherent_data_providers: inherent_data_providers.clone(),
force_authoring: force_authoring,
babe_link,
can_author_with,
};

let babe = babe::start_babe(babe_config)?;

0 comments on commit 6eb9c71

Please sign in to comment.