Skip to content

Commit faf38d5

Browse files
committed
jsonrpc2: fix testcases
1 parent 7b81b19 commit faf38d5

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

jsonrpc2_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,37 +91,37 @@ func run(ctx context.Context, t *testing.T, r io.ReadCloser, w io.WriteCloser) *
9191
return conn
9292
}
9393

94-
func handle(ctx context.Context, c *jsonrpc2.Conn, r *jsonrpc2.Request) {
94+
func handle(ctx context.Context, r *jsonrpc2.Request) {
9595
switch r.Method {
9696
case "no_args":
9797
if r.Params != nil {
98-
c.Reply(ctx, r, nil, jsonrpc2.Errorf(jsonrpc2.CodeInvalidParams, "Expected no params"))
98+
r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.InvalidParams, "Expected no params"))
9999
return
100100
}
101-
c.Reply(ctx, r, true, nil)
101+
r.Reply(ctx, true, nil)
102102
case "one_string":
103103
var v string
104104
if err := json.Unmarshal(*r.Params, &v); err != nil {
105-
c.Reply(ctx, r, nil, jsonrpc2.Errorf(jsonrpc2.CodeParseError, "%v", err.Error()))
105+
r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.ParseError, "%v", err.Error()))
106106
return
107107
}
108-
c.Reply(ctx, r, "got:"+v, nil)
108+
r.Reply(ctx, "got:"+v, nil)
109109
case "one_number":
110110
var v int
111111
if err := json.Unmarshal(*r.Params, &v); err != nil {
112-
c.Reply(ctx, r, nil, jsonrpc2.Errorf(jsonrpc2.CodeParseError, "%v", err.Error()))
112+
r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.ParseError, "%v", err.Error()))
113113
return
114114
}
115-
c.Reply(ctx, r, fmt.Sprintf("got:%d", v), nil)
115+
r.Reply(ctx, fmt.Sprintf("got:%d", v), nil)
116116
case "join":
117117
var v []string
118118
if err := json.Unmarshal(*r.Params, &v); err != nil {
119-
c.Reply(ctx, r, nil, jsonrpc2.Errorf(jsonrpc2.CodeParseError, "%v", err.Error()))
119+
r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.ParseError, "%v", err.Error()))
120120
return
121121
}
122-
c.Reply(ctx, r, path.Join(v...), nil)
122+
r.Reply(ctx, path.Join(v...), nil)
123123
default:
124-
c.Reply(ctx, r, nil, jsonrpc2.Errorf(jsonrpc2.CodeMethodNotFound, "method %q not found", r.Method))
124+
r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.MethodNotFound, "method %q not found", r.Method))
125125
}
126126
}
127127

0 commit comments

Comments
 (0)