From 57a9bfe2d9cdc621dfb2987d7219fa97edd7eb53 Mon Sep 17 00:00:00 2001
From: RJ Catalano <rj@monax.io>
Date: Wed, 12 Apr 2017 14:34:51 -0500
Subject: [PATCH] change from uints to bools because it makes more sense
Signed-off-by: RJ Catalano <rj@monax.io>
---
permission/types/util.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/permission/types/util.go b/permission/types/util.go
index fddf0b9e..9f9000d1 100644
--- a/permission/types/util.go
+++ b/permission/types/util.go
@@ -19,7 +19,7 @@ package types
// than zero to set the permission. For all unmentioned permissions the ZeroBasePermissions
// is defaulted to.
// TODO: [ben] re-evaluate the use of int for setting the permission.
-func ConvertPermissionsMapAndRolesToAccountPermissions(permissions map[string]int, roles []string) (*AccountPermissions, error) {
+func ConvertPermissionsMapAndRolesToAccountPermissions(permissions map[string]bool, roles []string) (*AccountPermissions, error) {
var err error
accountPermissions := &AccountPermissions{}
accountPermissions.Base, err = convertPermissionsMapStringIntToBasePermissions(permissions)
@@ -32,7 +32,7 @@ func ConvertPermissionsMapAndRolesToAccountPermissions(permissions map[string]in
// convertPermissionsMapStringIntToBasePermissions converts a map of string-integer pairs to
// BasePermissions.
-func convertPermissionsMapStringIntToBasePermissions(permissions map[string]int) (BasePermissions, error) {
+func convertPermissionsMapStringIntToBasePermissions(permissions map[string]bool) (BasePermissions, error) {
// initialise basePermissions as ZeroBasePermissions
basePermissions := ZeroBasePermissions
@@ -42,7 +42,7 @@ func convertPermissionsMapStringIntToBasePermissions(permissions map[string]int)
return basePermissions, err
}
// sets the permissions bitflag and the setbit flag for the permission.
- basePermissions.Set(permissionsFlag, value > 0)
+ basePermissions.Set(permissionsFlag, value)
}
return basePermissions, nil
--
GitLab