multi: fix linter issues, run imports

accounting/config.go

@@ -6,12 +6,11 @@ import (
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/lightninglabs/lndclient"
-	"github.com/lightningnetwork/lnd/routing/route"
-
 	"github.com/lightninglabs/faraday/fees"
 	"github.com/lightninglabs/faraday/fiat"
 	"github.com/lightninglabs/faraday/lndwrap"
+	"github.com/lightninglabs/lndclient"
+	"github.com/lightningnetwork/lnd/routing/route"
 )
 
 // decodePaymentRequest is a signature for decoding payment requests.

accounting/conversions.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
-
 	"github.com/lightninglabs/faraday/fiat"
 	"github.com/lightninglabs/faraday/utils"
 )

accounting/entries_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
+	"github.com/lightninglabs/faraday/fiat"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -15,8 +16,6 @@ import (
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/require"
-
-	"github.com/lightninglabs/faraday/fiat"
 )
 
 var (
@@ -222,7 +221,6 @@ func TestChannelOpenEntry(t *testing.T) {
 			Credit:    credit,
 			BTCPrice:  mockBTCPrice,
 		}
-
 	}
 
 	feeAmt := satsToMsat(channelFeesSats)

accounting/filter_test.go

@@ -132,7 +132,6 @@ func TestFilterOnChain(t *testing.T) {
 	expctedAmount := payment.Amount + payment.Fee
 
 	require.Equal(t, expctedAmount, filtered[0].Amount)
-
 }
 
 // TestFilterInvoices tests filtering out of invoices that are not settled.

accounting/on_chain.go

@@ -5,11 +5,10 @@ import (
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/wire"
+	"github.com/lightninglabs/faraday/utils"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
-
-	"github.com/lightninglabs/faraday/utils"
 )
 
 // OnChainReport produces a report of our on chain activity for a period using

accounting/report.go

@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/lightninglabs/faraday/fiat"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/shopspring/decimal"
-
-	"github.com/lightninglabs/faraday/fiat"
 )
 
 // Report contains a set of entries.

cmd/frcli/channel_insights.go

@@ -3,9 +3,8 @@ package main
 import (
 	"context"
 
-	"github.com/urfave/cli"
-
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/urfave/cli"
 )
 
 var channelInsightsCommand = cli.Command{

cmd/frcli/close_recommendations.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/urfave/cli"
-
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/urfave/cli"
 )
 
 var (

cmd/frcli/close_reports.go

@@ -3,9 +3,8 @@ package main
 import (
 	"context"
 
-	"github.com/urfave/cli"
-
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/urfave/cli"
 )
 
 var closeReportCommand = cli.Command{

cmd/frcli/fiat_estimate.go

@@ -5,12 +5,11 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/lightninglabs/faraday/fiat"
+	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/shopspring/decimal"
 	"github.com/urfave/cli"
-
-	"github.com/lightninglabs/faraday/fiat"
-	"github.com/lightninglabs/faraday/frdrpc"
 )
 
 var fiatBackendFlag = cli.StringFlag{

cmd/frcli/main.go

@@ -3,9 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/urfave/cli"
-
 	"github.com/lightninglabs/faraday"
+	"github.com/urfave/cli"
 )
 
 var (

cmd/frcli/node_audit.go

@@ -9,9 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/urfave/cli"
-
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/urfave/cli"
 )
 
 var onChainReportCommand = cli.Command{

cmd/frcli/revenue_report.go

@@ -3,9 +3,8 @@ package main
 import (
 	"context"
 
-	"github.com/urfave/cli"
-
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/urfave/cli"
 )
 
 var revenueReportCommand = cli.Command{

cmd/frcli/utils.go

@@ -15,10 +15,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lightninglabs/faraday/utils"
-
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
+	"github.com/lightninglabs/faraday"
+	"github.com/lightninglabs/faraday/fiat"
+	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/lightninglabs/faraday/utils"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/protobuf-hex-display/jsonpb"
 	"github.com/lightninglabs/protobuf-hex-display/proto"
@@ -28,10 +30,6 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"gopkg.in/macaroon.v2"
-
-	"github.com/lightninglabs/faraday"
-	"github.com/lightninglabs/faraday/fiat"
-	"github.com/lightninglabs/faraday/frdrpc"
 )
 
 var (

config.go

@@ -10,13 +10,12 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
+	"github.com/lightninglabs/faraday/chain"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/cert"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"google.golang.org/grpc/credentials"
-
-	"github.com/lightninglabs/faraday/chain"
 )
 
 const (

faraday.go

@@ -8,13 +8,12 @@ import (
 	"strings"
 
 	"github.com/jessevdk/go-flags"
+	"github.com/lightninglabs/faraday/chain"
+	"github.com/lightninglabs/faraday/frdrpcserver"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/lnrpc/verrpc"
 	"github.com/lightningnetwork/lnd/signal"
-
-	"github.com/lightninglabs/faraday/chain"
-	"github.com/lightninglabs/faraday/frdrpcserver"
 )
 
 // MinLndVersion is the minimum lnd version required. Note that apis that are

fiat/prices.go

@@ -7,10 +7,9 @@ import (
 	"sort"
 	"time"
 
+	"github.com/lightninglabs/faraday/utils"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/shopspring/decimal"
-
-	"github.com/lightninglabs/faraday/utils"
 )
 
 var (

fiat/prices_test.go

@@ -250,6 +250,5 @@ func TestValidatePriceSourceConfig(t *testing.T) {
 					test.expectedErr, err)
 			}
 		})
-
 	}
 }

frdrpcserver/close_report.go

@@ -5,11 +5,10 @@ import (
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/lightninglabs/lndclient"
-
 	"github.com/lightninglabs/faraday/fees"
 	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightninglabs/faraday/resolutions"
+	"github.com/lightninglabs/lndclient"
 )
 
 func parseCloseReportRequest(ctx context.Context, cfg *Config) *resolutions.Config {

frdrpcserver/node_audit.go

@@ -7,13 +7,12 @@ import (
 	"sort"
 	"time"
 
-	"github.com/lightningnetwork/lnd/routing/route"
-	"github.com/shopspring/decimal"
-
 	"github.com/lightninglabs/faraday/accounting"
 	"github.com/lightninglabs/faraday/fees"
 	"github.com/lightninglabs/faraday/fiat"
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/lightningnetwork/lnd/routing/route"
+	"github.com/shopspring/decimal"
 )
 
 var (

frdrpcserver/revenue_report.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/lightninglabs/lndclient"
-
 	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightninglabs/faraday/lndwrap"
 	"github.com/lightninglabs/faraday/revenue"
+	"github.com/lightninglabs/lndclient"
 )
 
 // parseRevenueRequest parses a request for a revenue report and wraps

frdrpcserver/rpcserver.go

@@ -21,13 +21,6 @@ import (
 	"sync/atomic"
 
 	proxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	"github.com/lightninglabs/lndclient"
-	"github.com/lightningnetwork/lnd/macaroons"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/protobuf/encoding/protojson"
-	"gopkg.in/macaroon-bakery.v2/bakery"
-
 	"github.com/lightninglabs/faraday/accounting"
 	"github.com/lightninglabs/faraday/chain"
 	"github.com/lightninglabs/faraday/fiat"
@@ -36,6 +29,12 @@ import (
 	"github.com/lightninglabs/faraday/recommend"
 	"github.com/lightninglabs/faraday/resolutions"
 	"github.com/lightninglabs/faraday/revenue"
+	"github.com/lightninglabs/lndclient"
+	"github.com/lightningnetwork/lnd/macaroons"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/protobuf/encoding/protojson"
+	"gopkg.in/macaroon-bakery.v2/bakery"
 )
 
 var (
@@ -234,7 +233,6 @@ func (s *RPCServer) Start() error {
 	if err != nil {
 		return fmt.Errorf("RPC RPCServer unable to listen on %v",
 			s.cfg.RPCListen)
-
 	}
 	shutdownFuncs["gRPC listener"] = s.rpcListener.Close
 	log.Infof("gRPC server listening on %s", s.rpcListener.Addr())
@@ -249,7 +247,6 @@ func (s *RPCServer) Start() error {
 		if err != nil {
 			return fmt.Errorf("REST server unable to listen on "+
 				"%v: %v", s.cfg.RESTListen, err)
-
 		}
 		restListener = tls.NewListener(
 			restListener, s.cfg.TLSServerConfig,

insights/insights.go

@@ -3,10 +3,9 @@ package insights
 import (
 	"time"
 
+	"github.com/lightninglabs/faraday/revenue"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnwire"
-
-	"github.com/lightninglabs/faraday/revenue"
 )
 
 // ChannelInfo provides a set of performance metrics for a lightning channel.

insights/insights_test.go

@@ -5,10 +5,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/lightninglabs/faraday/revenue"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnwire"
-
-	"github.com/lightninglabs/faraday/revenue"
 )
 
 // TestGetChannels tests gathering of channel insights from a set of lnrpc
@@ -144,7 +143,6 @@ func TestGetChannels(t *testing.T) {
 						insight, insights[i])
 				}
 			}
-
 		})
 	}
 }

itest/nodereport_test.go

@@ -8,16 +8,15 @@ import (
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
+	"github.com/lightninglabs/faraday/accounting"
+	"github.com/lightninglabs/faraday/fees"
+	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/stretchr/testify/require"
-
-	"github.com/lightninglabs/faraday/accounting"
-	"github.com/lightninglabs/faraday/fees"
-	"github.com/lightninglabs/faraday/frdrpc"
 )
 
 var (

itest/rpc.go

@@ -5,12 +5,11 @@ import (
 	"io/ioutil"
 
 	"github.com/btcsuite/btcd/rpcclient"
+	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"gopkg.in/macaroon.v2"
-
-	"github.com/lightninglabs/faraday/frdrpc"
 )
 
 // getBitcoindClient returns an rpc client connection to the running bitcoind

itest/test_context.go

@@ -13,6 +13,7 @@ import (
 	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/faraday"
+	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/lnrpc"
@@ -21,8 +22,6 @@ import (
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/stretchr/testify/require"
-
-	"github.com/lightninglabs/faraday/frdrpc"
 )
 
 var (

lndwrap/lndwrap.go

@@ -8,9 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/lightninglabs/lndclient"
-
 	"github.com/lightninglabs/faraday/paginater"
+	"github.com/lightninglabs/lndclient"
 )
 
 // ListInvoices makes paginated calls to lnd to get our full set of

log.go

@@ -2,15 +2,14 @@ package faraday
 
 import (
 	"github.com/btcsuite/btclog"
-	"github.com/lightningnetwork/lnd/build"
-	"github.com/lightningnetwork/lnd/signal"
-
 	"github.com/lightninglabs/faraday/accounting"
 	"github.com/lightninglabs/faraday/dataset"
 	"github.com/lightninglabs/faraday/fiat"
 	"github.com/lightninglabs/faraday/frdrpcserver"
 	"github.com/lightninglabs/faraday/recommend"
 	"github.com/lightninglabs/faraday/revenue"
+	"github.com/lightningnetwork/lnd/build"
+	"github.com/lightningnetwork/lnd/signal"
 )
 
 // Subsystem defines the logging code for this subsystem.
@@ -73,6 +72,7 @@ func genSubLogger(root *build.RotatingLogWriter,
 // logger of a sub system.
 func addSubLogger(root *build.RotatingLogWriter, subsystem string,
 	interceptor signal.Interceptor, useLogger func(btclog.Logger)) {
+
 	logger := build.NewSubLogger(subsystem, genSubLogger(root, interceptor))
 	setSubLogger(root, subsystem, logger, useLogger)
 }

resolutions/resolutions.go

@@ -8,10 +8,9 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
+	"github.com/lightninglabs/faraday/utils"
 	"github.com/lightninglabs/lndclient"
 	"github.com/shopspring/decimal"
-
-	"github.com/lightninglabs/faraday/utils"
 )
 
 var (

revenue/revenue.go

@@ -179,6 +179,7 @@ func (r Report) setRevenue(targetChan, pairChan string,
 // Revenue Report.
 func (r Report) addIncoming(incomingChannel,
 	outgoingChannel string, amount, fees lnwire.MilliSatoshi) {
+
 	revenue := r.getRevenue(incomingChannel, outgoingChannel)
 
 	// Add the fees and revenue that have been earned to the existing revenue
@@ -195,6 +196,7 @@ func (r Report) addIncoming(incomingChannel,
 // Revenue Report.
 func (r Report) addOutgoing(outgoingChannel,
 	incomingChannel string, amount, fees lnwire.MilliSatoshi) {
+
 	revenue := r.getRevenue(outgoingChannel, incomingChannel)
 
 	// Add the fees and revenue that have been earned to the existing revenue

revenue/revenue_test.go

@@ -130,7 +130,6 @@ func TestGetRevenueReport(t *testing.T) {
 				t.Fatalf("expected: \n%+v, got: \n%+v",
 					test.expectedReport, report)
 			}
-
 		})
 	}
 }