multi: update linter, fix issues

Author: guggero

.golangci.yml

@@ -76,6 +76,9 @@ linters:
   - golint
   - maligned
   - scopelint
+  - varcheck
+  - structcheck
+  - deadcode
 
   # New linters that need a code adjustment first.
   - wrapcheck
@@ -107,6 +110,10 @@ linters:
   - stylecheck
   - thelper
   - revive
+  - tagalign
+  - depguard
+  - nosnakecase
+  - interfacebloat
 
   # Additions compared to LND
   - exhaustruct
@@ -122,6 +129,10 @@ issues:
         linters:
           - forbidigo
           - unparam
+          - gosec
+      - path: _mock\.go
+        linters:
+          - gosec
 
       # Allow fmt.Printf() in loopd
       - path: cmd/loopd/*

client.go

@@ -204,6 +204,8 @@ func (s *Client) FetchSwaps(ctx context.Context) ([]*SwapInfo, error) {
 	swaps := make([]*SwapInfo, 0, len(loopInSwaps)+len(loopOutSwaps))
 
 	for _, swp := range loopOutSwaps {
+		swp := swp
+
 		swapInfo := &SwapInfo{
 			SwapType:      swap.TypeOut,
 			SwapContract:  swp.Contract.SwapContract,
@@ -235,6 +237,8 @@ func (s *Client) FetchSwaps(ctx context.Context) ([]*SwapInfo, error) {
 	}
 
 	for _, swp := range loopInSwaps {
+		swp := swp
+
 		swapInfo := &SwapInfo{
 			SwapType:      swap.TypeIn,
 			SwapContract:  swp.Contract.SwapContract,

fsm/fsm_test.go

@@ -88,8 +88,9 @@ func TestStateMachine_ActionError(t *testing.T) {
 
 	// Add a Transition to State2 if the Action on Stat2 fails.
 	// The new StateMap looks like this:
-	// State1 -> Event1 -> State2
-	// State2 -> OnError -> ErrorState
+	// 	State1 -> Event1 -> State2
+	//
+	// 	State2 -> OnError -> ErrorState
 	states["State2"] = State{
 		Action: ctx.errorAction,
 		Transitions: Transitions{

liquidity/autoloop_test.go

@@ -984,7 +984,7 @@ func TestAutoloopBothTypes(t *testing.T) {
 				Events: []*loopdb.LoopEvent{
 					{
 						SwapStateData: loopdb.SwapStateData{
-							State: loopdb.SwapState(loopdb.StateSuccess),
+							State: loopdb.StateSuccess,
 						},
 					},
 				},
@@ -1168,7 +1168,7 @@ func TestAutoLoopRecurringBudget(t *testing.T) {
 				Events: []*loopdb.LoopEvent{
 					{
 						SwapStateData: loopdb.SwapStateData{
-							State: loopdb.SwapState(loopdb.StateSuccess),
+							State: loopdb.StateSuccess,
 						},
 					},
 				},

liquidity/fees.go

@@ -349,7 +349,7 @@ func (f *FeePortion) loopOutLimits(swapAmt btcutil.Amount,
 	// multiplier from the miner fees. We do this because we want to
 	// consider the average case for our budget calculations and not the
 	// severe edge-case miner fees.
-	miner = miner / maxMinerMultiplier
+	miner /= maxMinerMultiplier
 
 	// Calculate the worst case fees that we could pay for this swap,
 	// ensuring that we are within our fee limit even if the swap fails.

liquidity/liquidity.go

@@ -536,10 +536,7 @@ func (m *Manager) dispatchBestEasyAutoloopSwap(ctx context.Context) error {
 
 	// Get a summary of our existing swaps so that we can check our autoloop
 	// budget.
-	summary, err := m.checkExistingAutoLoops(ctx, loopOut, loopIn)
-	if err != nil {
-		return err
-	}
+	summary := m.checkExistingAutoLoops(ctx, loopOut, loopIn)
 
 	err = m.checkSummaryBudget(summary)
 	if err != nil {
@@ -581,7 +578,7 @@ func (m *Manager) dispatchBestEasyAutoloopSwap(ctx context.Context) error {
 	// allowed clamp it to max.
 	amount := localTotal - m.params.EasyAutoloopTarget
 	if amount > restrictions.Maximum {
-		amount = btcutil.Amount(restrictions.Maximum)
+		amount = restrictions.Maximum
 	}
 
 	// If the amount we want to loop out is less than the minimum we can't
@@ -601,7 +598,7 @@ func (m *Manager) dispatchBestEasyAutoloopSwap(ctx context.Context) error {
 	builder := newLoopOutBuilder(m.cfg)
 
 	channel := m.pickEasyAutoloopChannel(
-		channels, restrictions, loopOut, loopIn, amount,
+		channels, restrictions, loopOut, loopIn,
 	)
 	if channel == nil {
 		return fmt.Errorf("no eligible channel for easy autoloop")
@@ -624,12 +621,12 @@ func (m *Manager) dispatchBestEasyAutoloopSwap(ctx context.Context) error {
 	switch feeLimit := easyParams.FeeLimit.(type) {
 	case *FeePortion:
 		if feeLimit.PartsPerMillion == 0 {
-			feeLimit = &FeePortion{
+			easyParams.FeeLimit = &FeePortion{
 				PartsPerMillion: defaultFeePPM,
 			}
 		}
 	default:
-		feeLimit = &FeePortion{
+		easyParams.FeeLimit = &FeePortion{
 			PartsPerMillion: defaultFeePPM,
 		}
 	}
@@ -646,16 +643,16 @@ func (m *Manager) dispatchBestEasyAutoloopSwap(ctx context.Context) error {
 		return err
 	}
 
-	swap := loop.OutRequest{}
+	var swp loop.OutRequest
 	if t, ok := suggestion.(*loopOutSwapSuggestion); ok {
-		swap = t.OutRequest
+		swp = t.OutRequest
 	} else {
 		return fmt.Errorf("unexpected swap suggestion type: %T", t)
 	}
 
 	// Dispatch a sticky loop out.
 	go m.dispatchStickyLoopOut(
-		ctx, swap, defaultAmountBackoffRetry, defaultAmountBackoff,
+		ctx, swp, defaultAmountBackoffRetry, defaultAmountBackoff,
 	)
 
 	return nil
@@ -762,10 +759,7 @@ func (m *Manager) SuggestSwaps(ctx context.Context) (
 
 	// Get a summary of our existing swaps so that we can check our autoloop
 	// budget.
-	summary, err := m.checkExistingAutoLoops(ctx, loopOut, loopIn)
-	if err != nil {
-		return nil, err
-	}
+	summary := m.checkExistingAutoLoops(ctx, loopOut, loopIn)
 
 	err = m.checkSummaryBudget(summary)
 	if err != nil {
@@ -1074,9 +1068,9 @@ func (e *existingAutoLoopSummary) totalFees() btcutil.Amount {
 // automatically dispatched swaps that have completed, and the worst-case fee
 // total for our set of ongoing, automatically dispatched swaps as well as a
 // current in-flight count.
-func (m *Manager) checkExistingAutoLoops(ctx context.Context,
-	loopOuts []*loopdb.LoopOut, loopIns []*loopdb.LoopIn) (
-	*existingAutoLoopSummary, error) {
+func (m *Manager) checkExistingAutoLoops(_ context.Context,
+	loopOuts []*loopdb.LoopOut,
+	loopIns []*loopdb.LoopIn) *existingAutoLoopSummary {
 
 	var summary existingAutoLoopSummary
 
@@ -1133,7 +1127,7 @@ func (m *Manager) checkExistingAutoLoops(ctx context.Context,
 		}
 	}
 
-	return &summary, nil
+	return &summary
 }
 
 // currentSwapTraffic examines our existing swaps and returns a summary of the
@@ -1416,7 +1410,7 @@ func (m *Manager) waitForSwapPayment(ctx context.Context, swapHash lntypes.Hash,
 // swap conflicts.
 func (m *Manager) pickEasyAutoloopChannel(channels []lndclient.ChannelInfo,
 	restrictions *Restrictions, loopOut []*loopdb.LoopOut,
-	loopIn []*loopdb.LoopIn, amount btcutil.Amount) *lndclient.ChannelInfo {
+	loopIn []*loopdb.LoopIn) *lndclient.ChannelInfo {
 
 	traffic := m.currentSwapTraffic(loopOut, loopIn)
 
@@ -1472,7 +1466,6 @@ func (m *Manager) numActiveStickyLoops() int {
 	defer m.activeStickyLock.Unlock()
 
 	return m.activeStickyLoops
-
 }
 
 func (m *Manager) checkSummaryBudget(summary *existingAutoLoopSummary) error {
@@ -1482,7 +1475,6 @@ func (m *Manager) checkSummaryBudget(summary *existingAutoLoopSummary) error {
 			"(upper limit)",
 			m.params.AutoFeeBudget, summary.spentFees,
 			summary.pendingFees)
-
 	}
 
 	return nil
@@ -1556,7 +1548,3 @@ func satPerKwToSatPerVByte(satPerKw chainfee.SatPerKWeight) int64 {
 func ppmToSat(amount btcutil.Amount, ppm uint64) btcutil.Amount {
 	return btcutil.Amount(uint64(amount) * ppm / FeeBase)
 }
-
-func mSatToSatoshis(amount lnwire.MilliSatoshi) btcutil.Amount {
-	return btcutil.Amount(amount / 1000)
-}

liquidity/parameters.go

@@ -3,13 +3,13 @@ package liquidity
 import (
 	"errors"
 	"fmt"
-	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"strings"
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/swap"
+	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
@@ -527,7 +527,6 @@ func ParametersToRpc(cfg Parameters) (*clientrpc.LiquidityParameters,
 
 	default:
 		addrType = clientrpc.AddressType_ADDRESS_TYPE_UNKNOWN
-
 	}
 
 	rpcCfg := &clientrpc.LiquidityParameters{

liquidity/threshold_rule.go

@@ -127,10 +127,10 @@ func (r *ThresholdRule) swapAmount(channel *balances,
 // This function can be used for loop out or loop in, but the concept is the
 // same - we want liquidity in one (target) direction, while preserving some
 // minimum in the other (reserve) direction.
-// * target: this is the side of the channel(s) where we want to acquire some
-//   liquidity. We aim for this liquidity to reach the threshold amount set.
-// * reserve: this is the side of the channel(s) that we will move liquidity
-//   away from. This may not drop below a certain reserve threshold.
+//   - target: this is the side of the channel(s) where we want to acquire some
+//     liquidity. We aim for this liquidity to reach the threshold amount set.
+//   - reserve: this is the side of the channel(s) that we will move liquidity
+//     away from. This may not drop below a certain reserve threshold.
 func calculateSwapAmount(targetAmount, reserveAmount,
 	capacity btcutil.Amount, targetThresholdPercentage,
 	reserveThresholdPercentage uint64) btcutil.Amount {

loopd/daemon.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 
 	"github.com/coreos/bbolt"
 	proxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
@@ -302,7 +303,10 @@ func (d *Daemon) startWebServers() error {
 	if d.restListener != nil {
 		log.Infof("Starting REST proxy listener")
 
-		d.restServer = &http.Server{Handler: restHandler}
+		d.restServer = &http.Server{
+			Handler:           restHandler,
+			ReadHeaderTimeout: 5 * time.Second,
+		}
 
 		d.wg.Add(1)
 		go func() {

loopd/migration.go

@@ -61,7 +61,7 @@ func migrateBoltdb(ctx context.Context, cfg *Config) error {
 		return err
 	}
 
-	// If the migration was successfull we'll rename the bolt db to
+	// If the migration was successful we'll rename the bolt db to
 	// loop.db.bk.
 	err = os.Rename(
 		filepath.Join(cfg.DataDir, "loop.db"),