-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
Handle unmarshalling failures gracefully in x/stake commands #1997
Merged
rigelrozanski
merged 10 commits into
cosmos:develop
from
alessio:alessio/1831-avoid-panic-on-unbond-begin
Aug 15, 2018
Merged
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e67df7a
Handle panic gracefully when unbond begin fails
2358caf
Handle failure to query delegation gracefully.
e220dcf
Update PENDING.md
14d7c20
Reuse stake's error functions
a96cf15
New ErrBadValidatorAddr error
b8d4888
New ErrBadDelegationAddr error
858f6ef
Introduce ErrBad{Redelegation,UnbondingDelegation}Addr custom errors …
84917c9
Replace ErrBadUnbondingDelegationAddr with ErrBadDelegationAddr to av…
e020976
Use sdk.AddrLen instead of hardcoded address length
306b854
s/triple/tuple/ ## mention PR id in PENDING.md
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ package cli | |
import ( | ||
"fmt" | ||
|
||
"github.com/pkg/errors" | ||
"github.com/spf13/cobra" | ||
"github.com/spf13/viper" | ||
"github.com/tendermint/tendermint/libs/cli" | ||
|
@@ -139,7 +140,10 @@ func GetCmdQueryDelegation(storeName string, cdc *wire.Codec) *cobra.Command { | |
} | ||
|
||
// parse out the delegation | ||
delegation := types.MustUnmarshalDelegation(cdc, key, res) | ||
delegation, err := types.UnmarshalDelegation(cdc, key, res) | ||
if err != nil { | ||
return errors.Errorf("cannot unmarshal delegation: %v", err) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wouldn't it be better to add a new error function in |
||
} | ||
|
||
switch viper.Get(cli.OutputFlag) { | ||
case "text": | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -273,11 +273,12 @@ func getShares( | |
if err != nil { | ||
return sharesAmount, errors.Errorf("cannot find delegation to determine percent Error: %v", err) | ||
} | ||
|
||
delegation := types.MustUnmarshalDelegation(cdc, key, resQuery) | ||
delegation, err := types.UnmarshalDelegation(cdc, key, resQuery) | ||
if err != nil { | ||
return sdk.ZeroRat(), errors.Errorf("cannot unmarshal delegation: %v", err) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same |
||
} | ||
sharesAmount = sharesPercent.Mul(delegation.Shares) | ||
} | ||
|
||
return | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's reference the PR here 👍