Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes calls to ctrl.Finish #1803

Merged
merged 3 commits into from
Aug 3, 2023
Merged

Removes calls to ctrl.Finish #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a98145
Removes calls to ctrl.Finish
darioush Aug 2, 2023
1768f28
remove unused return to appease linter
darioush Aug 2, 2023
65c5d7f
Remove additional calls to ctl.Finish (#1805)
hexfusion Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions api/admin/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ func TestLoadVMsSuccess(t *testing.T) {
require := require.New(t)

resources := initLoadVMsTest(t)
defer resources.ctrl.Finish()

id1 := ids.GenerateTestID()
id2 := ids.GenerateTestID()
Expand Down Expand Up @@ -84,7 +83,6 @@ func TestLoadVMsReloadFails(t *testing.T) {
require := require.New(t)

resources := initLoadVMsTest(t)
defer resources.ctrl.Finish()

resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
// Reload fails
Expand All @@ -100,7 +98,6 @@ func TestLoadVMsGetAliasesFails(t *testing.T) {
require := require.New(t)

resources := initLoadVMsTest(t)
defer resources.ctrl.Finish()

id1 := ids.GenerateTestID()
id2 := ids.GenerateTestID()
Expand Down
3 changes: 0 additions & 3 deletions api/info/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func TestGetVMsSuccess(t *testing.T) {
require := require.New(t)

resources := initGetVMsTest(t)
defer resources.ctrl.Finish()

id1 := ids.GenerateTestID()
id2 := ids.GenerateTestID()
Expand Down Expand Up @@ -76,7 +75,6 @@ func TestGetVMsSuccess(t *testing.T) {
// Tests GetVMs if we fail to list our vms.
func TestGetVMsVMsListFactoriesFails(t *testing.T) {
resources := initGetVMsTest(t)
defer resources.ctrl.Finish()

resources.mockLog.EXPECT().Debug(gomock.Any(), gomock.Any()).Times(1)
resources.mockVMManager.EXPECT().ListFactories().Times(1).Return(nil, errTest)
Expand All @@ -89,7 +87,6 @@ func TestGetVMsVMsListFactoriesFails(t *testing.T) {
// Tests GetVMs if we can't get our vm aliases.
func TestGetVMsGetAliasesFails(t *testing.T) {
resources := initGetVMsTest(t)
defer resources.ctrl.Finish()

id1 := ids.GenerateTestID()
id2 := ids.GenerateTestID()
Expand Down
4 changes: 0 additions & 4 deletions database/test_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,6 @@ func TestBatchRewrite(t *testing.T, db Database) {
// contents.
func TestBatchReplay(t *testing.T, db Database) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)

key1 := []byte("hello1")
Expand Down Expand Up @@ -469,8 +467,6 @@ func TestBatchReplay(t *testing.T, db Database) {
// propagate any returned error during Replay.
func TestBatchReplayPropagateError(t *testing.T, db Database) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)

key1 := []byte("hello1")
Expand Down
3 changes: 0 additions & 3 deletions indexer/indexer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ func TestMarkHasRunAndShutdown(t *testing.T) {
func TestIndexer(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

baseDB := memdb.New()
db := versiondb.New(baseDB)
Expand Down Expand Up @@ -399,7 +398,6 @@ func TestIncompleteIndex(t *testing.T) {
// Create an indexer with indexing disabled
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

baseDB := memdb.New()
config := Config{
Expand Down Expand Up @@ -481,7 +479,6 @@ func TestIncompleteIndex(t *testing.T) {
func TestIgnoreNonDefaultChains(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

baseDB := memdb.New()
db := versiondb.New(baseDB)
Expand Down
5 changes: 0 additions & 5 deletions network/throttling/inbound_resource_throttler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (

func TestNewSystemThrottler(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)
reg := prometheus.NewRegistry()
clock := mockable.Clock{}
Expand All @@ -50,8 +48,6 @@ func TestNewSystemThrottler(t *testing.T) {

func TestSystemThrottler(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)

// Setup
Expand Down Expand Up @@ -135,7 +131,6 @@ func TestSystemThrottler(t *testing.T) {
func TestSystemThrottlerContextCancel(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

// Setup
mockTracker := tracker.NewMockTracker(ctrl)
Expand Down
6 changes: 0 additions & 6 deletions network/throttling/outbound_msg_throttler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (

func TestSybilOutboundMsgThrottler(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)
config := MsgByteThrottlerConfig{
VdrAllocSize: 1024,
Expand Down Expand Up @@ -166,8 +164,6 @@ func TestSybilOutboundMsgThrottler(t *testing.T) {
// Ensure that the limit on taking from the at-large allocation is enforced
func TestSybilOutboundMsgThrottlerMaxNonVdr(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)
config := MsgByteThrottlerConfig{
VdrAllocSize: 100,
Expand Down Expand Up @@ -215,8 +211,6 @@ func TestSybilOutboundMsgThrottlerMaxNonVdr(t *testing.T) {
// Ensure that the throttler honors requested bypasses
func TestBypassThrottling(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)
config := MsgByteThrottlerConfig{
VdrAllocSize: 100,
Expand Down
4 changes: 0 additions & 4 deletions snow/engine/snowman/getter/getter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ func testSetup(

func TestAcceptedFrontier(t *testing.T) {
require := require.New(t)

ctrl := gomock.NewController(t)
defer ctrl.Finish()

vm, sender, config := testSetup(t, ctrl)

Expand Down Expand Up @@ -122,9 +120,7 @@ func TestAcceptedFrontier(t *testing.T) {

func TestFilterAccepted(t *testing.T) {
require := require.New(t)

ctrl := gomock.NewController(t)
defer ctrl.Finish()

vm, sender, config := testSetup(t, ctrl)

Expand Down
1 change: 0 additions & 1 deletion snow/networking/handler/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ func TestHandlerSubnetConnector(t *testing.T) {
)
require.NoError(err)
ctrl := gomock.NewController(t)
defer ctrl.Finish()
connector := validators.NewMockSubnetConnector(ctrl)

nodeID := ids.GenerateTestNodeID()
Expand Down
2 changes: 0 additions & 2 deletions snow/networking/handler/message_queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ const engineType = p2p.EngineType_ENGINE_TYPE_SNOWMAN

func TestQueue(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)
cpuTracker := tracker.NewMockTracker(ctrl)
vdrs := validators.NewSet()
Expand Down
4 changes: 0 additions & 4 deletions snow/networking/router/chain_router_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,6 @@ func TestRouterTimeout(t *testing.T) {

func TestRouterHonorsRequestedEngine(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

require := require.New(t)

// Create a timeout manager
Expand Down Expand Up @@ -1391,9 +1389,7 @@ func TestRouterCrossChainMessages(t *testing.T) {

func TestConnectedSubnet(t *testing.T) {
require := require.New(t)

ctrl := gomock.NewController(t)
defer ctrl.Finish()

tm, err := timeout.NewManager(
&timer.AdaptiveTimeoutConfig{
Expand Down
3 changes: 0 additions & 3 deletions snow/networking/sender/sender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,6 @@ func TestSender_Bootstrap_Requests(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var (
msgCreator = message.NewMockOutboundMsgBuilder(ctrl)
Expand Down Expand Up @@ -1067,7 +1066,6 @@ func TestSender_Bootstrap_Responses(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var (
msgCreator = message.NewMockOutboundMsgBuilder(ctrl)
Expand Down Expand Up @@ -1239,7 +1237,6 @@ func TestSender_Single_Request(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var (
msgCreator = message.NewMockOutboundMsgBuilder(ctrl)
Expand Down
2 changes: 0 additions & 2 deletions snow/networking/tracker/targeter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
func TestNewTargeter(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

config := &TargeterConfig{
VdrAlloc: 10,
Expand All @@ -43,7 +42,6 @@ func TestNewTargeter(t *testing.T) {

func TestTarget(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

vdr := ids.NodeID{1}
vdrWeight := uint64(1)
Expand Down
1 change: 0 additions & 1 deletion snow/uptime/locked_calculator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
func TestLockedCalculator(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

lc := NewLockedCalculator()
require.NotNil(lc)
Expand Down
5 changes: 0 additions & 5 deletions snow/validators/gvalidators/validator_state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ func setupState(t testing.TB, ctrl *gomock.Controller) *testState {
func TestGetMinimumHeight(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

state := setupState(t, ctrl)
defer state.closeFn()
Expand All @@ -87,7 +86,6 @@ func TestGetMinimumHeight(t *testing.T) {
func TestGetCurrentHeight(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

state := setupState(t, ctrl)
defer state.closeFn()
Expand All @@ -111,7 +109,6 @@ func TestGetCurrentHeight(t *testing.T) {
func TestGetSubnetID(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

state := setupState(t, ctrl)
defer state.closeFn()
Expand All @@ -136,7 +133,6 @@ func TestGetSubnetID(t *testing.T) {
func TestGetValidatorSet(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

state := setupState(t, ctrl)
defer state.closeFn()
Expand Down Expand Up @@ -214,7 +210,6 @@ func benchmarkGetValidatorSet(b *testing.B, vs map[ids.NodeID]*validators.GetVal
ctrl := gomock.NewController(b)
state := setupState(b, ctrl)
defer func() {
ctrl.Finish()
state.closeFn()
}()

Expand Down
8 changes: 0 additions & 8 deletions utils/crypto/keychain/keychain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ var errTest = errors.New("test")
func TestNewLedgerKeychain(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr := ids.GenerateTestShortID()

Expand Down Expand Up @@ -50,7 +49,6 @@ func TestNewLedgerKeychain(t *testing.T) {
func TestLedgerKeychain_Addresses(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr1 := ids.GenerateTestShortID()
addr2 := ids.GenerateTestShortID()
Expand Down Expand Up @@ -82,7 +80,6 @@ func TestLedgerKeychain_Addresses(t *testing.T) {
func TestLedgerKeychain_Get(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr1 := ids.GenerateTestShortID()
addr2 := ids.GenerateTestShortID()
Expand Down Expand Up @@ -126,7 +123,6 @@ func TestLedgerKeychain_Get(t *testing.T) {
func TestLedgerSigner_SignHash(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr1 := ids.GenerateTestShortID()
addr2 := ids.GenerateTestShortID()
Expand Down Expand Up @@ -210,7 +206,6 @@ func TestLedgerSigner_SignHash(t *testing.T) {
func TestNewLedgerKeychainFromIndices(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr := ids.GenerateTestShortID()
_ = addr
Expand Down Expand Up @@ -242,7 +237,6 @@ func TestNewLedgerKeychainFromIndices(t *testing.T) {
func TestLedgerKeychainFromIndices_Addresses(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr1 := ids.GenerateTestShortID()
addr2 := ids.GenerateTestShortID()
Expand Down Expand Up @@ -302,7 +296,6 @@ func TestLedgerKeychainFromIndices_Addresses(t *testing.T) {
func TestLedgerKeychainFromIndices_Get(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr1 := ids.GenerateTestShortID()
addr2 := ids.GenerateTestShortID()
Expand Down Expand Up @@ -348,7 +341,6 @@ func TestLedgerKeychainFromIndices_Get(t *testing.T) {
func TestLedgerSignerFromIndices_SignHash(t *testing.T) {
require := require.New(t)
ctrl := gomock.NewController(t)
defer ctrl.Finish()

addr1 := ids.GenerateTestShortID()
addr2 := ids.GenerateTestShortID()
Expand Down
Loading