rococo-runtime: Switch to latest construct_runtime! syntax (#4389)

* rococo-runtime: Switch to latest `construct_runtime!` syntax

Besides that it fixes pallet macro errors in other crates that popped up
because of this switch.

* FMT
This commit is contained in:
Bastian Köcher
2021-11-29 21:36:19 +01:00
committed by GitHub
parent b64caf97bf
commit 49d78d99f7
12 changed files with 137 additions and 139 deletions
+1 -9
View File
@@ -34,7 +34,7 @@ use primitives::v1::{
use scale_info::TypeInfo;
use sp_core::RuntimeDebug;
use sp_runtime::{traits::One, DispatchResult, SaturatedConversion};
use sp_std::{prelude::*, result};
use sp_std::prelude::*;
#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};
@@ -307,11 +307,6 @@ pub mod pallet {
#[pallet::config]
pub trait Config: frame_system::Config + configuration::Config + shared::Config {
/// The outer origin type.
type Origin: From<Origin>
+ From<<Self as frame_system::Config>::Origin>
+ Into<result::Result<Origin, <Self as Config>::Origin>>;
type Event: From<Event> + IsType<<Self as frame_system::Config>::Event>;
/// Weight information for extrinsics in this pallet.
@@ -518,9 +513,6 @@ pub mod pallet {
}
}
#[pallet::origin]
pub type Origin = ParachainOrigin;
#[pallet::call]
impl<T: Config> Pallet<T> {
/// Set the storage for the parachain validation code immediately.