mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 20:27:58 +00:00
fd6b29dd2c
* Extend `Proposer` to optionally generate a proof of the proposal * Something * Refactor sr-api to not depend on client anymore * Fix benches * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Apply suggestions from code review * Introduce new `into_storage_changes` function * Switch to runtime api for `execute_block` and don't require `H256` anywhere in the code * Put the `StorageChanges` into the `Proposal` * Move the runtime api error to its own trait * Adds `StorageTransactionCache` to the runtime api This requires that we add `type NodeBlock = ` to the `impl_runtime_apis!` macro to work around some bugs in rustc :( * Remove `type NodeBlock` and switch to a "better" hack * Start using the transaction cache from the runtime api * Make it compile * Move `InMemory` to its own file * Make all tests work again * Return block, storage_changes and proof from Blockbuilder::bake() * Make sure that we use/set `storage_changes` when possible * Add test * Fix deadlock * Remove accidentally added folders * Introduce `RecordProof` as argument type to be more explicit * Update client/src/client.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update primitives/state-machine/src/ext.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Integrates review feedback * Remove `unsafe` usage * Update client/block-builder/src/lib.rs Co-Authored-By: Benjamin Kampmann <ben@gnunicorn.org> * Update client/src/call_executor.rs * Bump versions Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com> Co-authored-by: Benjamin Kampmann <ben.kampmann@googlemail.com>
132 lines
3.8 KiB
Rust
132 lines
3.8 KiB
Rust
// Copyright 2019-2020 Parity Technologies (UK) Ltd.
|
|
// This file is part of Substrate.
|
|
|
|
// Substrate is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Substrate is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use sp_api::{RuntimeApiInfo, decl_runtime_apis, impl_runtime_apis};
|
|
|
|
use sp_runtime::{traits::{GetNodeBlockType, Block as BlockT}, generic::BlockId};
|
|
|
|
use substrate_test_runtime_client::runtime::Block;
|
|
use sp_blockchain::Result;
|
|
|
|
/// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
|
|
/// trait are done by the `construct_runtime!` macro in a real runtime.
|
|
pub struct Runtime {}
|
|
impl GetNodeBlockType for Runtime {
|
|
type NodeBlock = Block;
|
|
}
|
|
|
|
decl_runtime_apis! {
|
|
pub trait Api {
|
|
fn test(data: u64);
|
|
fn something_with_block(block: Block) -> Block;
|
|
fn function_with_two_args(data: u64, block: Block);
|
|
fn same_name();
|
|
fn wild_card(_: u32);
|
|
}
|
|
|
|
#[api_version(2)]
|
|
pub trait ApiWithCustomVersion {
|
|
fn same_name();
|
|
#[changed_in(2)]
|
|
fn same_name() -> String;
|
|
}
|
|
}
|
|
|
|
impl_runtime_apis! {
|
|
impl self::Api<Block> for Runtime {
|
|
fn test(_: u64) {
|
|
unimplemented!()
|
|
}
|
|
|
|
fn something_with_block(_: Block) -> Block {
|
|
unimplemented!()
|
|
}
|
|
|
|
fn function_with_two_args(_: u64, _: Block) {
|
|
unimplemented!()
|
|
}
|
|
|
|
fn same_name() {}
|
|
|
|
fn wild_card(_: u32) {}
|
|
}
|
|
|
|
impl self::ApiWithCustomVersion<Block> for Runtime {
|
|
fn same_name() {}
|
|
}
|
|
|
|
impl sp_api::Core<Block> for Runtime {
|
|
fn version() -> sp_version::RuntimeVersion {
|
|
unimplemented!()
|
|
}
|
|
fn execute_block(_: Block) {
|
|
unimplemented!()
|
|
}
|
|
fn initialize_block(_: &<Block as BlockT>::Header) {
|
|
unimplemented!()
|
|
}
|
|
}
|
|
}
|
|
|
|
type TestClient = substrate_test_runtime_client::sc_client::Client<
|
|
substrate_test_runtime_client::Backend,
|
|
substrate_test_runtime_client::Executor,
|
|
Block,
|
|
RuntimeApi,
|
|
>;
|
|
|
|
#[test]
|
|
fn test_client_side_function_signature() {
|
|
let _test: fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, u64) -> Result<()> =
|
|
RuntimeApiImpl::<Block, TestClient>::test;
|
|
let _something_with_block:
|
|
fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, Block) -> Result<Block> =
|
|
RuntimeApiImpl::<Block, TestClient>::something_with_block;
|
|
|
|
#[allow(deprecated)]
|
|
let _same_name_before_version_2:
|
|
fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>) -> Result<String> =
|
|
RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
|
|
}
|
|
|
|
#[test]
|
|
fn check_runtime_api_info() {
|
|
assert_eq!(&Api::<Block, Error = ()>::ID, &runtime_decl_for_Api::ID);
|
|
assert_eq!(Api::<Block, Error = ()>::VERSION, runtime_decl_for_Api::VERSION);
|
|
assert_eq!(Api::<Block, Error = ()>::VERSION, 1);
|
|
|
|
assert_eq!(
|
|
ApiWithCustomVersion::<Block, Error = ()>::VERSION,
|
|
runtime_decl_for_ApiWithCustomVersion::VERSION,
|
|
);
|
|
assert_eq!(
|
|
&ApiWithCustomVersion::<Block, Error = ()>::ID,
|
|
&runtime_decl_for_ApiWithCustomVersion::ID,
|
|
);
|
|
assert_eq!(ApiWithCustomVersion::<Block, Error = ()>::VERSION, 2);
|
|
}
|
|
|
|
fn check_runtime_api_versions_contains<T: RuntimeApiInfo + ?Sized>() {
|
|
assert!(RUNTIME_API_VERSIONS.iter().any(|v| v == &(T::ID, T::VERSION)));
|
|
}
|
|
|
|
#[test]
|
|
fn check_runtime_api_versions() {
|
|
check_runtime_api_versions_contains::<dyn Api<Block, Error = ()>>();
|
|
check_runtime_api_versions_contains::<dyn ApiWithCustomVersion<Block, Error = ()>>();
|
|
check_runtime_api_versions_contains::<dyn sp_api::Core<Block, Error = ()>>();
|
|
}
|