From 09748f1b284252e716e78bcd6227e4621350a03f Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Wed, 12 Oct 2022 18:10:31 +0200
Subject: [PATCH] BlockId::Number refactor: trivial changes to BlockId::Hash
(#12471)
* Trivial BlockId::Number => Hash
* missed BlockId::Hash added
---
substrate/client/consensus/aura/src/lib.rs | 2 +-
substrate/client/db/benches/state_access.rs | 2 +-
substrate/test-utils/runtime/src/lib.rs | 6 +++---
substrate/utils/frame/benchmarking-cli/src/storage/cmd.rs | 2 +-
substrate/utils/frame/benchmarking-cli/src/storage/read.rs | 2 +-
substrate/utils/frame/benchmarking-cli/src/storage/write.rs | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/substrate/client/consensus/aura/src/lib.rs b/substrate/client/consensus/aura/src/lib.rs
index a0eed6e3531..734cecca9b3 100644
--- a/substrate/client/consensus/aura/src/lib.rs
+++ b/substrate/client/consensus/aura/src/lib.rs
@@ -769,7 +769,7 @@ mod tests {
assert_eq!(client.chain_info().best_number, 0);
assert_eq!(
- authorities(&client, &BlockId::Number(0)).unwrap(),
+ authorities(&client, &BlockId::Hash(client.chain_info().best_hash)).unwrap(),
vec![
Keyring::Alice.public().into(),
Keyring::Bob.public().into(),
diff --git a/substrate/client/db/benches/state_access.rs b/substrate/client/db/benches/state_access.rs
index 714dda82d61..4f4c10bcc8f 100644
--- a/substrate/client/db/benches/state_access.rs
+++ b/substrate/client/db/benches/state_access.rs
@@ -84,7 +84,7 @@ fn insert_blocks(db: &Backend<Block>, storage: Vec<(Vec<u8>, Vec<u8>)>) -> H256
.map(|(k, v)| (k.clone(), Some(v.clone())))
.collect::<Vec<_>>();
- let (state_root, tx) = db.state_at(BlockId::Number(number - 1)).unwrap().storage_root(
+ let (state_root, tx) = db.state_at(BlockId::Hash(parent_hash)).unwrap().storage_root(
changes.iter().map(|(k, v)| (k.as_slice(), v.as_deref())),
StateVersion::V1,
);
diff --git a/substrate/test-utils/runtime/src/lib.rs b/substrate/test-utils/runtime/src/lib.rs
index 3db0e551005..8bda4ea6024 100644
--- a/substrate/test-utils/runtime/src/lib.rs
+++ b/substrate/test-utils/runtime/src/lib.rs
@@ -1340,7 +1340,7 @@ mod tests {
.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
.set_heap_pages(8)
.build();
- let block_id = BlockId::Number(client.chain_info().best_number);
+ let block_id = BlockId::Hash(client.chain_info().best_hash);
// Try to allocate 1024k of memory on heap. This is going to fail since it is twice larger
// than the heap.
@@ -1369,7 +1369,7 @@ mod tests {
let client =
TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
let runtime_api = client.runtime_api();
- let block_id = BlockId::Number(client.chain_info().best_number);
+ let block_id = BlockId::Hash(client.chain_info().best_hash);
runtime_api.test_storage(&block_id).unwrap();
}
@@ -1396,7 +1396,7 @@ mod tests {
let client =
TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
let runtime_api = client.runtime_api();
- let block_id = BlockId::Number(client.chain_info().best_number);
+ let block_id = BlockId::Hash(client.chain_info().best_hash);
runtime_api.test_witness(&block_id, proof, root).unwrap();
}
diff --git a/substrate/utils/frame/benchmarking-cli/src/storage/cmd.rs b/substrate/utils/frame/benchmarking-cli/src/storage/cmd.rs
index 1d91e8f0b05..a4c4188dfe0 100644
--- a/substrate/utils/frame/benchmarking-cli/src/storage/cmd.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/storage/cmd.rs
@@ -191,7 +191,7 @@ impl StorageCmd {
B: BlockT + Debug,
BA: ClientBackend<B>,
{
- let block = BlockId::Number(client.usage_info().chain.best_number);
+ let block = BlockId::Hash(client.usage_info().chain.best_hash);
let empty_prefix = StorageKey(Vec::new());
let mut keys = client.storage_keys(&block, &empty_prefix)?;
let (mut rng, _) = new_rng(None);
diff --git a/substrate/utils/frame/benchmarking-cli/src/storage/read.rs b/substrate/utils/frame/benchmarking-cli/src/storage/read.rs
index cba318f87ea..5e8a310ea5c 100644
--- a/substrate/utils/frame/benchmarking-cli/src/storage/read.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/storage/read.rs
@@ -41,7 +41,7 @@ impl StorageCmd {
<<B as BlockT>::Header as HeaderT>::Number: From<u32>,
{
let mut record = BenchRecord::default();
- let block = BlockId::Number(client.usage_info().chain.best_number);
+ let block = BlockId::Hash(client.usage_info().chain.best_hash);
info!("Preparing keys from block {}", block);
// Load all keys and randomly shuffle them.
diff --git a/substrate/utils/frame/benchmarking-cli/src/storage/write.rs b/substrate/utils/frame/benchmarking-cli/src/storage/write.rs
index 9a3821a7095..0ef2a2f9ae1 100644
--- a/substrate/utils/frame/benchmarking-cli/src/storage/write.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/storage/write.rs
@@ -57,7 +57,7 @@ impl StorageCmd {
// Store the time that it took to write each value.
let mut record = BenchRecord::default();
- let block = BlockId::Number(client.usage_info().chain.best_number);
+ let block = BlockId::Hash(client.usage_info().chain.best_hash);
let header = client.header(block)?.ok_or("Header not found")?;
let original_root = *header.state_root();
let trie = DbStateBuilder::<Block>::new(storage.clone(), original_root).build();
--
GitLab