Migrate away from SimpleDispatchInfo (#5686)

* Migrate away from SimpleDispatchInfo

* Fix imports

* Better doc

* Update lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Kian Paimani
2020-04-22 09:20:28 +02:00
committed by GitHub
parent 25c3ab2c1e
commit 50a7e12b3f
40 changed files with 458 additions and 405 deletions
+7 -8
View File
@@ -26,7 +26,6 @@ use sp_std::prelude::*;
use frame_support::{
decl_module, decl_storage, decl_event, decl_error,
traits::{ChangeMembers, InitializeMembers, EnsureOrigin},
weights::SimpleDispatchInfo,
};
use frame_system::{self as system, ensure_root, ensure_signed};
@@ -118,7 +117,7 @@ decl_module! {
/// Add a member `who` to the set.
///
/// May only be called from `AddOrigin` or root.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn add_member(origin, who: T::AccountId) {
T::AddOrigin::try_origin(origin)
.map(|_| ())
@@ -137,7 +136,7 @@ decl_module! {
/// Remove a member `who` from the set.
///
/// May only be called from `RemoveOrigin` or root.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn remove_member(origin, who: T::AccountId) {
T::RemoveOrigin::try_origin(origin)
.map(|_| ())
@@ -159,7 +158,7 @@ decl_module! {
/// May only be called from `SwapOrigin` or root.
///
/// Prime membership is *not* passed from `remove` to `add`, if extant.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn swap_member(origin, remove: T::AccountId, add: T::AccountId) {
T::SwapOrigin::try_origin(origin)
.map(|_| ())
@@ -188,7 +187,7 @@ decl_module! {
/// pass `members` pre-sorted.
///
/// May only be called from `ResetOrigin` or root.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn reset_members(origin, members: Vec<T::AccountId>) {
T::ResetOrigin::try_origin(origin)
.map(|_| ())
@@ -211,7 +210,7 @@ decl_module! {
/// May only be called from `Signed` origin of a current member.
///
/// Prime membership is passed from the origin account to `new`, if extant.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn change_key(origin, new: T::AccountId) {
let remove = ensure_signed(origin)?;
@@ -239,7 +238,7 @@ decl_module! {
}
/// Set the prime member. Must be a current member.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn set_prime(origin, who: T::AccountId) {
T::PrimeOrigin::try_origin(origin)
.map(|_| ())
@@ -250,7 +249,7 @@ decl_module! {
}
/// Remove the prime member if it exists.
#[weight = SimpleDispatchInfo::FixedNormal(50_000_000)]
#[weight = 50_000_000]
fn clear_prime(origin) {
T::PrimeOrigin::try_origin(origin)
.map(|_| ())