From 161aa8c5e9f59f857751f446ce3be9979d8800b4 Mon Sep 17 00:00:00 2001 From: Jae Kwon Date: Sat, 16 May 2015 15:14:41 -0700 Subject: [PATCH] refactor rpc/test/* --- rpc/test/client_ws_test.go | 124 +----------------- rpc/test/{helpers_test.go => helpers.go} | 0 rpc/test/{tests_test.go => tests.go} | 0 .../{ws_helpers_test.go => ws_helpers.go} | 124 +++++++++++++++++- 4 files changed, 125 insertions(+), 123 deletions(-) rename rpc/test/{helpers_test.go => helpers.go} (100%) rename rpc/test/{tests_test.go => tests.go} (100%) rename rpc/test/{ws_helpers_test.go => ws_helpers.go} (59%) diff --git a/rpc/test/client_ws_test.go b/rpc/test/client_ws_test.go index f7dec99b..4430418a 100644 --- a/rpc/test/client_ws_test.go +++ b/rpc/test/client_ws_test.go @@ -1,134 +1,14 @@ package rpctest import ( - "encoding/json" "fmt" - "github.com/gorilla/websocket" + "testing" + "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/rpc/types" _ "github.com/tendermint/tendermint/test" "github.com/tendermint/tendermint/types" - "net/http" - "testing" - "time" ) -//-------------------------------------------------------------------------------- -// Utilities for testing the websocket service - -// create a new connection -func newWSCon(t *testing.T) *websocket.Conn { - dialer := websocket.DefaultDialer - rHeader := http.Header{} - con, r, err := dialer.Dial(websocketAddr, rHeader) - fmt.Println("response", r) - if err != nil { - t.Fatal(err) - } - return con -} - -// subscribe to an event -func subscribe(t *testing.T, con *websocket.Conn, eventid string) { - err := con.WriteJSON(rpctypes.WSRequest{ - Type: "subscribe", - Event: eventid, - }) - if err != nil { - t.Fatal(err) - } -} - -// unsubscribe from an event -func unsubscribe(t *testing.T, con *websocket.Conn, eventid string) { - err := con.WriteJSON(rpctypes.WSRequest{ - Type: "unsubscribe", - Event: eventid, - }) - if err != nil { - t.Fatal(err) - } -} - -// wait for an event; do things that might trigger events, and check them when they are received -func waitForEvent(t *testing.T, con *websocket.Conn, eventid string, dieOnTimeout bool, f func(), check func(string, []byte) error) { - // go routine to wait for webscoket msg - gch := make(chan []byte) // good channel - ech := make(chan error) // error channel - go func() { - for { - _, p, err := con.ReadMessage() - if err != nil { - ech <- err - break - } else { - // if the event id isnt what we're waiting on - // ignore it - var response struct { - Event string `json:"event"` - } - if err := json.Unmarshal(p, &response); err != nil { - ech <- err - break - } - if response.Event == eventid { - gch <- p - break - } - } - } - }() - - // do stuff (transactions) - f() - - // wait for an event or 10 seconds - ticker := time.Tick(10 * time.Second) - select { - case <-ticker: - if dieOnTimeout { - con.Close() - t.Fatalf("%s event was not received in time", eventid) - } - // else that's great, we didn't hear the event - // and we shouldn't have - case p := <-gch: - if dieOnTimeout { - // message was received and expected - // run the check - err := check(eventid, p) - if err != nil { - t.Fatal(err) - } - } else { - con.Close() - t.Fatalf("%s event was not expected", eventid) - } - case err := <-ech: - t.Fatal(err) - } -} - -func unmarshalResponseNewBlock(b []byte) (*types.Block, error) { - // unmarshall and assert somethings - var response struct { - Event string `json:"event"` - Data *types.Block `json:"data"` - Error string `json:"error"` - } - var err error - binary.ReadJSON(&response, b, &err) - if err != nil { - return nil, err - } - if response.Error != "" { - return nil, fmt.Errorf(response.Error) - } - block := response.Data - return block, nil -} - //-------------------------------------------------------------------------------- // Test the websocket service diff --git a/rpc/test/helpers_test.go b/rpc/test/helpers.go similarity index 100% rename from rpc/test/helpers_test.go rename to rpc/test/helpers.go diff --git a/rpc/test/tests_test.go b/rpc/test/tests.go similarity index 100% rename from rpc/test/tests_test.go rename to rpc/test/tests.go diff --git a/rpc/test/ws_helpers_test.go b/rpc/test/ws_helpers.go similarity index 59% rename from rpc/test/ws_helpers_test.go rename to rpc/test/ws_helpers.go index 93758bcb..d70b4af5 100644 --- a/rpc/test/ws_helpers_test.go +++ b/rpc/test/ws_helpers.go @@ -2,14 +2,136 @@ package rpctest import ( "bytes" + "encoding/json" "fmt" + "net/http" + "testing" + "time" + "github.com/gorilla/websocket" "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/rpc/types" _ "github.com/tendermint/tendermint/test" "github.com/tendermint/tendermint/types" - "testing" ) +//-------------------------------------------------------------------------------- +// Utilities for testing the websocket service + +// create a new connection +func newWSCon(t *testing.T) *websocket.Conn { + dialer := websocket.DefaultDialer + rHeader := http.Header{} + con, r, err := dialer.Dial(websocketAddr, rHeader) + fmt.Println("response", r) + if err != nil { + t.Fatal(err) + } + return con +} + +// subscribe to an event +func subscribe(t *testing.T, con *websocket.Conn, eventid string) { + err := con.WriteJSON(rpctypes.WSRequest{ + Type: "subscribe", + Event: eventid, + }) + if err != nil { + t.Fatal(err) + } +} + +// unsubscribe from an event +func unsubscribe(t *testing.T, con *websocket.Conn, eventid string) { + err := con.WriteJSON(rpctypes.WSRequest{ + Type: "unsubscribe", + Event: eventid, + }) + if err != nil { + t.Fatal(err) + } +} + +// wait for an event; do things that might trigger events, and check them when they are received +func waitForEvent(t *testing.T, con *websocket.Conn, eventid string, dieOnTimeout bool, f func(), check func(string, []byte) error) { + // go routine to wait for webscoket msg + gch := make(chan []byte) // good channel + ech := make(chan error) // error channel + go func() { + for { + _, p, err := con.ReadMessage() + if err != nil { + ech <- err + break + } else { + // if the event id isnt what we're waiting on + // ignore it + var response struct { + Event string `json:"event"` + } + if err := json.Unmarshal(p, &response); err != nil { + ech <- err + break + } + if response.Event == eventid { + gch <- p + break + } + } + } + }() + + // do stuff (transactions) + f() + + // wait for an event or 10 seconds + ticker := time.Tick(10 * time.Second) + select { + case <-ticker: + if dieOnTimeout { + con.Close() + t.Fatalf("%s event was not received in time", eventid) + } + // else that's great, we didn't hear the event + // and we shouldn't have + case p := <-gch: + if dieOnTimeout { + // message was received and expected + // run the check + err := check(eventid, p) + if err != nil { + t.Fatal(err) + } + } else { + con.Close() + t.Fatalf("%s event was not expected", eventid) + } + case err := <-ech: + t.Fatal(err) + } +} + +//-------------------------------------------------------------------------------- + +func unmarshalResponseNewBlock(b []byte) (*types.Block, error) { + // unmarshall and assert somethings + var response struct { + Event string `json:"event"` + Data *types.Block `json:"data"` + Error string `json:"error"` + } + var err error + binary.ReadJSON(&response, b, &err) + if err != nil { + return nil, err + } + if response.Error != "" { + return nil, fmt.Errorf(response.Error) + } + block := response.Data + return block, nil +} + func unmarshalValidateBlockchain(t *testing.T, con *websocket.Conn, eid string) { var initBlockN uint for i := 0; i < 2; i++ {