-
Notifications
You must be signed in to change notification settings - Fork 2.2k
[Part 3|*] Implement Second Part for SQL Backend functions #10291
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ziggie1984
wants to merge
14
commits into
lightningnetwork:elle-payment-sql-series-new
Choose a base branch
from
ziggie1984:introduce-sql-schema-payments-part-3
base: elle-payment-sql-series-new
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
18f03ec
sqldb: add index and comment to payment tables
ziggie1984 c908b52
multi: add relevant queries for QueryPayments implemenation
ziggie1984 52d466f
paymentsdb: add new internal error
ziggie1984 353160c
paymentsdb: implement QueryPayments for sql backend
ziggie1984 fc4ce67
paymentsdb: implement FetchPayment for sql backend
ziggie1984 0849296
docs: add release-notes
ziggie1984 ed5622c
sqldb: add queries for deleting a payment and attempts
ziggie1984 215490c
paymentsdb: implement DeletePayment for sql backend
ziggie1984 3a39bdc
paymentsdb: implement DeleteFailedAttempts for sql backend
ziggie1984 1aae195
sqldb+paymentsdb: add queries to insert all relavant data
ziggie1984 f6f2ee3
paymentsdb: implement InitPayment for sql backend
ziggie1984 53b47ea
paymentsdb: implement RegisterAttempt for sql backend
ziggie1984 b3f3627
paymentsdb: implement SettleAttempt for sql backend
ziggie1984 6145682
docs: add release-notes
ziggie1984 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -523,3 +523,49 @@ func (s *SQLStore) FetchPayment(paymentHash lntypes.Hash) (*MPPayment, error) { | |
|
|
||
| return mpPayment, nil | ||
| } | ||
|
|
||
| // DeletePayment deletes a payment from the DB given its payment hash. If | ||
| // failedHtlcsOnly is set, only failed HTLC attempts of the payment will be | ||
| // deleted. | ||
| func (s *SQLStore) DeletePayment(paymentHash lntypes.Hash, | ||
| failedHtlcsOnly bool) error { | ||
|
|
||
| ctx := context.TODO() | ||
|
|
||
| err := s.db.ExecTx(ctx, sqldb.WriteTxOpt(), func(db SQLQueries) error { | ||
| fetchPayment, err := db.FetchPayment(ctx, paymentHash[:]) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to fetch payment: %w", err) | ||
| } | ||
| completePayment, err := s.fetchPaymentWithCompleteData( | ||
| ctx, db, fetchPayment, | ||
| ) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to fetch payment with "+ | ||
| "complete data: %w", err) | ||
| } | ||
|
|
||
| if err := completePayment.Status.removable(); err != nil { | ||
| return fmt.Errorf("payment %v cannot be deleted: %w", | ||
| paymentHash, err) | ||
| } | ||
|
|
||
| // If we are only deleting failed HTLCs, we delete them. | ||
| if failedHtlcsOnly { | ||
| return s.db.DeleteFailedAttempts( | ||
| ctx, fetchPayment.Payment.ID, | ||
| ) | ||
| } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. seems like the next commit should be before this one? |
||
|
|
||
| return db.DeletePayment(ctx, fetchPayment.Payment.ID) | ||
|
|
||
| }, func() { | ||
| }) | ||
|
Comment on lines
+580
to
+581
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NoOpReset |
||
| if err != nil { | ||
| return fmt.Errorf("failed to delete payment "+ | ||
| "(failedHtlcsOnly: %v, paymentHash: %v): %w", | ||
| failedHtlcsOnly, paymentHash, err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i dont think we need to fetch the complete payment here?