cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix rpc tests.

Browse Source
This commit is contained in:
Raúl Kripalani 2021-06-09 00:17:39 +01:00
parent 40ea660cdd
commit 9eecbb1b20
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
itests/kit/node_builder.go
View File

@ -11,6 +11,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/filecoin-project/go-jsonrpc/auth"
"github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
@ -628,13 +629,18 @@ func CreateRPCServer(t *testing.T, handler http.Handler) (*httptest.Server, mult
} }
func fullRpc(t *testing.T, nd TestFullNode) TestFullNode { func fullRpc(t *testing.T, nd TestFullNode) TestFullNode {
tok, err := nd.AuthNew(context.Background(), []auth.Permission{"admin", "read", "write", "sign"})
require.NoError(t, err)
handler, err := node.FullNodeHandler(nd.FullNode) handler, err := node.FullNodeHandler(nd.FullNode)
require.NoError(t, err) require.NoError(t, err)
srv, maddr := CreateRPCServer(t, handler) srv, maddr := CreateRPCServer(t, handler)
var ret TestFullNode var ret TestFullNode
cl, stop, err := client.NewFullNodeRPCV1(context.Background(), srv.Listener.Addr().String()+"/rpc/v1", nil) cl, stop, err := client.NewFullNodeRPCV1(context.Background(), "ws://"+srv.Listener.Addr().String()+"/rpc/v1", map[string][]string{
"Authorization": {"Bearer " + string(tok)},
})
require.NoError(t, err) require.NoError(t, err)
t.Cleanup(stop) t.Cleanup(stop)
ret.ListenAddr, ret.FullNode = maddr, cl ret.ListenAddr, ret.FullNode = maddr, cl
@ -643,13 +649,18 @@ func fullRpc(t *testing.T, nd TestFullNode) TestFullNode {
} }
func storerRpc(t *testing.T, nd TestMiner) TestMiner { func storerRpc(t *testing.T, nd TestMiner) TestMiner {
tok, err := nd.AuthNew(context.Background(), []auth.Permission{"admin", "read", "write"})
require.NoError(t, err)
handler, err := node.MinerHandler(nd.StorageMiner) handler, err := node.MinerHandler(nd.StorageMiner)
require.NoError(t, err) require.NoError(t, err)
srv, maddr := CreateRPCServer(t, handler) srv, maddr := CreateRPCServer(t, handler)
var ret TestMiner var ret TestMiner
cl, stop, err := client.NewStorageMinerRPCV0(context.Background(), srv.Listener.Addr().String()+"/rpc/v0", nil) cl, stop, err := client.NewStorageMinerRPCV0(context.Background(), "ws://"+srv.Listener.Addr().String()+"/rpc/v0", map[string][]string{
"Authorization": {"Bearer " + string(tok)},
})
require.NoError(t, err) require.NoError(t, err)
t.Cleanup(stop) t.Cleanup(stop)