From 64e3272fbf6e2aa9e43d4b31728a6eb73328576c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 23 Jul 2019 00:58:22 +0200 Subject: [PATCH] jsonrpc: remove test stuff from main code --- api/api.go | 2 -- api/struct.go | 6 ------ cli/cmd.go | 26 -------------------------- lib/jsonrpc/rpc_test.go | 1 + node/api.go | 22 ---------------------- 5 files changed, 1 insertion(+), 56 deletions(-) diff --git a/api/api.go b/api/api.go index 11f55d5f4..d2c2ad424 100644 --- a/api/api.go +++ b/api/api.go @@ -121,6 +121,4 @@ type API interface { // Version provides information about API provider Version(context.Context) (Version, error) - - TestCh(context.Context) (<-chan int, error) } diff --git a/api/struct.go b/api/struct.go index fb4f0991c..7783bcabc 100644 --- a/api/struct.go +++ b/api/struct.go @@ -41,15 +41,9 @@ type Struct struct { NetPeers func(context.Context) ([]peer.AddrInfo, error) NetConnect func(context.Context, peer.AddrInfo) error NetAddrsListen func(context.Context) (peer.AddrInfo, error) - - TestCh func(context.Context) (<-chan int, error) } } -func (c *Struct) TestCh(ctx context.Context) (<-chan int, error) { - return c.Internal.TestCh(ctx) -} - func (c *Struct) ClientListImports(ctx context.Context) ([]Import, error) { return c.Internal.ClientListImports(ctx) } diff --git a/cli/cmd.go b/cli/cmd.go index adc4bfe8b..ee964efbe 100644 --- a/cli/cmd.go +++ b/cli/cmd.go @@ -2,7 +2,6 @@ package cli import ( "context" - "fmt" "os" "os/signal" "syscall" @@ -68,29 +67,4 @@ var Commands = []*cli.Command{ versionCmd, walletCmd, createMinerCmd, - - { - Name: "testch", - Action: func(cctx *cli.Context) error { - api, err := getAPI(cctx) - if err != nil { - return err - } - ctx := reqContext(cctx) - - c, err := api.TestCh(ctx) - if err != nil { - return err - } - - for { - select { - case n := <-c: - fmt.Println(n) - case <-ctx.Done(): - return nil - } - } - }, - }, } diff --git a/lib/jsonrpc/rpc_test.go b/lib/jsonrpc/rpc_test.go index 277a75696..b167568e6 100644 --- a/lib/jsonrpc/rpc_test.go +++ b/lib/jsonrpc/rpc_test.go @@ -322,6 +322,7 @@ func TestChan(t *testing.T) { defer cancel() + sub, err := client.Sub(ctx, 2) require.NoError(t, err) diff --git a/node/api.go b/node/api.go index 3745a50a8..ee0954ee6 100644 --- a/node/api.go +++ b/node/api.go @@ -2,8 +2,6 @@ package node import ( "context" - "fmt" - "time" "github.com/filecoin-project/go-lotus/api" "github.com/filecoin-project/go-lotus/build" @@ -30,26 +28,6 @@ type API struct { Wallet *chain.Wallet } -func (a *API) TestCh(ctx context.Context) (<-chan int, error) { - out := make(chan int) - go func() { - defer close(out) - var n int - for { - time.Sleep(time.Millisecond * 100) - n++ - select { - case <-ctx.Done(): - fmt.Println("CTXCANCEL!") - return - case out <- n: - } - } - }() - - return out, nil -} - func (a *API) ChainSubmitBlock(ctx context.Context, blk *chain.BlockMsg) error { if err := a.Chain.AddBlock(blk.Header); err != nil { return err