Merge pull request #157 from lightninglabs/lnd-16

multi: bump lnd+lndclient compile time dependency

Author: guggero

.github/workflows/main.yml

@@ -21,7 +21,7 @@ env:
   # /Dockerfile
   # /frdrpc/Dockerfile
   # /itest/Dockerfile
-  GO_VERSION: 1.18.8
+  GO_VERSION: 1.19.4
 
 jobs:
   ########################

accounting/filter.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/lndclient"
-	"github.com/lightningnetwork/lnd/channeldb"
+	invoicespkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/routing/route"
 )
@@ -95,7 +95,7 @@ func filterInvoices(startTime, endTime time.Time,
 	for _, invoice := range invoices {
 		// If the invoice was not settled, we do not need to create an
 		// entry for it.
-		if invoice.State != channeldb.ContractSettled {
+		if invoice.State != invoicespkg.ContractSettled {
 			continue
 		}
 

accounting/filter_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/lndclient"
-	"github.com/lightningnetwork/lnd/channeldb"
+	invoicespkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/stretchr/testify/require"
@@ -143,18 +143,18 @@ func TestFilterInvoices(t *testing.T) {
 	// time range that is settled.
 	settledInvoice := lndclient.Invoice{
 		SettleDate: inRange,
-		State:      channeldb.ContractSettled,
+		State:      invoicespkg.ContractSettled,
 	}
 
 	invoices := []lndclient.Invoice{
 		settledInvoice,
 		{
 			SettleDate: inRange,
-			State:      channeldb.ContractCanceled,
+			State:      invoicespkg.ContractCanceled,
 		},
 		{
 			SettleDate: time.Unix(startTime-1, 0),
-			State:      channeldb.ContractSettled,
+			State:      invoicespkg.ContractSettled,
 		},
 	}
 

config.go

@@ -360,15 +360,24 @@ func loadCertWithCreate(cfg *Config) (tls.Certificate, *x509.Certificate,
 		!lnrpc.FileExists(cfg.TLSKeyPath) {
 
 		log.Infof("Generating TLS certificates...")
-		err := cert.GenCertPair(
-			defaultSelfSignedOrganization, cfg.TLSCertPath,
-			cfg.TLSKeyPath, cfg.TLSExtraIPs,
+		certBytes, keyBytes, err := cert.GenCertPair(
+			defaultSelfSignedOrganization, cfg.TLSExtraIPs,
 			cfg.TLSExtraDomains, cfg.TLSDisableAutofill,
 			DefaultAutogenValidity,
 		)
 		if err != nil {
 			return tls.Certificate{}, nil, err
 		}
+
+		// Now that we have the certificate and key, we'll store them
+		// to the file system.
+		err = cert.WriteCertPair(
+			cfg.TLSCertPath, cfg.TLSKeyPath, certBytes, keyBytes,
+		)
+		if err != nil {
+			return tls.Certificate{}, nil, err
+		}
+
 		log.Infof("Done generating TLS certificates")
 	}
 

dataset/dataset.go

@@ -156,20 +156,26 @@ func (d Dataset) isIQROutlier(value, lowerQuartile, upperQuartile,
 // Given some random set of data, with lower quartile = 5 and upper quartile
 // = 6, the inter-quartile range is 1.
 //
-//         LQ             UQ
-// [ 1  2  5  5  5  6  6  6  8 11 ]
+//	        LQ             UQ
+//	[ 1  2  5  5  5  6  6  6  8 11 ]
 //
 // For larger values, eg multiplier=3, we will detect fewer outliers:
 // Lower outlier bound: 5 - (1 * 3) = 2
-//   -> 1 is a strong lower outlier
+//
+//	-> 1 is a strong lower outlier
+//
 // Upper outlier bound: 6 + (1 * 3) = 9
-//   -> 11 is a strong upper outlier
+//
+//	-> 11 is a strong upper outlier
 //
 // For smaller values, eg multiplier=1.5, we detect more outliers:
 // Weak lower outlier bound: 5 - (1 * 1.5) = 3.5
-//   -> 1 and 2 are weak lower outliers
+//
+//	-> 1 and 2 are weak lower outliers
+//
 // Weak upper outlier bound: 6 + (1 *1.5) = 7.5
-//   -> 8 and 11 are weak upper outliers
+//
+//	-> 8 and 11 are weak upper outliers
 func (d Dataset) GetOutliers(outlierMultiplier float64) (
 	map[string]*OutlierResult, error) {
 

frdrpc/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18.8-buster
+FROM golang:1.19.4-buster
 
 RUN apt-get update && apt-get install -y \
   git \