From 64c7a0ad0dc3f7a746c29b76f3468981b51d16f0 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 22 Nov 2016 21:28:57 -0500 Subject: [PATCH] update glide --- glide.lock | 18 +++++++++--------- rpc/test/client_test.go | 12 +++++++++--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/glide.lock b/glide.lock index cbaa5f889..fed225f1e 100644 --- a/glide.lock +++ b/glide.lock @@ -1,8 +1,8 @@ hash: 20cb38481a78b73ba3a42af08e34cd825ddb7c826833d67cc61e45c1b3a4c484 -updated: 2016-11-16T16:25:10.693961906-05:00 +updated: 2016-11-22T21:27:18.770358866-05:00 imports: - name: github.com/btcsuite/btcd - version: b134beb3b7809de6370a93cc5f6a684d6942e2e8 + version: afec1bd1245a4a19e6dfe1306974b733e7cbb9b8 subpackages: - btcec - name: github.com/btcsuite/fastsha256 @@ -18,7 +18,7 @@ imports: subpackages: - proto - name: github.com/golang/protobuf - version: 224aaba33b1ac32a92a165f27489409fb8133d08 + version: 8ee79997227bf9b34611aee7946ae64735e6fd93 subpackages: - proto - name: github.com/golang/snappy @@ -58,7 +58,7 @@ imports: - name: github.com/tendermint/go-clist version: 3baa390bbaf7634251c42ad69a8682e7e3990552 - name: github.com/tendermint/go-common - version: fa3daa7abc253264c916c12fecce3effa01a1287 + version: 6b4160f2a57487f277c42bf06fd280195dfdb278 subpackages: - test - name: github.com/tendermint/go-config @@ -76,7 +76,7 @@ imports: - name: github.com/tendermint/go-logger version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2 - name: github.com/tendermint/go-merkle - version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8 + version: bfc4afe28c7a50045d4d1eb043e67460f8a51a4f - name: github.com/tendermint/go-p2p version: 62b37014a89b5eddff74844846979d30911cffda subpackages: @@ -94,7 +94,7 @@ imports: subpackages: - term - name: github.com/tendermint/tmsp - version: 0bdb3b887e70b1ef16d32eece0248ec071fd8490 + version: f4e97a5db1e45d2943d07b906677ad8765d0f19d subpackages: - client - example/counter @@ -103,7 +103,7 @@ imports: - server - types - name: golang.org/x/crypto - version: 9477e0b78b9ac3d0b03822fd95422e2fe07627cd + version: ede567c8e044a5913dad1d1af3696d9da953104c subpackages: - curve25519 - nacl/box @@ -124,11 +124,11 @@ imports: - lex/httplex - trace - name: golang.org/x/sys - version: b699b7032584f0953262cb2788a0ca19bb494703 + version: 30237cf4eefd639b184d1f2cb77a581ea0be8947 subpackages: - unix - name: google.golang.org/grpc - version: 941cc894cea3c87a12943fd12b594964541b6d28 + version: 63bd55dfbf781b183216d2dd4433a659c947648a subpackages: - codes - credentials diff --git a/rpc/test/client_test.go b/rpc/test/client_test.go index ddc84ef01..728e87bd3 100644 --- a/rpc/test/client_test.go +++ b/rpc/test/client_test.go @@ -5,13 +5,14 @@ import ( crand "crypto/rand" "fmt" "math/rand" - "strings" "testing" "time" . "github.com/tendermint/go-common" + "github.com/tendermint/go-wire" ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" + "github.com/tendermint/tmsp/example/dummy" tmsp "github.com/tendermint/tmsp/types" ) @@ -156,9 +157,14 @@ func testTMSPQuery(t *testing.T, statusI interface{}, value []byte) { if query.Result.IsErr() { panic(Fmt("Query returned an err: %v", query)) } + + qResult := new(dummy.QueryResult) + if err := wire.ReadJSONBytes(query.Result.Data, qResult); err != nil { + t.Fatal(err) + } // XXX: specific to value returned by the dummy - if !strings.Contains(string(query.Result.Data), "exists=true") { - panic(Fmt("Query error. Expected to find 'exists=true'. Got: %s", query.Result.Data)) + if qResult.Exists != true { + panic(Fmt("Query error. Expected to find 'exists=true'. Got: %v", qResult)) } }