diff --git a/instantout/reservation/store.go b/instantout/reservation/store.go index 8a4cc651..b73cc61e 100644 --- a/instantout/reservation/store.go +++ b/instantout/reservation/store.go @@ -81,7 +81,7 @@ func (r *SQLStore) CreateReservation(ctx context.Context, UpdateState: string(reservation.State), } - return r.baseDb.ExecTx(ctx, &loopdb.SqliteTxOptions{}, + return r.baseDb.ExecTx(ctx, loopdb.NewSqlWriteOpts(), func(q *sqlc.Queries) error { err := q.CreateReservation(ctx, args) if err != nil { @@ -121,7 +121,7 @@ func (r *SQLStore) UpdateReservation(ctx context.Context, ), } - return r.baseDb.ExecTx(ctx, &loopdb.SqliteTxOptions{}, + return r.baseDb.ExecTx(ctx, loopdb.NewSqlWriteOpts(), func(q *sqlc.Queries) error { err := q.UpdateReservation(ctx, updateArgs) if err != nil { diff --git a/instantout/store.go b/instantout/store.go index 6d622b02..a0f773ad 100644 --- a/instantout/store.go +++ b/instantout/store.go @@ -132,7 +132,7 @@ func (s *SQLStore) CreateInstantLoopOut(ctx context.Context, UpdateState: string(instantOut.State), } - return s.baseDb.ExecTx(ctx, &loopdb.SqliteTxOptions{}, + return s.baseDb.ExecTx(ctx, loopdb.NewSqlWriteOpts(), func(q *sqlc.Queries) error { err := q.InsertSwap(ctx, swapArgs) if err != nil { @@ -204,7 +204,7 @@ func (s *SQLStore) UpdateInstantLoopOut(ctx context.Context, UpdateState: string(instantOut.State), } - return s.baseDb.ExecTx(ctx, &loopdb.SqliteTxOptions{}, + return s.baseDb.ExecTx(ctx, loopdb.NewSqlWriteOpts(), func(q *sqlc.Queries) error { err := q.UpdateInstantOut(ctx, updateParams) if err != nil { diff --git a/loopdb/sql_store.go b/loopdb/sql_store.go index 6d9a49bc..c57141a7 100644 --- a/loopdb/sql_store.go +++ b/loopdb/sql_store.go @@ -96,7 +96,7 @@ func (s *BaseDB) FetchLoopOutSwap(ctx context.Context, func (s *BaseDB) CreateLoopOut(ctx context.Context, hash lntypes.Hash, swap *LoopOutContract) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return s.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { insertArgs := loopToInsertArgs( hash, &swap.SwapContract, @@ -134,7 +134,7 @@ func (s *BaseDB) CreateLoopOut(ctx context.Context, hash lntypes.Hash, func (s *BaseDB) BatchCreateLoopOut(ctx context.Context, swaps map[lntypes.Hash]*LoopOutContract) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return s.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { for swapHash, swap := range swaps { swap := swap @@ -223,7 +223,7 @@ func (s *BaseDB) FetchLoopInSwaps(ctx context.Context) ( func (s *BaseDB) CreateLoopIn(ctx context.Context, hash lntypes.Hash, swap *LoopInContract) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return s.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { insertArgs := loopToInsertArgs( hash, &swap.SwapContract, @@ -260,7 +260,7 @@ func (s *BaseDB) CreateLoopIn(ctx context.Context, hash lntypes.Hash, func (s *BaseDB) BatchCreateLoopIn(ctx context.Context, swaps map[lntypes.Hash]*LoopInContract) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return s.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { for swapHash, swap := range swaps { swap := swap @@ -351,7 +351,7 @@ var _ SwapStore = (*BaseDB)(nil) func (s *BaseDB) updateLoop(ctx context.Context, hash lntypes.Hash, time time.Time, state SwapStateData) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return s.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { updateParams := sqlc.InsertSwapUpdateParams{ SwapHash: hash[:], @@ -379,7 +379,7 @@ func (s *BaseDB) updateLoop(ctx context.Context, hash lntypes.Hash, func (s *BaseDB) BatchInsertUpdate(ctx context.Context, updateData map[lntypes.Hash][]BatchInsertUpdateData) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return s.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { for swapHash, updates := range updateData { for _, update := range updates { @@ -412,7 +412,7 @@ func (s *BaseDB) BatchInsertUpdate(ctx context.Context, func (b *BaseDB) BatchUpdateLoopOutSwapCosts(ctx context.Context, costs map[lntypes.Hash]SwapCost) error { - writeOpts := &SqliteTxOptions{} + writeOpts := NewSqlWriteOpts() return b.ExecTx(ctx, writeOpts, func(tx *sqlc.Queries) error { for swapHash, cost := range costs { lastUpdateID, err := tx.GetLastUpdateID( diff --git a/loopdb/sqlite.go b/loopdb/sqlite.go index 8493ed6b..37c2eba1 100644 --- a/loopdb/sqlite.go +++ b/loopdb/sqlite.go @@ -323,7 +323,7 @@ type SqliteTxOptions struct { readOnly bool } -// NewSqlReadOpts returns a new KeyStoreTxOptions instance triggers a read +// NewSqlReadOpts returns a new KeyStoreTxOptions instance that triggers a read // transaction. func NewSqlReadOpts() *SqliteTxOptions { return &SqliteTxOptions{ @@ -331,6 +331,14 @@ func NewSqlReadOpts() *SqliteTxOptions { } } +// NewSqlWriteOpts returns a new KeyStoreTxOptions instance that triggers a +// write (regular) transaction. +func NewSqlWriteOpts() *SqliteTxOptions { + return &SqliteTxOptions{ + readOnly: false, + } +} + // ReadOnly returns true if the transaction should be read only. // // NOTE: This implements the TxOptions interface.