Update Substrate & Polkadot (#387)

* 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
+6 -4
View File
@@ -31,18 +31,19 @@ use sp_runtime::{
use sp_state_machine::InspectState;
use cumulus_client_consensus_common::ParachainConsensus;
use polkadot_node_primitives::{Collation, CollationGenerationConfig, CollationResult};
use polkadot_node_primitives::{
BlockData, Collation, CollationGenerationConfig, CollationResult, PoV,
};
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_overseer::OverseerHandler;
use polkadot_primitives::v1::{
BlockData, BlockNumber as PBlockNumber, CollatorPair, Hash as PHash, HeadData, Id as ParaId,
PoV, UpwardMessage,
BlockNumber as PBlockNumber, CollatorPair, Hash as PHash, HeadData, Id as ParaId, UpwardMessage,
};
use codec::{Decode, Encode};
use futures::{channel::oneshot, FutureExt};
use std::sync::Arc;
use parking_lot::Mutex;
use std::sync::Arc;
use tracing::Instrument;
/// The logging target.
@@ -429,6 +430,7 @@ mod tests {
self.client
.import(BlockOrigin::Own, block.clone())
.await
.expect("Imports the block");
Some(ParachainCandidate {