Skip to content

Commit

Permalink
multi: standardize import order
Browse files Browse the repository at this point in the history
  • Loading branch information
carlaKC committed Sep 9, 2020
1 parent 562c26c commit 2be7115
Show file tree
Hide file tree
Showing 30 changed files with 66 additions and 38 deletions.
5 changes: 3 additions & 2 deletions accounting/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (

"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcutil"
"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.
Expand Down
1 change: 1 addition & 0 deletions accounting/conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

"github.com/btcsuite/btcutil"

"github.com/lightninglabs/faraday/fiat"
"github.com/lightninglabs/faraday/utils"
)
Expand Down
3 changes: 1 addition & 2 deletions accounting/entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ import (
"fmt"
"strings"

"github.com/lightningnetwork/lnd/routing/route"

"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"
)

// FeeReference returns a special unique reference for the fee paid on a
Expand Down
3 changes: 2 additions & 1 deletion accounting/entries_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import (
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/faraday/fiat"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"
"github.com/shopspring/decimal"
"github.com/stretchr/testify/require"

"github.com/lightninglabs/faraday/fiat"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion accounting/on_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (

"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"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
Expand Down
3 changes: 2 additions & 1 deletion accounting/report.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package accounting
import (
"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.
Expand Down
3 changes: 2 additions & 1 deletion cmd/faraday/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package main

import (
"github.com/btcsuite/btclog"
"github.com/lightninglabs/faraday"
"github.com/lightningnetwork/lnd/build"

"github.com/lightninglabs/faraday"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion cmd/frcli/channel_insights.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"

"github.com/lightninglabs/faraday/frdrpc"
"github.com/urfave/cli"

"github.com/lightninglabs/faraday/frdrpc"
)

var channelInsightsCommand = cli.Command{
Expand Down
3 changes: 2 additions & 1 deletion cmd/frcli/close_recommendations.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"fmt"
"time"

"github.com/lightninglabs/faraday/frdrpc"
"github.com/urfave/cli"

"github.com/lightninglabs/faraday/frdrpc"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion cmd/frcli/close_reports.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"

"github.com/lightninglabs/faraday/frdrpc"
"github.com/urfave/cli"

"github.com/lightninglabs/faraday/frdrpc"
)

var closeReportCommand = cli.Command{
Expand Down
5 changes: 3 additions & 2 deletions cmd/frcli/fiat_estimate.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ 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 fiatEstimateCommand = cli.Command{
Expand Down
3 changes: 2 additions & 1 deletion cmd/frcli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"os"

"github.com/lightninglabs/faraday"
"github.com/urfave/cli"

"github.com/lightninglabs/faraday"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion cmd/frcli/node_report.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"strings"
"time"

"github.com/lightninglabs/faraday/frdrpc"
"github.com/urfave/cli"

"github.com/lightninglabs/faraday/frdrpc"
)

var onChainReportCommand = cli.Command{
Expand Down
3 changes: 2 additions & 1 deletion cmd/frcli/revenue_report.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"

"github.com/lightninglabs/faraday/frdrpc"
"github.com/urfave/cli"

"github.com/lightninglabs/faraday/frdrpc"
)

var revenueReportCommand = cli.Command{
Expand Down
5 changes: 3 additions & 2 deletions cmd/frcli/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import (

"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/lightninglabs/faraday"
"github.com/lightninglabs/faraday/frdrpc"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/protobuf-hex-display/jsonpb"
"github.com/lightninglabs/protobuf-hex-display/proto"
Expand All @@ -25,6 +23,9 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"gopkg.in/macaroon.v2"

"github.com/lightninglabs/faraday"
"github.com/lightninglabs/faraday/frdrpc"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ import (

"github.com/btcsuite/btcutil"
"github.com/jessevdk/go-flags"
"github.com/lightninglabs/faraday/chain"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/build"
"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 (
Expand Down
5 changes: 3 additions & 2 deletions faraday.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ package faraday
import (
"fmt"

"github.com/lightninglabs/faraday/chain"
"github.com/lightninglabs/faraday/frdrpc"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/signal"

"github.com/lightninglabs/faraday/chain"
"github.com/lightninglabs/faraday/frdrpc"
)

// Main is the real entry point for faraday. It is required to ensure that
Expand Down
3 changes: 2 additions & 1 deletion fiat/coincap_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import (
"sort"
"time"

"github.com/lightninglabs/faraday/utils"
"github.com/shopspring/decimal"

"github.com/lightninglabs/faraday/utils"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion frdrpc/close_report.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (

"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"

"github.com/lightninglabs/faraday/fees"
"github.com/lightninglabs/faraday/resolutions"
"github.com/lightninglabs/lndclient"
)

func parseCloseReportRequest(ctx context.Context, cfg *Config) *resolutions.Config {
Expand Down
3 changes: 2 additions & 1 deletion frdrpc/node_report.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import (
"context"
"fmt"

"github.com/lightninglabs/faraday/accounting"
"github.com/lightningnetwork/lnd/routing/route"

"github.com/lightninglabs/faraday/accounting"
)

// parseNodeReportRequest parses a report request and returns the config
Expand Down
3 changes: 2 additions & 1 deletion frdrpc/revenue_report.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"time"

"github.com/lightninglabs/lndclient"

"github.com/lightninglabs/faraday/lndwrap"
"github.com/lightninglabs/faraday/revenue"
"github.com/lightninglabs/lndclient"
)

// parseRevenueRequest parses a request for a revenue report and wraps
Expand Down
7 changes: 4 additions & 3 deletions frdrpc/rpcserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@ import (
"sync/atomic"

proxy "github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/lightninglabs/lndclient"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/lightninglabs/faraday/accounting"
"github.com/lightninglabs/faraday/chain"
"github.com/lightninglabs/faraday/fiat"
"github.com/lightninglabs/faraday/recommend"
"github.com/lightninglabs/faraday/resolutions"
"github.com/lightninglabs/faraday/revenue"
"github.com/lightninglabs/lndclient"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion insights/insights.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ 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.
Expand Down
3 changes: 2 additions & 1 deletion insights/insights_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ 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
Expand Down
7 changes: 4 additions & 3 deletions itest/nodereport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ import (

"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcutil"
"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 (
Expand Down
3 changes: 2 additions & 1 deletion itest/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"fmt"

"github.com/btcsuite/btcd/rpcclient"
"github.com/lightninglabs/faraday/frdrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/lightninglabs/faraday/frdrpc"
)

// getBitcoindClient returns an rpc client connection to the running bitcoind
Expand Down
3 changes: 2 additions & 1 deletion itest/test_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/btcsuite/btcd/rpcclient"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/faraday/frdrpc"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc"
Expand All @@ -21,6 +20,8 @@ import (
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"
"github.com/stretchr/testify/require"

"github.com/lightninglabs/faraday/frdrpc"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion lndwrap/lndwrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"context"
"time"

"github.com/lightninglabs/faraday/paginater"
"github.com/lightninglabs/lndclient"

"github.com/lightninglabs/faraday/paginater"
)

// ListInvoices makes paginated calls to lnd to get our full set of
Expand Down
3 changes: 2 additions & 1 deletion log.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ package faraday

import (
"github.com/btcsuite/btclog"
"github.com/lightningnetwork/lnd/build"

"github.com/lightninglabs/faraday/accounting"
"github.com/lightninglabs/faraday/dataset"
"github.com/lightninglabs/faraday/fiat"
"github.com/lightninglabs/faraday/frdrpc"
"github.com/lightninglabs/faraday/recommend"
"github.com/lightninglabs/faraday/revenue"
"github.com/lightningnetwork/lnd/build"
)

// Subsystem defines the logging code for this subsystem.
Expand Down
3 changes: 2 additions & 1 deletion resolutions/resolutions.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/faraday/utils"
"github.com/lightninglabs/lndclient"
"github.com/shopspring/decimal"

"github.com/lightninglabs/faraday/utils"
)

var (
Expand Down

0 comments on commit 2be7115

Please sign in to comment.