akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

invoices: refactor - rename expiry queue to be timestamp specific

Browse Source
This commit is contained in:
carla 2021-04-23 08:19:53 +02:00
parent f5f1e9e6c7
commit 9c6e83b15f
No known key found for this signature in database
GPG Key ID: 4CA7FE54A6213C91
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
invoices/invoice_expiry_watcher.go
View File

@ -44,9 +44,9 @@ type InvoiceExpiryWatcher struct {
// cancelInvoice is a template method that cancels an expired invoice. // cancelInvoice is a template method that cancels an expired invoice.
cancelInvoice func(lntypes.Hash, bool) error cancelInvoice func(lntypes.Hash, bool) error
// expiryQueue holds invoiceExpiry items and is used to find the next // timestampExpiryQueue holds invoiceExpiry items and is used to find
// invoice to expire. // the next invoice to expire.
expiryQueue queue.PriorityQueue timestampExpiryQueue queue.PriorityQueue
// newInvoices channel is used to wake up the main loop when a new // newInvoices channel is used to wake up the main loop when a new
// invoices is added. // invoices is added.
@ -146,8 +146,8 @@ func (ew *InvoiceExpiryWatcher) AddInvoices(invoices ...*invoiceExpiryTs) {
// nextExpiry returns a Time chan to wait on until the next invoice expires. // nextExpiry returns a Time chan to wait on until the next invoice expires.
// If there are no active invoices, then it'll simply wait indefinitely. // If there are no active invoices, then it'll simply wait indefinitely.
func (ew *InvoiceExpiryWatcher) nextExpiry() <-chan time.Time { func (ew *InvoiceExpiryWatcher) nextExpiry() <-chan time.Time {
if !ew.expiryQueue.Empty() { if !ew.timestampExpiryQueue.Empty() {
top := ew.expiryQueue.Top().(*invoiceExpiryTs) top := ew.timestampExpiryQueue.Top().(*invoiceExpiryTs)
return ew.clock.TickAfter(top.Expiry.Sub(ew.clock.Now())) return ew.clock.TickAfter(top.Expiry.Sub(ew.clock.Now()))
} }
@ -157,8 +157,8 @@ func (ew *InvoiceExpiryWatcher) nextExpiry() <-chan time.Time {
// cancelNextExpiredInvoice will cancel the next expired invoice and removes // cancelNextExpiredInvoice will cancel the next expired invoice and removes
// it from the expiry queue. // it from the expiry queue.
func (ew *InvoiceExpiryWatcher) cancelNextExpiredInvoice() { func (ew *InvoiceExpiryWatcher) cancelNextExpiredInvoice() {
if !ew.expiryQueue.Empty() { if !ew.timestampExpiryQueue.Empty() {
top := ew.expiryQueue.Top().(*invoiceExpiryTs) top := ew.timestampExpiryQueue.Top().(*invoiceExpiryTs)
if !top.Expiry.Before(ew.clock.Now()) { if !top.Expiry.Before(ew.clock.Now()) {
return return
} }
@ -177,7 +177,7 @@ func (ew *InvoiceExpiryWatcher) cancelNextExpiredInvoice() {
top.PaymentHash) top.PaymentHash)
} }
ew.expiryQueue.Pop() ew.timestampExpiryQueue.Pop()
} }
} }
@ -194,7 +194,9 @@ func (ew *InvoiceExpiryWatcher) mainLoop() {
for _, invoiceWithExpiry := range invoicesWithExpiry { for _, invoiceWithExpiry := range invoicesWithExpiry {
// Avoid pushing nil object to the heap. // Avoid pushing nil object to the heap.
if invoiceWithExpiry != nil { if invoiceWithExpiry != nil {
ew.expiryQueue.Push(invoiceWithExpiry) ew.timestampExpiryQueue.Push(
invoiceWithExpiry,
)
} }
} }
} }