fix: Complete snowbridge pezpallet rebrand and critical bug fixes
- snowbridge-pezpallet-* → pezsnowbridge-pezpallet-* (201 refs) - pallet/ directories → pezpallet/ (4 locations) - Fixed pezpallet.rs self-include recursion bug - Fixed sc-chain-spec hardcoded crate name in derive macro - Reverted .pezpallet_by_name() to .pallet_by_name() (subxt API) - Added BizinikiwiConfig type alias for zombienet tests - Deleted obsolete session state files Verified: pezsnowbridge-pezpallet-*, pezpallet-staking, pezpallet-staking-async, pezframe-benchmarking-cli all pass cargo check
This commit is contained in:
@@ -24,11 +24,11 @@ use pezsp_metadata_ir::{
|
||||
};
|
||||
use pezsp_runtime::{generic, traits::BlakeTwo256, BuildStorage};
|
||||
|
||||
pub use self::pezframe_system::{pezpallet_prelude::*, Config, Pallet};
|
||||
pub use self::pezframe_system::{pezpallet_prelude::*, Config, Pezpallet};
|
||||
|
||||
mod storage_alias;
|
||||
|
||||
#[pallet]
|
||||
#[pezpallet]
|
||||
pub mod pezframe_system {
|
||||
#[allow(unused)]
|
||||
use super::{pezframe_system, pezframe_system::pezpallet_prelude::*};
|
||||
@@ -55,34 +55,34 @@ pub mod pezframe_system {
|
||||
}
|
||||
}
|
||||
|
||||
#[pallet::pallet]
|
||||
pub struct Pallet<T>(_);
|
||||
#[pezpallet::pezpallet]
|
||||
pub struct Pezpallet<T>(_);
|
||||
|
||||
#[pallet::config(with_default, pezframe_system_config)]
|
||||
#[pallet::disable_pezframe_system_supertrait_check]
|
||||
#[pezpallet::config(with_default, pezframe_system_config)]
|
||||
#[pezpallet::disable_pezframe_system_supertrait_check]
|
||||
pub trait Config: 'static {
|
||||
#[pallet::no_default]
|
||||
#[pezpallet::no_default]
|
||||
type Block: Parameter + pezsp_runtime::traits::Block;
|
||||
type AccountId;
|
||||
#[pallet::no_default_bounds]
|
||||
#[pezpallet::no_default_bounds]
|
||||
type BaseCallFilter: crate::traits::Contains<Self::RuntimeCall>;
|
||||
#[pallet::no_default_bounds]
|
||||
#[pezpallet::no_default_bounds]
|
||||
type RuntimeOrigin;
|
||||
#[pallet::no_default_bounds]
|
||||
#[pezpallet::no_default_bounds]
|
||||
type RuntimeCall;
|
||||
#[pallet::no_default_bounds]
|
||||
#[pezpallet::no_default_bounds]
|
||||
type RuntimeTask: crate::traits::tasks::Task;
|
||||
#[pallet::no_default_bounds]
|
||||
#[pezpallet::no_default_bounds]
|
||||
type PalletInfo: crate::traits::PalletInfo;
|
||||
type DbWeight: Get<crate::weights::RuntimeDbWeight>;
|
||||
#[pallet::constant]
|
||||
#[pallet::no_default]
|
||||
#[pezpallet::constant]
|
||||
#[pezpallet::no_default]
|
||||
#[deprecated = "this constant is deprecated"]
|
||||
#[allow(deprecated)]
|
||||
type ExampleConstant: Get<()>;
|
||||
}
|
||||
|
||||
#[pallet::error]
|
||||
#[pezpallet::error]
|
||||
pub enum Error<T> {
|
||||
/// Required by construct_runtime
|
||||
CallFiltered,
|
||||
@@ -94,13 +94,13 @@ pub mod pezframe_system {
|
||||
FailedTask,
|
||||
}
|
||||
|
||||
#[pallet::origin]
|
||||
#[pezpallet::origin]
|
||||
pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
|
||||
|
||||
#[pallet::call]
|
||||
impl<T: Config> Pallet<T> {
|
||||
#[pallet::call_index(0)]
|
||||
#[pallet::weight(task.weight())]
|
||||
#[pezpallet::call]
|
||||
impl<T: Config> Pezpallet<T> {
|
||||
#[pezpallet::call_index(0)]
|
||||
#[pezpallet::weight(task.weight())]
|
||||
pub fn do_task(_origin: OriginFor<T>, task: T::RuntimeTask) -> DispatchResultWithPostInfo {
|
||||
if !task.is_valid() {
|
||||
return Err(Error::<T>::InvalidTask.into());
|
||||
@@ -114,35 +114,35 @@ pub mod pezframe_system {
|
||||
}
|
||||
}
|
||||
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
#[deprecated]
|
||||
#[allow(deprecated)]
|
||||
pub type Data<T> = StorageMap<_, Twox64Concat, u32, u64, ValueQuery>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
#[deprecated(note = "test")]
|
||||
#[allow(deprecated)]
|
||||
pub type OptionLinkedMap<T> = StorageMap<_, Blake2_128Concat, u32, u32, OptionQuery>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pallet::getter(fn generic_data)]
|
||||
#[pezpallet::storage]
|
||||
#[pezpallet::getter(fn generic_data)]
|
||||
#[deprecated(note = "test", since = "test")]
|
||||
#[allow(deprecated)]
|
||||
pub type GenericData<T: Config> =
|
||||
StorageMap<_, Identity, BlockNumberFor<T>, BlockNumberFor<T>, ValueQuery>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pallet::getter(fn generic_data2)]
|
||||
#[pezpallet::storage]
|
||||
#[pezpallet::getter(fn generic_data2)]
|
||||
#[deprecated = "test"]
|
||||
#[allow(deprecated)]
|
||||
pub type GenericData2<T: Config> =
|
||||
StorageMap<_, Blake2_128Concat, BlockNumberFor<T>, BlockNumberFor<T>, OptionQuery>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
pub type DataDM<T> =
|
||||
StorageDoubleMap<_, Twox64Concat, u32, Blake2_128Concat, u32, u64, ValueQuery>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
pub type GenericDataDM<T: Config> = StorageDoubleMap<
|
||||
_,
|
||||
Blake2_128Concat,
|
||||
@@ -153,7 +153,7 @@ pub mod pezframe_system {
|
||||
ValueQuery,
|
||||
>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
pub type GenericData2DM<T: Config> = StorageDoubleMap<
|
||||
_,
|
||||
Blake2_128Concat,
|
||||
@@ -164,8 +164,8 @@ pub mod pezframe_system {
|
||||
OptionQuery,
|
||||
>;
|
||||
|
||||
#[pallet::storage]
|
||||
#[pallet::unbounded]
|
||||
#[pezpallet::storage]
|
||||
#[pezpallet::unbounded]
|
||||
pub type AppendableDM<T: Config> = StorageDoubleMap<
|
||||
_,
|
||||
Blake2_128Concat,
|
||||
@@ -176,7 +176,7 @@ pub mod pezframe_system {
|
||||
ValueQuery,
|
||||
>;
|
||||
|
||||
#[pallet::genesis_config]
|
||||
#[pezpallet::genesis_config]
|
||||
pub struct GenesisConfig<T: Config> {
|
||||
pub data: Vec<(u32, u64)>,
|
||||
pub test_config: Vec<(u32, u32, u64)>,
|
||||
@@ -194,7 +194,7 @@ pub mod pezframe_system {
|
||||
}
|
||||
}
|
||||
|
||||
#[pallet::genesis_build]
|
||||
#[pezpallet::genesis_build]
|
||||
impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
|
||||
#[allow(deprecated)]
|
||||
fn build(&self) {
|
||||
@@ -208,11 +208,11 @@ pub mod pezframe_system {
|
||||
}
|
||||
|
||||
/// Some running total.
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
pub type Total<T: Config> = StorageValue<_, (u32, u32), ValueQuery>;
|
||||
|
||||
/// Numbers to be added into the total.
|
||||
#[pallet::storage]
|
||||
#[pezpallet::storage]
|
||||
pub type Numbers<T: Config> = StorageMap<_, Twox64Concat, u32, u32, OptionQuery>;
|
||||
|
||||
pub mod pezpallet_prelude {
|
||||
@@ -731,14 +731,14 @@ fn expected_metadata() -> PalletStorageMetadataIR {
|
||||
|
||||
#[test]
|
||||
fn store_metadata() {
|
||||
let metadata = Pallet::<Runtime>::storage_metadata();
|
||||
let metadata = Pezpallet::<Runtime>::storage_metadata();
|
||||
pretty_assertions::assert_eq!(expected_metadata(), metadata);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn constant_metadata() {
|
||||
let metadata: Vec<pezsp_metadata_ir::PalletConstantMetadataIR> =
|
||||
Pallet::<Runtime>::pezpallet_constants_metadata();
|
||||
Pezpallet::<Runtime>::pezpallet_constants_metadata();
|
||||
pretty_assertions::assert_eq!(
|
||||
metadata,
|
||||
vec![pezsp_metadata_ir::PalletConstantMetadataIR {
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
use pezsp_core::Get;
|
||||
|
||||
use super::{new_test_ext, BlockNumberFor, Config, Pallet, Runtime};
|
||||
use super::{new_test_ext, BlockNumberFor, Config, Pezpallet, Runtime};
|
||||
use crate::{
|
||||
assert_noop, assert_ok, parameter_types, storage::generator::StorageValue, Blake2_128Concat,
|
||||
};
|
||||
@@ -29,9 +29,9 @@ fn storage_alias_works() {
|
||||
type GenericData2<T> =
|
||||
StorageMap<System, Blake2_128Concat, BlockNumberFor<T>, BlockNumberFor<T>>;
|
||||
|
||||
assert_eq!(Pallet::<Runtime>::generic_data2(5), None);
|
||||
assert_eq!(Pezpallet::<Runtime>::generic_data2(5), None);
|
||||
GenericData2::<Runtime>::insert(5, 5);
|
||||
assert_eq!(Pallet::<Runtime>::generic_data2(5), Some(5));
|
||||
assert_eq!(Pezpallet::<Runtime>::generic_data2(5), Some(5));
|
||||
|
||||
/// Some random docs that ensure that docs are accepted
|
||||
#[crate::storage_alias]
|
||||
@@ -40,7 +40,7 @@ fn storage_alias_works() {
|
||||
|
||||
#[crate::storage_alias]
|
||||
pub type GenericDataPallet<T: Config> =
|
||||
StorageMap<Pallet<T>, Blake2_128Concat, BlockNumberFor<T>, BlockNumberFor<T>>;
|
||||
StorageMap<Pezpallet<T>, Blake2_128Concat, BlockNumberFor<T>, BlockNumberFor<T>>;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -120,15 +120,15 @@ fn verbatim_attribute() {
|
||||
#[test]
|
||||
fn pezpallet_name_attribute() {
|
||||
new_test_ext().execute_with(|| {
|
||||
// Declare the alias that will use the pallet name as prefix.
|
||||
// Declare the alias that will use the pezpallet name as prefix.
|
||||
#[crate::storage_alias(pezpallet_name)]
|
||||
pub type Value<T: Config> = StorageValue<Pallet<T>, u32>;
|
||||
pub type Value<T: Config> = StorageValue<Pezpallet<T>, u32>;
|
||||
|
||||
// Check that it works as expected.
|
||||
Value::<Runtime>::put(1);
|
||||
assert_eq!(1, Value::<Runtime>::get().unwrap());
|
||||
|
||||
// The prefix is the pallet name. In this case the pallet name is `System` as declared in
|
||||
// The prefix is the pezpallet name. In this case the pezpallet name is `System` as declared in
|
||||
// `construct_runtime!`.
|
||||
assert_eq!(&b"System"[..], Value::<Runtime>::pezpallet_prefix());
|
||||
});
|
||||
@@ -168,9 +168,9 @@ fn storage_alias_guess() {
|
||||
|
||||
assert_eq!(&b"Test"[..], Value::pezpallet_prefix());
|
||||
|
||||
// The macro will use the pallet name as prefix.
|
||||
// The macro will use the pezpallet name as prefix.
|
||||
#[crate::storage_alias]
|
||||
pub type PalletValue<T: Config> = StorageValue<Pallet<T>, u32>;
|
||||
pub type PalletValue<T: Config> = StorageValue<Pezpallet<T>, u32>;
|
||||
|
||||
assert_eq!(&b"System"[..], PalletValue::<Runtime>::pezpallet_prefix());
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user