pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 09:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SystemOrigin trait (#7226)

Browse Source 
* SystemOrigin trait

* OriginTrait provides AccountId

* Use new trait definition

* Consolidate trait

Co-authored-by: Gav Wood <gavin@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Sergei Shulepov
2020-10-05 19:13:12 +02:00
committed by GitHub
parent 2e72767034
commit 2cf4fb2cbc
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/src/origin.rs
+18 -3
View File
@@ -215,6 +215,7 @@ macro_rules! impl_outer_origin {
impl $crate::traits::OriginTrait for $name {
type Call = <$runtime as $system::Trait>::Call;
type PalletsOrigin = $caller_name;
type AccountId = <$runtime as $system::Trait>::AccountId;
fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) {
let f = self.filter.clone();
@@ -244,6 +245,19 @@ macro_rules! impl_outer_origin {
fn caller(&self) -> &Self::PalletsOrigin {
&self.caller
}
/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
fn none() -> Self {
$system::RawOrigin::None.into()
}
/// Create with system root origin and no filter.
fn root() -> Self {
$system::RawOrigin::Root.into()
}
/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
fn signed(by: <$runtime as $system::Trait>::AccountId) -> Self {
$system::RawOrigin::Signed(by).into()
}
}
$crate::paste::item! {
@@ -263,19 +277,20 @@ macro_rules! impl_outer_origin {
}
}
// For backwards compatibility and ease of accessing these functions.
#[allow(dead_code)]
impl $name {
/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
pub fn none() -> Self {
$system::RawOrigin::None.into()
<$name as $crate::traits::OriginTrait>::none()
}
/// Create with system root origin and no filter.
pub fn root() -> Self {
$system::RawOrigin::Root.into()
<$name as $crate::traits::OriginTrait>::root()
}
/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
pub fn signed(by: <$runtime as $system::Trait>::AccountId) -> Self {
$system::RawOrigin::Signed(by).into()
<$name as $crate::traits::OriginTrait>::signed(by)
}
}
substrate/frame/support/src/traits.rs
+12
View File
@@ -1621,6 +1621,9 @@ pub trait OriginTrait: Sized {
/// The caller origin, overarching type of all pallets origins.
type PalletsOrigin;
/// The AccountId used across the system.
type AccountId;
/// Add a filter to the origin.
fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static);
@@ -1635,6 +1638,15 @@ pub trait OriginTrait: Sized {
/// Get the caller.
fn caller(&self) -> &Self::PalletsOrigin;
/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
fn none() -> Self;
/// Create with system root origin and no filter.
fn root() -> Self;
/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
fn signed(by: Self::AccountId) -> Self;
}
/// Trait to be used when types are exactly same.