Skip to content

Commit 1e7db33

Browse files
rueianrueian
committed
chore: remove unnecessary changes
Signed-off-by: Rueian <[email protected]>
1 parent 11d8bd1 commit 1e7db33

File tree

3 files changed

+69
-69
lines changed

3 files changed

+69
-69
lines changed

‎client_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type mockConn struct {
2626
ErrorFn func() error
2727
CloseFn func()
2828
DialFn func() error
29-
AcquireFn func(ctx context.Context) wire
29+
AcquireFn func() wire
3030
StoreFn func(w wire)
3131
OverrideFn func(c conn)
3232
AddrFn func() string
@@ -51,7 +51,7 @@ func (m *mockConn) Dial() error {
5151

5252
func (m *mockConn) Acquire(ctx context.Context) wire {
5353
if m.AcquireFn != nil {
54-
return m.AcquireFn(ctx)
54+
return m.AcquireFn()
5555
}
5656
return nil
5757
}
@@ -399,7 +399,7 @@ func TestSingleClient(t *testing.T) {
399399
return e
400400
},
401401
}
402-
m.AcquireFn = func(_ context.Context) wire {
402+
m.AcquireFn = func() wire {
403403
return w
404404
}
405405
if err := client.Dedicated(func(c DedicatedClient) error {
@@ -434,7 +434,7 @@ func TestSingleClient(t *testing.T) {
434434
closed = true
435435
},
436436
}
437-
m.AcquireFn = func(_ context.Context) wire {
437+
m.AcquireFn = func() wire {
438438
return w
439439
}
440440
stored := false
@@ -500,7 +500,7 @@ func TestSingleClient(t *testing.T) {
500500
closed = true
501501
},
502502
}
503-
m.AcquireFn = func(_ context.Context) wire {
503+
m.AcquireFn = func() wire {
504504
return w
505505
}
506506
stored := false
@@ -544,7 +544,7 @@ func TestSingleClient(t *testing.T) {
544544
t.Run("Dedicate Delegate Release On Close", func(t *testing.T) {
545545
stored := 0
546546
w := &mockWire{}
547-
m.AcquireFn = func(_ context.Context) wire { return w }
547+
m.AcquireFn = func() wire { return w }
548548
m.StoreFn = func(ww wire) { stored++ }
549549
c, _ := client.Dedicate()
550550

@@ -558,7 +558,7 @@ func TestSingleClient(t *testing.T) {
558558
t.Run("Dedicate Delegate No Duplicate Release", func(t *testing.T) {
559559
stored := 0
560560
w := &mockWire{}
561-
m.AcquireFn = func(_ context.Context) wire { return w }
561+
m.AcquireFn = func() wire { return w }
562562
m.StoreFn = func(ww wire) { stored++ }
563563
c, cancel := client.Dedicate()
564564

@@ -573,7 +573,7 @@ func TestSingleClient(t *testing.T) {
573573
})
574574

575575
t.Run("Dedicate ErrDedicatedClientRecycled after released", func(t *testing.T) {
576-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{} }
576+
m.AcquireFn = func() wire { return &mockWire{} }
577577
check := func(err error) {
578578
if !errors.Is(err, ErrDedicatedClientRecycled) {
579579
t.Fatalf("unexpected err %v", err)
@@ -1020,7 +1020,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
10201020
newErrResult(ErrClosing),
10211021
newResult(RedisMessage{typ: '+', string: "Do"}, nil),
10221022
)
1023-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoFn: m.DoFn} }
1023+
m.AcquireFn = func() wire { return &mockWire{DoFn: m.DoFn} }
10241024
if ret := c.Dedicated(func(cc DedicatedClient) error {
10251025
if v, err := cc.Do(context.Background(), c.B().Get().Key("Do").Build()).ToString(); err != nil || v != "Do" {
10261026
t.Fatalf("unexpected response %v %v", v, err)
@@ -1035,7 +1035,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
10351035
c, m := setup()
10361036
m.DoFn = makeDoFn(newErrResult(ErrClosing))
10371037
m.ErrorFn = func() error { return ErrClosing }
1038-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoFn: m.DoFn, ErrorFn: m.ErrorFn} }
1038+
m.AcquireFn = func() wire { return &mockWire{DoFn: m.DoFn, ErrorFn: m.ErrorFn} }
10391039
if ret := c.Dedicated(func(cc DedicatedClient) error {
10401040
return cc.Do(context.Background(), c.B().Get().Key("Do").Build()).Error()
10411041
}); ret != ErrClosing {
@@ -1046,7 +1046,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
10461046
t.Run("Dedicate Delegate Do ReadOnly NoRetry - ctx done", func(t *testing.T) {
10471047
c, m := setup()
10481048
m.DoFn = makeDoFn(newErrResult(ErrClosing))
1049-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoFn: m.DoFn} }
1049+
m.AcquireFn = func() wire { return &mockWire{DoFn: m.DoFn} }
10501050
ctx, cancel := context.WithCancel(context.Background())
10511051
cancel()
10521052
if ret := c.Dedicated(func(cc DedicatedClient) error {
@@ -1062,7 +1062,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
10621062
newErrResult(ErrClosing),
10631063
newResult(RedisMessage{typ: '+', string: "Do"}, nil),
10641064
)
1065-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoFn: m.DoFn} }
1065+
m.AcquireFn = func() wire { return &mockWire{DoFn: m.DoFn} }
10661066
if ret := c.Dedicated(func(cc DedicatedClient) error {
10671067
if cli, ok := cc.(*dedicatedClusterClient); ok {
10681068
cli.retryHandler = &mockRetryHandler{
@@ -1091,7 +1091,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
10911091
t.Run("Dedicate Delegate Do Write NoRetry", func(t *testing.T) {
10921092
c, m := setup()
10931093
m.DoFn = makeDoFn(newErrResult(ErrClosing))
1094-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoFn: m.DoFn} }
1094+
m.AcquireFn = func() wire { return &mockWire{DoFn: m.DoFn} }
10951095
if ret := c.Dedicated(func(cc DedicatedClient) error {
10961096
return cc.Do(context.Background(), c.B().Set().Key("Do").Value("Do").Build()).Error()
10971097
}); ret != ErrClosing {
@@ -1105,7 +1105,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
11051105
[]RedisResult{newErrResult(ErrClosing)},
11061106
[]RedisResult{newResult(RedisMessage{typ: '+', string: "Do"}, nil)},
11071107
)
1108-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
1108+
m.AcquireFn = func() wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
11091109
if ret := c.Dedicated(func(cc DedicatedClient) error {
11101110
if v, err := cc.DoMulti(context.Background(), c.B().Get().Key("Do").Build())[0].ToString(); err != nil || v != "Do" {
11111111
t.Fatalf("unexpected response %v %v", v, err)
@@ -1120,7 +1120,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
11201120
c, m := setup()
11211121
m.DoMultiFn = makeDoMultiFn([]RedisResult{newErrResult(ErrClosing)})
11221122
m.ErrorFn = func() error { return ErrClosing }
1123-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoMultiFn: m.DoMultiFn, ErrorFn: m.ErrorFn} }
1123+
m.AcquireFn = func() wire { return &mockWire{DoMultiFn: m.DoMultiFn, ErrorFn: m.ErrorFn} }
11241124
if ret := c.Dedicated(func(cc DedicatedClient) error {
11251125
return cc.DoMulti(context.Background(), c.B().Get().Key("Do").Build())[0].Error()
11261126
}); ret != ErrClosing {
@@ -1131,7 +1131,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
11311131
t.Run("Dedicate Delegate DoMulti ReadOnly NoRetry - ctx done", func(t *testing.T) {
11321132
c, m := setup()
11331133
m.DoMultiFn = makeDoMultiFn([]RedisResult{newErrResult(ErrClosing)})
1134-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
1134+
m.AcquireFn = func() wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
11351135
ctx, cancel := context.WithCancel(context.Background())
11361136
cancel()
11371137
if ret := c.Dedicated(func(cc DedicatedClient) error {
@@ -1147,7 +1147,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
11471147
[]RedisResult{newErrResult(ErrClosing)},
11481148
[]RedisResult{newResult(RedisMessage{typ: '+', string: "Do"}, nil)},
11491149
)
1150-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
1150+
m.AcquireFn = func() wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
11511151
if ret := c.Dedicated(func(cc DedicatedClient) error {
11521152
if cli, ok := cc.(*dedicatedClusterClient); ok {
11531153
cli.retryHandler = &mockRetryHandler{
@@ -1176,7 +1176,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
11761176
t.Run("Dedicate Delegate DoMulti Write NoRetry", func(t *testing.T) {
11771177
c, m := setup()
11781178
m.DoMultiFn = makeDoMultiFn([]RedisResult{newErrResult(ErrClosing)})
1179-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
1179+
m.AcquireFn = func() wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
11801180
if ret := c.Dedicated(func(cc DedicatedClient) error {
11811181
return cc.DoMulti(context.Background(), c.B().Set().Key("Do").Value("Do").Build())[0].Error()
11821182
}); ret != ErrClosing {
@@ -1187,7 +1187,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
11871187
t.Run("Delegate Receive Retry", func(t *testing.T) {
11881188
c, m := setup()
11891189
m.ReceiveFn = makeReceiveFn(ErrClosing, nil)
1190-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{ReceiveFn: m.ReceiveFn} }
1190+
m.AcquireFn = func() wire { return &mockWire{ReceiveFn: m.ReceiveFn} }
11911191
if ret := c.Dedicated(func(cc DedicatedClient) error {
11921192
if err := cc.Receive(context.Background(), c.B().Subscribe().Channel("Do").Build(), nil); err != nil {
11931193
t.Fatalf("unexpected response %v", err)
@@ -1202,7 +1202,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
12021202
c, m := setup()
12031203
m.ReceiveFn = makeReceiveFn(ErrClosing)
12041204
m.ErrorFn = func() error { return ErrClosing }
1205-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{ReceiveFn: m.ReceiveFn, ErrorFn: m.ErrorFn} }
1205+
m.AcquireFn = func() wire { return &mockWire{ReceiveFn: m.ReceiveFn, ErrorFn: m.ErrorFn} }
12061206
if ret := c.Dedicated(func(cc DedicatedClient) error {
12071207
return cc.Receive(context.Background(), c.B().Subscribe().Channel("Do").Build(), nil)
12081208
}); ret != ErrClosing {
@@ -1213,7 +1213,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
12131213
t.Run("Delegate Receive NoRetry - ctx done", func(t *testing.T) {
12141214
c, m := setup()
12151215
m.ReceiveFn = makeReceiveFn(ErrClosing)
1216-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{ReceiveFn: m.ReceiveFn} }
1216+
m.AcquireFn = func() wire { return &mockWire{ReceiveFn: m.ReceiveFn} }
12171217
ctx, cancel := context.WithCancel(context.Background())
12181218
cancel()
12191219
if ret := c.Dedicated(func(cc DedicatedClient) error {
@@ -1226,7 +1226,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
12261226
t.Run("Delegate Receive NoRetry - not retryable", func(t *testing.T) {
12271227
c, m := setup()
12281228
m.ReceiveFn = makeReceiveFn(ErrClosing, nil)
1229-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{ReceiveFn: m.ReceiveFn} }
1229+
m.AcquireFn = func() wire { return &mockWire{ReceiveFn: m.ReceiveFn} }
12301230
if ret := c.Dedicated(func(cc DedicatedClient) error {
12311231
if cli, ok := cc.(*dedicatedClusterClient); ok {
12321232
cli.retryHandler = &mockRetryHandler{
@@ -1377,7 +1377,7 @@ func TestSingleClientLoadingRetry(t *testing.T) {
13771377
}
13781378
return newResult(RedisMessage{typ: '+', string: "OK"}, nil)
13791379
}
1380-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoFn: m.DoFn} }
1380+
m.AcquireFn = func() wire { return &mockWire{DoFn: m.DoFn} }
13811381

13821382
err := client.Dedicated(func(c DedicatedClient) error {
13831383
if v, err := c.Do(context.Background(), c.B().Get().Key("test").Build()).ToString(); err != nil || v != "OK" {
@@ -1400,7 +1400,7 @@ func TestSingleClientLoadingRetry(t *testing.T) {
14001400
}
14011401
return &redisresults{s: []RedisResult{newResult(RedisMessage{typ: '+', string: "OK"}, nil)}}
14021402
}
1403-
m.AcquireFn = func(_ context.Context) wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
1403+
m.AcquireFn = func() wire { return &mockWire{DoMultiFn: m.DoMultiFn} }
14041404

14051405
err := client.Dedicated(func(c DedicatedClient) error {
14061406
resps := c.DoMulti(context.Background(), c.B().Get().Key("test").Build())

0 commit comments

Comments
 (0)