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

Update Substrate & Polkadot (#387)

Browse Source 
* Update Substrate & Polkadot

* Enforce `ParachainSetCode`
This commit is contained in:
Bastian Köcher
2021-04-02 16:17:04 +02:00
committed by GitHub
parent dc666c7e82
commit 1d4c02cc4e
14 changed files with 957 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/client/src/block_builder.rs
+5 -5
View File
@@ -19,7 +19,7 @@ use cumulus_primitives_core::PersistedValidationData;
use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER};
use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use cumulus_test_runtime::{Block, GetLastTimestamp};
use polkadot_primitives::v1::BlockNumber as PBlockNumber;
use polkadot_primitives::v1::{BlockNumber as PBlockNumber, Hash as PHash};
use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
use sp_api::ProvideRuntimeApi;
use sp_runtime::generic::BlockId;
@@ -35,7 +35,7 @@ pub trait InitBlockBuilder {
/// just use a default one.
fn init_block_builder(
&self,
validation_data: Option<PersistedValidationData<PBlockNumber>>,
validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
relay_sproof_builder: RelayStateSproofBuilder,
) -> sc_block_builder::BlockBuilder<Block, Client, Backend>;
@@ -46,7 +46,7 @@ pub trait InitBlockBuilder {
fn init_block_builder_at(
&self,
at: &BlockId<Block>,
validation_data: Option<PersistedValidationData<PBlockNumber>>,
validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
relay_sproof_builder: RelayStateSproofBuilder,
) -> sc_block_builder::BlockBuilder<Block, Client, Backend>;
}
@@ -54,7 +54,7 @@ pub trait InitBlockBuilder {
impl InitBlockBuilder for Client {
fn init_block_builder(
&self,
validation_data: Option<PersistedValidationData<PBlockNumber>>,
validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
relay_sproof_builder: RelayStateSproofBuilder,
) -> BlockBuilder<Block, Client, Backend> {
let chain_info = self.chain_info();
@@ -68,7 +68,7 @@ impl InitBlockBuilder for Client {
fn init_block_builder_at(
&self,
at: &BlockId<Block>,
validation_data: Option<PersistedValidationData<PBlockNumber>>,
validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
relay_sproof_builder: RelayStateSproofBuilder,
) -> BlockBuilder<Block, Client, Backend> {
let mut block_builder = self
test/runtime/src/lib.rs
+1
View File
@@ -162,6 +162,7 @@ impl frame_system::Config for Runtime {
type BlockWeights = RuntimeBlockWeights;
type BlockLength = RuntimeBlockLength;
type SS58Prefix = SS58Prefix;
type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
}
parameter_types! {
test/service/src/lib.rs
+1 -1
View File
@@ -158,7 +158,7 @@ where
let relay_chain_full_node = polkadot_test_service::new_full(
relay_chain_config,
if let Some(ref key) = collator_key {
polkadot_service::IsCollator::Yes(key.public())
polkadot_service::IsCollator::Yes(key.clone())
} else {
polkadot_service::IsCollator::No
},