Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

companion for polkadot#4545 (session-info v2) #875

Merged
merged 3 commits into from
Dec 27, 2021
Merged

companion for polkadot#4545 (session-info v2) #875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0783711
companion for https://github.com/paritytech/polkadot/pull/4545
ordian Dec 22, 2021
aa7f68d
Merge remote-tracking branch 'origin/master' into ao-companion-4545
Dec 27, 2021
d92d4a8
update lockfile for polkadot
Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions client/relay-chain-local/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ use std::{sync::Arc, time::Duration};
use async_trait::async_trait;
use cumulus_primitives_core::{
relay_chain::{
v1::{
CommittedCandidateReceipt, OccupiedCoreAssumption, ParachainHost, SessionIndex,
ValidatorId,
},
v1::{CommittedCandidateReceipt, OccupiedCoreAssumption, SessionIndex, ValidatorId},
v2::ParachainHost,
Block as PBlock, BlockId, Hash as PHash, InboundHrmpMessage,
},
InboundDownwardMessage, ParaId, PersistedValidationData,
Expand Down
2 changes: 1 addition & 1 deletion primitives/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub use polkadot_primitives::v1::{
/// A module that re-exports relevant relay chain definitions.
pub mod relay_chain {
pub use polkadot_core_primitives::*;
pub use polkadot_primitives::{v1, v1::well_known_keys};
pub use polkadot_primitives::{v1, v1::well_known_keys, v2};
}

/// An inbound HRMP message.
Expand Down