fix(errors): support wrapped errors with gRPC codes (#11385)
## Description Follows up on #11274 to properly support wrapped errors. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
parent
e0f812d3d7
commit
d3163b8960
|
@ -244,6 +244,26 @@ func (e *wrappedError) Unwrap() error {
|
|||
return e.parent
|
||||
}
|
||||
|
||||
// GRPCStatus gets the gRPC status from the wrapped error or returns an unknown gRPC status.
|
||||
func (e *wrappedError) GRPCStatus() *grpcstatus.Status {
|
||||
w := e.Cause()
|
||||
for {
|
||||
if hasStatus, ok := w.(interface {
|
||||
GRPCStatus() *grpcstatus.Status
|
||||
}); ok {
|
||||
return hasStatus.GRPCStatus()
|
||||
}
|
||||
|
||||
x, ok := w.(causer)
|
||||
if ok {
|
||||
w = x.Cause()
|
||||
}
|
||||
if x == nil {
|
||||
return grpcstatus.New(grpccodes.Unknown, e.msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Recover captures a panic and stop its propagation. If panic happens it is
|
||||
// transformed into a ErrPanic instance and assigned to given error. Call this
|
||||
// function using defer in order to work as expected.
|
||||
|
|
|
@ -213,11 +213,14 @@ func (s *errorsTestSuite) TestABCIError() {
|
|||
func (s *errorsTestSuite) TestGRPCStatus() {
|
||||
s.Require().Equal(codes.Unknown, grpcstatus.Code(errInternal))
|
||||
s.Require().Equal(codes.NotFound, grpcstatus.Code(ErrNotFound))
|
||||
s.Require().Equal(codes.Unimplemented, grpcstatus.Code(ErrNotSupported))
|
||||
s.Require().Equal(codes.FailedPrecondition, grpcstatus.Code(ErrConflict))
|
||||
|
||||
status, ok := grpcstatus.FromError(ErrNotFound)
|
||||
s.Require().True(ok)
|
||||
s.Require().Equal("codespace testtesttest code 38: not found", status.Message())
|
||||
|
||||
// test wrapping
|
||||
s.Require().Equal(codes.Unimplemented, grpcstatus.Code(ErrNotSupported.Wrap("test")))
|
||||
s.Require().Equal(codes.FailedPrecondition, grpcstatus.Code(ErrConflict.Wrapf("test %s", "foo")))
|
||||
}
|
||||
|
||||
func ExampleWrap() {
|
||||
|
|
Loading…
Reference in New Issue