From d87c9ebc74318f664c3fbb5f94df01633869a5b6 Mon Sep 17 00:00:00 2001
From: Sunny Aggarwal <sunnya97@gmail.com>
Date: Mon, 9 Jul 2018 00:29:09 -0700
Subject: [PATCH] fixed lcd errors

---
 x/bank/client/rest/sendtx.go  |  9 +--------
 x/ibc/client/rest/transfer.go | 11 +----------
 x/slashing/msg_test.go        |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/x/bank/client/rest/sendtx.go b/x/bank/client/rest/sendtx.go
index bba491b52a..4029a42f4a 100644
--- a/x/bank/client/rest/sendtx.go
+++ b/x/bank/client/rest/sendtx.go
@@ -44,7 +44,7 @@ func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreCont
 		vars := mux.Vars(r)
 		bech32addr := vars["address"]
 
-		address, err := sdk.GetAccAddressBech32(bech32addr)
+		to, err := sdk.GetAccAddressBech32(bech32addr)
 		if err != nil {
 			w.WriteHeader(http.StatusBadRequest)
 			w.Write([]byte(err.Error()))
@@ -72,13 +72,6 @@ func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreCont
 			return
 		}
 
-		to, err := sdk.GetAccAddressHex(address.String())
-		if err != nil {
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte(err.Error()))
-			return
-		}
-
 		// build message
 		msg := client.BuildMsg(sdk.AccAddress(info.GetPubKey().Address()), to, m.Amount)
 		if err != nil { // XXX rechecking same error ?
diff --git a/x/ibc/client/rest/transfer.go b/x/ibc/client/rest/transfer.go
index 139b79aee1..2540d14017 100644
--- a/x/ibc/client/rest/transfer.go
+++ b/x/ibc/client/rest/transfer.go
@@ -1,7 +1,6 @@
 package rest
 
 import (
-	"encoding/hex"
 	"io/ioutil"
 	"net/http"
 
@@ -39,7 +38,7 @@ func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.Core
 		destChainID := vars["destchain"]
 		bech32addr := vars["address"]
 
-		address, err := sdk.GetAccAddressBech32(bech32addr)
+		to, err := sdk.GetAccAddressBech32(bech32addr)
 		if err != nil {
 			w.WriteHeader(http.StatusBadRequest)
 			w.Write([]byte(err.Error()))
@@ -67,14 +66,6 @@ func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.Core
 			return
 		}
 
-		bz, err := hex.DecodeString(address.String())
-		if err != nil {
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte(err.Error()))
-			return
-		}
-		to := sdk.AccAddress(bz)
-
 		// build message
 		packet := ibc.NewIBCPacket(sdk.AccAddress(info.GetPubKey().Address()), to, m.Amount, m.SrcChainID, destChainID)
 		msg := ibc.IBCTransferMsg{packet}
diff --git a/x/slashing/msg_test.go b/x/slashing/msg_test.go
index 9c546da763..287eb6c5c5 100644
--- a/x/slashing/msg_test.go
+++ b/x/slashing/msg_test.go
@@ -12,5 +12,5 @@ func TestMsgUnrevokeGetSignBytes(t *testing.T) {
 	addr := sdk.AccAddress("abcd")
 	msg := NewMsgUnrevoke(addr)
 	bytes := msg.GetSignBytes()
-	require.Equal(t, string(bytes), `{"address":"cosmosvaladdr1v93xxeqamr0mv"}`)
+	require.Equal(t, string(bytes), `{"address":"cosmosaccaddr1v93xxeqhyqz5v"}`)
 }