From 9b099a2f369e99ec178bbdd3af808e420854acd5 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Wed, 19 Jul 2017 17:28:43 +0200
Subject: [PATCH] Fix up ibc to work with new cli reorg

---
 errors/common.go        | 14 +++++++++++---
 modules/coin/errors.go  |  8 --------
 modules/coin/handler.go |  2 +-
 modules/ibc/tx.go       |  6 +-----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/errors/common.go b/errors/common.go
index f4fd66debf..64d45c0820 100644
--- a/errors/common.go
+++ b/errors/common.go
@@ -16,6 +16,7 @@ var (
 	errUnknownTxType    = fmt.Errorf("Tx type unknown")
 	errInvalidFormat    = fmt.Errorf("Invalid format")
 	errUnknownModule    = fmt.Errorf("Unknown module")
+	errUnknownKey       = fmt.Errorf("Unknown key")
 
 	internalErr    = abci.CodeType_InternalError
 	encodingErr    = abci.CodeType_EncodingError
@@ -39,7 +40,7 @@ func unwrap(i interface{}) interface{} {
 
 func ErrUnknownTxType(tx interface{}) TMError {
 	msg := fmt.Sprintf("%T", unwrap(tx))
-	return WithMessage(msg, errUnknownTxType, abci.CodeType_UnknownRequest)
+	return WithMessage(msg, errUnknownTxType, unknownRequest)
 }
 func IsUnknownTxTypeErr(err error) bool {
 	return IsSameError(errUnknownTxType, err)
@@ -47,19 +48,26 @@ func IsUnknownTxTypeErr(err error) bool {
 
 func ErrInvalidFormat(expected string, tx interface{}) TMError {
 	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 {
 	return IsSameError(errInvalidFormat, err)
 }
 
 func ErrUnknownModule(mod string) TMError {
-	return WithMessage(mod, errUnknownModule, abci.CodeType_UnknownRequest)
+	return WithMessage(mod, errUnknownModule, unknownRequest)
 }
 func IsUnknownModuleErr(err error) bool {
 	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 {
 	return New(msg, internalErr)
 }
diff --git a/modules/coin/errors.go b/modules/coin/errors.go
index 49513f4336..430b59bffe 100644
--- a/modules/coin/errors.go
+++ b/modules/coin/errors.go
@@ -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)
-}
diff --git a/modules/coin/handler.go b/modules/coin/handler.go
index 08fc2e5396..ff1f040376 100644
--- a/modules/coin/handler.go
+++ b/modules/coin/handler.go
@@ -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) {
diff --git a/modules/ibc/tx.go b/modules/ibc/tx.go
index 69b8bcf414..48a09531aa 100644
--- a/modules/ibc/tx.go
+++ b/modules/ibc/tx.go
@@ -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
 }