BlockId removal: refactor: HeaderBackend::header (#12874)

* BlockId removal: refactor: HeaderBackend::header

It changes the arguments of:
- `HeaderBackend::header`,
- `Client::header`,
- `PeersClient::header`
- `ChainApi::block_header`

methods from: `BlockId<Block>` to: `Block::Hash`

This PR is part of BlockId::Number refactoring analysis (paritytech/substrate#11292)

* non-trivial usages of haeder(block_id) refactored

This may required introduction of dedicated function:
header_for_block_num

* fmt

* fix

* doc fixed

* ".git/.scripts/fmt.sh"

* BlockId removal: refactor: HeaderBackend::expect_header

It changes the arguments of `HeaderBackend::expect_header` method from: `BlockId<Block>` to: `Block::Hash`

* ".git/.scripts/fmt.sh"

* readme updated

* ".git/.scripts/fmt.sh"

* fix

Co-authored-by: parity-processbot <>
This commit is contained in:
Michal Kucharczyk
2022-12-20 10:43:31 +01:00
committed by GitHub
parent 74da30c8a2
commit 548955a73f
55 changed files with 307 additions and 360 deletions
@@ -525,7 +525,7 @@ where
Some((_, n)) if n > best_block_number => best_block_hash,
Some((h, _)) => {
// this is the header at which the new set will start
let header = self.client.header(BlockId::Hash(h))?.expect(
let header = self.client.header(h)?.expect(
"got block hash from registered pending change; \
pending changes are only registered on block import; qed.",
);
@@ -1171,7 +1171,7 @@ where
SelectChain: SelectChainT<Block> + 'static,
VotingRule: VotingRuleT<Block, Client>,
{
let base_header = match client.header(BlockId::Hash(block))? {
let base_header = match client.header(block)? {
Some(h) => h,
None => {
debug!(
@@ -1197,7 +1197,7 @@ where
let result = match select_chain.finality_target(block, None).await {
Ok(best_hash) => {
let best_header = client
.header(BlockId::Hash(best_hash))?
.header(best_hash)?
.expect("Header known to exist after `finality_target` call; qed");
// check if our vote is currently being limited due to a pending change
@@ -1221,7 +1221,7 @@ where
}
target_header = client
.header(BlockId::Hash(*target_header.parent_hash()))?
.header(*target_header.parent_hash())?
.expect("Header known to exist after `finality_target` call; qed");
}