update frisbii, lint tool, go version

Author: LexLuthr

.circleci/config.yml

@@ -271,7 +271,7 @@ jobs:
         default: golang
       golangci-lint-version:
         type: string
-        default: 1.60.1
+        default: 2.4.0
       concurrency:
         type: string
         default: '2'

.github/workflows/ci.yml

@@ -144,7 +144,7 @@ jobs:
 
       - name: Install golangci-lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.4.0
         shell: bash
 
       - name: Lint

cli/node/node.go

@@ -3,13 +3,12 @@ package node
 import (
 	"bytes"
 	"context"
+	"crypto/rand"
 	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 
-	crand "crypto/rand"
-
 	"github.com/filecoin-project/boost/lib/keystore"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -33,7 +32,7 @@ func Setup(cfgdir string) (*Node, error) {
 
 	_, err = os.Stat(cfgdir)
 	if err != nil && errors.Is(err, os.ErrNotExist) {
-		return nil, errors.New("repo dir doesn't exist. run `boost init` first.")
+		return nil, errors.New("repo dir doesn't exist. run `boost init` first")
 	}
 
 	peerkey, err := loadOrInitPeerKey(keyPath(cfgdir))
@@ -67,7 +66,7 @@ func loadOrInitPeerKey(kf string) (crypto.PrivKey, error) {
 			return nil, err
 		}
 
-		k, _, err := crypto.GenerateEd25519Key(crand.Reader)
+		k, _, err := crypto.GenerateEd25519Key(rand.Reader)
 		if err != nil {
 			return nil, err
 		}

cmd/boost/deal_cmd.go

@@ -282,7 +282,9 @@ func dealCmdAction(cctx *cli.Context, isOnline bool) error {
 	if err != nil {
 		return fmt.Errorf("failed to open stream to peer %s: %w", addrInfo.ID, err)
 	}
-	defer s.Close()
+	defer func() {
+		_ = s.Close()
+	}()
 
 	var resp types.DealResponse
 	if err := doRpc(ctx, s, &dealParams, &resp); err != nil {

cmd/boost/deal_status_cmd.go

@@ -6,7 +6,6 @@ import (
 
 	bcli "github.com/filecoin-project/boost/cli"
 	"github.com/filecoin-project/boost/cli/node"
-	clinode "github.com/filecoin-project/boost/cli/node"
 	"github.com/filecoin-project/boost/cmd"
 	"github.com/filecoin-project/boost/storagemarket/lp2pimpl"
 	"github.com/filecoin-project/boost/storagemarket/types"
@@ -45,7 +44,7 @@ var dealStatusCmd = &cli.Command{
 			return err
 		}
 
-		n, err := clinode.Setup(cctx.String(cmd.FlagRepo.Name))
+		n, err := node.Setup(cctx.String(cmd.FlagRepo.Name))
 		if err != nil {
 			return err
 		}

cmd/boost/direct_deal.go

@@ -130,7 +130,9 @@ var directDealAllocate = &cli.Command{
 			if err != nil {
 				return err
 			}
-			defer file.Close()
+			defer func() {
+				_ = file.Close()
+			}()
 			scanner := bufio.NewScanner(file)
 			for scanner.Scan() {
 				line := scanner.Text()

cmd/boost/helper.go

@@ -25,15 +25,15 @@ func NewAppFmt(a *ufcli.App) *AppFmt {
 }
 
 func (a *AppFmt) Print(args ...interface{}) {
-	fmt.Fprint(a.app.Writer, args...)
+	_, _ = fmt.Fprint(a.app.Writer, args...)
 }
 
 func (a *AppFmt) Println(args ...interface{}) {
-	fmt.Fprintln(a.app.Writer, args...)
+	_, _ = fmt.Fprintln(a.app.Writer, args...)
 }
 
 func (a *AppFmt) Printf(fmtstr string, args ...interface{}) {
-	fmt.Fprintf(a.app.Writer, fmtstr, args...)
+	_, _ = fmt.Fprintf(a.app.Writer, fmtstr, args...)
 }
 
 func (a *AppFmt) Scan(args ...interface{}) (int, error) {

cmd/boost/provider_cmd.go

@@ -170,7 +170,9 @@ var storageAskCmd = &cli.Command{
 		if err != nil {
 			return fmt.Errorf("failed to open stream to peer %s: %w", addrInfo.ID, err)
 		}
-		defer s.Close()
+		defer func() {
+			_ = s.Close()
+		}()
 
 		var resp network.AskResponse
 

cmd/boost/retrieve_cmd.go

@@ -166,7 +166,9 @@ var retrieveCmd = &cli.Command{
 			return fmt.Errorf("setting up temp dir: %w", err)
 		}
 		// Clean up the temp directory before exiting
-		defer os.RemoveAll(bstoreTmpDir)
+		defer func() {
+			_ = os.RemoveAll(bstoreTmpDir)
+		}()
 
 		bstoreDatastore, err := flatfs.CreateOrOpen(bstoreTmpDir, flatfs.NextToLast(3), false)
 		bstore := blockstore.NewBlockstore(bstoreDatastore, blockstore.NoPrefix())
@@ -180,7 +182,9 @@ var retrieveCmd = &cli.Command{
 			return fmt.Errorf("setting up temp dir: %w", err)
 		}
 		// Clean up the temp directory before exiting
-		defer os.RemoveAll(datastoreTmpDir)
+		defer func() {
+			_ = os.RemoveAll(datastoreTmpDir)
+		}()
 
 		ds, err := levelds.NewDatastore(datastoreTmpDir, nil)
 		if err != nil {
@@ -200,7 +204,7 @@ var retrieveCmd = &cli.Command{
 
 		proposal, err := rc.RetrievalProposalForAsk(query, c, selNode)
 		if err != nil {
-			return fmt.Errorf("Failed to create retrieval proposal with candidate miner %s: %v", miner, err)
+			return fmt.Errorf("failed to create retrieval proposal with candidate miner %s: %v", miner, err)
 		}
 
 		// Retrieve the data
@@ -213,7 +217,7 @@ var retrieveCmd = &cli.Command{
 			},
 		)
 		if err != nil {
-			return fmt.Errorf("Failed to retrieve content with candidate miner %s: %v", miner, err)
+			return fmt.Errorf("failed to retrieve content with candidate miner %s: %v", miner, err)
 		}
 
 		printRetrievalStats(&FILRetrievalStats{RStats: *stats})

cmd/boost/util/evm.go

@@ -96,7 +96,7 @@ func getAddressAllowanceOnContract(ctx context.Context, api api.Gateway, wallet
 	// Parse the contract ABI
 	parsedABI, err := eabi.JSON(strings.NewReader(contractABI))
 	if err != nil {
-		return nil, fmt.Errorf("Failed to parse contract ABI: %w", err)
+		return nil, fmt.Errorf("failed to parse contract ABI: %w", err)
 	}
 
 	// Convert from Filecoin to Eth Address
@@ -136,7 +136,7 @@ func getAddressAllowanceOnContract(ctx context.Context, api api.Gateway, wallet
 	}
 
 	if result.MsgRct.ExitCode.IsError() {
-		return nil, fmt.Errorf("Checking allowance failed with ExitCode %d", result.MsgRct.ExitCode)
+		return nil, fmt.Errorf("checking allowance failed with ExitCode %d", result.MsgRct.ExitCode)
 	}
 
 	// Decode return value (cbor -> evm ABI -> math/big Int -> filecoin big Int)
@@ -157,7 +157,7 @@ func buildTransferViaEVMParams(amount *big.Int, receiverParams []byte) ([]byte,
 	// Parse the contract's ABI
 	parsedABI, err := eabi.JSON(strings.NewReader(contractABI))
 	if err != nil {
-		return nil, fmt.Errorf("Failed to parse contract ABI: %w", err)
+		return nil, fmt.Errorf("failed to parse contract ABI: %w", err)
 	}
 
 	// convert amount from Filecoin big.Int to math/big Int