Skip to content

Commit

Permalink
make error message private
Browse files Browse the repository at this point in the history
  • Loading branch information
irreverentsimplicity committed Oct 5, 2024
1 parent 36c276e commit 870fa50
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions examples/gno.land/p/demo/zteams/errors.gno
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package zteams
import "errors"

var (
ErrNotOwner = errors.New("not the owner")
ErrNotAuthorized = errors.New("not authorized")
ErrUserNotDisburser = errors.New("cannot disburse")
ErrTeamNotFound = errors.New("team not found")
ErrUserNotMember = errors.New("user not a member")
ErrUserAlreadyMember = errors.New("user is already a member")
ErrTeamAddressAlreadyExists = errors.New("team address already exists")
errNotOwner = errors.New("not the owner")
errNotAuthorized = errors.New("not authorized")
errUserNotDisburser = errors.New("cannot disburse")
errTeamNotFound = errors.New("team not found")
errUserNotMember = errors.New("user not a member")
errUserAlreadyMember = errors.New("user is already a member")
errTeamAddressAlreadyExists = errors.New("team address already exists")
)
24 changes: 12 additions & 12 deletions examples/gno.land/p/demo/zteams/teams.gno
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func NewTeamManager() *TeamManager {
func (tm *TeamManager) GetTeam(teamAddress std.Address) (*Team, error) {
team, found := tm.Teams.Get(teamAddress.String())
if !found {
return nil, ErrTeamNotFound
return nil, errTeamNotFound
}
return team.(*Team), nil
}
Expand All @@ -57,7 +57,7 @@ func (tm *TeamManager) DesignateAdmin(teamAddress std.Address, userAddress std.A
}

if !team.isOwner(requester) {
return ErrNotOwner
return errNotOwner
}

team.Admins[userAddress.String()] = true
Expand All @@ -73,7 +73,7 @@ func (tm *TeamManager) RemoveAdmin(teamAddress std.Address, userAddress std.Addr
}

if !team.isOwner(requester) {
return ErrNotOwner
return errNotOwner
}

delete(team.Admins, userAddress.String())
Expand All @@ -90,7 +90,7 @@ func (tm *TeamManager) AssignDisbursePermission(teamAddress std.Address, userAdd

// Only Owner or Admin can assign disburse permissions.
if !team.isOwner(requester) && !team.isAdmin(requester) {
return ErrNotAuthorized
return errNotAuthorized
}

// Assign disburse permission.
Expand All @@ -108,12 +108,12 @@ func (tm *TeamManager) RemoveDisbursePermission(teamAddress std.Address, userAdd

// Only Owner or Admin can remove disburse permissions.
if !team.isOwner(requester) && !team.isAdmin(requester) {
return ErrNotAuthorized
return errNotAuthorized
}

// Check if the user has disburse permission.
if !team.Disbursers[userAddress.String()] {
return ErrUserNotDisburser // Use a specific error message.
return errUserNotDisburser // Use a specific error message.
}

// Remove disburse permission.
Expand All @@ -135,7 +135,7 @@ func (tm *TeamManager) CanDisburse(teamAddress std.Address, userAddress std.Addr
func (tm *TeamManager) AddTeam(t *Team) error {
_, found := tm.Teams.Get(t.Address.String())
if found {
return ErrTeamAddressAlreadyExists
return errTeamAddressAlreadyExists
}

// Initialize Admins and Disbursers maps.
Expand All @@ -154,7 +154,7 @@ func (tm *TeamManager) AddUserToTeam(teamAddress std.Address, user users.User, r
}

if !team.isOwner(requester) && !team.isAdmin(requester) {
return ErrNotAuthorized
return errNotAuthorized
}

// Retrieve current members or initialize an empty slice if nil.
Expand All @@ -167,7 +167,7 @@ func (tm *TeamManager) AddUserToTeam(teamAddress std.Address, user users.User, r
// Check if the user is already a member.
for _, member := range memberList {
if member.Address == user.Address {
return ErrUserAlreadyMember
return errUserAlreadyMember
}
}

Expand All @@ -185,14 +185,14 @@ func (tm *TeamManager) RemoveUserFromTeam(teamAddress std.Address, userAddress s
}

if !team.isOwner(requester) && !team.isAdmin(requester) {
return ErrNotAuthorized
return errNotAuthorized
}

// Retrieve current members or initialize an empty slice if nil.
members, _ := tm.Members.Get(teamAddress.String())
memberList, ok := members.([]*users.User)
if !ok || memberList == nil {
return ErrUserNotMember
return errUserNotMember
}

// Remove the user from the member list.
Expand All @@ -206,7 +206,7 @@ func (tm *TeamManager) RemoveUserFromTeam(teamAddress std.Address, userAddress s
}

if !userFound {
return ErrUserNotMember
return errUserNotMember
}

// Remove user roles and permissions.
Expand Down

0 comments on commit 870fa50

Please sign in to comment.