mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 17:31:05 +00:00
Replace parachain/parathread boolean by enum (#6198)
* Replace parachain/parathread boolean by enum * Address PR comments * Update dependencies * ParaType -> ParaKind * Swap enum field order to avoid migration * Rename paratype field to parakind * Manual en-/decocing of Parakind * Manual TypeInfo for ParaKind * rename field back to parachain * minor * Update runtime/parachains/src/paras/mod.rs Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com> * Manual serde Serialize and Deserialize for ParaKind * cargo fmt * Update runtime/parachains/src/paras/mod.rs Co-authored-by: Andronik <write@reusable.software> * Add test for serde_json encoding/decoding * Move serde_json dep to dev-deps Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Co-authored-by: Andronik <write@reusable.software>
This commit is contained in:
@@ -35,6 +35,7 @@ use sp_std::{prelude::*, result};
|
||||
use crate::traits::{OnSwap, Registrar};
|
||||
pub use pallet::*;
|
||||
use parity_scale_codec::{Decode, Encode};
|
||||
use runtime_parachains::paras::ParaKind;
|
||||
use scale_info::TypeInfo;
|
||||
use sp_runtime::{
|
||||
traits::{CheckedSub, Saturating},
|
||||
@@ -570,7 +571,7 @@ impl<T: Config> Pallet<T> {
|
||||
};
|
||||
ensure!(paras::Pallet::<T>::lifecycle(id).is_none(), Error::<T>::AlreadyRegistered);
|
||||
let (genesis, deposit) =
|
||||
Self::validate_onboarding_data(genesis_head, validation_code, false)?;
|
||||
Self::validate_onboarding_data(genesis_head, validation_code, ParaKind::Parathread)?;
|
||||
let deposit = deposit_override.unwrap_or(deposit);
|
||||
|
||||
if let Some(additional) = deposit.checked_sub(&deposited) {
|
||||
@@ -613,7 +614,7 @@ impl<T: Config> Pallet<T> {
|
||||
fn validate_onboarding_data(
|
||||
genesis_head: HeadData,
|
||||
validation_code: ValidationCode,
|
||||
parachain: bool,
|
||||
para_kind: ParaKind,
|
||||
) -> Result<(ParaGenesisArgs, BalanceOf<T>), sp_runtime::DispatchError> {
|
||||
let config = configuration::Pallet::<T>::config();
|
||||
ensure!(validation_code.0.len() > 0, Error::<T>::EmptyCode);
|
||||
@@ -628,7 +629,7 @@ impl<T: Config> Pallet<T> {
|
||||
.saturating_add(per_byte_fee.saturating_mul((genesis_head.0.len() as u32).into()))
|
||||
.saturating_add(per_byte_fee.saturating_mul((validation_code.0.len() as u32).into()));
|
||||
|
||||
Ok((ParaGenesisArgs { genesis_head, validation_code, parachain }, deposit))
|
||||
Ok((ParaGenesisArgs { genesis_head, validation_code, para_kind }, deposit))
|
||||
}
|
||||
|
||||
/// Swap a parachain and parathread, which involves scheduling an appropriate lifecycle update.
|
||||
|
||||
Reference in New Issue
Block a user