Replace ValidationData with PersistedValidationData (#291)

* Replace ValidationData with PersistedValidationData

* Update polkadot
This commit is contained in:
Sergei Shulepov
2021-01-19 15:20:12 +01:00
committed by GitHub
parent 8ebcf10e31
commit d6a7bc4e30
9 changed files with 541 additions and 507 deletions
+7 -7
View File
@@ -20,7 +20,7 @@ use cumulus_network::WaitToAnnounce;
use cumulus_primitives::{
inherents::{self, VALIDATION_DATA_IDENTIFIER},
well_known_keys, InboundDownwardMessage, InboundHrmpMessage, OutboundHrmpMessage,
ValidationData, relay_chain,
PersistedValidationData, relay_chain,
};
use cumulus_runtime::ParachainBlockData;
@@ -271,7 +271,7 @@ where
/// Get the inherent data with validation function parameters injected
fn inherent_data(
&mut self,
validation_data: &ValidationData,
validation_data: &PersistedValidationData,
relay_parent: PHash,
) -> Option<InherentData> {
let mut inherent_data = self
@@ -472,12 +472,12 @@ where
async fn produce_candidate(
mut self,
relay_parent: PHash,
validation_data: ValidationData,
validation_data: PersistedValidationData,
) -> Option<Collation> {
trace!(target: "cumulus-collator", "Producing candidate");
let last_head =
match Block::Header::decode(&mut &validation_data.persisted.parent_head.0[..]) {
match Block::Header::decode(&mut &validation_data.parent_head.0[..]) {
Ok(x) => x,
Err(e) => {
error!(target: "cumulus-collator", "Could not decode the head data: {:?}", e);
@@ -582,7 +582,7 @@ where
);
let collation =
self.build_collation(b, block_hash, validation_data.persisted.block_number)?;
self.build_collation(b, block_hash, validation_data.block_number)?;
let pov_hash = collation.proof_of_validity.hash();
self.wait_to_announce
@@ -842,8 +842,8 @@ mod tests {
CollationGenerationMessage::Initialize(config) => config,
};
let mut validation_data = ValidationData::default();
validation_data.persisted.parent_head = header.encode().into();
let mut validation_data = PersistedValidationData::default();
validation_data.parent_head = header.encode().into();
let collation = block_on((config.collator)(relay_parent, &validation_data))
.expect("Collation is build");