diff --git a/internal/api/bulking/mocks_ledger_controller_test.go b/internal/api/bulking/mocks_ledger_controller_test.go index cbf90fc33..2cede2100 100644 --- a/internal/api/bulking/mocks_ledger_controller_test.go +++ b/internal/api/bulking/mocks_ledger_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/ledger/controller.go -destination mocks_ledger_controller_test.go -package bulking --mock_names Controller=LedgerController . Controller -// - package bulking import ( @@ -23,7 +21,6 @@ import ( type LedgerController struct { ctrl *gomock.Controller recorder *LedgerControllerMockRecorder - isgomock struct{} } // LedgerControllerMockRecorder is the mock recorder for LedgerController. diff --git a/internal/api/common/mocks_ledger_controller_test.go b/internal/api/common/mocks_ledger_controller_test.go index 01e775d3f..c263cfa1f 100644 --- a/internal/api/common/mocks_ledger_controller_test.go +++ b/internal/api/common/mocks_ledger_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/ledger/controller.go -destination mocks_ledger_controller_test.go -package common --mock_names Controller=LedgerController . Controller -// - package common import ( @@ -23,7 +21,6 @@ import ( type LedgerController struct { ctrl *gomock.Controller recorder *LedgerControllerMockRecorder - isgomock struct{} } // LedgerControllerMockRecorder is the mock recorder for LedgerController. diff --git a/internal/api/common/mocks_system_controller_test.go b/internal/api/common/mocks_system_controller_test.go index 0c85dc246..b0fbeaea8 100644 --- a/internal/api/common/mocks_system_controller_test.go +++ b/internal/api/common/mocks_system_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/system/controller.go -destination mocks_system_controller_test.go -package common --mock_names Controller=SystemController . Controller -// - package common import ( @@ -21,7 +19,6 @@ import ( type SystemController struct { ctrl *gomock.Controller recorder *SystemControllerMockRecorder - isgomock struct{} } // SystemControllerMockRecorder is the mock recorder for SystemController. diff --git a/internal/api/v1/mocks_ledger_controller_test.go b/internal/api/v1/mocks_ledger_controller_test.go index 2f3a686e1..f89439826 100644 --- a/internal/api/v1/mocks_ledger_controller_test.go +++ b/internal/api/v1/mocks_ledger_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/ledger/controller.go -destination mocks_ledger_controller_test.go -package v1 --mock_names Controller=LedgerController . Controller -// - package v1 import ( @@ -23,7 +21,6 @@ import ( type LedgerController struct { ctrl *gomock.Controller recorder *LedgerControllerMockRecorder - isgomock struct{} } // LedgerControllerMockRecorder is the mock recorder for LedgerController. diff --git a/internal/api/v1/mocks_system_controller_test.go b/internal/api/v1/mocks_system_controller_test.go index f3f19b232..1ad57614e 100644 --- a/internal/api/v1/mocks_system_controller_test.go +++ b/internal/api/v1/mocks_system_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/system/controller.go -destination mocks_system_controller_test.go -package v1 --mock_names Controller=SystemController . Controller -// - package v1 import ( @@ -21,7 +19,6 @@ import ( type SystemController struct { ctrl *gomock.Controller recorder *SystemControllerMockRecorder - isgomock struct{} } // SystemControllerMockRecorder is the mock recorder for SystemController. diff --git a/internal/api/v2/mocks_ledger_controller_test.go b/internal/api/v2/mocks_ledger_controller_test.go index a0d043ca4..2cbbfee4a 100644 --- a/internal/api/v2/mocks_ledger_controller_test.go +++ b/internal/api/v2/mocks_ledger_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/ledger/controller.go -destination mocks_ledger_controller_test.go -package v2 --mock_names Controller=LedgerController . Controller -// - package v2 import ( @@ -23,7 +21,6 @@ import ( type LedgerController struct { ctrl *gomock.Controller recorder *LedgerControllerMockRecorder - isgomock struct{} } // LedgerControllerMockRecorder is the mock recorder for LedgerController. diff --git a/internal/api/v2/mocks_system_controller_test.go b/internal/api/v2/mocks_system_controller_test.go index c4d8c215a..45d1eaaa5 100644 --- a/internal/api/v2/mocks_system_controller_test.go +++ b/internal/api/v2/mocks_system_controller_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../../controller/system/controller.go -destination mocks_system_controller_test.go -package v2 --mock_names Controller=SystemController . Controller -// - package v2 import ( @@ -21,7 +19,6 @@ import ( type SystemController struct { ctrl *gomock.Controller recorder *SystemControllerMockRecorder - isgomock struct{} } // SystemControllerMockRecorder is the mock recorder for SystemController. diff --git a/internal/controller/ledger/controller_generated_test.go b/internal/controller/ledger/controller_generated_test.go index 1495b8c74..7e6601231 100644 --- a/internal/controller/ledger/controller_generated_test.go +++ b/internal/controller/ledger/controller_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source controller.go -destination controller_generated_test.go -package ledger . Controller -// - package ledger import ( @@ -22,7 +20,6 @@ import ( type MockController struct { ctrl *gomock.Controller recorder *MockControllerMockRecorder - isgomock struct{} } // MockControllerMockRecorder is the mock recorder for MockController. diff --git a/internal/controller/ledger/controller_with_too_many_client_handling_generated_test.go b/internal/controller/ledger/controller_with_too_many_client_handling_generated_test.go index 9f397752e..2f0c421cb 100644 --- a/internal/controller/ledger/controller_with_too_many_client_handling_generated_test.go +++ b/internal/controller/ledger/controller_with_too_many_client_handling_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source controller_with_too_many_client_handling.go -destination controller_with_too_many_client_handling_generated_test.go -package ledger . DelayCalculator -typed -// - package ledger import ( @@ -18,7 +16,6 @@ import ( type MockDelayCalculator struct { ctrl *gomock.Controller recorder *MockDelayCalculatorMockRecorder - isgomock struct{} } // MockDelayCalculatorMockRecorder is the mock recorder for MockDelayCalculator. diff --git a/internal/controller/ledger/listener_generated_test.go b/internal/controller/ledger/listener_generated_test.go index e0e7e584c..44df6a6a7 100644 --- a/internal/controller/ledger/listener_generated_test.go +++ b/internal/controller/ledger/listener_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source listener.go -destination listener_generated_test.go -package ledger . Listener -// - package ledger import ( @@ -20,7 +18,6 @@ import ( type MockListener struct { ctrl *gomock.Controller recorder *MockListenerMockRecorder - isgomock struct{} } // MockListenerMockRecorder is the mock recorder for MockListener. diff --git a/internal/controller/ledger/numscript_parser_generated_test.go b/internal/controller/ledger/numscript_parser_generated_test.go index 5219a92e2..f319d367d 100644 --- a/internal/controller/ledger/numscript_parser_generated_test.go +++ b/internal/controller/ledger/numscript_parser_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source numscript_parser.go -destination numscript_parser_generated_test.go -package ledger . NumscriptParser -// - package ledger import ( @@ -17,7 +15,6 @@ import ( type MockNumscriptParser struct { ctrl *gomock.Controller recorder *MockNumscriptParserMockRecorder - isgomock struct{} } // MockNumscriptParserMockRecorder is the mock recorder for MockNumscriptParser. diff --git a/internal/controller/ledger/numscript_runtime_generated_test.go b/internal/controller/ledger/numscript_runtime_generated_test.go index 8a6343843..254a78556 100644 --- a/internal/controller/ledger/numscript_runtime_generated_test.go +++ b/internal/controller/ledger/numscript_runtime_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source numscript_runtime.go -destination numscript_runtime_generated_test.go -package ledger . NumscriptRuntime -// - package ledger import ( @@ -18,7 +16,6 @@ import ( type MockNumscriptRuntime struct { ctrl *gomock.Controller recorder *MockNumscriptRuntimeMockRecorder - isgomock struct{} } // MockNumscriptRuntimeMockRecorder is the mock recorder for MockNumscriptRuntime. diff --git a/internal/controller/ledger/store_generated_test.go b/internal/controller/ledger/store_generated_test.go index accb45087..7a677d58e 100644 --- a/internal/controller/ledger/store_generated_test.go +++ b/internal/controller/ledger/store_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source store.go -destination store_generated_test.go -package ledger . PaginatedResource -// - package ledger import ( @@ -25,7 +23,6 @@ import ( type MockStore struct { ctrl *gomock.Controller recorder *MockStoreMockRecorder - isgomock struct{} } // MockStoreMockRecorder is the mock recorder for MockStore. @@ -373,7 +370,6 @@ func (mr *MockStoreMockRecorder) Volumes() *gomock.Call { type MockResource[ResourceType any, OptionsType any] struct { ctrl *gomock.Controller recorder *MockResourceMockRecorder[ResourceType, OptionsType] - isgomock struct{} } // MockResourceMockRecorder is the mock recorder for MockResource. @@ -427,7 +423,6 @@ func (mr *MockResourceMockRecorder[ResourceType, OptionsType]) GetOne(ctx, query type MockPaginatedResource[ResourceType any, OptionsType any, PaginationQueryType PaginatedQuery[OptionsType]] struct { ctrl *gomock.Controller recorder *MockPaginatedResourceMockRecorder[ResourceType, OptionsType, PaginationQueryType] - isgomock struct{} } // MockPaginatedResourceMockRecorder is the mock recorder for MockPaginatedResource. diff --git a/internal/leadership/broadcaster.go b/internal/leadership/broadcaster.go index b0f084878..1b84c8a4b 100644 --- a/internal/leadership/broadcaster.go +++ b/internal/leadership/broadcaster.go @@ -9,7 +9,7 @@ type listener struct { } type Broadcaster struct { - mu *sync.Mutex + mu sync.Mutex t *Leadership inner []listener @@ -81,6 +81,5 @@ func (h *Broadcaster) CountListeners() int { func NewSignal() *Broadcaster { return &Broadcaster{ outer: make(chan Leadership), - mu: &sync.Mutex{}, } } diff --git a/internal/leadership/context.go b/internal/leadership/context.go index a79bdb450..58766edde 100644 --- a/internal/leadership/context.go +++ b/internal/leadership/context.go @@ -5,9 +5,9 @@ import ( "sync" ) -type contextKey string +type contextKey struct{} -var holderContextKey contextKey = "holder" +var holderContextKey contextKey = struct{}{} func ContextWithLeadershipInfo(ctx context.Context) context.Context { return context.WithValue(ctx, holderContextKey, &holder{}) diff --git a/internal/leadership/locker.go b/internal/leadership/locker.go index 3bebb246d..4fe2fc5a5 100644 --- a/internal/leadership/locker.go +++ b/internal/leadership/locker.go @@ -38,7 +38,7 @@ func (p *defaultLocker) Take(ctx context.Context) (DBHandle, error) { var acquired bool if err := ret.Scan(&acquired); err != nil { _ = conn.Close() - panic(err) + return nil, err } if !acquired { diff --git a/internal/leadership/manager_test.go b/internal/leadership/manager_test.go index 5151ed64e..2cde900f4 100644 --- a/internal/leadership/manager_test.go +++ b/internal/leadership/manager_test.go @@ -43,6 +43,13 @@ func TestLeaderShip(t *testing.T) { } return false }, 2*time.Second, 10*time.Millisecond) + leaderCount := 0 + for _, manager := range instances { + if manager.GetSignal().Actual().Acquired { + leaderCount++ + } + } + require.Equal(t, 1, leaderCount) require.GreaterOrEqual(t, selectedLeader, 0) // ensure the provided db connection is still functionnal diff --git a/internal/storage/driver/buckets_generated_test.go b/internal/storage/driver/buckets_generated_test.go index 61635f327..b71780813 100644 --- a/internal/storage/driver/buckets_generated_test.go +++ b/internal/storage/driver/buckets_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../bucket/bucket.go -destination buckets_generated_test.go -package driver --mock_names Factory=BucketFactory . Factory -// - package driver import ( @@ -21,7 +19,6 @@ import ( type MockBucket struct { ctrl *gomock.Controller recorder *MockBucketMockRecorder - isgomock struct{} } // MockBucketMockRecorder is the mock recorder for MockBucket. @@ -138,7 +135,6 @@ func (mr *MockBucketMockRecorder) Migrate(ctx any, opts ...any) *gomock.Call { type BucketFactory struct { ctrl *gomock.Controller recorder *BucketFactoryMockRecorder - isgomock struct{} } // BucketFactoryMockRecorder is the mock recorder for BucketFactory. diff --git a/internal/storage/driver/ledger_generated_test.go b/internal/storage/driver/ledger_generated_test.go index b940e41b3..fb2f8a6ab 100644 --- a/internal/storage/driver/ledger_generated_test.go +++ b/internal/storage/driver/ledger_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../ledger/factory.go -destination ledger_generated_test.go -package driver --mock_names Factory=LedgerStoreFactory . Factory -// - package driver import ( @@ -20,7 +18,6 @@ import ( type LedgerStoreFactory struct { ctrl *gomock.Controller recorder *LedgerStoreFactoryMockRecorder - isgomock struct{} } // LedgerStoreFactoryMockRecorder is the mock recorder for LedgerStoreFactory. diff --git a/internal/storage/driver/system_generated_test.go b/internal/storage/driver/system_generated_test.go index 6ce339a3f..d6afce573 100644 --- a/internal/storage/driver/system_generated_test.go +++ b/internal/storage/driver/system_generated_test.go @@ -3,8 +3,6 @@ // Generated by this command: // // mockgen -write_source_comment=false -write_package_comment=false -source ../system/store.go -destination system_generated_test.go -package driver --mock_names Store=SystemStore . Store -// - package driver import ( @@ -23,7 +21,6 @@ import ( type SystemStore struct { ctrl *gomock.Controller recorder *SystemStoreMockRecorder - isgomock struct{} } // SystemStoreMockRecorder is the mock recorder for SystemStore.