Revert "channeldb: convert invoice settle/cancel calls to use Batch"

This reverts commit da76c34418a40761fdc99e11200755661699f7eb.
This commit is contained in:
Conner Fromknecht 2019-04-01 11:51:29 -07:00
parent e35f676b4c
commit 2f927493c8
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7

@ -242,9 +242,7 @@ func (d *DB) AddInvoice(newInvoice *Invoice, paymentHash lntypes.Hash) (
} }
var invoiceAddIndex uint64 var invoiceAddIndex uint64
err := d.Batch(func(tx *bbolt.Tx) error { err := d.Update(func(tx *bbolt.Tx) error {
invoiceAddIndex = 0
invoices, err := tx.CreateBucketIfNotExists(invoiceBucket) invoices, err := tx.CreateBucketIfNotExists(invoiceBucket)
if err != nil { if err != nil {
return err return err
@ -637,9 +635,7 @@ func (d *DB) AcceptOrSettleInvoice(paymentHash [32]byte,
amtPaid lnwire.MilliSatoshi) (*Invoice, error) { amtPaid lnwire.MilliSatoshi) (*Invoice, error) {
var settledInvoice *Invoice var settledInvoice *Invoice
err := d.Batch(func(tx *bbolt.Tx) error { err := d.Update(func(tx *bbolt.Tx) error {
settledInvoice = nil
invoices, err := tx.CreateBucketIfNotExists(invoiceBucket) invoices, err := tx.CreateBucketIfNotExists(invoiceBucket)
if err != nil { if err != nil {
return err return err
@ -718,9 +714,7 @@ func (d *DB) SettleHoldInvoice(preimage lntypes.Preimage) (*Invoice, error) {
// payment hash. // payment hash.
func (d *DB) CancelInvoice(paymentHash lntypes.Hash) (*Invoice, error) { func (d *DB) CancelInvoice(paymentHash lntypes.Hash) (*Invoice, error) {
var canceledInvoice *Invoice var canceledInvoice *Invoice
err := d.Batch(func(tx *bbolt.Tx) error { err := d.Update(func(tx *bbolt.Tx) error {
canceledInvoice = nil
invoices, err := tx.CreateBucketIfNotExists(invoiceBucket) invoices, err := tx.CreateBucketIfNotExists(invoiceBucket)
if err != nil { if err != nil {
return err return err