pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-29 20:47:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Client::info() no longer returns a Result (#2776)

Browse Source
This commit is contained in:
Pierre Krieger
2019-06-04 16:09:46 +02:00
committed by Bastian Köcher
parent 53e8ad8728
commit 5df89a8a6f
33 changed files with 235 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/service/src/chain_ops.rs
+3 -3
View File
@@ -52,7 +52,7 @@ pub fn export_blocks<F, E, W>(
let last = match to {
Some(v) if v.is_zero() => One::one(),
Some(v) => v,
None => client.info()?.chain.best_number,
None => client.info().chain.best_number,
};
if last < block {
@@ -186,7 +186,7 @@ pub fn import_blocks<F, E, R>(
blocks_imported += 1;
}
info!("Imported {} blocks. Best: #{}", block_count, client.info()?.chain.best_number);
info!("Imported {} blocks. Best: #{}", block_count, client.info().chain.best_number);
Ok(())
}
@@ -200,7 +200,7 @@ pub fn revert_chain<F>(
{
let client = new_client::<F>(&config)?;
let reverted = client.revert(blocks)?;
let info = client.info()?.chain;
let info = client.info().chain;
if reverted.is_zero() {
info!("There aren't any non-finalized blocks to revert.");
substrate/core/service/src/lib.rs
+2 -7
View File
@@ -156,7 +156,7 @@ impl<Components: components::Components> Service<Components> {
select_chain.clone(),
)?);
let finality_proof_provider = Components::build_finality_proof_provider(client.clone())?;
let chain_info = client.info()?.chain;
let chain_info = client.info().chain;
let version = config.full_version();
info!("Highest known block at #{}", chain_info.best_number);
@@ -479,12 +479,7 @@ pub struct TransactionPoolAdapter<C: Components> {
impl<C: Components> TransactionPoolAdapter<C> {
fn best_block_id(&self) -> Option<BlockId<ComponentBlock<C>>> {
self.client.info()
.map(|info| BlockId::hash(info.chain.best_hash))
.map_err(|e| {
debug!("Error getting best block: {:?}", e);
})
.ok()
Some(BlockId::hash(self.client.info().chain.best_hash))
}
}