mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 14:37:57 +00:00
BREAKING: Rename Call & Event (#11981)
* rename Event to RuntimeEvent * rename Call * rename in runtimes * small fix * rename Event * small fix & rename RuntimeCall back to Call for now * small fixes * more renaming * a bit more renaming * fmt * small fix * commit * prep for renaming associated types * fix * rename associated Event type * rename to RuntimeEvent * commit * merge conflict fixes & fmt * additional renaming * fix. * fix decl_event * rename in tests * remove warnings * remove accidental rename * . * commit * update .stderr * fix in test * update .stderr * TRYBUILD=overwrite * docs * fmt * small change in docs * rename PalletEvent to Event * rename Call to RuntimeCall * renamed at wrong places :P * rename Call * rename * rename associated type * fix * fix & fmt * commit * frame-support-test * passing tests * update docs * rustdoc fix * update .stderr * wrong code in docs * merge fix * fix in error message * update .stderr * docs & error message * . * merge fix * merge fix * fmt * fmt * merge fix * more fixing * fmt * remove unused * fmt * fix Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
@@ -42,7 +42,8 @@ pub mod pallet {
|
||||
#[pallet::constant]
|
||||
type MyGetParam: Get<u32>;
|
||||
type Balance: Parameter + Default + scale_info::StaticTypeInfo;
|
||||
type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
|
||||
type RuntimeEvent: From<Event<Self, I>>
|
||||
+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
|
||||
}
|
||||
|
||||
#[pallet::pallet]
|
||||
@@ -253,7 +254,8 @@ pub mod pallet2 {
|
||||
|
||||
#[pallet::config]
|
||||
pub trait Config<I: 'static = ()>: frame_system::Config {
|
||||
type Event: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::Event>;
|
||||
type RuntimeEvent: From<Event<Self, I>>
|
||||
+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
|
||||
}
|
||||
|
||||
#[pallet::pallet]
|
||||
@@ -288,13 +290,13 @@ impl frame_system::Config for Runtime {
|
||||
type Origin = Origin;
|
||||
type Index = u64;
|
||||
type BlockNumber = u32;
|
||||
type Call = Call;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hash = sp_runtime::testing::H256;
|
||||
type Hashing = sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
|
||||
type Header = Header;
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type BlockHashCount = ConstU32<250>;
|
||||
type BlockWeights = ();
|
||||
type BlockLength = ();
|
||||
@@ -310,25 +312,25 @@ impl frame_system::Config for Runtime {
|
||||
type MaxConsumers = ConstU32<16>;
|
||||
}
|
||||
impl pallet::Config for Runtime {
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type MyGetParam = ConstU32<10>;
|
||||
type Balance = u64;
|
||||
}
|
||||
impl pallet::Config<pallet::Instance1> for Runtime {
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type MyGetParam = ConstU32<10>;
|
||||
type Balance = u64;
|
||||
}
|
||||
impl pallet2::Config for Runtime {
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
}
|
||||
impl pallet2::Config<pallet::Instance1> for Runtime {
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
}
|
||||
|
||||
pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
|
||||
pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
|
||||
pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, (), ()>;
|
||||
pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
|
||||
|
||||
frame_support::construct_runtime!(
|
||||
pub enum Runtime where
|
||||
@@ -433,7 +435,7 @@ fn pallet_expand_deposit_event() {
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[0].event,
|
||||
Event::Example(pallet::Event::Something(3)),
|
||||
RuntimeEvent::Example(pallet::Event::Something(3)),
|
||||
);
|
||||
});
|
||||
|
||||
@@ -444,7 +446,7 @@ fn pallet_expand_deposit_event() {
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[0].event,
|
||||
Event::Instance1Example(pallet::Event::Something(3)),
|
||||
RuntimeEvent::Instance1Example(pallet::Event::Something(3)),
|
||||
);
|
||||
});
|
||||
}
|
||||
@@ -668,27 +670,27 @@ fn pallet_hooks_expand() {
|
||||
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[0].event,
|
||||
Event::Example(pallet::Event::Something(10)),
|
||||
RuntimeEvent::Example(pallet::Event::Something(10)),
|
||||
);
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[1].event,
|
||||
Event::Instance1Example(pallet::Event::Something(11)),
|
||||
RuntimeEvent::Instance1Example(pallet::Event::Something(11)),
|
||||
);
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[2].event,
|
||||
Event::Example(pallet::Event::Something(20)),
|
||||
RuntimeEvent::Example(pallet::Event::Something(20)),
|
||||
);
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[3].event,
|
||||
Event::Instance1Example(pallet::Event::Something(21)),
|
||||
RuntimeEvent::Instance1Example(pallet::Event::Something(21)),
|
||||
);
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[4].event,
|
||||
Event::Example(pallet::Event::Something(30)),
|
||||
RuntimeEvent::Example(pallet::Event::Something(30)),
|
||||
);
|
||||
assert_eq!(
|
||||
frame_system::Pallet::<Runtime>::events()[5].event,
|
||||
Event::Instance1Example(pallet::Event::Something(31)),
|
||||
RuntimeEvent::Instance1Example(pallet::Event::Something(31)),
|
||||
);
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user