R4R: Codespaces as Strings #2821
Merged
Conversation
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
jaekwon
approved these changes
Nov 16, 2018
Codecov Report
@@ Coverage Diff @@
## develop #2821 +/- ##
===========================================
- Coverage 56.75% 56.68% -0.07%
===========================================
Files 131 131
Lines 8554 8536 -18
===========================================
- Hits 4855 4839 -16
+ Misses 3366 3364 -2
Partials 333 333 |
cwgoes
suggested changes
Nov 16, 2018
cmd/gaia/app/app.go
Outdated
| @@ -124,19 +124,19 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio | |||
| app.keyDistr, | |||
| app.paramsKeeper.Subspace(distr.DefaultParamspace), | |||
| app.bankKeeper, &stakeKeeper, app.feeCollectionKeeper, | |||
| app.RegisterCodespace(stake.DefaultCodespace), | |||
| stake.DefaultCodespace, | |||
| @@ -107,7 +107,7 @@ func handleMsgSend(key *sdk.KVStoreKey) sdk.Handler { | |||
| if !ok { | |||
| // Create custom error message and return result | |||
| // Note: Using unreserved error codespace | |||
| return sdk.NewError(2, 1, "MsgSend is malformed").Result() | |||
| return sdk.NewError("bank", 1, "MsgSend is malformed").Result() | |||
| @@ -137,7 +137,7 @@ func handleFrom(store sdk.KVStore, from sdk.AccAddress, amt sdk.Coins) sdk.Resul | |||
| accBytes := store.Get(from) | |||
| if accBytes == nil { | |||
| // Account was not added to store. Return the result of the error. | |||
| return sdk.NewError(2, 101, "Account not added to store").Result() | |||
| return sdk.NewError("bank", 101, "Account not added to store").Result() | |||
There was a problem hiding this comment.
Ditto, should be a constant
| @@ -126,7 +126,7 @@ func handleMsgIssue(keyIssue *sdk.KVStoreKey, keyAcc *sdk.KVStoreKey) sdk.Handle | |||
| return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { | |||
| issueMsg, ok := msg.(MsgIssue) | |||
| if !ok { | |||
| return sdk.NewError(2, 1, "MsgIssue is malformed").Result() | |||
| return sdk.NewError("bank", 1, "MsgIssue is malformed").Result() | |||
x/slashing/errors.go
Outdated
| @@ -10,7 +10,7 @@ type CodeType = sdk.CodeType | |||
|
|
|||
| const ( | |||
| // Default slashing codespace | |||
| DefaultCodespace sdk.CodespaceType = 10 | |||
| DefaultCodespace sdk.CodespaceType = MsgRoute | |||
There was a problem hiding this comment.
Hmm, although sharing the variable is better reading through this line doesn't make a lot of sense (what does the codespace have to do with the msg route) - maybe we should declare const ModuleName = "slashing" and assign both MsgRoute and DefaultCodespace to ModuleName, what do you think?
There was a problem hiding this comment.
Just setting new strings that are capitalized instead, so as to differentiate.
alexanderbez
suggested changes
Nov 16, 2018
There was a problem hiding this comment.
Changes LGTM -- just a few minor tidbits that @cwgoes pointed out.
x/slashing/errors.go
Outdated
| @@ -10,7 +10,7 @@ type CodeType = sdk.CodeType | |||
|
|
|||
| const ( | |||
| // Default slashing codespace | |||
| DefaultCodespace sdk.CodespaceType = 10 | |||
| DefaultCodespace sdk.CodespaceType = MsgRoute | |||
…dk into sunny/codespacer-strings
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Matches ABCI update
Targeted PR against correct branch (see CONTRIBUTING.md)
Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
Wrote tests
Updated relevant documentation (
docs/)Added entries in
PENDING.mdwith issue #rereviewed
Files changedin the github PR explorerFor Admin Use: