From 916ab454c15d0983a4d98686fa962cfd2d45a04a Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Mon, 28 Aug 2017 22:04:06 -0500 Subject: [PATCH] channeldb: Fix payment serialization tests. This modifies the tests that deal serializing the Invoice type to limit the creation date to seconds since Go1.9 added the concept of a monotonic component to times which does not round trip through MarshalBinary and UnmarshalBinary and therefore causes the tests to fail. In particular, it modifies the creation dates in the randInvoice, makeFakePayment, makeRandomFakePayment, and TestInvoiceWorkflow functions. This results in allowing TestOutgoingPaymentSerialization, TestOutgoingPaymentWorkflow, and TestInvoiceWorkflow to pass. --- channeldb/invoice_test.go | 9 ++++++--- channeldb/payments_test.go | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/channeldb/invoice_test.go b/channeldb/invoice_test.go index 8f5746c80..b29102fba 100644 --- a/channeldb/invoice_test.go +++ b/channeldb/invoice_test.go @@ -12,14 +12,15 @@ import ( ) func randInvoice(value lnwire.MilliSatoshi) (*Invoice, error) { - var pre [32]byte if _, err := rand.Read(pre[:]); err != nil { return nil, err } i := &Invoice{ - CreationDate: time.Now(), + // Use single second precision to avoid false positive test + // failures due to the monotonic time component. + CreationDate: time.Unix(time.Now().Unix(), 0), Terms: ContractTerm{ PaymentPreimage: pre, Value: value, @@ -43,7 +44,9 @@ func TestInvoiceWorkflow(t *testing.T) { // Create a fake invoice which we'll use several times in the tests // below. fakeInvoice := &Invoice{ - CreationDate: time.Now(), + // Use single second precision to avoid false positive test + // failures due to the monotonic time component. + CreationDate: time.Unix(time.Now().Unix(), 0), } fakeInvoice.Memo = []byte("memo") fakeInvoice.Receipt = []byte("recipt") diff --git a/channeldb/payments_test.go b/channeldb/payments_test.go index 78baa0523..f84572c27 100644 --- a/channeldb/payments_test.go +++ b/channeldb/payments_test.go @@ -15,7 +15,9 @@ import ( func makeFakePayment() *OutgoingPayment { fakeInvoice := &Invoice{ - CreationDate: time.Now(), + // Use single second precision to avoid false positive test + // failures due to the monotonic time component. + CreationDate: time.Unix(time.Now().Unix(), 0), Memo: []byte("fake memo"), Receipt: []byte("fake receipt"), } @@ -52,7 +54,9 @@ func randomBytes(minLen, maxLen int) ([]byte, error) { func makeRandomFakePayment() (*OutgoingPayment, error) { var err error fakeInvoice := &Invoice{ - CreationDate: time.Now(), + // Use single second precision to avoid false positive test + // failures due to the monotonic time component. + CreationDate: time.Unix(time.Now().Unix(), 0), } fakeInvoice.Memo, err = randomBytes(1, 50)