Fix up ibc to work with new cli reorg

This commit is contained in:
Ethan Frey
2017-07-27 16:25:05 -04:00
parent 8659c4db68
commit 9b099a2f36
4 changed files with 13 additions and 17 deletions
-8
View File
@@ -16,7 +16,6 @@ var (
errNoOutputs = fmt.Errorf("No output coins")
errInvalidAddress = fmt.Errorf("Invalid address")
errInvalidCoins = fmt.Errorf("Invalid coins")
errUnknownKey = fmt.Errorf("Unknown key")
invalidInput = abci.CodeType_BaseInvalidInput
invalidOutput = abci.CodeType_BaseInvalidOutput
@@ -80,10 +79,3 @@ func ErrNoOutputs() errors.TMError {
func IsNoOutputsErr(err error) bool {
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)
}
+1 -1
View File
@@ -99,7 +99,7 @@ func (h Handler) SetOption(l log.Logger, store state.SimpleDB, module, key, valu
return "Success", nil
}
return "", ErrUnknownKey(key)
return "", errors.ErrUnknownKey(key)
}
func checkTx(ctx basecoin.Context, tx basecoin.Tx) (send SendTx, err error) {
+1 -5
View File
@@ -5,7 +5,6 @@ import (
merkle "github.com/tendermint/merkleeyes/iavl"
"github.com/tendermint/basecoin"
"github.com/tendermint/basecoin/errors"
)
// nolint
@@ -94,11 +93,8 @@ type CreatePacketTx struct {
// ValidateBasic makes sure this is consistent - used to satisfy TxInner
func (p CreatePacketTx) ValidateBasic() error {
if p.DestChain == "" {
return errors.ErrNoChain()
return ErrWrongDestChain(p.DestChain)
}
// if len(p.Permissions) == 0 {
// return ErrNoPermissions()
// }
return nil
}