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

fix new linting errors

Browse Source
This commit is contained in:
Zach Ramsay
2017-10-26 19:24:18 -04:00
committed by Ethan Buchman
parent 414a8cb0ba
commit 6f3c05545d
6 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
rpc/lib/rpc_test.go
View File

@ -216,19 +216,17 @@ func echoViaWS(cl *client.WSClient, val string) (string, error) {
return "", err
}
select {
case msg := <-cl.ResponsesCh:
if msg.Error != nil {
return "", err
msg := <-cl.ResponsesCh
if msg.Error != nil {
return "", err
}
result := new(ResultEcho)
err = json.Unmarshal(msg.Result, result)
if err != nil {
return "", nil
}
return result.Value, nil
}
result := new(ResultEcho)
err = json.Unmarshal(msg.Result, result)
if err != nil {
return "", nil
}
return result.Value, nil
}
func echoBytesViaWS(cl *client.WSClient, bytes []byte) ([]byte, error) {
@ -240,19 +238,17 @@ func echoBytesViaWS(cl *client.WSClient, bytes []byte) ([]byte, error) {
return []byte{}, err
}
select {
case msg := <-cl.ResponsesCh:
if msg.Error != nil {
return []byte{}, msg.Error
msg := <-cl.ResponsesCh
if msg.Error != nil {
return []byte{}, msg.Error
}
result := new(ResultEchoBytes)
err = json.Unmarshal(msg.Result, result)
if err != nil {
return []byte{}, nil
}
return result.Value, nil
}
result := new(ResultEchoBytes)
err = json.Unmarshal(msg.Result, result)
if err != nil {
return []byte{}, nil
}
return result.Value, nil
}
func testWithWSClient(t *testing.T, cl *client.WSClient) {
@ -333,6 +329,11 @@ func TestWSNewWSRPCFunc(t *testing.T) {
got := result.Value
assert.Equal(t, got, val)
}
result := new(ResultEcho)
err = json.Unmarshal(*msg.Result, result)
require.Nil(t, err)
got := result.Value
assert.Equal(t, got, val)
}
func TestWSHandlesArrayParams(t *testing.T) {
@ -358,6 +359,11 @@ func TestWSHandlesArrayParams(t *testing.T) {
got := result.Value
assert.Equal(t, got, val)
}
result := new(ResultEcho)
err = json.Unmarshal(*msg.Result, result)
require.Nil(t, err)
got := result.Value
assert.Equal(t, got, val)
}
// TestWSClientPingPong checks that a client & server exchange pings