chore(perms): permissions store is moved to top index

Cerebellum-Network · Jun 29, 2023 · ea3c23c · ea3c23c
1 parent c50afa9
commit ea3c23c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bucket/ddc_bucket/perm/messages.rs b/bucket/ddc_bucket/perm/messages.rs
@@ -8,12 +8,12 @@ use crate::ddc_bucket::perm::entity::Permission;
 impl DdcBucket {
 
     pub fn grant_permission(&mut self, account_id: AccountId, permission: Permission) -> Result<()> {
-        self.perms.grant_permission(account_id, &permission);
+        self.perms.grant_permission(account_id, permission);
         Ok(())
     }
 
     pub fn revoke_permission(&mut self, account_id: AccountId, permission: Permission) -> Result<()> {
-        self.perms.revoke_permission(account_id, &permission);
+        self.perms.revoke_permission(account_id, permission);
         Ok(())
     }
 

diff --git a/bucket/ddc_bucket/perm/store.rs b/bucket/ddc_bucket/perm/store.rs
@@ -22,12 +22,12 @@ pub struct PermStore {
 
 
 impl PermStore {
-    pub fn grant_permission(&mut self, account_id: AccountId, permission: &Permission) {
+    pub fn grant_permission(&mut self, account_id: AccountId, permission: Permission) {
         let key = (account_id, permission).encode();
         self.perms.insert(key, &true);
     }
 
-    pub fn revoke_permission(&mut self, account_id: AccountId, permission: &Permission) {
+    pub fn revoke_permission(&mut self, account_id: AccountId, permission: Permission) {
         let key = (account_id, permission).encode();
         self.perms.remove(&key);
     }

diff --git a/bucket/lib.rs b/bucket/lib.rs
@@ -51,12 +51,12 @@ pub mod ddc_bucket {
     #[ink(storage)]
     #[derive(SpreadAllocate, Default)]
     pub struct DdcBucket {
+        perms: PermStore,
         buckets: BucketStore,
         clusters: ClusterStore,
         cdn_nodes: CdnNodeStore,
         nodes: NodeStore,
         accounts: AccountStore,
-        perms: PermStore,
         network_fee: NetworkFeeStore,
         committer_store: CommitterStore,
         protocol_store: ProtocolStore,
@@ -72,7 +72,7 @@ pub mod ddc_bucket {
             ink_lang::utils::initialize_contract(|contract: &mut Self| {
                 let admin = Self::env().caller();
                 // Make the creator of this contract a super-admin.
-                contract.perms.grant_permission(admin, &Permission::SuperAdmin);
+                contract.perms.grant_permission(admin, Permission::SuperAdmin);
                 contract.committer_store.init(admin);
                 contract.protocol_store.init(admin, DEFAULT_BASIS_POINTS);
             })