Merge pull request #761 from starius/sweepbatcher-load-swaps-from-loo…

…pdb-only sweepbatcher/Store: use only own tables (separating from loopdb)
lightninglabs · May 31, 2024 · 37194d3 · 37194d3
2 parents 6b09aaa + 7a7ea05
commit 37194d3
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 208 deletions.
diff --git a/loopdb/sqlc/batch.sql.go b/loopdb/sqlc/batch.sql.go
diff --git a/loopdb/sqlc/instantout.sql.go b/loopdb/sqlc/instantout.sql.go
diff --git a/loopdb/sqlc/querier.go b/loopdb/sqlc/querier.go
diff --git a/loopdb/sqlc/queries/batch.sql b/loopdb/sqlc/queries/batch.sql
@@ -76,7 +76,7 @@ WHERE
         sweeps.swap_hash = $1
 AND
         sweeps.completed = TRUE
-AND   
+AND
         sweep_batches.confirmed = TRUE;
 
 -- name: GetBatchSweptAmount :one
@@ -91,22 +91,13 @@ AND
 
 -- name: GetBatchSweeps :many
 SELECT
-        sweeps.*,
-        swaps.*,
-        loopout_swaps.*,
-        htlc_keys.*
+        *
 FROM
         sweeps
-JOIN
-        swaps ON sweeps.swap_hash = swaps.swap_hash
-JOIN
-        loopout_swaps ON sweeps.swap_hash = loopout_swaps.swap_hash
-JOIN
-        htlc_keys ON sweeps.swap_hash = htlc_keys.swap_hash
 WHERE
-        sweeps.batch_id = $1
+        batch_id = $1
 ORDER BY
-        sweeps.id ASC;
+        id ASC;
 
 -- name: GetSweepStatus :one
 SELECT

diff --git a/loopdb/sqlc/queries/instantout.sql b/loopdb/sqlc/queries/instantout.sql
@@ -1,7 +1,7 @@
 -- name: InsertInstantOut :exec
 INSERT INTO instantout_swaps (
         swap_hash,
-        preimage, 
+        preimage,
         sweep_address,
         outgoing_chan_set,
         htlc_fee_rate,
@@ -53,7 +53,7 @@ WHERE
     swaps.swap_hash = $1;
 
 -- name: GetInstantOutSwaps :many
-SELECT 
+SELECT
     swaps.*,
     instantout_swaps.*,
     htlc_keys.*

diff --git a/loopdb/sqlc/queries/swaps.sql b/loopdb/sqlc/queries/swaps.sql
@@ -1,9 +1,9 @@
 -- name: GetLoopOutSwaps :many
-SELECT 
+SELECT
     swaps.*,
     loopout_swaps.*,
     htlc_keys.*
-FROM 
+FROM
     swaps
 JOIN
     loopout_swaps ON swaps.swap_hash = loopout_swaps.swap_hash
@@ -13,7 +13,7 @@ ORDER BY
     swaps.id;
 
 -- name: GetLoopOutSwap :one
-SELECT 
+SELECT
     swaps.*,
     loopout_swaps.*,
     htlc_keys.*
@@ -27,7 +27,7 @@ WHERE
     swaps.swap_hash = $1;
 
 -- name: GetLoopInSwaps :many
-SELECT 
+SELECT
     swaps.*,
     loopin_swaps.*,
     htlc_keys.*
@@ -41,7 +41,7 @@ ORDER BY
     swaps.id;
 
 -- name: GetLoopInSwap :one
-SELECT 
+SELECT
     swaps.*,
     loopin_swaps.*,
     htlc_keys.*
@@ -55,7 +55,7 @@ WHERE
     swaps.swap_hash = $1;
 
 -- name: GetSwapUpdates :many
-SELECT 
+SELECT
     *
 FROM
     swap_updates

diff --git a/loopdb/sqlc/swaps.sql.go b/loopdb/sqlc/swaps.sql.go
diff --git a/loopout_test.go b/loopout_test.go
@@ -297,7 +297,7 @@ func testCustomSweepConfTarget(t *testing.T) {
 
 	errChan := make(chan error, 2)
 
-	batcherStore := sweepbatcher.NewStoreMock(cfg.store)
+	batcherStore := sweepbatcher.NewStoreMock()
 
 	batcher := sweepbatcher.NewBatcher(
 		lnd.WalletKit, lnd.ChainNotifier, lnd.Signer,
@@ -530,7 +530,7 @@ func testPreimagePush(t *testing.T) {
 
 	errChan := make(chan error, 2)
 
-	batcherStore := sweepbatcher.NewStoreMock(cfg.store)
+	batcherStore := sweepbatcher.NewStoreMock()
 
 	batcher := sweepbatcher.NewBatcher(
 		lnd.WalletKit, lnd.ChainNotifier, lnd.Signer,
@@ -951,7 +951,7 @@ func TestLoopOutMuSig2Sweep(t *testing.T) {
 
 	errChan := make(chan error, 2)
 
-	batcherStore := sweepbatcher.NewStoreMock(cfg.store)
+	batcherStore := sweepbatcher.NewStoreMock()
 
 	batcher := sweepbatcher.NewBatcher(
 		lnd.WalletKit, lnd.ChainNotifier, lnd.Signer,