From 17b9e6ec81fc305379c8189d8f40d2306238685f Mon Sep 17 00:00:00 2001 From: Vladyslav Proshchavaiev Date: Wed, 29 Jun 2022 18:09:01 +0300 Subject: [PATCH] Fix code formatting in permissions pallet --- .../permissions/src/default_permissions.rs | 2 +- pallets/permissions/src/lib.rs | 11 ++++---- pallets/permissions/src/types.rs | 27 ++++++++----------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/pallets/permissions/src/default_permissions.rs b/pallets/permissions/src/default_permissions.rs index 3dfda9fd..e0e758d5 100644 --- a/pallets/permissions/src/default_permissions.rs +++ b/pallets/permissions/src/default_permissions.rs @@ -1,7 +1,7 @@ use crate::{SpacePermission as SP, SpacePermissions}; -use sp_std::vec; use frame_support::parameter_types; +use sp_std::vec; parameter_types! { pub DefaultSpacePermissions: SpacePermissions = SpacePermissions { diff --git a/pallets/permissions/src/lib.rs b/pallets/permissions/src/lib.rs index 1f8de58a..7f87ff74 100644 --- a/pallets/permissions/src/lib.rs +++ b/pallets/permissions/src/lib.rs @@ -9,6 +9,7 @@ use sp_std::collections::btree_set::BTreeSet; pub mod default_permissions; mod types; + pub use types::*; #[frame_support::pallet] @@ -61,17 +62,17 @@ pub mod pallet { // Check if this permission is forbidden: if permission.is_present_in_role(perms_by_role.none) { - return Some(false); + return Some(false) } let is_space_owner = ctx.is_space_owner; let is_follower = is_space_owner || ctx.is_space_follower; - if permission.is_present_in_role(perms_by_role.everyone) - || is_follower && permission.is_present_in_role(perms_by_role.follower) - || is_space_owner && permission.is_present_in_role(perms_by_role.space_owner) + if permission.is_present_in_role(perms_by_role.everyone) || + is_follower && permission.is_present_in_role(perms_by_role.follower) || + is_space_owner && permission.is_present_in_role(perms_by_role.space_owner) { - return Some(true); + return Some(true) } None diff --git a/pallets/permissions/src/types.rs b/pallets/permissions/src/types.rs index 5ef6a347..b1af9132 100644 --- a/pallets/permissions/src/types.rs +++ b/pallets/permissions/src/types.rs @@ -1,5 +1,5 @@ use codec::{Decode, Encode}; -use frame_support::{dispatch::{DispatchError, DispatchResult}}; +use frame_support::dispatch::{DispatchError, DispatchResult}; use scale_info::TypeInfo; use sp_runtime::RuntimeDebug; @@ -86,20 +86,20 @@ pub type SpacePermissionSet = BTreeSet; #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub struct SpacePermissions { /// None represents a set of permissions which is not capable of being performed by anyone. - /// For example, if you want to create a space similar to Twitter, you would set the permissions - /// for `UpdateOwnPosts`, `UpdateOwnComments`, and `Downvote` to `none`. + /// For example, if you want to create a space similar to Twitter, you would set the + /// permissions for `UpdateOwnPosts`, `UpdateOwnComments`, and `Downvote` to `none`. pub none: Option, - /// Everyone represents a set of permissions which are capable of being performed by every account - /// in a given space. + /// Everyone represents a set of permissions which are capable of being performed by every + /// account in a given space. pub everyone: Option, - /// Follower represents a set of permissions which are capable of being performed by every account - /// that follows a given space. + /// Follower represents a set of permissions which are capable of being performed by every + /// account that follows a given space. pub follower: Option, - /// Space owner represents a set of permissions which are capable of being performed by an account - /// that is a current owner of a given space. + /// Space owner represents a set of permissions which are capable of being performed by an + /// account that is a current owner of a given space. pub space_owner: Option, } @@ -115,7 +115,7 @@ impl SpacePermission { pub(super) fn is_present_in_role(&self, perms_opt: Option) -> bool { if let Some(perms) = perms_opt { if perms.contains(self) { - return true; + return true } } false @@ -138,11 +138,6 @@ pub trait PermissionChecker { permission: SpacePermission, error: DispatchError, ) -> DispatchResult { - Self::ensure_user_has_space_permission( - User::Account(account), - ctx, - permission, - error - ) + Self::ensure_user_has_space_permission(User::Account(account), ctx, permission, error) } }