pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 17:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

BlockId removal: CallApiAt::state_at (#13394)

Browse Source 
* BlockId removal: CallApiAt::state_at

It changes the arguments of:
- `CallApiAt::state_at`,
- `Client::code_at`,
- `Client::state_at`

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

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <git@kchr.de>

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: parity-processbot <>
This commit is contained in:
Michal Kucharczyk
2023-02-16 23:21:15 +01:00
committed by GitHub
parent 0669b8bb05
commit 2e4ea01311
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/service/src/client/client.rs
+3 -5
View File
@@ -481,8 +481,7 @@ where
}
/// Get the code at a given block.
pub fn code_at(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Vec<u8>> {
let hash = self.backend.blockchain().expect_block_hash_from_id(id)?;
pub fn code_at(&self, hash: Block::Hash) -> sp_blockchain::Result<Vec<u8>> {
Ok(StorageProvider::storage(self, hash, &StorageKey(well_known_keys::CODE.to_vec()))?
.expect(
"None is returned if there's no value stored for the given key;\
@@ -1746,9 +1745,8 @@ where
CallExecutor::runtime_version(&self.executor, hash).map_err(Into::into)
}
fn state_at(&self, at: &BlockId<Block>) -> Result<Self::StateBackend, sp_api::ApiError> {
let hash = self.backend.blockchain().expect_block_hash_from_id(at)?;
self.state_at(hash).map_err(Into::into)
fn state_at(&self, at: Block::Hash) -> Result<Self::StateBackend, sp_api::ApiError> {
self.state_at(at).map_err(Into::into)
}
}
substrate/primitives/api/src/lib.rs
+1 -1
View File
@@ -622,7 +622,7 @@ pub trait CallApiAt<Block: BlockT> {
fn runtime_version_at(&self, at: &BlockId<Block>) -> Result<RuntimeVersion, ApiError>;
/// Get the state `at` the given block.
fn state_at(&self, at: &BlockId<Block>) -> Result<Self::StateBackend, ApiError>;
fn state_at(&self, at: Block::Hash) -> Result<Self::StateBackend, ApiError>;
}
/// Auxiliary wrapper that holds an api instance and binds it to the given lifetime.
substrate/primitives/api/test/tests/runtime_calls.rs
+2 -2
View File
@@ -147,13 +147,12 @@ fn record_proof_works() {
.set_execution_strategy(ExecutionStrategy::Both)
.build_with_longest_chain();
let block_id = BlockId::Number(client.chain_info().best_number);
let storage_root =
*futures::executor::block_on(longest_chain.best_chain()).unwrap().state_root();
let runtime_code = sp_core::traits::RuntimeCode {
code_fetcher: &sp_core::traits::WrappedRuntimeCode(
client.code_at(&block_id).unwrap().into(),
client.code_at(client.chain_info().best_hash).unwrap().into(),
),
hash: vec![1],
heap_pages: None,
@@ -167,6 +166,7 @@ fn record_proof_works() {
}
.into_signed_tx();
let block_id = BlockId::Hash(client.chain_info().best_hash);
// Build the block and record proof
let mut builder = client
.new_block_at(&block_id, Default::default(), true)