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

invoiceregistry: serialize all invoice modifications, eliminate extra db call for settle

Browse Source 
In this commit, we now ensure that all modifications to the invoice DB
are properly serialized. This ensures that our time series within the
database will be properly coherent. Additionally, within SettleInvoice,
we remove an extra DB call by taking advantage of the new SettleInvoice
method which will return the invoice being settled as well.
This commit is contained in:
Olaoluwa Osuntokun 2018-06-28 21:47:41 -07:00
parent e5c579120e
commit 3bedffcc1a
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
invoiceregistry.go
View File

@ -223,6 +223,9 @@ func (i *invoiceRegistry) AddDebugInvoice(amt btcutil.Amount, preimage chainhash
// daemon add/forward HTLCs are able to obtain the proper preimage required for // daemon add/forward HTLCs are able to obtain the proper preimage required for
// redemption in the case that we're the final destination. // redemption in the case that we're the final destination.
func (i *invoiceRegistry) AddInvoice(invoice *channeldb.Invoice) error { func (i *invoiceRegistry) AddInvoice(invoice *channeldb.Invoice) error {
i.Lock()
defer i.Unlock()
ltndLog.Debugf("Adding invoice %v", newLogClosure(func() string { ltndLog.Debugf("Adding invoice %v", newLogClosure(func() string {
return spew.Sdump(invoice) return spew.Sdump(invoice)
})) }))
@ -280,39 +283,29 @@ func (i *invoiceRegistry) LookupInvoice(rHash chainhash.Hash) (channeldb.Invoice
func (i *invoiceRegistry) SettleInvoice(rHash chainhash.Hash, func (i *invoiceRegistry) SettleInvoice(rHash chainhash.Hash,
amtPaid lnwire.MilliSatoshi) error { amtPaid lnwire.MilliSatoshi) error {
i.Lock()
defer i.Unlock()
ltndLog.Debugf("Settling invoice %x", rHash[:]) ltndLog.Debugf("Settling invoice %x", rHash[:])
// First check the in-memory debug invoice index to see if this is an // First check the in-memory debug invoice index to see if this is an
// existing invoice added for debugging. // existing invoice added for debugging.
i.RLock()
if _, ok := i.debugInvoices[rHash]; ok { if _, ok := i.debugInvoices[rHash]; ok {
// Debug invoices are never fully settled, so we simply return // Debug invoices are never fully settled, so we simply return
// immediately in this case. // immediately in this case.
i.RUnlock()
return nil return nil
} }
i.RUnlock()
// If this isn't a debug invoice, then we'll attempt to settle an // If this isn't a debug invoice, then we'll attempt to settle an
// invoice matching this rHash on disk (if one exists). // invoice matching this rHash on disk (if one exists).
if err := i.cdb.SettleInvoice(rHash, amtPaid); err != nil { invoice, err := i.cdb.SettleInvoice(rHash, amtPaid)
if err != nil {
return err return err
} }
// Launch a new goroutine to notify any/all registered invoice ltndLog.Infof("Payment received: %v", spew.Sdump(invoice))
// notification clients.
go func() {
invoice, err := i.cdb.LookupInvoice(rHash)
if err != nil {
ltndLog.Errorf("unable to find invoice: %v", err)
return
}
ltndLog.Infof("Payment received: %v", spew.Sdump(invoice)) i.notifyClients(invoice, true)
i.notifyClients(&invoice, true)
}()
return nil return nil
} }