pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 13:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

BlockId removal: &Hash to Hash (#12626)

Browse Source 
It changes &Block::Hash argument to Block::Hash.

This PR is part of BlockId::Number refactoring analysis (paritytech/substrate#11292)
This commit is contained in:
Michal Kucharczyk
2022-11-07 22:42:16 +01:00
committed by GitHub
parent 7c4bfc9749
commit 1ed70004e7
49 changed files with 428 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/rpc/src/chain/tests.rs
+2 -2
View File
@@ -206,7 +206,7 @@ async fn should_return_finalized_hash() {
assert_eq!(res, client.genesis_hash());
// finalize
client.finalize_block(&block_hash, None).unwrap();
client.finalize_block(block_hash, None).unwrap();
let res: H256 = api.call("chain_getFinalizedHead", EmptyParams::new()).await.unwrap();
assert_eq!(res, block_hash);
}
@@ -235,7 +235,7 @@ async fn test_head_subscription(method: &str) {
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
let block_hash = block.hash();
client.import(BlockOrigin::Own, block).await.unwrap();
client.finalize_block(&block_hash, None).unwrap();
client.finalize_block(block_hash, None).unwrap();
sub
};
substrate/client/rpc/src/state/state_full.rs
+16 -16
View File
@@ -147,7 +147,7 @@ where
let mut block_changes = StorageChangeSet { block: *block_hash, changes: Vec::new() };
for key in keys {
let (has_changed, data) = {
let curr_data = self.client.storage(block_hash, key).map_err(client_err)?;
let curr_data = self.client.storage(*block_hash, key).map_err(client_err)?;
match last_values.get(key) {
Some(prev_data) => (curr_data != *prev_data, curr_data),
None => (true, curr_data),
@@ -213,7 +213,7 @@ where
prefix: StorageKey,
) -> std::result::Result<Vec<StorageKey>, Error> {
self.block_or_best(block)
.and_then(|block| self.client.storage_keys(&block, &prefix))
.and_then(|block| self.client.storage_keys(block, &prefix))
.map_err(client_err)
}
@@ -223,7 +223,7 @@ where
prefix: StorageKey,
) -> std::result::Result<Vec<(StorageKey, StorageData)>, Error> {
self.block_or_best(block)
.and_then(|block| self.client.storage_pairs(&block, &prefix))
.and_then(|block| self.client.storage_pairs(block, &prefix))
.map_err(client_err)
}
@@ -236,7 +236,7 @@ where
) -> std::result::Result<Vec<StorageKey>, Error> {
self.block_or_best(block)
.and_then(|block| {
self.client.storage_keys_iter(&block, prefix.as_ref(), start_key.as_ref())
self.client.storage_keys_iter(block, prefix.as_ref(), start_key.as_ref())
})
.map(|iter| iter.take(count as usize).collect())
.map_err(client_err)
@@ -248,7 +248,7 @@ where
key: StorageKey,
) -> std::result::Result<Option<StorageData>, Error> {
self.block_or_best(block)
.and_then(|block| self.client.storage(&block, &key))
.and_then(|block| self.client.storage(block, &key))
.map_err(client_err)
}
@@ -262,14 +262,14 @@ where
Err(e) => return Err(client_err(e)),
};
match self.client.storage(&block, &key) {
match self.client.storage(block, &key) {
Ok(Some(d)) => return Ok(Some(d.0.len() as u64)),
Err(e) => return Err(client_err(e)),
Ok(None) => {},
}
self.client
.storage_pairs(&block, &key)
.storage_pairs(block, &key)
.map(|kv| {
let item_sum = kv.iter().map(|(_, v)| v.0.len() as u64).sum::<u64>();
if item_sum > 0 {
@@ -287,7 +287,7 @@ where
key: StorageKey,
) -> std::result::Result<Option<Block::Hash>, Error> {
self.block_or_best(block)
.and_then(|block| self.client.storage_hash(&block, &key))
.and_then(|block| self.client.storage_hash(block, &key))
.map_err(client_err)
}
@@ -345,7 +345,7 @@ where
self.block_or_best(block)
.and_then(|block| {
self.client
.read_proof(&block, &mut keys.iter().map(|key| key.0.as_ref()))
.read_proof(block, &mut keys.iter().map(|key| key.0.as_ref()))
.map(|proof| proof.into_iter_nodes().map(|node| node.into()).collect())
.map(|proof| ReadProof { at: block, proof })
})
@@ -413,7 +413,7 @@ where
let changes = keys
.into_iter()
.map(|key| {
let v = self.client.storage(&block, &key).ok().flatten();
let v = self.client.storage(block, &key).ok().flatten();
(key, v)
})
.collect();
@@ -494,7 +494,7 @@ where
};
self.client
.read_child_proof(
&block,
block,
&child_info,
&mut keys.iter().map(|key| key.0.as_ref()),
)
@@ -517,7 +517,7 @@ where
ChildInfo::new_default(storage_key),
None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
};
self.client.child_storage_keys(&block, &child_info, &prefix)
self.client.child_storage_keys(block, &child_info, &prefix)
})
.map_err(client_err)
}
@@ -538,7 +538,7 @@ where
None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
};
self.client.child_storage_keys_iter(
&block,
block,
child_info,
prefix.as_ref(),
start_key.as_ref(),
@@ -561,7 +561,7 @@ where
ChildInfo::new_default(storage_key),
None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
};
self.client.child_storage(&block, &child_info, &key)
self.client.child_storage(block, &child_info, &key)
})
.map_err(client_err)
}
@@ -584,7 +584,7 @@ where
keys.into_iter()
.map(move |key| {
client.clone().child_storage(&block, &child_info, &key).map_err(client_err)
client.clone().child_storage(block, &child_info, &key).map_err(client_err)
})
.collect()
}
@@ -602,7 +602,7 @@ where
ChildInfo::new_default(storage_key),
None => return Err(sp_blockchain::Error::InvalidChildStorageKey),
};
self.client.child_storage_hash(&block, &child_info, &key)
self.client.child_storage_hash(block, &child_info, &key)
})
.map_err(client_err)
}