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:
Robert Habermeier
2022-03-09 14:01:13 -06:00
committed by GitHub
parent 3394cbb142
commit 49f7e5cce4
215 changed files with 2312 additions and 3123 deletions
@@ -99,7 +99,7 @@ pub struct RococoLikeChain<B, GI> {
impl<B, GI> ChainWithMessages for RococoLikeChain<B, GI> {
type Hash = crate::Hash;
type AccountId = crate::AccountId;
type Signer = primitives::v1::AccountPublic;
type Signer = primitives::v2::AccountPublic;
type Signature = crate::Signature;
type Weight = Weight;
type Balance = crate::Balance;
@@ -447,10 +447,10 @@ mod tests {
u64::MAX,
u64::MAX,
)),
frame_system::CheckNonce::from(primitives::v1::Nonce::MAX),
frame_system::CheckNonce::from(primitives::v2::Nonce::MAX),
frame_system::CheckWeight::new(),
pallet_transaction_payment::ChargeTransactionPayment::from(
primitives::v1::Balance::MAX,
primitives::v2::Balance::MAX,
),
);
let mut zeroes = TrailingZeroInput::zeroes();
+9 -11
View File
@@ -34,20 +34,18 @@ use pallet_mmr_primitives as mmr;
use pallet_session::historical as session_historical;
use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo};
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use primitives::{
v1::{
AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt,
CoreState, GroupRotationInfo, Hash, Id, InboundDownwardMessage, InboundHrmpMessage, Moment,
Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, Signature,
ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
},
v2::{PvfCheckStatement, SessionInfo as SessionInfoData},
use primitives::v2::{
AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt,
CoreState, GroupRotationInfo, Hash, Id, InboundDownwardMessage, InboundHrmpMessage, Moment,
Nonce, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
SessionInfo as SessionInfoData, Signature, ValidationCode, ValidationCodeHash, ValidatorId,
ValidatorIndex, ValidatorSignature,
};
use runtime_common::{
assigned_slots, auctions, crowdloan, impls::ToAuthor, paras_registrar, paras_sudo_wrapper,
slots, BlockHashCount, BlockLength, BlockWeights, RocksDbWeight, SlowAdjustingFeeUpdate,
};
use runtime_parachains::{self, runtime_api_impl::v1 as runtime_api_impl};
use runtime_parachains::{self, runtime_api_impl::v2 as runtime_api_impl};
use scale_info::TypeInfo;
use sp_core::{OpaqueMetadata, RuntimeDebug};
use sp_runtime::{
@@ -213,7 +211,7 @@ impl_opaque_keys! {
construct_runtime! {
pub enum Runtime where
Block = Block,
NodeBlock = primitives::v1::Block,
NodeBlock = primitives::v2::Block,
UncheckedExtrinsic = UncheckedExtrinsic
{
System: frame_system,
@@ -1218,7 +1216,7 @@ sp_api::impl_runtime_apis! {
fn check_validation_outputs(
para_id: Id,
outputs: primitives::v1::CandidateCommitments,
outputs: primitives::v2::CandidateCommitments,
) -> bool {
runtime_api_impl::check_validation_outputs::<Runtime>(para_id, outputs)
}