From efc4403aa882899fe56000c12f26730663579369 Mon Sep 17 00:00:00 2001 From: tgmichel Date: Thu, 24 Feb 2022 18:09:32 +0100 Subject: [PATCH] `pallet-base-fee` storage utility functions (#585) * `pallet-base-fee` storage utility functions * fmt --- frame/base-fee/src/lib.rs | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/frame/base-fee/src/lib.rs b/frame/base-fee/src/lib.rs index 727aa80f7b..da743fe6ee 100644 --- a/frame/base-fee/src/lib.rs +++ b/frame/base-fee/src/lib.rs @@ -18,12 +18,15 @@ pub use self::pallet::*; +use frame_support::{traits::Get, weights::Weight}; +use sp_core::U256; +use sp_runtime::Permill; + #[frame_support::pallet] pub mod pallet { + use super::*; use frame_support::{dispatch::DispatchResult, pallet_prelude::*}; use frame_system::pallet_prelude::*; - use sp_core::U256; - use sp_runtime::Permill; pub trait BaseFeeThreshold { fn lower() -> Permill; @@ -211,7 +214,7 @@ pub mod pallet { #[pallet::weight(10_000 + T::DbWeight::get().writes(1))] pub fn set_base_fee_per_gas(origin: OriginFor, fee: U256) -> DispatchResult { ensure_root(origin)?; - >::put(fee); + let _ = Self::set_base_fee_per_gas_inner(fee); Self::deposit_event(Event::NewBaseFeePerGas(fee)); Ok(()) } @@ -219,7 +222,7 @@ pub mod pallet { #[pallet::weight(10_000 + T::DbWeight::get().writes(1))] pub fn set_is_active(origin: OriginFor, is_active: bool) -> DispatchResult { ensure_root(origin)?; - >::put(is_active); + let _ = Self::set_is_active_inner(is_active); Self::deposit_event(Event::IsActive(is_active)); Ok(()) } @@ -227,7 +230,7 @@ pub mod pallet { #[pallet::weight(10_000 + T::DbWeight::get().writes(1))] pub fn set_elasticity(origin: OriginFor, elasticity: Permill) -> DispatchResult { ensure_root(origin)?; - >::put(elasticity); + let _ = Self::set_elasticity_inner(elasticity); Self::deposit_event(Event::NewElasticity(elasticity)); Ok(()) } @@ -240,6 +243,21 @@ pub mod pallet { } } +impl Pallet { + pub fn set_base_fee_per_gas_inner(value: U256) -> Weight { + >::put(value); + T::DbWeight::get().write + } + pub fn set_elasticity_inner(value: Permill) -> Weight { + >::put(value); + T::DbWeight::get().write + } + pub fn set_is_active_inner(value: bool) -> Weight { + >::put(value); + T::DbWeight::get().write + } +} + #[cfg(test)] mod tests { use super::*;