Skip to content

Commit 0a0c3ba

Browse files
committed
Format by gofumpt
1 parent 3536cb9 commit 0a0c3ba

12 files changed

+5
-22
lines changed

context.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import (
66
"github.com/goccy/go-json"
77
)
88

9-
type requestIDKey struct{}
10-
type metadataIDKey struct{}
11-
type methodNameKey struct{}
9+
type (
10+
requestIDKey struct{}
11+
metadataIDKey struct{}
12+
methodNameKey struct{}
13+
)
1214

1315
// RequestID takes request id from context.
1416
func RequestID(c context.Context) *json.RawMessage {

context_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
)
1010

1111
func TestRequestID(t *testing.T) {
12-
1312
c := context.Background()
1413
id := json.RawMessage("1")
1514
c = WithRequestID(c, &id)
@@ -21,7 +20,6 @@ func TestRequestID(t *testing.T) {
2120
}
2221

2322
func TestMetadata(t *testing.T) {
24-
2523
c := context.Background()
2624
md := Metadata{Params: Metadata{}}
2725
c = WithMetadata(c, md)
@@ -33,7 +31,6 @@ func TestMetadata(t *testing.T) {
3331
}
3432

3533
func TestMethodName(t *testing.T) {
36-
3734
c := context.Background()
3835
c = WithMethodName(c, t.Name())
3936
var pick string

debug_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
)
1111

1212
func TestDebugHandler(t *testing.T) {
13-
1413
t.Skip()
1514

1615
mr := NewMethodRepository()

error_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ func TestError(t *testing.T) {
1414
}
1515

1616
func TestError_Error(t *testing.T) {
17-
1817
err := &Error{
1918
Code: ErrorCode(100),
2019
Message: "test",

example_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ type (
2929
)
3030

3131
func (h EchoHandler) ServeJSONRPC(c context.Context, params *json.RawMessage) (interface{}, *Error) {
32-
3332
var p EchoParams
3433
if err := Unmarshal(params, &p); err != nil {
3534
return nil, err
@@ -41,7 +40,6 @@ func (h EchoHandler) ServeJSONRPC(c context.Context, params *json.RawMessage) (i
4140
}
4241

4342
func (h PositionalHandler) ServeJSONRPC(c context.Context, params *json.RawMessage) (interface{}, *Error) {
44-
4543
var p PositionalParams
4644
if err := Unmarshal(params, &p); err != nil {
4745
return nil, err
@@ -53,7 +51,6 @@ func (h PositionalHandler) ServeJSONRPC(c context.Context, params *json.RawMessa
5351
}
5452

5553
func ExampleEchoHandler_ServeJSONRPC() {
56-
5754
mr := NewMethodRepository()
5855

5956
if err := mr.RegisterMethod("Main.Echo", EchoHandler{}, EchoParams{}, EchoResult{}); err != nil {

handler.go

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ func (f HandlerFunc) ServeJSONRPC(c context.Context, params *json.RawMessage) (r
2626

2727
// ServeHTTP provides basic JSON-RPC handling.
2828
func (mr *MethodRepository) ServeHTTP(w http.ResponseWriter, r *http.Request) {
29-
3029
rs, batch, err := ParseRequest(r)
3130
if err != nil {
3231
err := SendResponse(w, []*Response{

handler_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
)
1414

1515
func TestHandler(t *testing.T) {
16-
1716
mr := NewMethodRepository()
1817

1918
rec := httptest.NewRecorder()

jsonrpc.go

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ type (
3737

3838
// ParseRequest parses a HTTP request to JSON-RPC request.
3939
func ParseRequest(r *http.Request) ([]*Request, bool, *Error) {
40-
4140
var rerr *Error
4241

4342
if !strings.HasPrefix(r.Header.Get(contentTypeKey), contentTypeValue) {

jsonrpc_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
)
1313

1414
func TestParseRequest(t *testing.T) {
15-
1615
r, rerr := http.NewRequest("", "", bytes.NewReader(nil))
1716
require.NoError(t, rerr)
1817

@@ -87,7 +86,6 @@ func TestNewResponse(t *testing.T) {
8786
}
8887

8988
func TestSendResponse(t *testing.T) {
90-
9189
rec := httptest.NewRecorder()
9290
err := SendResponse(rec, []*Response{}, false)
9391
require.NoError(t, err)

method.go

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ func NewMethodRepository() *MethodRepository {
2929

3030
// TakeMethodMetadata takes metadata in MethodRepository for request.
3131
func (mr *MethodRepository) TakeMethodMetadata(r *Request) (Metadata, *Error) {
32-
3332
if r.Method == "" || r.Version != Version {
3433
return Metadata{}, ErrInvalidParams()
3534
}

method_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
)
1111

1212
func TestTakeMethod(t *testing.T) {
13-
1413
mr := NewMethodRepository()
1514

1615
r := &Request{}
@@ -36,7 +35,6 @@ func TestTakeMethod(t *testing.T) {
3635
}
3736

3837
func TestRegisterMethod(t *testing.T) {
39-
4038
mr := NewMethodRepository()
4139

4240
err := mr.RegisterMethod("", nil, nil, nil)
@@ -50,7 +48,6 @@ func TestRegisterMethod(t *testing.T) {
5048
}
5149

5250
func TestMethods(t *testing.T) {
53-
5451
mr := NewMethodRepository()
5552

5653
err := mr.RegisterMethod("JsonRpc.Sample", SampleHandler(), nil, nil)
@@ -62,7 +59,6 @@ func TestMethods(t *testing.T) {
6259
}
6360

6461
func SampleHandler() Handler {
65-
6662
h := HandlerFunc(func(c context.Context, params *json.RawMessage) (result interface{}, err *Error) {
6763
return nil, nil
6864
})

unmarshal_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
)
1010

1111
func TestUnmarshal(t *testing.T) {
12-
1312
err := Unmarshal(nil, nil)
1413
require.IsType(t, &Error{}, err)
1514
assert.Equal(t, ErrorCodeInvalidParams, err.Code)

0 commit comments

Comments
 (0)