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

review comments:

Browse Source 
gofmt
This commit is contained in:
Liamsi
2018-06-21 12:21:33 -07:00
parent a39b2522d5
commit 9803f18494
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rpc/lib/server/handlers_test.go
View File

@ -9,6 +9,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -16,7 +17,6 @@ import (
rs "github.com/tendermint/tendermint/rpc/lib/server" rs "github.com/tendermint/tendermint/rpc/lib/server"
types "github.com/tendermint/tendermint/rpc/lib/types" types "github.com/tendermint/tendermint/rpc/lib/types"
"github.com/tendermint/tmlibs/log" "github.com/tendermint/tmlibs/log"
"github.com/gorilla/websocket"
) )
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -124,22 +124,22 @@ func TestWebsocketManagerHandler(t *testing.T) {
s := newWSServer() s := newWSServer()
defer s.Close() defer s.Close()
// check upgrader works // check upgrader works
d := websocket.Dialer{} d := websocket.Dialer{}
c, dialResp, err := d.Dial("ws://"+s.Listener.Addr().String()+"/websocket", nil) c, dialResp, err := d.Dial("ws://"+s.Listener.Addr().String()+"/websocket", nil)
require.NoError(t, err) require.NoError(t, err)
if got, want := dialResp.StatusCode, http.StatusSwitchingProtocols; got != want { if got, want := dialResp.StatusCode, http.StatusSwitchingProtocols; got != want {
t.Errorf("dialResp.StatusCode = %q, want %q", got, want) t.Errorf("dialResp.StatusCode = %q, want %q", got, want)
} }
// check basic functionality works // check basic functionality works
req, err := types.MapToRequest(amino.NewCodec(), "TestWebsocketManager", "c", map[string]interface{}{"s": "a", "i": 10}) req, err := types.MapToRequest(amino.NewCodec(), "TestWebsocketManager", "c", map[string]interface{}{"s": "a", "i": 10})
require.NoError(t, err) require.NoError(t, err)
err = c.WriteJSON(req) err = c.WriteJSON(req)
require.NoError(t, err) require.NoError(t, err)
var resp types.RPCResponse var resp types.RPCResponse
err = c.ReadJSON(&resp) err = c.ReadJSON(&resp)
require.NoError(t, err) require.NoError(t, err)
require.Nil(t, resp.Error) require.Nil(t, resp.Error)
@ -147,13 +147,13 @@ func TestWebsocketManagerHandler(t *testing.T) {
func newWSServer() *httptest.Server { func newWSServer() *httptest.Server {
funcMap := map[string]*rs.RPCFunc{ funcMap := map[string]*rs.RPCFunc{
"c": rs.NewWSRPCFunc(func(wsCtx types.WSRPCContext, s string, i int) (string, error) { return "foo", nil }, "s,i"), "c": rs.NewWSRPCFunc(func(wsCtx types.WSRPCContext, s string, i int) (string, error) { return "foo", nil }, "s,i"),
} }
wm := rs.NewWebsocketManager(funcMap, amino.NewCodec()) wm := rs.NewWebsocketManager(funcMap, amino.NewCodec())
wm.SetLogger(log.TestingLogger()) wm.SetLogger(log.TestingLogger())
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc("/websocket", wm.WebsocketHandler) mux.HandleFunc("/websocket", wm.WebsocketHandler)
return httptest.NewServer(mux) return httptest.NewServer(mux)
} }