certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix up ibc to work with new cli reorg

This commit is contained in:
Ethan Frey 2017-07-19 17:28:43 +02:00
parent 8659c4db68
commit 9b099a2f36
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
errors/common.go
View File

@ -16,6 +16,7 @@ var (
errUnknownTxType = fmt.Errorf("Tx type unknown") errUnknownTxType = fmt.Errorf("Tx type unknown")
errInvalidFormat = fmt.Errorf("Invalid format") errInvalidFormat = fmt.Errorf("Invalid format")
errUnknownModule = fmt.Errorf("Unknown module") errUnknownModule = fmt.Errorf("Unknown module")
errUnknownKey = fmt.Errorf("Unknown key")
internalErr = abci.CodeType_InternalError internalErr = abci.CodeType_InternalError
encodingErr = abci.CodeType_EncodingError encodingErr = abci.CodeType_EncodingError
@ -39,7 +40,7 @@ func unwrap(i interface{}) interface{} {
func ErrUnknownTxType(tx interface{}) TMError { func ErrUnknownTxType(tx interface{}) TMError {
msg := fmt.Sprintf("%T", unwrap(tx)) msg := fmt.Sprintf("%T", unwrap(tx))
return WithMessage(msg, errUnknownTxType, abci.CodeType_UnknownRequest) return WithMessage(msg, errUnknownTxType, unknownRequest)
} }
func IsUnknownTxTypeErr(err error) bool { func IsUnknownTxTypeErr(err error) bool {
return IsSameError(errUnknownTxType, err) return IsSameError(errUnknownTxType, err)
@ -47,19 +48,26 @@ func IsUnknownTxTypeErr(err error) bool {
func ErrInvalidFormat(expected string, tx interface{}) TMError { func ErrInvalidFormat(expected string, tx interface{}) TMError {
msg := fmt.Sprintf("%T not %s", unwrap(tx), expected) msg := fmt.Sprintf("%T not %s", unwrap(tx), expected)
return WithMessage(msg, errInvalidFormat, abci.CodeType_UnknownRequest) return WithMessage(msg, errInvalidFormat, unknownRequest)
} }
func IsInvalidFormatErr(err error) bool { func IsInvalidFormatErr(err error) bool {
return IsSameError(errInvalidFormat, err) return IsSameError(errInvalidFormat, err)
} }
func ErrUnknownModule(mod string) TMError { func ErrUnknownModule(mod string) TMError {
return WithMessage(mod, errUnknownModule, abci.CodeType_UnknownRequest) return WithMessage(mod, errUnknownModule, unknownRequest)
} }
func IsUnknownModuleErr(err error) bool { func IsUnknownModuleErr(err error) bool {
return IsSameError(errUnknownModule, err) return IsSameError(errUnknownModule, err)
} }
func ErrUnknownKey(mod string) TMError {
return WithMessage(mod, errUnknownKey, unknownRequest)
}
func IsUnknownKeyErr(err error) bool {
return IsSameError(errUnknownKey, err)
}
func ErrInternal(msg string) TMError { func ErrInternal(msg string) TMError {
return New(msg, internalErr) return New(msg, internalErr)
} }

8
modules/coin/errors.go
View File

@ -16,7 +16,6 @@ var (
errNoOutputs = fmt.Errorf("No output coins") errNoOutputs = fmt.Errorf("No output coins")
errInvalidAddress = fmt.Errorf("Invalid address") errInvalidAddress = fmt.Errorf("Invalid address")
errInvalidCoins = fmt.Errorf("Invalid coins") errInvalidCoins = fmt.Errorf("Invalid coins")
errUnknownKey = fmt.Errorf("Unknown key")
invalidInput = abci.CodeType_BaseInvalidInput invalidInput = abci.CodeType_BaseInvalidInput
invalidOutput = abci.CodeType_BaseInvalidOutput invalidOutput = abci.CodeType_BaseInvalidOutput
@ -80,10 +79,3 @@ func ErrNoOutputs() errors.TMError {
func IsNoOutputsErr(err error) bool { func IsNoOutputsErr(err error) bool {
return errors.IsSameError(errNoOutputs, err) return errors.IsSameError(errNoOutputs, err)
} }
func ErrUnknownKey(mod string) errors.TMError {
return errors.WithMessage(mod, errUnknownKey, unknownRequest)
}
func IsUnknownKeyErr(err error) bool {
return errors.IsSameError(errUnknownKey, err)
}

2
modules/coin/handler.go
View File

@ -99,7 +99,7 @@ func (h Handler) SetOption(l log.Logger, store state.SimpleDB, module, key, valu
return "Success", nil return "Success", nil
} }
return "", ErrUnknownKey(key) return "", errors.ErrUnknownKey(key)
} }
func checkTx(ctx basecoin.Context, tx basecoin.Tx) (send SendTx, err error) { func checkTx(ctx basecoin.Context, tx basecoin.Tx) (send SendTx, err error) {

6
modules/ibc/tx.go
View File

@ -5,7 +5,6 @@ import (
merkle "github.com/tendermint/merkleeyes/iavl" merkle "github.com/tendermint/merkleeyes/iavl"
"github.com/tendermint/basecoin" "github.com/tendermint/basecoin"
"github.com/tendermint/basecoin/errors"
) )
// nolint // nolint
@ -94,11 +93,8 @@ type CreatePacketTx struct {
// ValidateBasic makes sure this is consistent - used to satisfy TxInner // ValidateBasic makes sure this is consistent - used to satisfy TxInner
func (p CreatePacketTx) ValidateBasic() error { func (p CreatePacketTx) ValidateBasic() error {
if p.DestChain == "" { if p.DestChain == "" {
return errors.ErrNoChain() return ErrWrongDestChain(p.DestChain)
} }
// if len(p.Permissions) == 0 {
// return ErrNoPermissions()
// }
return nil return nil
} }