Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(x/authz): non utf-8 characters in logs #19923

Merged
merged 9 commits into from
Apr 5, 2024
Merged

fix(x/authz): non utf-8 characters in logs #19923

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab6cc27
write unit test first
EmilGeorgiev Apr 2, 2024
fdbe314
implement parsing function that convert grant key to UTF-8 valid string
EmilGeorgiev Apr 2, 2024
c61670e
remove unnecessary debug fmt.Println
EmilGeorgiev Apr 2, 2024
5b5e64b
refactor the function for parsing grsnt key to valid utf-8 string
EmilGeorgiev Apr 2, 2024
a1d24a0
add comments
EmilGeorgiev Apr 2, 2024
a9b1bc5
for consistency woth other methods print in the logs grenter address,…
EmilGeorgiev Apr 3, 2024
ebd7df1
remove unnecessary '%s' in the format string
EmilGeorgiev Apr 3, 2024
8b393f0
update the changelog.md file
EmilGeorgiev Apr 5, 2024
bb306f2
Merge branch 'main' into fix-authz-non-utf-8-characters-in-event-logs…
facundomedica Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion x/authz/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ func (k Keeper) DeleteGrant(ctx context.Context, grantee, granter sdk.AccAddress
skey := grantStoreKey(grantee, granter, msgType)
grant, found := k.getGrant(ctx, skey)
if !found {
return errorsmod.Wrapf(authz.ErrNoAuthorizationFound, "failed to delete grant with key %s", string(skey))
return errorsmod.Wrapf(authz.ErrNoAuthorizationFound,
sontrinh16 marked this conversation as resolved.
Show resolved Hide resolved
"failed to delete grant with key %s given granter: %s, grantee: %s & msgType: %s ", granter.String(), grantee.String(), msgType)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using fmt.Errorf instead of errorsmod.Wrapf for consistency with the rest of the Cosmos SDK codebase and to improve readability.

- return errorsmod.Wrapf(authz.ErrNoAuthorizationFound,
+ return fmt.Errorf("failed to delete grant with key %s given granter: %s, grantee: %s & msgType: %s: %w", granter.String(), grantee.String(), msgType, authz.ErrNoAuthorizationFound)
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
return errorsmod.Wrapf(authz.ErrNoAuthorizationFound,
"failed to delete grant with key %s given granter: %s, grantee: %s & msgType: %s ", granter.String(), grantee.String(), msgType)
return fmt.Errorf("failed to delete grant with key %s given granter: %s, grantee: %s & msgType: %s: %w", granter.String(), grantee.String(), msgType, authz.ErrNoAuthorizationFound)

}

if grant.Expiration != nil {
Expand Down
Loading