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

Revert "channeldb: explicitly store the FinalCltvDelta within the ContractTerm struct"

Browse Source 
This reverts commit 8dcfeeaef507ebe02c60e34022f614a65a18b050.
This commit is contained in:
Olaoluwa Osuntokun 2018-06-29 12:40:42 -07:00
parent 076fc71261
commit e5f802c33c
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
channeldb/invoice_test.go
View File

@ -3,7 +3,6 @@ package channeldb
import ( import (
"crypto/rand" "crypto/rand"
"crypto/sha256" "crypto/sha256"
prand "math/rand"
"reflect" "reflect"
"testing" "testing"
"time" "time"
@ -25,7 +24,6 @@ func randInvoice(value lnwire.MilliSatoshi) (*Invoice, error) {
Terms: ContractTerm{ Terms: ContractTerm{
PaymentPreimage: pre, PaymentPreimage: pre,
Value: value, Value: value,
FinalCltvDelta: uint16(prand.Int31()),
}, },
} }
i.Memo = []byte("memo") i.Memo = []byte("memo")
@ -68,7 +66,6 @@ func TestInvoiceWorkflow(t *testing.T) {
fakeInvoice.PaymentRequest = []byte("") fakeInvoice.PaymentRequest = []byte("")
copy(fakeInvoice.Terms.PaymentPreimage[:], rev[:]) copy(fakeInvoice.Terms.PaymentPreimage[:], rev[:])
fakeInvoice.Terms.Value = lnwire.NewMSatFromSatoshis(10000) fakeInvoice.Terms.Value = lnwire.NewMSatFromSatoshis(10000)
fakeInvoice.Terms.FinalCltvDelta = uint16(prand.Int31())
// Add the invoice to the database, this should succeed as there aren't // Add the invoice to the database, this should succeed as there aren't
// any existing invoices within the database with the same payment // any existing invoices within the database with the same payment

24
channeldb/invoices.go
View File

@ -68,13 +68,6 @@ type ContractTerm struct {
// Settled indicates if this particular contract term has been fully // Settled indicates if this particular contract term has been fully
// settled by the payer. // settled by the payer.
Settled bool Settled bool
// FinalCltvDelta is the lower bound of a delta from the current height
// that the HTLC that wishes to settle this invoice MUST carry. This
// allows the receiver to specify the time window that should be
// available for them to sweep the HTLC on-chain if that becomes
// necessary.
FinalCltvDelta uint16
} }
// Invoice is a payment invoice generated by a payee in order to request // Invoice is a payment invoice generated by a payee in order to request
@ -86,7 +79,8 @@ type ContractTerm struct {
// invoices are never deleted from the database, instead a bit is toggled // invoices are never deleted from the database, instead a bit is toggled
// denoting the invoice has been fully settled. Within the database, all // denoting the invoice has been fully settled. Within the database, all
// invoices must have a unique payment hash which is generated by taking the // invoices must have a unique payment hash which is generated by taking the
// sha256 of the payment preimage. // sha256 of the payment
// preimage.
type Invoice struct { type Invoice struct {
// Memo is an optional memo to be stored along side an invoice. The // Memo is an optional memo to be stored along side an invoice. The
// memo may contain further details pertaining to the invoice itself, // memo may contain further details pertaining to the invoice itself,
@ -367,7 +361,7 @@ func serializeInvoice(w io.Writer, i *Invoice) error {
return err return err
} }
return binary.Write(w, byteOrder, i.Terms.FinalCltvDelta) return nil
} }
func fetchInvoice(invoiceNum []byte, invoices *bolt.Bucket) (*Invoice, error) { func fetchInvoice(invoiceNum []byte, invoices *bolt.Bucket) (*Invoice, error) {
@ -429,18 +423,6 @@ func deserializeInvoice(r io.Reader) (*Invoice, error) {
return nil, err return nil, err
} }
// Before we return with the current invoice, we'll check to see if
// there's still enough space in the buffer to read out the final ctlv
// delta. We'll get an EOF error if there isn't any thing else
// lingering in the buffer.
err = binary.Read(r, byteOrder, &invoice.Terms.FinalCltvDelta)
if err != nil && err != io.EOF {
// If we got a non-eof error, then we know there's an actually
// issue. Otherwise, it may have been the case that this
// summary didn't have the set of optional fields.
return nil, err
}
return invoice, nil return invoice, nil
} }