Merge pull request cosmos#814 from cosmos/jae/aminoify

aminoification

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.15.0 (TBD)
+
+BREAKING CHANGES
+
+* Remove go-wire, use go-amino
+
 ## 0.14.0 (April 9, 2018)
 
 BREAKING CHANGES:

Gopkg.toml

@@ -53,29 +53,28 @@
   version = "~1.2.1"
 
 [[constraint]]
-  version = "~0.10.2"
   name = "github.com/tendermint/abci"
+  version = "~0.10.3"
 
 [[constraint]]
-  version = "~0.5.0"
   name = "github.com/tendermint/go-crypto"
+  version = "~0.6.2"
 
 [[constraint]]
-  version = "~0.7.3"
-  source = "github.com/tendermint/go-amino"
-  name = "github.com/tendermint/go-wire"
+  name = "github.com/tendermint/go-amino"
+  version = "~0.9.6"
 
 [[constraint]]
-  version = "~0.7.0"
   name = "github.com/tendermint/iavl"
+  version = "~0.7.0"
 
 [[constraint]]
-  version = "~0.18.0"
   name = "github.com/tendermint/tendermint"
+  version = "0.19.0-rc4"
 
-[[override]]
-  version = "~0.8.1"
+[[constraint]]
   name = "github.com/tendermint/tmlibs"
+  version = "~0.8.1"
 
 [prune]
   go-tests = true

baseapp/baseapp_test.go

@@ -432,7 +432,7 @@ func makePubKey(secret string) crypto.PubKey {
 
 func makePrivKey(secret string) crypto.PrivKey {
 	privKey := crypto.GenPrivKeyEd25519FromSecret([]byte(secret))
-	return privKey.Wrap()
+	return privKey
 }
 
 func secret(index int) string {

client/lcd/helpers.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	cmn "github.com/tendermint/tmlibs/common"
 
@@ -21,11 +22,15 @@ func waitForRPC() {
 	laddr := GetConfig().RPC.ListenAddress
 	fmt.Println("LADDR", laddr)
 	client := rpcclient.NewJSONRPCClient(laddr)
+	ctypes.RegisterAmino(client.Codec())
 	result := new(ctypes.ResultStatus)
 	for {
 		_, err := client.Call("status", map[string]interface{}{}, result)
 		if err == nil {
 			return
+		} else {
+			fmt.Println("error", err)
+			time.Sleep(time.Millisecond)
 		}
 	}
 }