Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

removes use of sc_client::Client from sc_finality_grandpa #5030

Merged
gnunicorn merged 5 commits into from
Feb 27, 2020
Merged

removes use of sc_client::Client from sc_finality_grandpa #5030

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c500b7
removes use of sc_client::Client from sc_finality_grandpa
seunlanlege Feb 24, 2020
ee18abc
code formatting
seunlanlege Feb 24, 2020
2c0eafd
code formatting
seunlanlege Feb 24, 2020
4907e0b
removes use of sc_client::Client from sc_finality_grandpa
seunlanlege Feb 26, 2020
e48f24c
Merge branch 'master' of github.com:paritytech/substrate into seun-re…
seunlanlege Feb 27, 2020
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
Prev Previous commit
Next Next commit
code formatting
  • Loading branch information
@seunlanlege
seunlanlege committed Feb 26, 2020
commit ee18abcabb58ce32866a90b47ad5f97b8b81e645
32 changes: 18 additions & 14 deletions client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,16 @@ impl<B, E, Block, RA> BlockOf for Client<B, E, Block, RA> where
type Type = Block;
}

impl<B, E, Block, RA> ClientBackend<Block, B> for Client<B, E, Block, RA> where
B: backend::Backend<Block>,
E: CallExecutor<Block>,
Block: BlockT,
impl<B, E, Block, RA> ClientBackend<Block, B> for Client<B, E, Block, RA>
where
B: backend::Backend<Block>,
E: CallExecutor<Block>,
Block: BlockT,
{
fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err> where
F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
Err: From<sp_blockchain::Error>,
fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err>
where
F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
Err: From<sp_blockchain::Error>,
{
let inner = || {
let _import_lock = self.backend.get_import_lock().write();
Expand Down Expand Up @@ -256,14 +258,16 @@ impl<B, E, Block, RA> ClientBackend<Block, B> for Client<B, E, Block, RA> where
}
}

impl<B, E, Block, RA> ClientBackend<Block, B> for &Client<B, E, Block, RA> where
B: backend::Backend<Block>,
E: CallExecutor<Block>,
Block: BlockT,
impl<B, E, Block, RA> ClientBackend<Block, B> for &Client<B, E, Block, RA>
where
Block: BlockT,
B: backend::Backend<Block>,
E: CallExecutor<Block>,
{
fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err> where
F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
Err: From<sp_blockchain::Error>,
fn lock_import_and_run<R, Err, F>(&self, f: F) -> Result<R, Err>
where
F: FnOnce(&mut ClientImportOperation<Block, B>) -> Result<R, Err>,
Err: From<sp_blockchain::Error>,
{
(**self).lock_import_and_run(f)
}
Expand Down