mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-14 04:01:10 +00:00
BlockId::Number refactor: trivial changes to BlockId::Hash (#12471)
* Trivial BlockId::Number => Hash * missed BlockId::Hash added
This commit is contained in:
committed by
GitHub
parent
8920b1c5b3
commit
09748f1b28
@@ -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(),
|
||||
|
||||
@@ -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,
|
||||
);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user