From 4bee8c6865965eab22ea86c6e84feed38b1d0cb8 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Thu, 5 Apr 2018 16:31:06 +0300
Subject: [PATCH] update for tendermint v0.18.0-rc1

---
 Gopkg.lock          | 34 +++++++++++++++++-----------------
 Gopkg.toml          |  6 +++---
 x/bank/msgs.go      |  2 +-
 x/bank/msgs_test.go | 19 ++++++++++++-------
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 3773902977..2de9e117ef 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -117,7 +117,7 @@
     "json/scanner",
     "json/token"
   ]
-  revision = "f40e974e75af4e271d97ce0fc917af5898ae7bda"
+  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
 
 [[projects]]
   branch = "master"
@@ -191,8 +191,8 @@
     ".",
     "mem"
   ]
-  revision = "bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
-  version = "v1.0.2"
+  revision = "63644898a8da0bc22138abf860edaf5277b6102e"
+  version = "v1.1.0"
 
 [[projects]]
   name = "github.com/spf13/cast"
@@ -203,8 +203,8 @@
 [[projects]]
   name = "github.com/spf13/cobra"
   packages = ["."]
-  revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-  version = "v0.0.1"
+  revision = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+  version = "v0.0.2"
 
 [[projects]]
   branch = "master"
@@ -250,7 +250,7 @@
     "leveldb/table",
     "leveldb/util"
   ]
-  revision = "169b1b37be738edb2813dab48c97a549bcf99bb5"
+  revision = "714f901b98fdb3aa954b4193d8cbd64a28d80cad"
 
 [[projects]]
   name = "github.com/tendermint/abci"
@@ -341,8 +341,8 @@
     "version",
     "wire"
   ]
-  revision = "6f9956990c444d53f62f2a3905ed410cfe9afe77"
-  version = "v0.17.1"
+  revision = "a1dd329d72e78d4770e602359bad5b7b1e8b72a3"
+  version = "v0.18.0-rc1"
 
 [[projects]]
   name = "github.com/tendermint/tmlibs"
@@ -359,8 +359,8 @@
     "pubsub",
     "pubsub/query"
   ]
-  revision = "24da7009c3d8c019b40ba4287495749e3160caca"
-  version = "v0.7.1"
+  revision = "2e24b64fc121dcdf1cabceab8dc2f7257675483c"
+  version = "0.8.1"
 
 [[projects]]
   branch = "master"
@@ -376,7 +376,7 @@
     "ripemd160",
     "salsa20/salsa"
   ]
-  revision = "88942b9c40a4c9d203b82b3731787b672d6e809b"
+  revision = "b2aa35443fbc700ab74c586ae79b81c171851023"
 
 [[projects]]
   branch = "master"
@@ -390,13 +390,13 @@
     "lex/httplex",
     "trace"
   ]
-  revision = "6078986fec03a1dcc236c34816c71b0e05018fda"
+  revision = "b3c676e531a6dc479fa1b35ac961c13f5e2b4d2e"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["unix"]
-  revision = "13d03a9a82fba647c21a0ef8fba44a795d0f0835"
+  revision = "1d206c9fa8975fb4cf00df1dc8bf3283dc24ba0e"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -423,7 +423,7 @@
   branch = "master"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
-  revision = "ab0870e398d5dd054b868c0db1481ab029b9a9f2"
+  revision = "35de2414665fc36f56b72d982c5af480d86de5ab"
 
 [[projects]]
   name = "google.golang.org/grpc"
@@ -452,12 +452,12 @@
 [[projects]]
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb"
-  version = "v2.2.0"
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "ed1f3f7f1728cd02945f90ca780e9bdc982573a36a5cc8d7e9f19fb40ba2ca19"
+  inputs-digest = "67298e1f8058b85f082dbd32123f2779b11bda282616e595141dba41a8675c39"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index e3df3d6946..e9774e1c15 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -70,11 +70,11 @@
   name = "github.com/tendermint/iavl"
 
 [[constraint]]
-  version = "~0.17.1"
+  version = "~0.18.0-rc1"
   name = "github.com/tendermint/tendermint"
 
-[[constraint]]
-  version = "~0.7.1"
+[[override]]
+  version = "~0.8.1"
   name = "github.com/tendermint/tmlibs"
 
 [prune]
diff --git a/x/bank/msgs.go b/x/bank/msgs.go
index 05f824eba5..15822eed75 100644
--- a/x/bank/msgs.go
+++ b/x/bank/msgs.go
@@ -195,7 +195,7 @@ func (out Output) ValidateBasic() sdk.Error {
 }
 
 func (out Output) String() string {
-	return fmt.Sprintf("Output{%X,%v}", out.Address, out.Coins)
+	return fmt.Sprintf("Output{%v,%v}", out.Address, out.Coins)
 }
 
 // NewOutput - create a transaction output, used with SendMsg
diff --git a/x/bank/msgs_test.go b/x/bank/msgs_test.go
index bbfdc62ffd..b158405d96 100644
--- a/x/bank/msgs_test.go
+++ b/x/bank/msgs_test.go
@@ -179,8 +179,10 @@ func TestSendMsgValidation(t *testing.T) {
 
 func TestSendMsgString(t *testing.T) {
 	// Construct a SendMsg
-	addr1 := sdk.Address([]byte("input"))
-	addr2 := sdk.Address([]byte("output"))
+	addr1String := "input"
+	addr2String := "output"
+	addr1 := sdk.Address([]byte(addr1String))
+	addr2 := sdk.Address([]byte(addr2String))
 	coins := sdk.Coins{{"atom", 10}}
 	var msg = SendMsg{
 		Inputs:  []Input{NewInput(addr1, coins)},
@@ -188,8 +190,9 @@ func TestSendMsgString(t *testing.T) {
 	}
 
 	res := msg.String()
+	expected := fmt.Sprintf("SendMsg{[Input{%X,10atom}]->[Output{%X,10atom}]}", addr1String, addr2String)
 	// TODO some failures for bad results
-	assert.Equal(t, res, "SendMsg{[Input{696E707574,10atom}]->[Output{364637353734373037353734,10atom}]}")
+	assert.Equal(t, expected, res)
 }
 
 func TestSendMsgGet(t *testing.T) {
@@ -275,16 +278,18 @@ func TestIssueMsgValidation(t *testing.T) {
 }
 
 func TestIssueMsgString(t *testing.T) {
+	addrString := "loan-from-bank"
+	bankerString := "input"
 	// Construct a IssueMsg
-	addr := sdk.Address([]byte("loan-from-bank"))
+	addr := sdk.Address([]byte(addrString))
 	coins := sdk.Coins{{"atom", 10}}
 	var msg = IssueMsg{
-		Banker:  sdk.Address([]byte("input")),
+		Banker:  sdk.Address([]byte(bankerString)),
 		Outputs: []Output{NewOutput(addr, coins)},
 	}
 	res := msg.String()
-	// TODO: FIX THIS OUTPUT!
-	assert.Equal(t, res, "IssueMsg{696E707574#[Output{36433646363136453244363637323646364432443632363136453642,10atom}]}")
+	expected := fmt.Sprintf("IssueMsg{%X#[Output{%X,10atom}]}", bankerString, addrString)
+	assert.Equal(t, expected, res)
 }
 
 func TestIssueMsgGet(t *testing.T) {