linter: fix lint issues after linter update

Author: hieblmi

assets/client.go

@@ -290,7 +290,8 @@ func getClientConn(config *TapdConfig) (*grpc.ClientConn, error) {
 		return nil, err
 	}
 	mac := &macaroon.Macaroon{}
-	if err := mac.UnmarshalBinary(macBytes); err != nil {
+	err = mac.UnmarshalBinary(macBytes)
+	if err != nil {
 		return nil, err
 	}
 

client.go

@@ -93,6 +93,8 @@ var (
 // Client performs the client side part of swaps. This interface exists to be
 // able to implement a stub.
 type Client struct {
+	clientConfig
+
 	started uint32 // To be used atomically.
 	errChan chan error
 
@@ -107,8 +109,6 @@ type Client struct {
 
 	resumeReady chan struct{}
 	wg          sync.WaitGroup
-
-	clientConfig
 }
 
 // ClientConfig is the exported configuration structure that is required to

cmd/loop/instantout.go

@@ -187,7 +187,6 @@ func instantOut(ctx *cli.Context) error {
 			DestAddr:        ctx.String("addr"),
 		},
 	)
-
 	if err != nil {
 		return err
 	}
@@ -228,5 +227,6 @@ func listInstantOuts(ctx *cli.Context) error {
 	}
 
 	printRespJSON(resp)
+
 	return nil
 }

cmd/loop/loopin.go

@@ -126,11 +126,13 @@ func loopIn(ctx *cli.Context) error {
 
 	// Validate our label early so that we can fail before getting a quote.
 	label := ctx.String(labelFlag.Name)
-	if err := labels.Validate(label); err != nil {
+	err = labels.Validate(label)
+	if err != nil {
 		return err
 	}
 
 	var lastHop []byte
+
 	if ctx.IsSet(lastHopFlag.Name) {
 		lastHopVertex, err := route.NewVertexFromStr(
 			ctx.String(lastHopFlag.Name),
@@ -207,6 +209,7 @@ func loopIn(ctx *cli.Context) error {
 
 	fmt.Printf("Swap initiated\n")
 	fmt.Printf("ID:           %v\n", resp.Id)
+
 	if resp.HtlcAddressP2Tr != "" {
 		fmt.Printf("HTLC address (P2TR): %v\n", resp.HtlcAddressP2Tr)
 	} else {

cmd/loop/loopout.go

@@ -148,6 +148,7 @@ func loopOut(ctx *cli.Context) error {
 	// Otherwise, strings.Split returns a slice of length one with an empty
 	// element.
 	var outgoingChanSet []uint64
+
 	if ctx.IsSet("channel") {
 		if ctx.IsSet("asset_id") {
 			return fmt.Errorf("channel flag is not supported when " +
@@ -166,7 +167,8 @@ func loopOut(ctx *cli.Context) error {
 
 	// Validate our label early so that we can fail before getting a quote.
 	label := ctx.String(labelFlag.Name)
-	if err := labels.Validate(label); err != nil {
+	err = labels.Validate(label)
+	if err != nil {
 		return err
 	}
 
@@ -177,6 +179,7 @@ func loopOut(ctx *cli.Context) error {
 	}
 
 	var destAddr string
+
 	var account string
 	switch {
 	case ctx.IsSet("addr"):
@@ -338,6 +341,7 @@ func loopOut(ctx *cli.Context) error {
 	fmt.Printf("Swap initiated\n")
 	fmt.Printf("ID:             %x\n", resp.IdBytes)
 	fmt.Printf("HTLC address:   %v\n", resp.HtlcAddress) // nolint:staticcheck
+
 	if resp.ServerMessage != "" {
 		fmt.Printf("Server message: %v\n", resp.ServerMessage)
 	}

cmd/loop/main.go

@@ -140,6 +140,7 @@ func printJSON(resp interface{}) {
 	if err != nil {
 		fatal(err)
 	}
+
 	out.WriteString("\n")
 	_, _ = out.WriteTo(os.Stdout)
 }
@@ -446,7 +447,8 @@ func readMacaroon(macPath string) (grpc.DialOption, error) {
 	}
 
 	mac := &macaroon.Macaroon{}
-	if err = mac.UnmarshalBinary(macBytes); err != nil {
+	err = mac.UnmarshalBinary(macBytes)
+	if err != nil {
 		return nil, fmt.Errorf("unable to decode macaroon: %v", err)
 	}
 

cmd/loop/staticaddr.go

@@ -417,6 +417,7 @@ func utxosToOutpoints(utxos []string) ([]*looprpc.OutPoint, error) {
 	if len(utxos) == 0 {
 		return nil, fmt.Errorf("no utxos specified")
 	}
+
 	for _, utxo := range utxos {
 		outpoint, err := NewProtoOutPoint(utxo)
 		if err != nil {
@@ -509,7 +510,8 @@ func staticAddressLoopIn(ctx *cli.Context) error {
 	)
 
 	// Validate our label early so that we can fail before getting a quote.
-	if err := labels.Validate(label); err != nil {
+	err = labels.Validate(label)
+	if err != nil {
 		return err
 	}
 

cost_migration.go

@@ -25,7 +25,7 @@ func CalculateLoopOutCost(params *chaincfg.Params, loopOutSwap *loopdb.LoopOut,
 	paymentFees map[lntypes.Hash]lnwire.MilliSatoshi) (loopdb.SwapCost,
 	error) {
 
-	// First make sure that this swap is actually finished.
+	// First, make sure that this swap is actually finished.
 	if loopOutSwap.State().State.IsPending() {
 		return loopdb.SwapCost{}, fmt.Errorf("swap is not yet finished")
 	}
@@ -41,8 +41,8 @@ func CalculateLoopOutCost(params *chaincfg.Params, loopOutSwap *loopdb.LoopOut,
 	}
 
 	// The swap hash is given and we don't need to get it from the
-	// swap invoice, however we'll decode it anyway to get the invoice amount
-	// that was paid in case we don't have the payment anymore.
+	// swap invoice, however we'll decode it anyway to get the invoice
+	// amount that was paid in case we don't have the payment anymore.
 	_, _, swapHash, swapPaymentAmount, err := swap.DecodeInvoice(
 		params, loopOutSwap.Contract.SwapInvoice,
 	)
@@ -195,6 +195,6 @@ func MigrateLoopOutCosts(ctx context.Context, lnd lndclient.LndServices,
 		return err
 	}
 
-	// Finally mark the migration as done.
+	// Finally, mark the migration as done.
 	return db.SetMigration(ctx, costMigrationID)
 }

executor.go

@@ -45,14 +45,13 @@ type executorConfig struct {
 //
 // TODO(roasbeef): rename to SubSwapper.
 type executor struct {
+	sync.Mutex
+	executorConfig
+
 	wg            sync.WaitGroup
 	newSwaps      chan genericSwap
 	currentHeight uint32
 	ready         chan struct{}
-
-	sync.Mutex
-
-	executorConfig
 }
 
 // newExecutor returns a new swap executor instance.
@@ -80,7 +79,6 @@ func (s *executor) run(mainCtx context.Context,
 	for {
 		blockEpochChan, blockErrorChan, err =
 			s.lnd.ChainNotifier.RegisterBlockEpochNtfn(mainCtx)
-
 		if err == nil {
 			break
 		}

fsm/fsm.go

@@ -138,7 +138,7 @@ func NewStateMachine(states States, observerSize int) *StateMachine {
 func NewStateMachineWithState(states States, current StateType,
 	observerSize int) *StateMachine {
 
-	observers := []Observer{}
+	var observers []Observer
 	var defaultObserver *CachedObserver
 
 	if observerSize > 0 {