Revert "Companion for primitives consolidation into v2 (#1071)"

This reverts commit 8eee3c37c4.
This commit is contained in:
Bastian Köcher
2022-03-21 23:22:50 +01:00
parent 5d6e38fc11
commit 0ff2825aea
32 changed files with 400 additions and 401 deletions
@@ -43,4 +43,4 @@ polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch =
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Cumulus
cumulus-test-service = { path = "../../test/service" }
cumulus-test-service = { path = "../../test/service" }
@@ -19,10 +19,8 @@ use std::{pin::Pin, sync::Arc, time::Duration};
use async_trait::async_trait;
use cumulus_primitives_core::{
relay_chain::{
v2::{
CommittedCandidateReceipt, OccupiedCoreAssumption, ParachainHost, SessionIndex,
ValidatorId,
},
v1::{CommittedCandidateReceipt, OccupiedCoreAssumption, SessionIndex, ValidatorId},
v2::ParachainHost,
Block as PBlock, BlockId, Hash as PHash, Header as PHeader, InboundHrmpMessage,
},
InboundDownwardMessage, ParaId, PersistedValidationData,
@@ -386,7 +384,7 @@ mod tests {
use super::*;
use polkadot_primitives::v2::Block as PBlock;
use polkadot_primitives::v1::Block as PBlock;
use polkadot_test_client::{
construct_transfer_extrinsic, BlockBuilderExt, Client, ClientBlockImportExt,
DefaultTestClientBuilderExt, ExecutionStrategy, InitPolkadotBlockBuilder,