Change the import queue traits to take &mut self instead of &self (#3058)

* SharedFinalityProofRequestBuilder -> BoxFinalityProofRequestBuilder

* SharedThings -> BoxThings

* Fix tests

* build_request_data now takes &mut self

* The other traits now also take &mut self

* More or less fix tests

* Fix tests

* Fix more tests

* Moar tests

* Don't call make_block_import multiple time

* Fix doctest
This commit is contained in:
Pierre Krieger
2019-07-09 17:11:25 +02:00
committed by Gavin Wood
parent e729dbabbe
commit d7b6720663
21 changed files with 268 additions and 150 deletions
+3 -3
View File
@@ -57,7 +57,7 @@ impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
where
B: client::backend::Backend<Block, Blake2Hasher>,
E: client::CallExecutor<Block, Blake2Hasher>,
Self: BlockImport<Block, Error=ConsensusError>,
for<'r> &'r Self: BlockImport<Block, Error=ConsensusError>,
Block: BlockT<Hash=<Blake2Hasher as Hasher>::Out>,
{
fn import(&self, origin: BlockOrigin, block: Block)
@@ -75,7 +75,7 @@ impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
fork_choice: ForkChoiceStrategy::LongestChain,
};
self.import_block(import, HashMap::new()).map(|_| ())
BlockImport::import_block(&mut (&*self), import, HashMap::new()).map(|_| ())
}
fn import_justified(
@@ -96,7 +96,7 @@ impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
fork_choice: ForkChoiceStrategy::LongestChain,
};
self.import_block(import, HashMap::new()).map(|_| ())
BlockImport::import_block(&mut (&*self), import, HashMap::new()).map(|_| ())
}
fn finalize_block(