Skip to content

Commit 2f9ab17

Browse files
peterbroadhurstpeterbroadhurst
authored
Merge pull request #98 from kaleido-io/expose-internal-interface-for-testing
avoid using internal interface in public pkg
2 parents 7b03729 + 3b0f7f6 commit 2f9ab17

34 files changed

+306
-307
lines changed

‎internal/metrics/metrics.go

+2-19
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/hyperledger/firefly-common/pkg/config"
2525
"github.com/hyperledger/firefly-common/pkg/metric"
2626
"github.com/hyperledger/firefly-transaction-manager/internal/tmconfig"
27+
"github.com/hyperledger/firefly-transaction-manager/pkg/txhandler"
2728
"github.com/prometheus/client_golang/prometheus"
2829
"github.com/prometheus/client_golang/prometheus/promhttp"
2930
)
@@ -91,25 +92,7 @@ type Metrics interface {
9192

9293
// Transaction handler metrics are defined and emitted by transaction handlers
9394
type TransactionHandlerMetrics interface {
94-
// functions for declaring new metrics
95-
InitTxHandlerCounterMetric(ctx context.Context, metricName string, helpText string, withDefaultLabels bool)
96-
InitTxHandlerCounterMetricWithLabels(ctx context.Context, metricName string, helpText string, labelNames []string, withDefaultLabels bool)
97-
InitTxHandlerGaugeMetric(ctx context.Context, metricName string, helpText string, withDefaultLabels bool)
98-
InitTxHandlerGaugeMetricWithLabels(ctx context.Context, metricName string, helpText string, labelNames []string, withDefaultLabels bool)
99-
InitTxHandlerHistogramMetric(ctx context.Context, metricName string, helpText string, buckets []float64, withDefaultLabels bool)
100-
InitTxHandlerHistogramMetricWithLabels(ctx context.Context, metricName string, helpText string, buckets []float64, labelNames []string, withDefaultLabels bool)
101-
InitTxHandlerSummaryMetric(ctx context.Context, metricName string, helpText string, withDefaultLabels bool)
102-
InitTxHandlerSummaryMetricWithLabels(ctx context.Context, metricName string, helpText string, labelNames []string, withDefaultLabels bool)
103-
104-
// functions for use existing metrics
105-
SetTxHandlerGaugeMetric(ctx context.Context, metricName string, number float64, defaultLabels *metric.FireflyDefaultLabels)
106-
SetTxHandlerGaugeMetricWithLabels(ctx context.Context, metricName string, number float64, labels map[string]string, defaultLabels *metric.FireflyDefaultLabels)
107-
IncTxHandlerCounterMetric(ctx context.Context, metricName string, defaultLabels *metric.FireflyDefaultLabels)
108-
IncTxHandlerCounterMetricWithLabels(ctx context.Context, metricName string, labels map[string]string, defaultLabels *metric.FireflyDefaultLabels)
109-
ObserveTxHandlerHistogramMetric(ctx context.Context, metricName string, number float64, defaultLabels *metric.FireflyDefaultLabels)
110-
ObserveTxHandlerHistogramMetricWithLabels(ctx context.Context, metricName string, number float64, labels map[string]string, defaultLabels *metric.FireflyDefaultLabels)
111-
ObserveTxHandlerSummaryMetric(ctx context.Context, metricName string, number float64, defaultLabels *metric.FireflyDefaultLabels)
112-
ObserveTxHandlerSummaryMetricWithLabels(ctx context.Context, metricName string, number float64, labels map[string]string, defaultLabels *metric.FireflyDefaultLabels)
95+
txhandler.TransactionMetrics
11396
}
11497

11598
func (mm *metricsManager) InitTxHandlerCounterMetric(ctx context.Context, metricName string, helpText string, withDefaultLabels bool) {

‎internal/persistence/dbmigration/migration.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/hyperledger/firefly-common/pkg/log"
2424
"github.com/hyperledger/firefly-transaction-manager/internal/persistence"
2525
"github.com/hyperledger/firefly-transaction-manager/pkg/apitypes"
26+
"github.com/hyperledger/firefly-transaction-manager/pkg/txhandler"
2627
)
2728

2829
const (
@@ -54,7 +55,7 @@ func (m *dbMigration) migrateEventStreams(ctx context.Context) error {
5455
var after *fftypes.UUID
5556
count := 0
5657
for {
57-
page, err := m.source.ListStreamsByCreateTime(ctx, after, paginationLimit, persistence.SortDirectionAscending)
58+
page, err := m.source.ListStreamsByCreateTime(ctx, after, paginationLimit, txhandler.SortDirectionAscending)
5859
if err != nil {
5960
return err
6061
}
@@ -123,7 +124,7 @@ func (m *dbMigration) migrateListeners(ctx context.Context) error {
123124
var after *fftypes.UUID
124125
count := 0
125126
for {
126-
page, err := m.source.ListListenersByCreateTime(ctx, after, paginationLimit, persistence.SortDirectionAscending)
127+
page, err := m.source.ListListenersByCreateTime(ctx, after, paginationLimit, txhandler.SortDirectionAscending)
127128
if err != nil {
128129
return err
129130
}
@@ -171,7 +172,7 @@ func (m *dbMigration) migrateTransactions(ctx context.Context) error {
171172
var after *apitypes.ManagedTX
172173
count := 0
173174
for {
174-
page, err := m.source.ListTransactionsByCreateTime(ctx, after, paginationLimit, persistence.SortDirectionAscending)
175+
page, err := m.source.ListTransactionsByCreateTime(ctx, after, paginationLimit, txhandler.SortDirectionAscending)
175176
if err != nil {
176177
return err
177178
}

‎internal/persistence/dbmigration/migration_test.go

+25-25
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"testing"
2323

2424
"github.com/hyperledger/firefly-common/pkg/fftypes"
25-
"github.com/hyperledger/firefly-transaction-manager/internal/persistence"
2625
"github.com/hyperledger/firefly-transaction-manager/mocks/persistencemocks"
2726
"github.com/hyperledger/firefly-transaction-manager/pkg/apitypes"
2827
"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
28+
"github.com/hyperledger/firefly-transaction-manager/pkg/txhandler"
2929
"github.com/stretchr/testify/assert"
3030
"github.com/stretchr/testify/mock"
3131
)
@@ -36,8 +36,8 @@ func TestDBMigrationOK(t *testing.T) {
3636
mdb2 := persistencemocks.NewPersistence(t)
3737

3838
es := &apitypes.EventStream{ID: fftypes.NewUUID()}
39-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
40-
mdb1.On("ListStreamsByCreateTime", mock.Anything, es.ID, paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{}, nil)
39+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
40+
mdb1.On("ListStreamsByCreateTime", mock.Anything, es.ID, paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{}, nil)
4141
mdb2.On("GetStream", mock.Anything, es.ID).Return(nil, nil)
4242
mdb2.On("WriteStream", mock.Anything, es).Return(nil)
4343

@@ -47,8 +47,8 @@ func TestDBMigrationOK(t *testing.T) {
4747
mdb2.On("WriteCheckpoint", mock.Anything, cp).Return(nil)
4848

4949
l := &apitypes.Listener{ID: fftypes.NewUUID()}
50-
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.Listener{l}, nil)
51-
mdb1.On("ListListenersByCreateTime", mock.Anything, l.ID, paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.Listener{}, nil)
50+
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.Listener{l}, nil)
51+
mdb1.On("ListListenersByCreateTime", mock.Anything, l.ID, paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.Listener{}, nil)
5252
mdb2.On("GetListener", mock.Anything, l.ID).Return(nil, nil)
5353
mdb2.On("WriteListener", mock.Anything, l).Return(nil)
5454

@@ -57,8 +57,8 @@ func TestDBMigrationOK(t *testing.T) {
5757
Receipt: &ffcapi.TransactionReceiptResponse{BlockHash: fftypes.NewRandB32().String()},
5858
Confirmations: []*apitypes.Confirmation{{BlockHash: fftypes.NewRandB32().String()}},
5959
}
60-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
61-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, tx.ManagedTX, paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{}, nil)
60+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
61+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, tx.ManagedTX, paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{}, nil)
6262
mdb1.On("GetTransactionByIDWithStatus", mock.Anything, tx.ID, false).Return(tx, nil)
6363
mdb2.On("GetTransactionByID", mock.Anything, tx.ID).Return(nil, nil)
6464
mdb2.On("InsertTransactionPreAssignedNonce", mock.Anything, tx.ManagedTX).Return(nil)
@@ -80,11 +80,11 @@ func TestDBMigrationRunFailTransactions(t *testing.T) {
8080
mdb1 := persistencemocks.NewPersistence(t)
8181
mdb2 := persistencemocks.NewPersistence(t)
8282

83-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{}, nil)
83+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{}, nil)
8484

85-
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.Listener{}, nil)
85+
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.Listener{}, nil)
8686

87-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{}, fmt.Errorf("pop"))
87+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{}, fmt.Errorf("pop"))
8888

8989
m := dbMigration{
9090
source: mdb1,
@@ -101,9 +101,9 @@ func TestDBMigrationRunFailListeners(t *testing.T) {
101101
mdb1 := persistencemocks.NewPersistence(t)
102102
mdb2 := persistencemocks.NewPersistence(t)
103103

104-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{}, nil)
104+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{}, nil)
105105

106-
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.Listener{}, fmt.Errorf("pop"))
106+
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.Listener{}, fmt.Errorf("pop"))
107107

108108
m := dbMigration{
109109
source: mdb1,
@@ -120,7 +120,7 @@ func TestDBMigrationRunFailStreams(t *testing.T) {
120120
mdb1 := persistencemocks.NewPersistence(t)
121121
mdb2 := persistencemocks.NewPersistence(t)
122122

123-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{}, fmt.Errorf("pop"))
123+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{}, fmt.Errorf("pop"))
124124

125125
m := dbMigration{
126126
source: mdb1,
@@ -138,7 +138,7 @@ func TestMigrateEventsStreamsFailWrite(t *testing.T) {
138138
mdb2 := persistencemocks.NewPersistence(t)
139139

140140
es := &apitypes.EventStream{ID: fftypes.NewUUID()}
141-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
141+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
142142
mdb2.On("GetStream", mock.Anything, es.ID).Return(nil, nil)
143143
mdb2.On("WriteStream", mock.Anything, es).Return(fmt.Errorf("pop"))
144144

@@ -158,7 +158,7 @@ func TestMigrateEventsStreamsFailCheckExist(t *testing.T) {
158158
mdb2 := persistencemocks.NewPersistence(t)
159159

160160
es := &apitypes.EventStream{ID: fftypes.NewUUID()}
161-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
161+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
162162
mdb2.On("GetStream", mock.Anything, es.ID).Return(nil, fmt.Errorf("pop"))
163163

164164
m := dbMigration{
@@ -177,7 +177,7 @@ func TestMigrateEventsStreamsFailWriteCheckpoint(t *testing.T) {
177177
mdb2 := persistencemocks.NewPersistence(t)
178178

179179
es := &apitypes.EventStream{ID: fftypes.NewUUID()}
180-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
180+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
181181
mdb2.On("GetStream", mock.Anything, es.ID).Return(nil, nil)
182182
mdb2.On("WriteStream", mock.Anything, es).Return(nil)
183183

@@ -202,7 +202,7 @@ func TestMigrateEventsStreamsFailCheckCheckpointExists(t *testing.T) {
202202
mdb2 := persistencemocks.NewPersistence(t)
203203

204204
es := &apitypes.EventStream{ID: fftypes.NewUUID()}
205-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
205+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
206206
mdb2.On("GetStream", mock.Anything, es.ID).Return(nil, nil)
207207
mdb2.On("WriteStream", mock.Anything, es).Return(nil)
208208

@@ -226,7 +226,7 @@ func TestMigrateEventsStreamsFailGetCheckpoint(t *testing.T) {
226226
mdb2 := persistencemocks.NewPersistence(t)
227227

228228
es := &apitypes.EventStream{ID: fftypes.NewUUID()}
229-
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
229+
mdb1.On("ListStreamsByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.EventStream{es}, nil)
230230
mdb2.On("GetStream", mock.Anything, es.ID).Return(nil, nil)
231231
mdb2.On("WriteStream", mock.Anything, es).Return(nil)
232232

@@ -248,7 +248,7 @@ func TestMigrateListenersFailWrite(t *testing.T) {
248248
mdb2 := persistencemocks.NewPersistence(t)
249249

250250
l := &apitypes.Listener{ID: fftypes.NewUUID()}
251-
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.Listener{l}, nil)
251+
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.Listener{l}, nil)
252252
mdb2.On("GetListener", mock.Anything, l.ID).Return(nil, nil)
253253
mdb2.On("WriteListener", mock.Anything, l).Return(fmt.Errorf("pop"))
254254

@@ -268,7 +268,7 @@ func TestMigrateListenersFailCheckExists(t *testing.T) {
268268
mdb2 := persistencemocks.NewPersistence(t)
269269

270270
l := &apitypes.Listener{ID: fftypes.NewUUID()}
271-
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.Listener{l}, nil)
271+
mdb1.On("ListListenersByCreateTime", mock.Anything, (*fftypes.UUID)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.Listener{l}, nil)
272272
mdb2.On("GetListener", mock.Anything, l.ID).Return(nil, fmt.Errorf("pop"))
273273

274274
m := dbMigration{
@@ -291,7 +291,7 @@ func TestMigrateTransactionsFailWriteConfirmations(t *testing.T) {
291291
Receipt: &ffcapi.TransactionReceiptResponse{BlockHash: fftypes.NewRandB32().String()},
292292
Confirmations: []*apitypes.Confirmation{{BlockHash: fftypes.NewRandB32().String()}},
293293
}
294-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
294+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
295295
mdb1.On("GetTransactionByIDWithStatus", mock.Anything, tx.ID, false).Return(tx, nil)
296296
mdb2.On("GetTransactionByID", mock.Anything, tx.ID).Return(nil, nil)
297297
mdb2.On("InsertTransactionPreAssignedNonce", mock.Anything, tx.ManagedTX).Return(nil)
@@ -318,7 +318,7 @@ func TestMigrateTransactionsFailWriteReceipt(t *testing.T) {
318318
Receipt: &ffcapi.TransactionReceiptResponse{BlockHash: fftypes.NewRandB32().String()},
319319
Confirmations: []*apitypes.Confirmation{{BlockHash: fftypes.NewRandB32().String()}},
320320
}
321-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
321+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
322322
mdb1.On("GetTransactionByIDWithStatus", mock.Anything, tx.ID, false).Return(tx, nil)
323323
mdb2.On("GetTransactionByID", mock.Anything, tx.ID).Return(nil, nil)
324324
mdb2.On("InsertTransactionPreAssignedNonce", mock.Anything, tx.ManagedTX).Return(nil)
@@ -344,7 +344,7 @@ func TestMigrateTransactionsFailWriteTx(t *testing.T) {
344344
Receipt: &ffcapi.TransactionReceiptResponse{BlockHash: fftypes.NewRandB32().String()},
345345
Confirmations: []*apitypes.Confirmation{{BlockHash: fftypes.NewRandB32().String()}},
346346
}
347-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
347+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
348348
mdb1.On("GetTransactionByIDWithStatus", mock.Anything, tx.ID, false).Return(tx, nil)
349349
mdb2.On("GetTransactionByID", mock.Anything, tx.ID).Return(nil, nil)
350350
mdb2.On("InsertTransactionPreAssignedNonce", mock.Anything, tx.ManagedTX).Return(fmt.Errorf("pop"))
@@ -369,7 +369,7 @@ func TestMigrateTransactionsFailCheckExists(t *testing.T) {
369369
Receipt: &ffcapi.TransactionReceiptResponse{BlockHash: fftypes.NewRandB32().String()},
370370
Confirmations: []*apitypes.Confirmation{{BlockHash: fftypes.NewRandB32().String()}},
371371
}
372-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
372+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
373373
mdb1.On("GetTransactionByIDWithStatus", mock.Anything, tx.ID, false).Return(tx, nil)
374374
mdb2.On("GetTransactionByID", mock.Anything, tx.ID).Return(nil, fmt.Errorf("pop"))
375375

@@ -393,7 +393,7 @@ func TestMigrateTransactionsFailGetDetail(t *testing.T) {
393393
Receipt: &ffcapi.TransactionReceiptResponse{BlockHash: fftypes.NewRandB32().String()},
394394
Confirmations: []*apitypes.Confirmation{{BlockHash: fftypes.NewRandB32().String()}},
395395
}
396-
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, persistence.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
396+
mdb1.On("ListTransactionsByCreateTime", mock.Anything, (*apitypes.ManagedTX)(nil), paginationLimit, txhandler.SortDirectionAscending).Return([]*apitypes.ManagedTX{tx.ManagedTX}, nil)
397397
mdb1.On("GetTransactionByIDWithStatus", mock.Anything, tx.ID, false).Return(tx, fmt.Errorf("pop"))
398398

399399
m := dbMigration{

0 commit comments

Comments
 (0)