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

invoices: unify invoice log statements

Browse Source
This commit is contained in:
Joost Jager 2019-04-08 10:47:15 +02:00
parent 86eb0a3383
commit 33a1904dc9
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
invoices/invoiceregistry.go
View File

@ -408,9 +408,11 @@ func (i *InvoiceRegistry) AddInvoice(invoice *channeldb.Invoice,
i.Lock() i.Lock()
defer i.Unlock() defer i.Unlock()
log.Debugf("Adding invoice %v", newLogClosure(func() string { log.Debugf("Invoice(%v): added %v", paymentHash,
return spew.Sdump(invoice) newLogClosure(func() string {
})) return spew.Sdump(invoice)
}),
)
addIndex, err := i.cdb.AddInvoice(invoice, paymentHash) addIndex, err := i.cdb.AddInvoice(invoice, paymentHash)
if err != nil { if err != nil {
@ -476,7 +478,7 @@ func (i *InvoiceRegistry) NotifyExitHopHtlc(rHash lntypes.Hash,
i.Lock() i.Lock()
defer i.Unlock() defer i.Unlock()
log.Debugf("Settling invoice %x", rHash[:]) log.Debugf("Invoice(%x): htlc accepted", rHash[:])
createEvent := func(preimage *lntypes.Preimage) *HodlEvent { createEvent := func(preimage *lntypes.Preimage) *HodlEvent {
return &HodlEvent{ return &HodlEvent{
@ -519,6 +521,8 @@ func (i *InvoiceRegistry) NotifyExitHopHtlc(rHash lntypes.Hash,
i.notifyClients(rHash, invoice, invoice.Terms.State) i.notifyClients(rHash, invoice, invoice.Terms.State)
switch invoice.Terms.State { switch invoice.Terms.State {
case channeldb.ContractSettled: case channeldb.ContractSettled:
log.Debugf("Invoice(%x): settled", rHash[:])
return createEvent(&invoice.Terms.PaymentPreimage), nil return createEvent(&invoice.Terms.PaymentPreimage), nil
case channeldb.ContractAccepted: case channeldb.ContractAccepted:
// Subscribe to updates to this invoice. // Subscribe to updates to this invoice.
@ -541,12 +545,12 @@ func (i *InvoiceRegistry) SettleHodlInvoice(preimage lntypes.Preimage) error {
invoice, err := i.cdb.SettleHoldInvoice(preimage) invoice, err := i.cdb.SettleHoldInvoice(preimage)
if err != nil { if err != nil {
log.Errorf("Invoice SetPreimage %v: %v", preimage, err) log.Errorf("SettleHodlInvoice with preimage %v: %v", preimage, err)
return err return err
} }
hash := preimage.Hash() hash := preimage.Hash()
log.Infof("Notifying clients of set preimage to %v", log.Debugf("Invoice(%v): settled with preimage %v", hash,
invoice.Terms.PaymentPreimage) invoice.Terms.PaymentPreimage)
i.notifyHodlSubscribers(HodlEvent{ i.notifyHodlSubscribers(HodlEvent{
@ -564,21 +568,21 @@ func (i *InvoiceRegistry) CancelInvoice(payHash lntypes.Hash) error {
i.Lock() i.Lock()
defer i.Unlock() defer i.Unlock()
log.Debugf("Canceling invoice %v", payHash) log.Debugf("Invoice(%v): canceling invoice", payHash)
invoice, err := i.cdb.CancelInvoice(payHash) invoice, err := i.cdb.CancelInvoice(payHash)
// Implement idempotency by returning success if the invoice was already // Implement idempotency by returning success if the invoice was already
// canceled. // canceled.
if err == channeldb.ErrInvoiceAlreadyCanceled { if err == channeldb.ErrInvoiceAlreadyCanceled {
log.Debugf("Invoice %v already canceled", payHash) log.Debugf("Invoice(%v): already canceled", payHash)
return nil return nil
} }
if err != nil { if err != nil {
return err return err
} }
log.Infof("Invoice %v canceled", payHash) log.Debugf("Invoice(%v): canceled", payHash)
i.notifyHodlSubscribers(HodlEvent{ i.notifyHodlSubscribers(HodlEvent{
Hash: payHash, Hash: payHash,
}) })