Revert "grandpa: Use storage proofs for Grandpa authorities (#3734)" (#3983)

This reverts commit c0a1926704.
This commit is contained in:
Jim Posen
2019-10-31 23:48:04 +01:00
committed by Gavin Wood
parent b0a58647eb
commit 8207b4fceb
18 changed files with 195 additions and 263 deletions
+6 -10
View File
@@ -69,11 +69,10 @@ macro_rules! new_full_start {
.with_import_queue(|_config, client, mut select_chain, _transaction_pool| {
let select_chain = select_chain.take()
.ok_or_else(|| substrate_service::Error::SelectChainRequired)?;
let (grandpa_block_import, grandpa_link) = grandpa::block_import(
client.clone(),
&*client,
select_chain,
)?;
let (grandpa_block_import, grandpa_link) =
grandpa::block_import::<_, _, _, node_runtime::RuntimeApi, _, _>(
client.clone(), &*client, select_chain
)?;
let justification_import = grandpa_block_import.clone();
let (block_import, babe_link) = babe::block_import(
@@ -292,11 +291,8 @@ pub fn new_light<C: Send + Default + 'static>(config: NodeConfiguration<C>)
let fetch_checker = fetcher
.map(|fetcher| fetcher.checker().clone())
.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
let grandpa_block_import = grandpa::light_block_import::<_, _, _, RuntimeApi>(
client.clone(),
backend,
&*client,
Arc::new(fetch_checker),
let grandpa_block_import = grandpa::light_block_import::<_, _, _, RuntimeApi, _>(
client.clone(), backend, Arc::new(fetch_checker), client.clone()
)?;
let finality_proof_import = grandpa_block_import.clone();