From da76c34418a40761fdc99e11200755661699f7eb Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 13 Mar 2019 13:34:19 -0700 Subject: [PATCH] channeldb: convert invoice settle/cancel calls to use Batch --- channeldb/invoices.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/channeldb/invoices.go b/channeldb/invoices.go index 47a8e1990..5e3c6202d 100644 --- a/channeldb/invoices.go +++ b/channeldb/invoices.go @@ -242,7 +242,9 @@ func (d *DB) AddInvoice(newInvoice *Invoice, paymentHash lntypes.Hash) ( } var invoiceAddIndex uint64 - err := d.Update(func(tx *bbolt.Tx) error { + err := d.Batch(func(tx *bbolt.Tx) error { + invoiceAddIndex = 0 + invoices, err := tx.CreateBucketIfNotExists(invoiceBucket) if err != nil { return err @@ -635,7 +637,9 @@ func (d *DB) AcceptOrSettleInvoice(paymentHash [32]byte, amtPaid lnwire.MilliSatoshi) (*Invoice, error) { var settledInvoice *Invoice - err := d.Update(func(tx *bbolt.Tx) error { + err := d.Batch(func(tx *bbolt.Tx) error { + settledInvoice = nil + invoices, err := tx.CreateBucketIfNotExists(invoiceBucket) if err != nil { return err @@ -714,7 +718,9 @@ func (d *DB) SettleHoldInvoice(preimage lntypes.Preimage) (*Invoice, error) { // payment hash. func (d *DB) CancelInvoice(paymentHash lntypes.Hash) (*Invoice, error) { var canceledInvoice *Invoice - err := d.Update(func(tx *bbolt.Tx) error { + err := d.Batch(func(tx *bbolt.Tx) error { + canceledInvoice = nil + invoices, err := tx.CreateBucketIfNotExists(invoiceBucket) if err != nil { return err