mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 01:11:10 +00:00
Update Cumulus for Parachains V1 (#224)
* Start with something * Whatever * Update * MOARE * Make cumulus-network compile and tests work * Update more and fixes * More stuff * More fixes * Make collator build * Make test almost work * Remove contracts runtime * More test work * Make service compile * Fix test-service * Fix test client * More fixes * Fix collator test * Fix network tests (again) * Make everything compile, finally * Fix tests * Update to latest masters * Remove ignore * Switch to different branch in polkadot for now * Update reference * Make it compile with latest changes * Update collator/src/lib.rs Co-authored-by: Robert Habermeier <rphmeier@gmail.com> * Update to latest upstream * Update to latest master * Fix test Co-authored-by: Robert Habermeier <rphmeier@gmail.com>
This commit is contained in:
@@ -21,7 +21,7 @@ mod block_builder;
|
||||
pub use block_builder::*;
|
||||
|
||||
use codec::Encode;
|
||||
pub use runtime;
|
||||
pub use cumulus_test_runtime as runtime;
|
||||
use runtime::{
|
||||
Balance, Block, BlockHashCount, Call, GenesisConfig, Runtime, Signature, SignedExtra,
|
||||
SignedPayload, UncheckedExtrinsic, VERSION,
|
||||
@@ -35,14 +35,14 @@ use sp_runtime::{
|
||||
BuildStorage, SaturatedConversion,
|
||||
};
|
||||
use std::collections::BTreeMap;
|
||||
pub use test_client::*;
|
||||
pub use substrate_test_client::*;
|
||||
|
||||
mod local_executor {
|
||||
use test_client::sc_executor::native_executor_instance;
|
||||
use substrate_test_client::sc_executor::native_executor_instance;
|
||||
native_executor_instance!(
|
||||
pub LocalExecutor,
|
||||
runtime::api::dispatch,
|
||||
runtime::native_version,
|
||||
cumulus_test_runtime::api::dispatch,
|
||||
cumulus_test_runtime::native_version,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -50,14 +50,14 @@ mod local_executor {
|
||||
pub use local_executor::LocalExecutor;
|
||||
|
||||
/// Test client database backend.
|
||||
pub type Backend = test_client::Backend<Block>;
|
||||
pub type Backend = substrate_test_client::Backend<Block>;
|
||||
|
||||
/// Test client executor.
|
||||
pub type Executor = client::LocalCallExecutor<Backend, sc_executor::NativeExecutor<LocalExecutor>>;
|
||||
|
||||
/// Test client builder for Cumulus
|
||||
pub type TestClientBuilder =
|
||||
test_client::TestClientBuilder<Block, Executor, Backend, GenesisParameters>;
|
||||
substrate_test_client::TestClientBuilder<Block, Executor, Backend, GenesisParameters>;
|
||||
|
||||
/// LongestChain type for the test runtime/client.
|
||||
pub type LongestChain = sc_consensus::LongestChain<Backend, Block>;
|
||||
@@ -71,7 +71,7 @@ pub struct GenesisParameters {
|
||||
support_changes_trie: bool,
|
||||
}
|
||||
|
||||
impl test_client::GenesisInit for GenesisParameters {
|
||||
impl substrate_test_client::GenesisInit for GenesisParameters {
|
||||
fn genesis_storage(&self) -> Storage {
|
||||
let changes_trie_config: Option<ChangesTrieConfiguration> = if self.support_changes_trie {
|
||||
Some(sp_test_primitives::changes_trie_config())
|
||||
|
||||
Reference in New Issue
Block a user