linter: fix lint issues after migrating to golangci-lint v2

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

@@ -40,6 +40,7 @@ func instantOut(ctx *cli.Context) error {
 	// Otherwise, strings.Split returns a slice of length one with an empty
 	// element.
 	var outgoingChanSet []uint64
+
 	if ctx.IsSet("channel") {
 		chanStrings := strings.Split(ctx.String("channel"), ",")
 		for _, chanString := range chanStrings {
@@ -48,6 +49,7 @@ func instantOut(ctx *cli.Context) error {
 				return fmt.Errorf("error parsing channel id "+
 					"\"%v\"", chanString)
 			}
+
 			outgoingChanSet = append(outgoingChanSet, chanID)
 		}
 	}
@@ -87,6 +89,7 @@ func instantOut(ctx *cli.Context) error {
 	}
 
 	fmt.Printf("Available reservations: \n\n")
+
 	for _, res := range confirmedReservations {
 		idx++
 		fmt.Printf("Reservation %v: shortid %x, amt %v, expiry "+
@@ -111,6 +114,7 @@ func instantOut(ctx *cli.Context) error {
 		selectedReservations [][]byte
 		selectedAmt          uint64
 	)
+
 	switch answer {
 	case "ALL":
 		for _, res := range confirmedReservations {
@@ -127,18 +131,21 @@ func instantOut(ctx *cli.Context) error {
 	default:
 		selectedIndexes := strings.Split(answer, ",")
 		selectedIndexMap := make(map[int]struct{})
+
 		for _, idxStr := range selectedIndexes {
 			idx, err := strconv.Atoi(idxStr)
 			if err != nil {
 				return err
 			}
+
 			if idx < 0 {
 				return fmt.Errorf("invalid index %v", idx)
 			}
 
 			if idx > len(confirmedReservations) {
 				return fmt.Errorf("invalid index %v", idx)
 			}
+
 			if _, ok := selectedIndexMap[idx]; ok {
 				return fmt.Errorf("duplicate index %v", idx)
 			}
@@ -164,6 +171,7 @@ func instantOut(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
+
 	fmt.Println()
 	fmt.Printf(satAmtFmt, "Estimated on-chain fee:", quote.SweepFeeSat)
 	fmt.Printf(satAmtFmt, "Service fee:", quote.ServiceFeeSat)
@@ -172,6 +180,7 @@ func instantOut(ctx *cli.Context) error {
 	fmt.Printf("CONTINUE SWAP? (y/n): ")
 
 	fmt.Scanln(&answer)
+
 	if answer != "y" {
 		return errors.New("swap canceled")
 	}
@@ -187,7 +196,6 @@ func instantOut(ctx *cli.Context) error {
 			DestAddr:        ctx.String("addr"),
 		},
 	)
-
 	if err != nil {
 		return err
 	}
@@ -228,5 +236,6 @@ func listInstantOuts(ctx *cli.Context) error {
 	}
 
 	printRespJSON(resp)
+
 	return nil
 }

cmd/loop/l402.go

@@ -48,6 +48,7 @@ func listAuth(ctx *cli.Context) error {
 	tokens := make([]*printableToken, len(resp.Tokens))
 	for i, t := range resp.Tokens {
 		mac := &macaroon.Macaroon{}
+
 		err := mac.UnmarshalBinary(t.BaseMacaroon)
 		if err != nil {
 			return fmt.Errorf("unable to unmarshal macaroon: %v",

cmd/loop/liquidity.go

@@ -87,13 +87,15 @@ func setRule(ctx *cli.Context) error {
 		pubkey     route.Vertex
 		pubkeyRule bool
 	)
+
 	chanID, err := strconv.ParseUint(ctx.Args().First(), 10, 64)
 	if err != nil {
 		pubkey, err = route.NewVertexFromStr(ctx.Args().First())
 		if err != nil {
 			return fmt.Errorf("please provide a valid pubkey: "+
 				"%v, or short channel ID", err)
 		}
+
 		pubkeyRule = true
 	}
 
@@ -177,6 +179,7 @@ func setRule(ctx *cli.Context) error {
 		ChannelId: chanID,
 		Type:      looprpc.LiquidityRuleType_THRESHOLD,
 	}
+
 	if ctx.IsSet("type") {
 		switch ctx.String("type") {
 		case "in":
@@ -406,6 +409,7 @@ func setParams(ctx *cli.Context) error {
 	if ctx.IsSet("maxswapfee") {
 		feeRate := ctx.Float64("maxswapfee")
 		params.MaxSwapFeePpm, err = ppmFromPercentage(feeRate)
+
 		if err != nil {
 			return err
 		}
@@ -425,6 +429,7 @@ func setParams(ctx *cli.Context) error {
 	if ctx.IsSet("feepercent") {
 		feeRate := ctx.Float64("feepercent")
 		params.FeePpm, err = ppmFromPercentage(feeRate)
+
 		if err != nil {
 			return err
 		}
@@ -447,6 +452,7 @@ func setParams(ctx *cli.Context) error {
 	if ctx.IsSet("maxprepayfee") {
 		feeRate := ctx.Float64("maxprepayfee")
 		params.MaxPrepayRoutingFeePpm, err = ppmFromPercentage(feeRate)
+
 		if err != nil {
 			return err
 		}
@@ -551,6 +557,7 @@ func setParams(ctx *cli.Context) error {
 				map[string]*looprpc.EasyAssetAutoloopParams,
 			)
 		}
+
 		if _, ok := params.EasyAssetParams[ctx.String("asset_id")]; !ok { //nolint:lll
 			params.EasyAssetParams[ctx.String("asset_id")] =
 				&looprpc.EasyAssetAutoloopParams{}
@@ -572,6 +579,7 @@ func setParams(ctx *cli.Context) error {
 			return fmt.Errorf("asset_id must be set to use " +
 				"asset_easyautoloop")
 		}
+
 		params.EasyAssetParams[ctx.String("asset_id")].
 			Enabled = ctx.Bool("asset_easyautoloop")
 		flagSet = true
@@ -582,6 +590,7 @@ func setParams(ctx *cli.Context) error {
 			return fmt.Errorf("asset_id must be set to use " +
 				"asset_localbalance")
 		}
+
 		params.EasyAssetParams[ctx.String("asset_id")].
 			LocalTargetAssetAmt = ctx.Uint64("asset_localbalance")
 		flagSet = true

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

@@ -261,6 +261,7 @@ func listDeposits(ctx *cli.Context) error {
 	defer cleanup()
 
 	var filterState looprpc.DepositState
+
 	switch ctx.String("filter") {
 	case "":
 		// If no filter is specified, we'll default to showing all.
@@ -417,6 +418,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 +511,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
 	}
 
@@ -550,6 +553,7 @@ func staticAddressLoopIn(ctx *cli.Context) error {
 	}
 
 	var depositOutpoints []string
+
 	switch {
 	case isAllSelected == isUtxoSelected:
 		return errors.New("must select either all or some utxos")

cmd/loop/swaps.go

@@ -62,6 +62,7 @@ func listSwaps(ctx *cli.Context) error {
 	filter := &looprpc.ListSwapsFilter{}
 
 	// Set the swap type filter.
+
 	switch {
 	case ctx.Bool("loop_out_only"):
 		filter.SwapType = looprpc.ListSwapsFilter_LOOP_OUT
@@ -150,6 +151,7 @@ func swapInfo(ctx *cli.Context) error {
 	args := ctx.Args()
 
 	var id string
+
 	switch {
 	case ctx.IsSet("id"):
 		id = ctx.String("id")