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.

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

Move existing comparision code to types #531

Merged
merged 3 commits into from
Apr 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
317 changes: 0 additions & 317 deletions internal/handlers/common/compare.go

This file was deleted.

20 changes: 16 additions & 4 deletions internal/handlers/common/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,26 @@ func ProtocolError(err error) (*Error, bool) {
func formatBitwiseOperatorErr(err error, operator string, maskValue any) error {
switch err {
case errNotWholeNumber:
return NewErrorMsg(ErrFailedToParse, fmt.Sprintf("Expected an integer: %s: %#v", operator, maskValue))
return NewErrorMsg(
ErrFailedToParse,
fmt.Sprintf("Expected an integer: %s: %#v", operator, maskValue),
)
case errNegativeNumber:
if _, ok := maskValue.(float64); ok {
return NewErrorMsg(ErrFailedToParse, fmt.Sprintf(`Expected a positive number in: %s: %.1f`, operator, maskValue))
return NewErrorMsg(
ErrFailedToParse,
fmt.Sprintf(`Expected a positive number in: %s: %.1f`, operator, maskValue),
)
}
return NewErrorMsg(ErrFailedToParse, fmt.Sprintf(`Expected a positive number in: %s: %v`, operator, maskValue))
return NewErrorMsg(
ErrFailedToParse,
fmt.Sprintf(`Expected a positive number in: %s: %v`, operator, maskValue),
)
case errNotBinaryMask:
return NewErrorMsg(ErrBadValue, fmt.Sprintf(`value takes an Array, a number, or a BinData but received: %s: %#v`, operator, maskValue))
return NewErrorMsg(
ErrBadValue,
fmt.Sprintf(`value takes an Array, a number, or a BinData but received: %s: %#v`, operator, maskValue),
)
seeforschauer marked this conversation as resolved.
Show resolved Hide resolved
default:
return err
}
Expand Down
Loading