mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 10:31:03 +00:00
Update substrate (#878)
* Switch branch * Small changes * Update substrate branch * Switch * Revert "Switch branch" This reverts commit b9d48b2ce8f5cbfa379dd385e817e80870391d9d. * fix * add `wipe` and `commit` * Remove deprecated_host_interface * Switch branch * HasherFor -> HashFor * More HasherFor changes * Final touches * Revert "Switch branch" This reverts commit d0da27313839559de01f59690f3826fe587becb8. Co-authored-by: thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
@@ -32,7 +32,7 @@ use polkadot_primitives::{
|
||||
ParachainHost, AvailableData, OmittedValidationData,
|
||||
},
|
||||
};
|
||||
use sp_runtime::traits::{BlakeTwo256, Hash as HashT, HasherFor};
|
||||
use sp_runtime::traits::{BlakeTwo256, Hash as HashT, HashFor};
|
||||
use sp_blockchain::{Result as ClientResult};
|
||||
use client::{
|
||||
BlockchainEvents, BlockBody,
|
||||
@@ -199,7 +199,7 @@ impl Store {
|
||||
P::Api: ParachainHost<Block>,
|
||||
P::Api: ApiExt<Block, Error=sp_blockchain::Error>,
|
||||
// Rust bug: https://github.com/rust-lang/rust/issues/24159
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>>,
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HashFor<Block>>,
|
||||
{
|
||||
let to_worker = self.to_worker.clone();
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ use std::thread;
|
||||
|
||||
use log::{error, info, trace, warn};
|
||||
use sp_blockchain::{Result as ClientResult};
|
||||
use sp_runtime::traits::{Header as HeaderT, Block as BlockT, HasherFor};
|
||||
use sp_runtime::traits::{Header as HeaderT, Block as BlockT, HashFor, BlakeTwo256};
|
||||
use sp_api::{ApiExt, ProvideRuntimeApi};
|
||||
use client::{
|
||||
BlockchainEvents, BlockBody,
|
||||
@@ -205,7 +205,7 @@ where
|
||||
P: ProvideRuntimeApi<Block>,
|
||||
P::Api: ParachainHost<Block, Error = sp_blockchain::Error>,
|
||||
// Rust bug: https://github.com/rust-lang/rust/issues/24159
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>>,
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HashFor<Block>>,
|
||||
{
|
||||
let api = client.runtime_api();
|
||||
|
||||
@@ -229,7 +229,7 @@ where
|
||||
P::Api: ParachainHost<Block> + ApiExt<Block, Error=sp_blockchain::Error>,
|
||||
S: Sink<WorkerMsg> + Clone + Send + Sync + Unpin,
|
||||
// Rust bug: https://github.com/rust-lang/rust/issues/24159
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>>,
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HashFor<Block>>,
|
||||
{
|
||||
let mut finality_notification_stream = client.finality_notification_stream();
|
||||
|
||||
@@ -613,7 +613,7 @@ impl<I, P> BlockImport<Block> for AvailabilityBlockImport<I, P> where
|
||||
P: ProvideRuntimeApi<Block> + ProvideCache<Block>,
|
||||
P::Api: ParachainHost<Block, Error = sp_blockchain::Error>,
|
||||
// Rust bug: https://github.com/rust-lang/rust/issues/24159
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<sp_core::Blake2Hasher>
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<BlakeTwo256>
|
||||
{
|
||||
type Error = ConsensusError;
|
||||
type Transaction = sp_api::TransactionFor<P, Block>;
|
||||
@@ -726,7 +726,7 @@ impl<I, P> AvailabilityBlockImport<I, P> {
|
||||
P::Api: ParachainHost<Block>,
|
||||
P::Api: ApiExt<Block, Error = sp_blockchain::Error>,
|
||||
// Rust bug: https://github.com/rust-lang/rust/issues/24159
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>>,
|
||||
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HashFor<Block>>,
|
||||
{
|
||||
let (signal, exit) = exit_future::signal();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user