fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-18 23:51:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix tmsp-cli to conform to go-wire new TypeByte behavior; Rename tmsp_cli to tmsp-cli

Browse Source
This commit is contained in:
Jae Kwon
2015-12-21 16:18:41 -08:00
parent 2d9abb06ca
commit 844c4a519d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/tmsp_cli/tmsp_cli.go → cmd/tmsp-cli/tmsp-cli.go
View File

@ -3,10 +3,12 @@ package main
import ( import (
"bufio" "bufio"
"encoding/hex" "encoding/hex"
"errors"
"fmt" "fmt"
"io" "io"
"net" "net"
"os" "os"
"reflect"
"strings" "strings"
. "github.com/tendermint/go-common" . "github.com/tendermint/go-common"
@ -241,13 +243,13 @@ func makeRequest(conn net.Conn, req types.Request) (types.Response, error) {
var err error var err error
// Write desired request // Write desired request
wire.WriteBinaryLengthPrefixed(req, conn, &n, &err) wire.WriteBinaryLengthPrefixed(struct{ types.Request }{req}, conn, &n, &err)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Write flush request // Write flush request
wire.WriteBinaryLengthPrefixed(types.RequestFlush{}, conn, &n, &err) wire.WriteBinaryLengthPrefixed(struct{ types.Request }{types.RequestFlush{}}, conn, &n, &err)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -260,11 +262,14 @@ func makeRequest(conn net.Conn, req types.Request) (types.Response, error) {
} }
// Read flush response // Read flush response
var resFlush types.ResponseFlush var resFlush types.Response
wire.ReadBinaryPtrLengthPrefixed(&resFlush, conn, 0, &n, &err) wire.ReadBinaryPtrLengthPrefixed(&resFlush, conn, 0, &n, &err)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if _, ok := resFlush.(types.ResponseFlush); !ok {
return nil, errors.New(Fmt("Expected types.ResponseFlush but got %v instead", reflect.TypeOf(resFlush)))
}
return res, nil return res, nil
} }

3
example/golang/dummy_test.go
View File

@ -35,8 +35,7 @@ func TestStream(t *testing.T) {
var n int var n int
var err error var err error
var res types.Response var res types.Response
wire.ReadVarint(conn, &n, &err) // ignore wire.ReadBinaryPtrLengthPrefixed(&res, conn, 0, &n, &err)
wire.ReadBinaryPtr(&res, conn, 0, &n, &err)
if err != nil { if err != nil {
Exit(err.Error()) Exit(err.Error())
} }