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

jsonrpc: gofmt

Browse Source
This commit is contained in:
Łukasz Magiera 2019-07-22 22:28:40 +02:00
parent 790ed0730e
commit fd40f9a82a
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cmd.go
View File

@ -70,7 +70,7 @@ var Commands = []*cli.Command{
createMinerCmd, createMinerCmd,
{ {
Name:"testch", Name: "testch",
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
api, err := getAPI(cctx) api, err := getAPI(cctx)
if err != nil { if err != nil {
@ -87,7 +87,7 @@ var Commands = []*cli.Command{
select { select {
case n := <-c: case n := <-c:
fmt.Println(n) fmt.Println(n)
case <- ctx.Done(): case <-ctx.Done():
return nil return nil
} }
} }

1
daemon/cmd.go
View File

@ -4,6 +4,7 @@ package daemon
import ( import (
"context" "context"
"github.com/multiformats/go-multiaddr" "github.com/multiformats/go-multiaddr"
"gopkg.in/urfave/cli.v2" "gopkg.in/urfave/cli.v2"

1
lib/jsonrpc/client.go
View File

@ -34,7 +34,6 @@ func (e *ErrClient) Unwrap(err error) error {
return e.err return e.err
} }
type clientResponse struct { type clientResponse struct {
Jsonrpc string `json:"jsonrpc"` Jsonrpc string `json:"jsonrpc"`
Result json.RawMessage `json:"result"` Result json.RawMessage `json:"result"`

11
lib/jsonrpc/websocket.go
View File

@ -98,7 +98,10 @@ func handleWsConn(ctx context.Context, conn *websocket.Conn, handler handlers, r
var chOnce sync.Once var chOnce sync.Once
var outId uint64 var outId uint64
type chReg struct { id uint64; ch reflect.Value } type chReg struct {
id uint64
ch reflect.Value
}
registerCh := make(chan chReg) registerCh := make(chan chReg)
defer close(registerCh) defer close(registerCh)
@ -113,7 +116,6 @@ func handleWsConn(ctx context.Context, conn *websocket.Conn, handler handlers, r
} }
var caseToId []uint64 var caseToId []uint64
for { for {
chosen, val, ok := reflect.Select(cases) chosen, val, ok := reflect.Select(cases)
@ -136,12 +138,11 @@ func handleWsConn(ctx context.Context, conn *websocket.Conn, handler handlers, r
continue continue
} }
if !ok { if !ok {
n := len(caseToId) n := len(caseToId)
if n > 0 { if n > 0 {
cases[chosen] = cases[n] cases[chosen] = cases[n]
caseToId[chosen - 1] = caseToId[n - 1] caseToId[chosen-1] = caseToId[n-1]
} }
cases = cases[:n] cases = cases[:n]
@ -153,7 +154,7 @@ func handleWsConn(ctx context.Context, conn *websocket.Conn, handler handlers, r
Jsonrpc: "2.0", Jsonrpc: "2.0",
ID: nil, // notification ID: nil, // notification
Method: chValue, Method: chValue,
Params: []param{{v: reflect.ValueOf(caseToId[chosen - 1])}, {v: val}}, Params: []param{{v: reflect.ValueOf(caseToId[chosen-1])}, {v: val}},
}) })
} }
} }