mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-28 17:57:56 +00:00
Finish migration to v2 primitives (#5037)
* remove v0 primitives from polkadot-primitives * first pass: remove v0 * fix fallout in erasure-coding * remove v1 primitives, consolidate to v2 * the great import update * update runtime_api_impl_v1 to v2 as well * guide: add `Version` request for runtime API * add version query to runtime API * reintroduce OldV1SessionInfo in a limited way
This commit is contained in:
committed by
GitHub
parent
3394cbb142
commit
49f7e5cce4
@@ -31,7 +31,7 @@ use polkadot_node_subsystem::{
|
||||
use polkadot_node_subsystem_test_helpers as test_helpers;
|
||||
use polkadot_node_subsystem_util::TimeoutExt;
|
||||
use polkadot_overseer::HeadSupportsParachains;
|
||||
use polkadot_primitives::v1::{
|
||||
use polkadot_primitives::v2::{
|
||||
CandidateCommitments, CandidateEvent, CoreIndex, GroupIndex, Header, Id as ParaId,
|
||||
ValidationCode, ValidatorSignature,
|
||||
};
|
||||
@@ -220,7 +220,7 @@ struct MockAssignmentCriteria<Compute, Check>(Compute, Check);
|
||||
|
||||
impl<Compute, Check> AssignmentCriteria for MockAssignmentCriteria<Compute, Check>
|
||||
where
|
||||
Compute: Fn() -> HashMap<polkadot_primitives::v1::CoreIndex, criteria::OurAssignment>,
|
||||
Compute: Fn() -> HashMap<polkadot_primitives::v2::CoreIndex, criteria::OurAssignment>,
|
||||
Check: Fn(ValidatorIndex) -> Result<DelayTranche, criteria::InvalidAssignment>,
|
||||
{
|
||||
fn compute_assignments(
|
||||
@@ -230,21 +230,21 @@ where
|
||||
_config: &criteria::Config,
|
||||
_leaving_cores: Vec<(
|
||||
CandidateHash,
|
||||
polkadot_primitives::v1::CoreIndex,
|
||||
polkadot_primitives::v1::GroupIndex,
|
||||
polkadot_primitives::v2::CoreIndex,
|
||||
polkadot_primitives::v2::GroupIndex,
|
||||
)>,
|
||||
) -> HashMap<polkadot_primitives::v1::CoreIndex, criteria::OurAssignment> {
|
||||
) -> HashMap<polkadot_primitives::v2::CoreIndex, criteria::OurAssignment> {
|
||||
self.0()
|
||||
}
|
||||
|
||||
fn check_assignment_cert(
|
||||
&self,
|
||||
_claimed_core_index: polkadot_primitives::v1::CoreIndex,
|
||||
_claimed_core_index: polkadot_primitives::v2::CoreIndex,
|
||||
validator_index: ValidatorIndex,
|
||||
_config: &criteria::Config,
|
||||
_relay_vrf_story: polkadot_node_primitives::approval::RelayVRFStory,
|
||||
_assignment: &polkadot_node_primitives::approval::AssignmentCert,
|
||||
_backing_group: polkadot_primitives::v1::GroupIndex,
|
||||
_backing_group: polkadot_primitives::v2::GroupIndex,
|
||||
) -> Result<polkadot_node_primitives::approval::DelayTranche, criteria::InvalidAssignment> {
|
||||
self.1(validator_index)
|
||||
}
|
||||
@@ -252,7 +252,7 @@ where
|
||||
|
||||
impl<F>
|
||||
MockAssignmentCriteria<
|
||||
fn() -> HashMap<polkadot_primitives::v1::CoreIndex, criteria::OurAssignment>,
|
||||
fn() -> HashMap<polkadot_primitives::v2::CoreIndex, criteria::OurAssignment>,
|
||||
F,
|
||||
>
|
||||
{
|
||||
@@ -470,7 +470,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
|
||||
|
||||
let keystore = LocalKeystore::in_memory();
|
||||
let _ = keystore.sr25519_generate_new(
|
||||
polkadot_primitives::v1::PARACHAIN_KEY_TYPE_ID,
|
||||
polkadot_primitives::v2::PARACHAIN_KEY_TYPE_ID,
|
||||
Some(&Sr25519Keyring::Alice.to_seed()),
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user