EnsureOrigin is a frame abstraction - it should be in frame_support (#5521)

* EnsureOrigin is a frame abstraction - it should be in frame_support

* Fixes
This commit is contained in:
Gavin Wood
2020-04-04 12:58:05 +02:00
committed by GitHub
parent f0375a858f
commit 7c0fa83720
14 changed files with 48 additions and 45 deletions
@@ -19,9 +19,9 @@
use super::*;
use frame_benchmarking::{benchmarks, account};
use frame_support::traits::{Currency, Get};
use frame_support::traits::{Currency, Get, EnsureOrigin};
use frame_system::{RawOrigin, Module as System, self};
use sp_runtime::traits::{Bounded, EnsureOrigin, One};
use sp_runtime::traits::{Bounded, One};
use crate::Module as Democracy;
+2 -2
View File
@@ -166,7 +166,7 @@
use sp_std::prelude::*;
use sp_runtime::{
DispatchResult, DispatchError, RuntimeDebug,
traits::{Zero, EnsureOrigin, Hash, Dispatchable, Saturating},
traits::{Zero, Hash, Dispatchable, Saturating},
};
use codec::{Ref, Encode, Decode};
use frame_support::{
@@ -174,7 +174,7 @@ use frame_support::{
weights::{SimpleDispatchInfo, Weight, WeighData},
traits::{
Currency, ReservableCurrency, LockableCurrency, WithdrawReason, LockIdentifier, Get,
OnUnbalanced, BalanceStatus, schedule::Named as ScheduleNamed
OnUnbalanced, BalanceStatus, schedule::Named as ScheduleNamed, EnsureOrigin
}
};
use frame_system::{self as system, ensure_signed, ensure_root};