rpc: test cleanup
This commit is contained in:
parent
3fdb4c03ab
commit
8e776a252b
|
@ -82,21 +82,21 @@ var wsTyp = "JSONRPC"
|
||||||
|
|
||||||
// make a simple connection to the server
|
// make a simple connection to the server
|
||||||
func TestWSConnect(t *testing.T) {
|
func TestWSConnect(t *testing.T) {
|
||||||
con := newWSCon(t)
|
wsc := newWSClient(t)
|
||||||
con.Close()
|
wsc.Stop()
|
||||||
}
|
}
|
||||||
|
|
||||||
// receive a new block message
|
// receive a new block message
|
||||||
func TestWSNewBlock(t *testing.T) {
|
func TestWSNewBlock(t *testing.T) {
|
||||||
con := newWSCon(t)
|
wsc := newWSClient(t)
|
||||||
eid := types.EventStringNewBlock()
|
eid := types.EventStringNewBlock()
|
||||||
subscribe(t, con, eid)
|
subscribe(t, wsc, eid)
|
||||||
defer func() {
|
defer func() {
|
||||||
unsubscribe(t, con, eid)
|
unsubscribe(t, wsc, eid)
|
||||||
con.Close()
|
wsc.Stop()
|
||||||
}()
|
}()
|
||||||
waitForEvent(t, con, eid, true, func() {}, func(eid string, b []byte) error {
|
waitForEvent(t, wsc, eid, true, func() {}, func(eid string, b interface{}) error {
|
||||||
fmt.Println("Check:", string(b))
|
fmt.Println("Check:", b)
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -106,15 +106,31 @@ func TestWSBlockchainGrowth(t *testing.T) {
|
||||||
if testing.Short() {
|
if testing.Short() {
|
||||||
t.Skip("skipping test in short mode.")
|
t.Skip("skipping test in short mode.")
|
||||||
}
|
}
|
||||||
con := newWSCon(t)
|
wsc := newWSClient(t)
|
||||||
eid := types.EventStringNewBlock()
|
eid := types.EventStringNewBlock()
|
||||||
subscribe(t, con, eid)
|
subscribe(t, wsc, eid)
|
||||||
defer func() {
|
defer func() {
|
||||||
unsubscribe(t, con, eid)
|
unsubscribe(t, wsc, eid)
|
||||||
con.Close()
|
wsc.Stop()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// listen for NewBlock, ensure height increases by 1
|
// listen for NewBlock, ensure height increases by 1
|
||||||
unmarshalValidateBlockchain(t, con, eid)
|
|
||||||
|
var initBlockN int
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
waitForEvent(t, wsc, eid, true, func() {}, func(eid string, eventData interface{}) error {
|
||||||
|
block := eventData.(types.EventDataNewBlock).Block
|
||||||
|
if i == 0 {
|
||||||
|
initBlockN = block.Header.Height
|
||||||
|
} else {
|
||||||
|
if block.Header.Height != initBlockN+i {
|
||||||
|
return fmt.Errorf("Expected block %d, got block %d", initBlockN+i, block.Header.Height)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: this with dummy app..
|
/* TODO: this with dummy app..
|
||||||
|
|
|
@ -1,19 +1,14 @@
|
||||||
package rpctest
|
package rpctest
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gorilla/websocket"
|
|
||||||
. "github.com/tendermint/go-common"
|
. "github.com/tendermint/go-common"
|
||||||
"github.com/tendermint/go-p2p"
|
"github.com/tendermint/go-p2p"
|
||||||
"github.com/tendermint/go-wire"
|
"github.com/tendermint/go-wire"
|
||||||
|
|
||||||
client "github.com/tendermint/go-rpc/client"
|
client "github.com/tendermint/go-rpc/client"
|
||||||
"github.com/tendermint/go-rpc/types"
|
|
||||||
_ "github.com/tendermint/tendermint/config/tendermint_test"
|
_ "github.com/tendermint/tendermint/config/tendermint_test"
|
||||||
nm "github.com/tendermint/tendermint/node"
|
nm "github.com/tendermint/tendermint/node"
|
||||||
ctypes "github.com/tendermint/tendermint/rpc/core/types"
|
ctypes "github.com/tendermint/tendermint/rpc/core/types"
|
||||||
|
@ -77,84 +72,58 @@ func newNode(ready chan struct{}) {
|
||||||
// Utilities for testing the websocket service
|
// Utilities for testing the websocket service
|
||||||
|
|
||||||
// create a new connection
|
// create a new connection
|
||||||
func newWSCon(t *testing.T) *websocket.Conn {
|
func newWSClient(t *testing.T) *client.WSClient {
|
||||||
dialer := websocket.DefaultDialer
|
wsc := client.NewWSClient(websocketAddr)
|
||||||
rHeader := http.Header{}
|
if _, err := wsc.Start(); err != nil {
|
||||||
con, r, err := dialer.Dial(websocketAddr, rHeader)
|
|
||||||
fmt.Println("response", r)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
return con
|
return wsc
|
||||||
}
|
}
|
||||||
|
|
||||||
// subscribe to an event
|
// subscribe to an event
|
||||||
func subscribe(t *testing.T, con *websocket.Conn, eventid string) {
|
func subscribe(t *testing.T, wsc *client.WSClient, eventid string) {
|
||||||
err := con.WriteJSON(rpctypes.RPCRequest{
|
if err := wsc.Subscribe(eventid); err != nil {
|
||||||
JSONRPC: "2.0",
|
|
||||||
ID: "",
|
|
||||||
Method: "subscribe",
|
|
||||||
Params: []interface{}{eventid},
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// unsubscribe from an event
|
// unsubscribe from an event
|
||||||
func unsubscribe(t *testing.T, con *websocket.Conn, eventid string) {
|
func unsubscribe(t *testing.T, wsc *client.WSClient, eventid string) {
|
||||||
err := con.WriteJSON(rpctypes.RPCRequest{
|
if err := wsc.Unsubscribe(eventid); err != nil {
|
||||||
JSONRPC: "2.0",
|
|
||||||
ID: "",
|
|
||||||
Method: "unsubscribe",
|
|
||||||
Params: []interface{}{eventid},
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// wait for an event; do things that might trigger events, and check them when they are received
|
// wait for an event; do things that might trigger events, and check them when they are received
|
||||||
// the check function takes an event id and the byte slice read off the ws
|
// the check function takes an event id and the byte slice read off the ws
|
||||||
func waitForEvent(t *testing.T, con *websocket.Conn, eventid string, dieOnTimeout bool, f func(), check func(string, []byte) error) {
|
func waitForEvent(t *testing.T, wsc *client.WSClient, eventid string, dieOnTimeout bool, f func(), check func(string, interface{}) error) {
|
||||||
// go routine to wait for webscoket msg
|
// go routine to wait for webscoket msg
|
||||||
goodCh := make(chan []byte)
|
goodCh := make(chan interface{})
|
||||||
errCh := make(chan error)
|
errCh := make(chan error)
|
||||||
quitCh := make(chan struct{})
|
|
||||||
defer close(quitCh)
|
|
||||||
|
|
||||||
// Read message
|
// Read message
|
||||||
go func() {
|
go func() {
|
||||||
|
var err error
|
||||||
|
LOOP:
|
||||||
for {
|
for {
|
||||||
_, p, err := con.ReadMessage()
|
select {
|
||||||
if err != nil {
|
case r := <-wsc.ResultsCh:
|
||||||
errCh <- err
|
|
||||||
break
|
|
||||||
} else {
|
|
||||||
// if the event id isnt what we're waiting on
|
|
||||||
// ignore it
|
|
||||||
var response rpctypes.RPCResponse
|
|
||||||
if err := json.Unmarshal(p, &response); err != nil {
|
|
||||||
errCh <- err
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if response.Error != "" {
|
|
||||||
errCh <- fmt.Errorf(response.Error)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
result := new(ctypes.TMResult)
|
result := new(ctypes.TMResult)
|
||||||
fmt.Println("RESULT:", string(*response.Result))
|
wire.ReadJSONPtr(result, r, &err)
|
||||||
wire.ReadJSONPtr(result, *response.Result, &err)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errCh <- err
|
errCh <- err
|
||||||
break
|
break LOOP
|
||||||
}
|
}
|
||||||
event, ok := (*result).(*ctypes.ResultEvent)
|
event, ok := (*result).(*ctypes.ResultEvent)
|
||||||
if ok && event.Name == eventid {
|
if ok && event.Name == eventid {
|
||||||
goodCh <- p
|
goodCh <- event.Data
|
||||||
break
|
break LOOP
|
||||||
}
|
}
|
||||||
|
case err := <-wsc.ErrorsCh:
|
||||||
|
errCh <- err
|
||||||
|
break LOOP
|
||||||
|
case <-wsc.Quit:
|
||||||
|
break LOOP
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
@ -167,68 +136,27 @@ func waitForEvent(t *testing.T, con *websocket.Conn, eventid string, dieOnTimeou
|
||||||
select {
|
select {
|
||||||
case <-timeout.C:
|
case <-timeout.C:
|
||||||
if dieOnTimeout {
|
if dieOnTimeout {
|
||||||
con.Close()
|
wsc.Stop()
|
||||||
t.Fatalf("%s event was not received in time", eventid)
|
t.Fatalf("%s event was not received in time", eventid)
|
||||||
}
|
}
|
||||||
// else that's great, we didn't hear the event
|
// else that's great, we didn't hear the event
|
||||||
// and we shouldn't have
|
// and we shouldn't have
|
||||||
case p := <-goodCh:
|
case eventData := <-goodCh:
|
||||||
if dieOnTimeout {
|
if dieOnTimeout {
|
||||||
// message was received and expected
|
// message was received and expected
|
||||||
// run the check
|
// run the check
|
||||||
err := check(eventid, p)
|
if err := check(eventid, eventData); err != nil {
|
||||||
if err != nil {
|
t.Fatal(err) // Show the stack trace.
|
||||||
t.Fatal(err)
|
|
||||||
panic(err) // Show the stack trace.
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
con.Close()
|
wsc.Stop()
|
||||||
t.Fatalf("%s event was not expected", eventid)
|
t.Fatalf("%s event was not expected", eventid)
|
||||||
}
|
}
|
||||||
case err := <-errCh:
|
case err := <-errCh:
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
panic(err) // Show the stack trace.
|
panic(err) // Show the stack trace.
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
|
|
||||||
func unmarshalResponseNewBlock(b []byte) (*types.Block, error) {
|
|
||||||
// unmarshall and assert somethings
|
|
||||||
var response rpctypes.RPCResponse
|
|
||||||
var err error
|
|
||||||
if err := json.Unmarshal(b, &response); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if response.Error != "" {
|
|
||||||
return nil, fmt.Errorf(response.Error)
|
|
||||||
}
|
|
||||||
var result ctypes.TMResult
|
|
||||||
wire.ReadJSONPtr(&result, *response.Result, &err)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
block := result.(*ctypes.ResultEvent).Data.(types.EventDataNewBlock).Block
|
|
||||||
return block, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func unmarshalValidateBlockchain(t *testing.T, con *websocket.Conn, eid string) {
|
|
||||||
var initBlockN int
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
waitForEvent(t, con, eid, true, func() {}, func(eid string, b []byte) error {
|
|
||||||
block, err := unmarshalResponseNewBlock(b)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if i == 0 {
|
|
||||||
initBlockN = block.Header.Height
|
|
||||||
} else {
|
|
||||||
if block.Header.Height != initBlockN+i {
|
|
||||||
return fmt.Errorf("Expected block %d, got block %d", i, block.Header.Height)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue