Implement runtime api client side directly in the runtime (#1094)

* Move `initialise_block` into `Core` trait as it is crucial calling the API functions

* Switch to first version of new runtime API implementation

* Fixes bug in tests

* Reenable asserts

* Directly use the `TestAPI` in the tests

* Start improving the api traits

:100644 100644 898aadc7 49217199 M	Cargo.lock
:100644 100644 61570436 465ed664 M	core/client/src/backend.rs
:100644 100644 5d0c886b 64d710fd M	core/client/src/block_builder.rs
:100644 100644 c447855e 5ecbe474 M	core/client/src/client.rs
:100644 100644 139cef13 f90dbf3d M	core/client/src/error.rs
:100644 100644 2800c503 3298e66a M	core/client/src/runtime_api.rs
:100644 100644 affa1c5c 809b08bc M	core/primitives/src/lib.rs
:100644 100644 2877dfa9 d5547413 M	core/sr-api/Cargo.toml
:100644 100644 9a49784d 6a625a03 M	core/sr-api/src/lib.rs
:100644 100644 7c28e1c7 a1a444a9 M	core/sr-primitives/src/traits.rs
:100644 100644 2e113ab6 dcc01a6d M	srml/metadata/Cargo.toml
:100644 100644 ea722a70 0809531a M	srml/metadata/src/lib.rs

* Refactoring

* Move `sr-api` into client and more refactoring

* Fixes tests

* Some documentation and cleanup

* Fixes compilation after rebase

* More refactoring and more documentation

* Makes `substrate-client` compilable on `wasm`

On `wasm` it basically just exports the runtime api stuff.

* Fixes grumbles

* Updates wasm files after rebasing the master

* Remove TODO comment

* Remove whitespaces

* Fixes after rebasing master

* Another rebase, another fix commit
This commit is contained in:
Bastian Köcher
2018-11-13 13:33:28 +01:00
committed by Gav Wood
parent 6e3c56c135
commit 9063d1acae
51 changed files with 2993 additions and 777 deletions
+14 -9
View File
@@ -18,8 +18,9 @@
use std::{
sync::Arc,
marker::PhantomData,
};
use client::{self, runtime_api::TaggedTransactionQueue};
use client::{runtime_api::TaggedTransactionQueue, blockchain::HeaderBackend};
use parity_codec::Encode;
use txpool;
use substrate_primitives::{
@@ -36,30 +37,34 @@ use sr_primitives::{
use error;
/// The transaction pool logic
pub struct ChainApi<B, E, Block: traits::Block> {
client: Arc<client::Client<B, E, Block>>,
pub struct ChainApi<T, Block> {
client: Arc<T>,
_marker: PhantomData<Block>,
}
impl<B, E, Block: traits::Block> ChainApi<B, E, Block> {
impl<T, Block> ChainApi<T, Block> where
Block: traits::Block,
T: traits::ProvideRuntimeApi + HeaderBackend<Block> {
/// Create new transaction pool logic.
pub fn new(client: Arc<client::Client<B, E, Block>>) -> Self {
pub fn new(client: Arc<T>) -> Self {
ChainApi {
client,
_marker: Default::default()
}
}
}
impl<B, E, Block> txpool::ChainApi for ChainApi<B, E, Block> where
impl<T, Block> txpool::ChainApi for ChainApi<T, Block> where
Block: traits::Block<Hash=H256>,
B: client::backend::Backend<Block, Blake2Hasher> + Send + Sync + 'static,
E: client::CallExecutor<Block, Blake2Hasher> + Send + Sync + Clone + 'static,
T: traits::ProvideRuntimeApi + HeaderBackend<Block>,
T::Api: TaggedTransactionQueue<Block>
{
type Block = Block;
type Hash = H256;
type Error = error::Error;
fn validate_transaction(&self, at: &BlockId<Self::Block>, uxt: &txpool::ExtrinsicFor<Self>) -> error::Result<TransactionValidity> {
Ok(self.client.validate_transaction(at, uxt)?)
Ok(self.client.runtime_api().validate_transaction(at, uxt)?)
}
// TODO [toDr] Use proper lbock number type