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:
Sergej Sakac
2022-09-13 00:03:31 +02:00
committed by GitHub
parent 472b5746e5
commit 6e8795afe6
228 changed files with 1791 additions and 1672 deletions
+8 -8
View File
@@ -56,12 +56,12 @@ pub type DispatchErrorWithPostInfo =
/// Serializable version of pallet dispatchable.
pub trait Callable<T> {
type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
type RuntimeCall: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
}
// dirty hack to work around serde_derive issue
// https://github.com/rust-lang/rust/issues/51331
pub type CallableCallFor<A, R> = <A as Callable<R>>::Call;
pub type CallableCallFor<A, R> = <A as Callable<R>>::RuntimeCall;
/// Origin for the System pallet.
#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, TypeInfo, MaxEncodedLen)]
@@ -1497,7 +1497,7 @@ macro_rules! decl_module {
{
/// Deposits an event using `frame_system::Pallet::deposit_event`.
$vis fn deposit_event(
event: impl Into<< $trait_instance as $trait_name $(<$instance>)? >::Event>
event: impl Into<< $trait_instance as $trait_name $(<$instance>)? >::RuntimeEvent>
) {
<$system::Pallet<$trait_instance>>::deposit_event(event.into())
}
@@ -2376,7 +2376,7 @@ macro_rules! decl_module {
impl<$trait_instance: $trait_name $(<I>, $instance: $instantiable)?> $crate::dispatch::Callable<$trait_instance>
for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
{
type Call = $call_type<$trait_instance $(, $instance)?>;
type RuntimeCall = $call_type<$trait_instance $(, $instance)?>;
}
$crate::__dispatch_impl_metadata! {
@@ -2648,9 +2648,9 @@ mod tests {
pub trait Config: 'static {
type AccountId;
type Call;
type RuntimeCall;
type BaseCallFilter;
type Origin: crate::traits::OriginTrait<Call = Self::Call>;
type Origin: crate::traits::OriginTrait<Call = Self::RuntimeCall>;
type BlockNumber: Into<u32>;
type PalletInfo: crate::traits::PalletInfo;
type DbWeight: Get<RuntimeDbWeight>;
@@ -2751,7 +2751,7 @@ mod tests {
}
impl crate::traits::OriginTrait for OuterOrigin {
type Call = <TraitImpl as system::Config>::Call;
type Call = <TraitImpl as system::Config>::RuntimeCall;
type PalletsOrigin = OuterOrigin;
type AccountId = <TraitImpl as system::Config>::AccountId;
@@ -2799,7 +2799,7 @@ mod tests {
impl system::Config for TraitImpl {
type Origin = OuterOrigin;
type AccountId = u32;
type Call = ();
type RuntimeCall = ();
type BaseCallFilter = frame_support::traits::Everything;
type BlockNumber = u32;
type PalletInfo = Self;
+6 -6
View File
@@ -1452,9 +1452,9 @@ pub mod pallet_prelude {
/// I.e. a regular trait definition named `Config`, with supertrait `frame_system::Config`,
/// optionally other supertrait and where clause.
///
/// The associated type `Event` is reserved, if defined it must bounds `From<Event>` and
/// `IsType<<Self as frame_system::Config>::Event>`, see `#[pallet::event]` for more
/// information.
/// The associated type `RuntimeEvent` is reserved, if defined it must bounds
/// `From<Event>` and `IsType<<Self as frame_system::Config>::RuntimeEvent>`, see
/// `#[pallet::event]` for more information.
///
/// To put `Get` associated type into metadatas, use the attribute `#[pallet::constant]`, e.g.:
/// ```ignore
@@ -2078,7 +2078,7 @@ pub mod pallet_prelude {
/// #[pallet::constant] // put the constant in metadata
/// type MyGetParam: Get<u32>;
/// type Balance: Parameter + MaxEncodedLen + From<u8>;
/// type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
/// type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
/// }
///
/// // Define some additional constant to put into the constant metadata.
@@ -2267,7 +2267,7 @@ pub mod pallet_prelude {
/// #[pallet::constant]
/// type MyGetParam: Get<u32>;
/// type Balance: Parameter + MaxEncodedLen + From<u8>;
/// 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::extra_constants]
@@ -2423,7 +2423,7 @@ pub mod pallet_prelude {
/// ```
/// 5. **migrate Config**: move trait into the module with
/// * all const in decl_module to `#[pallet::constant]`
/// * add bound `IsType<<Self as frame_system::Config>::Event>` to `type Event`
/// * add bound `IsType<<Self as frame_system::Config>::RuntimeEvent>` to `type RuntimeEvent`
/// 7. **migrate decl_module**: write:
/// ```ignore
/// #[pallet::hooks]