From 68eaee1bd4737db0edf86c1dd46e44d5fa1c29d6 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 12 Aug 2021 16:59:20 +0300 Subject: [PATCH] migrate pallet-shift-session-manager to frame v2 (#1090) --- .../modules/shift-session-manager/src/lib.rs | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/bridges/modules/shift-session-manager/src/lib.rs b/bridges/modules/shift-session-manager/src/lib.rs index 0d867657af..eef336ffd8 100644 --- a/bridges/modules/shift-session-manager/src/lib.rs +++ b/bridges/modules/shift-session-manager/src/lib.rs @@ -19,22 +19,33 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::{decl_module, decl_storage}; use sp_std::prelude::*; -/// The module configuration trait. -pub trait Config: pallet_session::Config {} +pub use pallet::*; -decl_module! { - /// Shift session manager pallet. - pub struct Module for enum Call where origin: T::Origin {} -} +#[frame_support::pallet] +pub mod pallet { + use super::*; + use frame_support::pallet_prelude::*; + use frame_system::pallet_prelude::*; -decl_storage! { - trait Store for Pallet as ShiftSessionManager { - /// Validators of first two sessions. - InitialValidators: Option>; - } + #[pallet::config] + #[pallet::disable_frame_system_supertrait_check] + pub trait Config: pallet_session::Config {} + + #[pallet::pallet] + #[pallet::generate_store(pub(super) trait Store)] + pub struct Pallet(PhantomData); + + #[pallet::hooks] + impl Hooks> for Pallet {} + + #[pallet::call] + impl Pallet {} + + /// Validators of first two sessions. + #[pallet::storage] + pub(super) type InitialValidators = StorageValue<_, Vec>; } impl pallet_session::SessionManager for Pallet {