From 4c2d874b8d231d1b6bfa2d304f84f686cdd9c589 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 19 Jun 2024 00:48:16 -0300 Subject: [PATCH] loopdb: use passed transaction in ExecTx calls Some calls used external queries instead of the passed one, bypassing the transaction. --- loopdb/sql_store.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/loopdb/sql_store.go b/loopdb/sql_store.go index c57141a7..5547be50 100644 --- a/loopdb/sql_store.go +++ b/loopdb/sql_store.go @@ -23,8 +23,8 @@ func (s *BaseDB) FetchLoopOutSwaps(ctx context.Context) ([]*LoopOut, var loopOuts []*LoopOut - err := s.ExecTx(ctx, NewSqlReadOpts(), func(*sqlc.Queries) error { - swaps, err := s.Queries.GetLoopOutSwaps(ctx) + err := s.ExecTx(ctx, NewSqlReadOpts(), func(tx *sqlc.Queries) error { + swaps, err := tx.GetLoopOutSwaps(ctx) if err != nil { return err } @@ -32,7 +32,7 @@ func (s *BaseDB) FetchLoopOutSwaps(ctx context.Context) ([]*LoopOut, loopOuts = make([]*LoopOut, len(swaps)) for i, swap := range swaps { - updates, err := s.Queries.GetSwapUpdates( + updates, err := tx.GetSwapUpdates( ctx, swap.SwapHash, ) if err != nil { @@ -65,13 +65,13 @@ func (s *BaseDB) FetchLoopOutSwap(ctx context.Context, var loopOut *LoopOut - err := s.ExecTx(ctx, NewSqlReadOpts(), func(*sqlc.Queries) error { - swap, err := s.Queries.GetLoopOutSwap(ctx, hash[:]) + err := s.ExecTx(ctx, NewSqlReadOpts(), func(tx *sqlc.Queries) error { + swap, err := tx.GetLoopOutSwap(ctx, hash[:]) if err != nil { return err } - updates, err := s.Queries.GetSwapUpdates(ctx, swap.SwapHash) + updates, err := tx.GetSwapUpdates(ctx, swap.SwapHash) if err != nil { return err } @@ -186,8 +186,8 @@ func (s *BaseDB) FetchLoopInSwaps(ctx context.Context) ( var loopIns []*LoopIn - err := s.ExecTx(ctx, NewSqlReadOpts(), func(*sqlc.Queries) error { - swaps, err := s.Queries.GetLoopInSwaps(ctx) + err := s.ExecTx(ctx, NewSqlReadOpts(), func(tx *sqlc.Queries) error { + swaps, err := tx.GetLoopInSwaps(ctx) if err != nil { return err } @@ -195,7 +195,7 @@ func (s *BaseDB) FetchLoopInSwaps(ctx context.Context) ( loopIns = make([]*LoopIn, len(swaps)) for i, swap := range swaps { - updates, err := s.Queries.GetSwapUpdates(ctx, swap.SwapHash) + updates, err := tx.GetSwapUpdates(ctx, swap.SwapHash) if err != nil { return err }