From 52353433a319b7352c36349c67e47d6db25b0d8e Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Thu, 13 Apr 2017 14:25:06 +0200 Subject: [PATCH] Update all dependencies to develop, fix method names --- cmd/commands/tx.go | 2 +- cmd/commands/utils.go | 4 ++-- glide.lock | 20 ++++++++++---------- glide.yaml | 18 +++++++++--------- tests/tendermint/main.go | 4 ++-- types/tx.go | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cmd/commands/tx.go b/cmd/commands/tx.go index 66c5acc0a7..8595e57d64 100644 --- a/cmd/commands/tx.go +++ b/cmd/commands/tx.go @@ -189,7 +189,7 @@ func AppTx(c *cli.Context, name string, data []byte) error { func broadcastTx(c *cli.Context, tx types.Tx) ([]byte, string, error) { tmResult := new(ctypes.TMResult) tmAddr := c.String("node") - clientURI := client.NewClientURI(tmAddr) + clientURI := client.NewURIClient(tmAddr) // Don't you hate having to do this? // How many times have I lost an hour over this trick?! diff --git a/cmd/commands/utils.go b/cmd/commands/utils.go index 56c1480780..8e29949812 100644 --- a/cmd/commands/utils.go +++ b/cmd/commands/utils.go @@ -89,7 +89,7 @@ func ParseCoins(str string) (types.Coins, error) { } func Query(tmAddr string, key []byte) (*abci.ResponseQuery, error) { - clientURI := client.NewClientURI(tmAddr) + clientURI := client.NewURIClient(tmAddr) tmResult := new(ctypes.TMResult) params := map[string]interface{}{ @@ -136,7 +136,7 @@ func getAcc(tmAddr string, address []byte) (*types.Account, error) { func getHeaderAndCommit(c *cli.Context, height int) (*tmtypes.Header, *tmtypes.Commit, error) { tmResult := new(ctypes.TMResult) tmAddr := c.String("node") - clientURI := client.NewClientURI(tmAddr) + clientURI := client.NewURIClient(tmAddr) method := "commit" _, err := clientURI.Call(method, map[string]interface{}{"height": height}, tmResult) diff --git a/glide.lock b/glide.lock index d53e80837b..198a8712a5 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: c71c0d6c409bfddb4c4b471d8445f59cebd2cd41e1635a90d6facd81bd09a5e0 -updated: 2017-03-14T17:02:44.512359631-04:00 +hash: 3869944d14a8df914ffcad02c2ef3548173daba51c5ea697767f8af77c07b348 +updated: 2017-04-13T14:20:12.625211087+02:00 imports: - name: github.com/btcsuite/btcd version: 583684b21bfbde9b5fc4403916fd7c807feb0289 @@ -43,7 +43,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/abci - version: af792eac777de757cd496349a5f6b5313738fcbc + version: 31eafe8f8eba6b8817edd74df399f508540da528 subpackages: - client - example/dummy @@ -59,13 +59,13 @@ imports: - name: github.com/tendermint/go-clist version: 3baa390bbaf7634251c42ad69a8682e7e3990552 - name: github.com/tendermint/go-common - version: dcb015dff6c7af21e65c8e2f3b450df19d38c777 + version: 6af2364fa91ef2f3afc8ba0db33b66d9d3ae006c - name: github.com/tendermint/go-config version: 620dcbbd7d587cf3599dedbf329b64311b0c307a - name: github.com/tendermint/go-crypto - version: 3f47cfac5fcd9e0f1727c7db980b3559913b3e3a + version: 750b25c47a5782f5f2b773ed9e706cb82b3ccef4 - name: github.com/tendermint/go-data - version: 32271140e8fd5abdbb22e268d7a02421fa382f0b + version: e7fcc6d081ec8518912fcdc103188275f83a3ee5 - name: github.com/tendermint/go-db version: eac3f2bc147023957c8bf69432a4e6c4dc5c3f72 - name: github.com/tendermint/go-events @@ -79,17 +79,17 @@ imports: - name: github.com/tendermint/go-merkle version: 714d4d04557fd068a7c2a1748241ce8428015a96 - name: github.com/tendermint/go-p2p - version: 97a5ed2d1a17eaee8717b8a32cfaf7a9a82a273d + version: c39e001a957caf768f06c85c840debb8282c3aaa subpackages: - upnp - name: github.com/tendermint/go-rpc - version: fcea0cda21f64889be00a0f4b6d13266b1a76ee7 + version: 9d18cbe74e66f875afa36d2fa3be280e4a2dc9e6 subpackages: - client - server - types - name: github.com/tendermint/go-wire - version: f530b7af7a8b06e612c2063bff6ace49060a085e + version: 50889e2b4a9ba65b67be86a486f25853d514b937 - name: github.com/tendermint/log15 version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6 subpackages: @@ -100,7 +100,7 @@ imports: - app - client - name: github.com/tendermint/tendermint - version: d4f625455109d88e7f55a999fdb25e208f174802 + version: 585ce45a5e253743da7b72d9a2385c01059fc6d5 subpackages: - blockchain - config/tendermint diff --git a/glide.yaml b/glide.yaml index d607c41cb4..ecf4f151b4 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,22 +1,22 @@ package: github.com/tendermint/basecoin import: - package: github.com/tendermint/go-common - version: master + version: develop - package: github.com/tendermint/go-crypto - version: master + version: develop - package: github.com/tendermint/go-events - version: master + version: develop - package: github.com/tendermint/go-logger - version: master + version: develop - package: github.com/tendermint/go-rpc - version: master + version: develop - package: github.com/tendermint/go-wire - version: master + version: develop - package: github.com/tendermint/merkleeyes - version: master + version: develop - package: github.com/tendermint/tendermint - version: master + version: develop - package: github.com/tendermint/abci - version: master + version: develop - package: github.com/gorilla/websocket version: v1.1.0 diff --git a/tests/tendermint/main.go b/tests/tendermint/main.go index 5481bfd3a8..504fa88d9e 100644 --- a/tests/tendermint/main.go +++ b/tests/tendermint/main.go @@ -72,7 +72,7 @@ func main() { // Write request txBytes := wire.BinaryBytes(struct{ types.Tx }{tx}) - request := rpctypes.NewRPCRequest("fakeid", "broadcast_tx_sync", cmn.Arr(txBytes)) + request := rpctypes.NewRPCRequest("fakeid", "broadcast_tx_sync", map[string]interface{}{"tx": txBytes}) reqBytes := wire.JSONBytes(request) //fmt.Print(".") err := ws.WriteMessage(websocket.TextMessage, reqBytes) @@ -122,7 +122,7 @@ func main() { // Write request txBytes := wire.BinaryBytes(struct{ types.Tx }{tx}) - request := rpctypes.NewRPCRequest("fakeid", "broadcast_tx_sync", cmn.Arr(txBytes)) + request := rpctypes.NewRPCRequest("fakeid", "broadcast_tx_sync", map[string]interface{}{"tx": txBytes}) reqBytes := wire.JSONBytes(request) //fmt.Print(".") err := ws.WriteMessage(websocket.TextMessage, reqBytes) diff --git a/types/tx.go b/types/tx.go index 285902db6f..d4925bbb65 100644 --- a/types/tx.go +++ b/types/tx.go @@ -40,8 +40,8 @@ var txMapper data.Mapper // register both private key types with go-data (and thus go-wire) func init() { txMapper = data.NewMapper(TxS{}). - RegisterInterface(&SendTx{}, TxNameSend, TxTypeSend). - RegisterInterface(&AppTx{}, TxNameApp, TxTypeApp) + RegisterImplementation(&SendTx{}, TxNameSend, TxTypeSend). + RegisterImplementation(&AppTx{}, TxNameApp, TxTypeApp) } // TxS add json serialization to Tx