From a95d0fbc892063f7d8d8edaebb55e3156345e005 Mon Sep 17 00:00:00 2001 From: Carly de Frondeville Date: Fri, 11 Oct 2024 14:34:28 -0700 Subject: [PATCH] fix lint and mock gen --- common/quotas/clocked_rate_limiter_test.go | 4 ++-- common/quotas/rate_limiter_mock.go | 15 ++++++++++----- service/matching/matching_engine_test.go | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/common/quotas/clocked_rate_limiter_test.go b/common/quotas/clocked_rate_limiter_test.go index 77abf5e02ac..9bf86c6f063 100644 --- a/common/quotas/clocked_rate_limiter_test.go +++ b/common/quotas/clocked_rate_limiter_test.go @@ -169,7 +169,7 @@ func TestClockedRateLimiter_Wait_Recycle(t *testing.T) { asserted = true }() // wait for rl.Wait() to start and get to the select statement - time.Sleep(10 * time.Millisecond) + time.Sleep(10 * time.Millisecond) // nolint // once a waiter exists, recycle the token instead of advancing time rl.RecycleToken() @@ -200,7 +200,7 @@ func TestClockedRateLimiter_WaitN_NoRecycle(t *testing.T) { asserted = true }() // wait for rl.Wait() to start and get to the select statement - time.Sleep(10 * time.Millisecond) + time.Sleep(10 * time.Millisecond) // nolint // once a waiter exists, recycle the token instead of advancing time rl.RecycleToken() diff --git a/common/quotas/rate_limiter_mock.go b/common/quotas/rate_limiter_mock.go index 9cbf68d760a..61d71de5090 100644 --- a/common/quotas/rate_limiter_mock.go +++ b/common/quotas/rate_limiter_mock.go @@ -24,6 +24,11 @@ // Code generated by MockGen. DO NOT EDIT. // Source: rate_limiter.go +// +// Generated by this command: +// +// mockgen -copyright_file ../../LICENSE -package quotas -source rate_limiter.go -destination rate_limiter_mock.go +// // Package quotas is a generated GoMock package. package quotas @@ -82,7 +87,7 @@ func (m *MockRateLimiter) AllowN(now time.Time, numToken int) bool { } // AllowN indicates an expected call of AllowN. -func (mr *MockRateLimiterMockRecorder) AllowN(now, numToken interface{}) *gomock.Call { +func (mr *MockRateLimiterMockRecorder) AllowN(now, numToken any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowN", reflect.TypeOf((*MockRateLimiter)(nil).AllowN), now, numToken) } @@ -150,7 +155,7 @@ func (m *MockRateLimiter) ReserveN(now time.Time, numToken int) Reservation { } // ReserveN indicates an expected call of ReserveN. -func (mr *MockRateLimiterMockRecorder) ReserveN(now, numToken interface{}) *gomock.Call { +func (mr *MockRateLimiterMockRecorder) ReserveN(now, numToken any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReserveN", reflect.TypeOf((*MockRateLimiter)(nil).ReserveN), now, numToken) } @@ -164,7 +169,7 @@ func (m *MockRateLimiter) TokensAt(t time.Time) int { } // TokensAt indicates an expected call of TokensAt. -func (mr *MockRateLimiterMockRecorder) TokensAt(t interface{}) *gomock.Call { +func (mr *MockRateLimiterMockRecorder) TokensAt(t any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TokensAt", reflect.TypeOf((*MockRateLimiter)(nil).TokensAt), t) } @@ -178,7 +183,7 @@ func (m *MockRateLimiter) Wait(ctx context.Context) error { } // Wait indicates an expected call of Wait. -func (mr *MockRateLimiterMockRecorder) Wait(ctx interface{}) *gomock.Call { +func (mr *MockRateLimiterMockRecorder) Wait(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Wait", reflect.TypeOf((*MockRateLimiter)(nil).Wait), ctx) } @@ -192,7 +197,7 @@ func (m *MockRateLimiter) WaitN(ctx context.Context, numToken int) error { } // WaitN indicates an expected call of WaitN. -func (mr *MockRateLimiterMockRecorder) WaitN(ctx, numToken interface{}) *gomock.Call { +func (mr *MockRateLimiterMockRecorder) WaitN(ctx, numToken any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitN", reflect.TypeOf((*MockRateLimiter)(nil).WaitN), ctx, numToken) } diff --git a/service/matching/matching_engine_test.go b/service/matching/matching_engine_test.go index 6ffec11ee23..0ad8d81b396 100644 --- a/service/matching/matching_engine_test.go +++ b/service/matching/matching_engine_test.go @@ -1990,7 +1990,7 @@ func (s *matchingEngineSuite) TestAddTaskAfterStartFailure() { task, _, err := s.matchingEngine.pollTask(context.Background(), dbq.partition, &pollMetadata{}) s.NoError(err) - task.finish(errors.New("test error"), true) + task.finish(serviceerror.NewInternal("test error"), true) s.EqualValues(1, s.taskManager.getTaskCount(dbq)) task2, _, err := s.matchingEngine.pollTask(context.Background(), dbq.partition, &pollMetadata{}) s.NoError(err)