Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit 940725b

Browse files
chris-4chainchris-4chain
committed
refactor(BUX-411): unnecessary With* func options - partially removed
1 parent 60a3fd5 commit 940725b

18 files changed

+107
-115
lines changed

‎action_transaction_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func BenchmarkAction_Transaction_newTransaction(b *testing.B) {
325325

326326
func initBenchmarkData(b *testing.B) (context.Context, ClientInterface, *Xpub, *TransactionConfig, error) {
327327
ctx, client, _ := CreateBenchmarkSQLiteClient(b, false, true,
328-
WithCustomTaskManager(&taskManagerMockBase{}),
328+
withTaskManagerMockup(),
329329
WithFreeCache(),
330330
WithIUCDisabled(),
331331
)

‎bux_suite_mocks_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,10 @@ func (tm *taskManagerMockBase) IsNewRelicEnabled() bool {
5151
func (tm *taskManagerMockBase) CronJobsInit(cronJobsMap taskmanager.CronJobs) error {
5252
return nil
5353
}
54+
55+
// Sets custom task manager only for testing
56+
func withTaskManagerMockup() ClientOps {
57+
return func(c *clientOptions) {
58+
c.taskManager.TaskManagerInterface = &taskManagerMockBase{}
59+
}
60+
}

‎bux_suite_test.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ func (ts *EmbeddedDBTestSuite) serveMySQL() {
8686

8787
// SetupSuite runs at the start of the suite
8888
func (ts *EmbeddedDBTestSuite) SetupSuite() {
89-
9089
var err error
9190

9291
// Create the MySQL server
@@ -120,7 +119,6 @@ func (ts *EmbeddedDBTestSuite) SetupSuite() {
120119

121120
// TearDownSuite runs after the suite finishes
122121
func (ts *EmbeddedDBTestSuite) TearDownSuite() {
123-
124122
// Stop the Mongo server
125123
if ts.MongoServer != nil {
126124
ts.MongoServer.Stop()
@@ -157,8 +155,8 @@ func (ts *EmbeddedDBTestSuite) TearDownTest() {
157155
//
158156
// NOTE: you need to close the client: ts.Close()
159157
func (ts *EmbeddedDBTestSuite) createTestClient(ctx context.Context, database datastore.Engine,
160-
tablePrefix string, mockDB, mockRedis bool, opts ...ClientOps) (*TestingClient, error) {
161-
158+
tablePrefix string, mockDB, mockRedis bool, opts ...ClientOps,
159+
) (*TestingClient, error) {
162160
var err error
163161

164162
// Start the suite
@@ -201,7 +199,6 @@ func (ts *EmbeddedDBTestSuite) createTestClient(ctx context.Context, database da
201199
}
202200

203201
} else {
204-
205202
// Load the in-memory version of the database
206203
if database == datastore.SQLite {
207204
opts = append(opts, WithSQLite(&datastore.SQLiteConfig{
@@ -331,7 +328,7 @@ func (ts *EmbeddedDBTestSuite) genericDBClient(t *testing.T, database datastore.
331328
if taskManagerEnabled {
332329
opts = append(opts, WithTaskQ(taskmanager.DefaultTaskQConfig(prefix+"_queue"), taskmanager.FactoryMemory))
333330
} else {
334-
opts = append(opts, WithCustomTaskManager(&taskManagerMockBase{}))
331+
opts = append(opts, withTaskManagerMockup())
335332
}
336333

337334
tc, err := ts.createTestClient(
@@ -358,7 +355,7 @@ func (ts *EmbeddedDBTestSuite) genericMockedDBClient(t *testing.T, database data
358355
),
359356
database, prefix,
360357
true, true, WithDebugging(),
361-
WithCustomTaskManager(&taskManagerMockBase{}),
358+
withTaskManagerMockup(),
362359
)
363360
require.NoError(t, err)
364361
require.NotNil(t, tc)

‎client.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ type (
113113

114114
// taskManagerOptions holds the configuration for taskmanager
115115
taskManagerOptions struct {
116-
taskmanager.ClientInterface // Client for TaskManager
117-
cronJobs taskmanager.CronJobs // List of cron jobs
118-
options []taskmanager.ClientOps // List of options
119-
cronCustomPeriods map[string]time.Duration // will override the default period of cronJob
116+
taskmanager.TaskManagerInterface // Client for TaskManager
117+
cronJobs taskmanager.CronJobs // List of cron jobs
118+
options []taskmanager.ClientOps // List of options
119+
cronCustomPeriods map[string]time.Duration // will override the default period of cronJob
120120
}
121121
)
122122

@@ -303,7 +303,7 @@ func (c *Client) Close(ctx context.Context) error {
303303
if err := tm.Close(ctx); err != nil {
304304
return err
305305
}
306-
c.options.taskManager.ClientInterface = nil
306+
c.options.taskManager.TaskManagerInterface = nil
307307
}
308308
return nil
309309
}
@@ -445,9 +445,9 @@ func (c *Client) SetNotificationsClient(client notifications.ClientInterface) {
445445
}
446446

447447
// Taskmanager will return the Taskmanager if it exists
448-
func (c *Client) Taskmanager() taskmanager.ClientInterface {
449-
if c.options.taskManager != nil && c.options.taskManager.ClientInterface != nil {
450-
return c.options.taskManager.ClientInterface
448+
func (c *Client) Taskmanager() taskmanager.TaskManagerInterface {
449+
if c.options.taskManager != nil && c.options.taskManager.TaskManagerInterface != nil {
450+
return c.options.taskManager.TaskManagerInterface
451451
}
452452
return nil
453453
}

‎client_internal.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ func (c *Client) loadPaymailClient() (err error) {
114114
// loadTaskmanager will load the TaskManager and start the TaskManager client
115115
func (c *Client) loadTaskmanager(ctx context.Context) (err error) {
116116
// Load if a custom interface was NOT provided
117-
if c.options.taskManager.ClientInterface == nil {
118-
c.options.taskManager.ClientInterface, err = taskmanager.NewClient(
117+
if c.options.taskManager.TaskManagerInterface == nil {
118+
c.options.taskManager.TaskManagerInterface, err = taskmanager.NewClient(
119119
ctx, c.options.taskManager.options...,
120120
)
121121
}

‎client_options.go

+2-11
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ func defaultClientOptions() *clientOptions {
105105

106106
// Blank TaskManager config
107107
taskManager: &taskManagerOptions{
108-
ClientInterface: nil,
109-
cronCustomPeriods: map[string]time.Duration{},
108+
TaskManagerInterface: nil,
109+
cronCustomPeriods: map[string]time.Duration{},
110110
},
111111

112112
// Default user agent
@@ -532,15 +532,6 @@ func WithPaymailServerConfig(config *server.Configuration, defaultFromPaymail, d
532532
// TASK MANAGER
533533
// -----------------------------------------------------------------
534534

535-
// WithCustomTaskManager will set the taskmanager
536-
func WithCustomTaskManager(taskManager taskmanager.ClientInterface) ClientOps {
537-
return func(c *clientOptions) {
538-
if taskManager != nil {
539-
c.taskManager.ClientInterface = taskManager
540-
}
541-
}
542-
}
543-
544535
// WithTaskQ will set the task manager to use TaskQ & in-memory
545536
func WithTaskQ(config *taskq.QueueOptions, factory taskmanager.Factory) ClientOps {
546537
return func(c *clientOptions) {

‎interface.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ type ClientService interface {
6666
Logger() *zerolog.Logger
6767
Notifications() notifications.ClientInterface
6868
PaymailClient() paymail.ClientInterface
69-
Taskmanager() taskmanager.ClientInterface
69+
Taskmanager() taskmanager.TaskManagerInterface
7070
}
7171

7272
// DestinationService is the destination actions

‎model_access_keys_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func Test_newAccessKey(t *testing.T) {
3030
})
3131

3232
t.Run("save", func(t *testing.T) {
33-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
33+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
3434
defer deferMe()
3535

3636
key := newAccessKey(testXPubID, append(
@@ -56,7 +56,7 @@ func Test_newAccessKey(t *testing.T) {
5656
})
5757

5858
t.Run("revoke", func(t *testing.T) {
59-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
59+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
6060
defer deferMe()
6161

6262
key := newAccessKey(testXPubID, append(client.DefaultModelOptions(), New())...)
@@ -88,7 +88,7 @@ func Test_newAccessKey(t *testing.T) {
8888
// TestAccessKey_GetAccessKey will test the method getAccessKey()
8989
func TestAccessKey_GetAccessKey(t *testing.T) {
9090
t.Run("not found", func(t *testing.T) {
91-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
91+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
9292
defer deferMe()
9393
accessKey, err := getAccessKey(ctx, testXPubID, client.DefaultModelOptions()...)
9494
require.NoError(t, err)
@@ -116,7 +116,7 @@ func TestAccessKey_GetAccessKey(t *testing.T) {
116116
// TestAccessKey_GetAccessKeys will test the method getAccessKeysByXPubID()
117117
func TestAccessKey_GetAccessKeys(t *testing.T) {
118118
t.Run("not found", func(t *testing.T) {
119-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
119+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
120120
defer deferMe()
121121
accessKey, err := getAccessKeysByXPubID(ctx, testXPubID, nil, nil, nil, client.DefaultModelOptions()...)
122122
require.NoError(t, err)

‎model_destinations_test.go

+17-21
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ import (
1515

1616
// todo: finish unit tests!
1717

18-
var testLockingScript = "76a9147ff514e6ae3deb46e6644caac5cdd0bf2388906588ac"
19-
var testAddressID = "fc1e635d98151c6008f29908ee2928c60c745266f9853e945c917b1baa05973e"
20-
var testDestinationID = "c775e7b757ede630cd0aa1113bd102661ab38829ca52a6422ab782862f268646"
21-
var stasHex = "76a9146d3562a8ec96bcb3b2253fd34f38a556fb66733d88ac6976aa607f5f7f7c5e7f7c5d7f7c5c7f7c5b7f7c5a7f7c597f7c587f7c577f7c567f7c557f7c547f7c537f7c527f7c517f7c7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7c5f7f7c5e7f7c5d7f7c5c7f7c5b7f7c5a7f7c597f7c587f7c577f7c567f7c557f7c547f7c537f7c527f7c517f7c7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e01007e818b21414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff007d976e7c5296a06394677768827601249301307c7e23022079be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798027e7c7e7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e01417e21038ff83d8cf12121491609c4939dc11c4aa35503508fe432dc5a5c1905608b9218ad547f7701207f01207f7701247f517f7801007e8102fd00a063546752687f7801007e817f727e7b01177f777b557a766471567a577a786354807e7e676d68aa880067765158a569765187645294567a5379587a7e7e78637c8c7c53797e577a7e6878637c8c7c53797e577a7e6878637c8c7c53797e577a7e6878637c8c7c53797e577a7e6878637c8c7c53797e577a7e6867567a6876aa587a7d54807e577a597a5a7a786354807e6f7e7eaa727c7e676d6e7eaa7c687b7eaa587a7d877663516752687c72879b69537a647500687c7b547f77517f7853a0916901247f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e816854937f77788c6301247f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e816854937f777852946301247f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e816854937f77686877517f7c52797d8b9f7c53a09b91697c76638c7c587f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e81687f777c6876638c7c587f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e81687f777c6863587f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e81687f7768587f517f7801007e817602fc00a06302fd00a063546752687f7801007e81727e7b7b687f75537f7c0376a9148801147f775379645579887567726881766968789263556753687a76026c057f7701147f8263517f7c766301007e817f7c6775006877686b537992635379528763547a6b547a6b677c6b567a6b537a7c717c71716868547a587f7c81547a557964936755795187637c686b687c547f7701207f75748c7a7669765880748c7a76567a876457790376a9147e7c7e557967041976a9147c7e0288ac687e7e5579636c766976748c7a9d58807e6c0376a9147e748c7a7e6c7e7e676c766b8263828c007c80517e846864745aa0637c748c7a76697d937b7b58807e56790376a9147e748c7a7e55797e7e6868686c567a5187637500678263828c007c80517e846868647459a0637c748c7a76697d937b7b58807e55790376a9147e748c7a7e55797e7e687459a0637c748c7a76697d937b7b58807e55790376a9147e748c7a7e55797e7e68687c537a9d547963557958807e041976a91455797e0288ac7e7e68aa87726d77776a14f566909f378788e61108d619e40df2757455d14c010005546f6b656e"
18+
var (
19+
testLockingScript = "76a9147ff514e6ae3deb46e6644caac5cdd0bf2388906588ac"
20+
testAddressID = "fc1e635d98151c6008f29908ee2928c60c745266f9853e945c917b1baa05973e"
21+
testDestinationID = "c775e7b757ede630cd0aa1113bd102661ab38829ca52a6422ab782862f268646"
22+
stasHex = "76a9146d3562a8ec96bcb3b2253fd34f38a556fb66733d88ac6976aa607f5f7f7c5e7f7c5d7f7c5c7f7c5b7f7c5a7f7c597f7c587f7c577f7c567f7c557f7c547f7c537f7c527f7c517f7c7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7c5f7f7c5e7f7c5d7f7c5c7f7c5b7f7c5a7f7c597f7c587f7c577f7c567f7c557f7c547f7c537f7c527f7c517f7c7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e01007e818b21414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff007d976e7c5296a06394677768827601249301307c7e23022079be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798027e7c7e7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c8276638c687f7c7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e01417e21038ff83d8cf12121491609c4939dc11c4aa35503508fe432dc5a5c1905608b9218ad547f7701207f01207f7701247f517f7801007e8102fd00a063546752687f7801007e817f727e7b01177f777b557a766471567a577a786354807e7e676d68aa880067765158a569765187645294567a5379587a7e7e78637c8c7c53797e577a7e6878637c8c7c53797e577a7e6878637c8c7c53797e577a7e6878637c8c7c53797e577a7e6878637c8c7c53797e577a7e6867567a6876aa587a7d54807e577a597a5a7a786354807e6f7e7eaa727c7e676d6e7eaa7c687b7eaa587a7d877663516752687c72879b69537a647500687c7b547f77517f7853a0916901247f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e816854937f77788c6301247f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e816854937f777852946301247f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e816854937f77686877517f7c52797d8b9f7c53a09b91697c76638c7c587f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e81687f777c6876638c7c587f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e81687f777c6863587f77517f7c01007e817602fc00a06302fd00a063546752687f7c01007e81687f7768587f517f7801007e817602fc00a06302fd00a063546752687f7801007e81727e7b7b687f75537f7c0376a9148801147f775379645579887567726881766968789263556753687a76026c057f7701147f8263517f7c766301007e817f7c6775006877686b537992635379528763547a6b547a6b677c6b567a6b537a7c717c71716868547a587f7c81547a557964936755795187637c686b687c547f7701207f75748c7a7669765880748c7a76567a876457790376a9147e7c7e557967041976a9147c7e0288ac687e7e5579636c766976748c7a9d58807e6c0376a9147e748c7a7e6c7e7e676c766b8263828c007c80517e846864745aa0637c748c7a76697d937b7b58807e56790376a9147e748c7a7e55797e7e6868686c567a5187637500678263828c007c80517e846868647459a0637c748c7a76697d937b7b58807e55790376a9147e748c7a7e55797e7e687459a0637c748c7a76697d937b7b58807e55790376a9147e748c7a7e55797e7e68687c537a9d547963557958807e041976a91455797e0288ac7e7e68aa87726d77776a14f566909f378788e61108d619e40df2757455d14c010005546f6b656e"
23+
)
2224

2325
// TestDestination_newDestination will test the method newDestination()
2426
func TestDestination_newDestination(t *testing.T) {
@@ -86,7 +88,6 @@ func TestDestination_newAddress(t *testing.T) {
8688
assert.Equal(t, bscript2.ScriptTypePubKeyHash, address.Type)
8789
assert.Equal(t, testAddressID, address.GetID())
8890
})
89-
9091
}
9192

9293
// TestDestination_GetModelName will test the method GetModelName()
@@ -126,7 +127,6 @@ func TestDestination_GetID(t *testing.T) {
126127

127128
// TestDestination_setAddress will test the method setAddress()
128129
func TestDestination_setAddress(t *testing.T) {
129-
130130
t.Run("internal 1", func(t *testing.T) {
131131
destination := newDestination(testXPubID, testLockingScript)
132132
destination.Chain = utils.ChainInternal
@@ -166,9 +166,8 @@ func TestDestination_setAddress(t *testing.T) {
166166

167167
// TestDestination_getDestinationByID will test the method getDestinationByID()
168168
func TestDestination_getDestinationByID(t *testing.T) {
169-
170169
t.Run("does not exist", func(t *testing.T) {
171-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
170+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
172171
defer deferMe()
173172

174173
xPub, err := getDestinationByID(ctx, testDestinationID, client.DefaultModelOptions()...)
@@ -177,7 +176,7 @@ func TestDestination_getDestinationByID(t *testing.T) {
177176
})
178177

179178
t.Run("get", func(t *testing.T) {
180-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
179+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
181180
defer deferMe()
182181

183182
destination := newDestination(testXPubID, testLockingScript, client.DefaultModelOptions()...)
@@ -198,9 +197,8 @@ func TestDestination_getDestinationByID(t *testing.T) {
198197

199198
// TestDestination_getDestinationByAddress will test the method getDestinationByAddress()
200199
func TestDestination_getDestinationByAddress(t *testing.T) {
201-
202200
t.Run("does not exist", func(t *testing.T) {
203-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
201+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
204202
defer deferMe()
205203

206204
xPub, err := getDestinationByAddress(ctx, testExternalAddress, client.DefaultModelOptions()...)
@@ -209,7 +207,7 @@ func TestDestination_getDestinationByAddress(t *testing.T) {
209207
})
210208

211209
t.Run("get", func(t *testing.T) {
212-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
210+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
213211
defer deferMe()
214212

215213
destination := newDestination(testXPubID, testLockingScript, client.DefaultModelOptions()...)
@@ -230,9 +228,8 @@ func TestDestination_getDestinationByAddress(t *testing.T) {
230228

231229
// TestDestination_getDestinationByLockingScript will test the method getDestinationByLockingScript()
232230
func TestDestination_getDestinationByLockingScript(t *testing.T) {
233-
234231
t.Run("does not exist", func(t *testing.T) {
235-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
232+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
236233
defer deferMe()
237234

238235
xPub, err := getDestinationByLockingScript(ctx, testLockingScript, client.DefaultModelOptions()...)
@@ -241,7 +238,7 @@ func TestDestination_getDestinationByLockingScript(t *testing.T) {
241238
})
242239

243240
t.Run("get destination", func(t *testing.T) {
244-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, WithCustomTaskManager(&taskManagerMockBase{}))
241+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, false, withTaskManagerMockup())
245242
defer deferMe()
246243

247244
destination := newDestination(testXPubID, testLockingScript, client.DefaultModelOptions()...)
@@ -269,9 +266,8 @@ func BenchmarkDestination_newAddress(b *testing.B) {
269266

270267
// TestClient_NewDestination will test the method NewDestination()
271268
func TestClient_NewDestination(t *testing.T) {
272-
273269
t.Run("valid - simple destination", func(t *testing.T) {
274-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, WithCustomTaskManager(&taskManagerMockBase{}))
270+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, withTaskManagerMockup())
275271
defer deferMe()
276272

277273
// Get new random key
@@ -304,7 +300,7 @@ func TestClient_NewDestination(t *testing.T) {
304300
})
305301

306302
t.Run("error - invalid xPub", func(t *testing.T) {
307-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, WithCustomTaskManager(&taskManagerMockBase{}))
303+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, withTaskManagerMockup())
308304
defer deferMe()
309305

310306
opts := append(
@@ -324,7 +320,7 @@ func TestClient_NewDestination(t *testing.T) {
324320
})
325321

326322
t.Run("error - xPub not found", func(t *testing.T) {
327-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, WithCustomTaskManager(&taskManagerMockBase{}))
323+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, withTaskManagerMockup())
328324
defer deferMe()
329325

330326
opts := append(
@@ -345,7 +341,7 @@ func TestClient_NewDestination(t *testing.T) {
345341
})
346342

347343
t.Run("error - unsupported destination type", func(t *testing.T) {
348-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, WithCustomTaskManager(&taskManagerMockBase{}))
344+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, withTaskManagerMockup())
349345
defer deferMe()
350346

351347
// Get new random key
@@ -369,7 +365,7 @@ func TestClient_NewDestination(t *testing.T) {
369365
})
370366

371367
t.Run("stas token", func(t *testing.T) {
372-
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, WithCustomTaskManager(&taskManagerMockBase{}))
368+
ctx, client, deferMe := CreateTestSQLiteClient(t, false, true, withTaskManagerMockup())
373369
defer deferMe()
374370

375371
// Get new random key

0 commit comments

Comments
 (0)