Addressed Chris and Dev's comments

This commit is contained in:
Federico Kunze 2018-08-23 12:02:12 +02:00
parent 1ec9d16d94
commit f143c92ca6
2 changed files with 15 additions and 16 deletions

View File

@ -21,6 +21,7 @@ BREAKING CHANGES
* SDK
* [core] \#1807 Switch from use of rational to decimal
* [types] \#1901 Validator interface's GetOwner() renamed to GetOperator()
* [types] \#2119 Parsed error messages and ABCI log errors to make them more human readable.
* Tendermint
@ -56,7 +57,6 @@ IMPROVEMENTS
* SDK
* [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present.
* [types] \#2119 Parsed error messages and ABCI log errors to make them more human readable.
* Tendermint

View File

@ -1,12 +1,12 @@
package types
import (
"encoding/json"
"fmt"
"strings"
cmn "github.com/tendermint/tendermint/libs/common"
"github.com/cosmos/cosmos-sdk/wire"
abci "github.com/tendermint/tendermint/abci/types"
)
@ -251,9 +251,15 @@ func (err *sdkError) Code() CodeType {
// Implements ABCIError.
func (err *sdkError) ABCILog() string {
cdc := wire.NewCodec()
parsedErrMsg := parseCmnError(err.cmnError.Error())
jsonErr := newHumanReadableError(err.codespace, err.code, err.ABCICode(), parsedErrMsg)
bz, er := json.Marshal(jsonErr)
jsonErr := humanReadableError{
Codespace: err.codespace,
Code: err.code,
ABCICode: err.ABCICode(),
Message: parsedErrMsg,
}
bz, er := cdc.MarshalJSON(jsonErr)
if er != nil {
panic(er)
}
@ -277,23 +283,16 @@ func (err *sdkError) QueryResult() abci.ResponseQuery {
}
func parseCmnError(err string) string {
errArray := strings.Split(err, "{")
return errArray[1][:len(errArray[1])-1]
if idx := strings.Index(err, "{"); idx != -1 {
err = err[idx+1 : len(err)-1]
}
return err
}
// nolint
type HumanReadableError struct {
type humanReadableError struct {
Codespace CodespaceType `json:"codespace"`
Code CodeType `json:"code"`
ABCICode ABCICodeType `json:"abci_code"`
Message string `json:"message"`
}
func newHumanReadableError(codespace CodespaceType, code CodeType, ABCICode ABCICodeType, msg string) HumanReadableError {
return HumanReadableError{
Codespace: codespace,
Code: code,
ABCICode: ABCICode,
Message: msg,
}
}