chore: format code (#270)

api/modules_test.go

@@ -17,7 +17,7 @@ import (
 // weather `limiter.WraperLimiter` could warp 'msgAPI' to 'ratelimitAPI' or not,
 // if ok, all member function in 'ratelimitAPI' is not nil
 func TestLimitWrap(t *testing.T) {
-	//todo make test injection more generic
+	// todo make test injection more generic
 	provider := fx.Options(
 		fx.Supply(&config.RateLimitConfig{
 			Redis: "test url",

cli/address.go

@@ -16,7 +16,7 @@ var AddrCmds = &cli.Command{
 		searchAddrCmd,
 		listAddrCmd,
 		deleteAddrCmd,
-		//updateNonceCmd,
+		// updateNonceCmd,
 		forbiddenAddrCmd,
 		activeAddrCmd,
 		setAddrSelMsgNumCmd,

cli/msg.go

@@ -474,7 +474,6 @@ var updateFilledMessageCmd = &cli.Command{
 
 		var id string
 		if id = ctx.String("id"); len(id) > 0 {
-
 		} else if signedCidStr := ctx.String("signed_cid"); len(signedCidStr) > 0 {
 			signedCid, err := cid.Decode(signedCidStr)
 			if err != nil {

cli/node.go

@@ -63,7 +63,6 @@ var addNodeCmd = &cli.Command{
 		}
 		if has {
 			return fmt.Errorf("node exist")
-
 		}
 
 		err = client.SaveNode(ctx.Context, &node)

cli/tablewriter/tablewriter.go

@@ -35,7 +35,7 @@ func NewLineCol(name string) Column {
 }
 
 // New unlike text/tabwriter, this works with CLI escape codes, and allows for info
-//  in separate lines
+// in separate lines
 func New(cols ...Column) *TableWriter {
 	return &TableWriter{
 		cols: cols,

cmds/cfg_example/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"io/ioutil"
+	"os"
 
 	"github.com/pelletier/go-toml"
 
@@ -10,5 +10,5 @@ import (
 
 func main() {
 	bytes, _ := toml.Marshal(config.DefaultConfig())
-	_ = ioutil.WriteFile("messager.toml", bytes, 0777)
+	_ = os.WriteFile("messager.toml", bytes, 0o777)
 }

filestore/file_store.go

@@ -2,7 +2,6 @@ package filestore
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -54,7 +53,7 @@ func NewFSRepo(repoPath string) (FSRepo, error) {
 }
 
 func InitFSRepo(repoPath string, cfg *config.Config) (FSRepo, error) {
-	if err := os.MkdirAll(repoPath, 0775); err != nil {
+	if err := os.MkdirAll(repoPath, 0o775); err != nil {
 		return nil, err
 	}
 
@@ -91,13 +90,13 @@ func (r *fsRepo) ReplaceConfig(cfg *config.Config) error {
 }
 
 func (r *fsRepo) SaveToken(token []byte) error {
-	err := ioutil.WriteFile(filepath.Join(r.path, TokenFile), token, 0644)
+	err := os.WriteFile(filepath.Join(r.path, TokenFile), token, 0o644)
 	if err != nil {
 		return fmt.Errorf("write token to token file failed: %v", err)
 	}
 	return nil
 }
 
 func (r *fsRepo) GetToken() ([]byte, error) {
-	return ioutil.ReadFile(filepath.Join(r.path, TokenFile))
+	return os.ReadFile(filepath.Join(r.path, TokenFile))
 }

gateway/gateway_client.go

@@ -55,10 +55,11 @@ func (w *WalletProxy) getCachedClient(account string, addr address.Address) gate
 }
 
 // todo: think about 'fastSelectAvaClient' was called parallelly,
-//  input the same params('account', 'address')
+//
+//	input the same params('account', 'address')
 func (w *WalletProxy) fastSelectAvaClient(ctx context.Context, account string, addr address.Address) (gateway.IWalletClient, error) {
-	var g = &sync.WaitGroup{}
-	var ch = make(chan gateway.IWalletClient, 1)
+	g := &sync.WaitGroup{}
+	ch := make(chan gateway.IWalletClient, 1)
 	for url, c := range w.clients {
 		g.Add(1)
 		go func(url string, c gateway.IWalletClient) {
@@ -97,7 +98,8 @@ func (w *WalletProxy) WalletHas(ctx context.Context, supportAccount string, addr
 }
 
 func (w *WalletProxy) WalletSign(ctx context.Context, account string,
-	addr address.Address, toSign []byte, meta venusTypes.MsgMeta) (*crypto.Signature, error) {
+	addr address.Address, toSign []byte, meta venusTypes.MsgMeta,
+) (*crypto.Signature, error) {
 	var err error
 	var useCachedClient bool
 
@@ -143,7 +145,7 @@ func NewWalletClient(ctx context.Context,
 	cfg *config.GatewayConfig,
 	logger *log.Logger,
 ) (*WalletProxy, jsonrpc.ClientCloser, error) {
-	var proxy = &WalletProxy{
+	proxy := &WalletProxy{
 		clients:             make(map[string]gateway.IWalletClient),
 		avaliabeClientCache: make(map[cacheKey]gateway.IWalletClient),
 		logger:              logger,
@@ -153,7 +155,6 @@ func NewWalletClient(ctx context.Context,
 
 	for _, url := range cfg.Url {
 		c, cls, err := gateway.DialIGatewayRPC(ctx, url, cfg.Token, nil)
-
 		if err != nil {
 			return nil, nil, fmt.Errorf("create geteway client with url:%s failed:%w", url, err)
 		}

integration_test/address_test.go

@@ -95,7 +95,8 @@ func testGetAddressAndHasAddress(ctx context.Context,
 	t *testing.T,
 	api messager.IMessager,
 	allAddrs []address.Address,
-	usedAddrs map[address.Address]struct{}) {
+	usedAddrs map[address.Address]struct{},
+) {
 	var err error
 	for _, addr := range allAddrs {
 		_, ok := usedAddrs[addr]

integration_test/message_test.go

@@ -772,7 +772,6 @@ func checkUnsignedMsg(t *testing.T, expect, actual *shared.Message) {
 	assert.Equal(t, testhelper.ResolveAddr(t, expect.From), actual.From)
 	// todo: finish estimate gas
 	if actual.Nonce > 0 {
-
 	} else {
 		assert.Equal(t, expect.GasLimit, actual.GasLimit)
 		assert.Equal(t, expect.GasFeeCap, actual.GasFeeCap)

log/log.go

@@ -31,7 +31,7 @@ func SetLogger(logCfg *config.LogConfig) (*Logger, error) {
 	}
 
 	if len(logCfg.Path) > 0 {
-		file, err := os.OpenFile(logCfg.Path, os.O_CREATE|os.O_WRONLY, 0666)
+		file, err := os.OpenFile(logCfg.Path, os.O_CREATE|os.O_WRONLY, 0o666)
 		if err == nil {
 			logrus.SetOutput(file)
 		} else {

main.go

@@ -43,7 +43,8 @@ func main() {
 				Value: "~/.venus-messager",
 			},
 		},
-		Commands: []*cli.Command{ccli.MsgCmds,
+		Commands: []*cli.Command{
+			ccli.MsgCmds,
 			ccli.AddrCmds,
 			ccli.SharedParamsCmds,
 			ccli.NodeCmds,
@@ -60,7 +61,6 @@ func main() {
 		fmt.Println(err)
 		return
 	}
-
 }
 
 var runCmd = &cli.Command{

models/mysql/db.go

@@ -81,9 +81,8 @@ func (t *TxMysqlRepo) AddressRepo() repo.AddressRepo {
 
 func OpenMysql(cfg *config.MySqlConfig) (repo.Repo, error) {
 	db, err := gorm.Open(mysql.Open(cfg.ConnectionString), &gorm.Config{
-		//Logger: logger.Default.LogMode(logger.Info), // 日志配置
+		// Logger: logger.Default.LogMode(logger.Info), // 日志配置
 	})
-
 	if err != nil {
 		return nil, fmt.Errorf("[db connection failed] Database name: %s %w", cfg.ConnectionString, err)
 	}
@@ -103,7 +102,7 @@ func OpenMysql(cfg *config.MySqlConfig) (repo.Repo, error) {
 	sqlDB.SetConnMaxLifetime(time.Minute * cfg.ConnMaxLifeTime)
 
 	// 使用插件
-	//db.Use(&TracePlugin{})
+	// db.Use(&TracePlugin{})
 	return &Repo{
 		db,
 	}, nil

models/mysql/init.go

@@ -6,14 +6,22 @@ import (
 	types "github.com/filecoin-project/venus/venus-shared/types/messager"
 )
 
-var TMysqlMessage = reflect.TypeOf(&mysqlMessage{})
-var TMessage = reflect.TypeOf(&types.Message{})
+var (
+	TMysqlMessage = reflect.TypeOf(&mysqlMessage{})
+	TMessage      = reflect.TypeOf(&types.Message{})
+)
 
-var TSharedParams = reflect.TypeOf(&types.SharedSpec{})
-var TMysqlSharedParams = reflect.TypeOf(&mysqlSharedParams{})
+var (
+	TSharedParams      = reflect.TypeOf(&types.SharedSpec{})
+	TMysqlSharedParams = reflect.TypeOf(&mysqlSharedParams{})
+)
 
-var TAddress = reflect.TypeOf(&types.Address{})
-var TMysqlAddress = reflect.TypeOf(&mysqlAddress{})
+var (
+	TAddress      = reflect.TypeOf(&types.Address{})
+	TMysqlAddress = reflect.TypeOf(&mysqlAddress{})
+)
 
-var TNode = reflect.TypeOf(&types.Node{})
-var TMysqlNode = reflect.TypeOf(&mysqlNode{})
+var (
+	TNode      = reflect.TypeOf(&types.Node{})
+	TMysqlNode = reflect.TypeOf(&mysqlNode{})
+)

models/mysql/message.go

@@ -61,7 +61,7 @@ func (sqlMsg *mysqlMessage) TableName() string {
 }
 
 func (sqlMsg *mysqlMessage) Message() *types.Message {
-	var destMsg = &types.Message{
+	destMsg := &types.Message{
 		ID: sqlMsg.ID,
 		Message: venustypes.Message{
 			Version:    sqlMsg.Version,
@@ -271,7 +271,7 @@ func (m *mysqlMessageRepo) ListUnChainMessageByAddress(addr address.Address, top
 	return result, nil
 }
 
-//todo better batch update
+// todo better batch update
 func (m *mysqlMessageRepo) BatchSaveMessage(msgs []*types.Message) error {
 	for _, msg := range msgs {
 		err := m.SaveMessage(msg)
@@ -432,7 +432,7 @@ func (m *mysqlMessageRepo) ListUnFilledMessage(addr address.Address) ([]*types.M
 		return nil, err
 	}
 
-	var result = make([]*types.Message, len(sqlMsgs))
+	result := make([]*types.Message, len(sqlMsgs))
 
 	for idx, msg := range sqlMsgs {
 		result[idx] = msg.Message()
@@ -448,7 +448,7 @@ func (m *mysqlMessageRepo) ListSignedMsgs() ([]*types.Message, error) {
 		return nil, err
 	}
 
-	var result = make([]*types.Message, len(sqlMsgs))
+	result := make([]*types.Message, len(sqlMsgs))
 
 	for idx, msg := range sqlMsgs {
 		result[idx] = msg.Message()
@@ -460,7 +460,8 @@ func (m *mysqlMessageRepo) UpdateMessageInfoByCid(unsignedCid string,
 	receipt *venustypes.MessageReceipt,
 	height abi.ChainEpoch,
 	state types.MessageState,
-	tsKey venustypes.TipSetKey) error {
+	tsKey venustypes.TipSetKey,
+) error {
 	rcp := repo.FromMsgReceipt(receipt)
 	updateClause := map[string]interface{}{
 		"height":               uint64(height),

models/mysql/message_test.go

@@ -115,7 +115,6 @@ func testBatchSaveMessage(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {
 	}
 
 	assert.NoError(t, r.MessageRepo().BatchSaveMessage(msgs))
-
 }
 
 func testSaveMessage(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {
@@ -144,7 +143,6 @@ func testSaveMessage(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {
 	mock.ExpectCommit()
 
 	assert.NoError(t, r.MessageRepo().SaveMessage(msg))
-
 }
 
 func testGetMessageByFromAndNonce(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {

models/sqlite/db.go

@@ -78,8 +78,8 @@ func (d SqlLiteRepo) DbClose() error {
 }
 
 func OpenSqlite(fsRepo filestore.FSRepo) (repo.Repo, error) {
-	//cache=shared&_journal_mode=wal&sync=normal
-	//cache=shared&sync=full
+	// cache=shared&_journal_mode=wal&sync=normal
+	// cache=shared&sync=full
 	db, err := gorm.Open(sqlite.Open(fsRepo.SqliteFile()+"?cache=shared&_journal_mode=wal&sync=normal"), &gorm.Config{
 		// Logger: logger.Default.LogMode(logger.Info), // 日志配置
 	})

models/sqlite/init.go

@@ -6,14 +6,22 @@ import (
 	types "github.com/filecoin-project/venus/venus-shared/types/messager"
 )
 
-var TMessage = reflect.TypeOf(&types.Message{})
-var TSqliteMessage = reflect.TypeOf(&sqliteMessage{})
+var (
+	TMessage       = reflect.TypeOf(&types.Message{})
+	TSqliteMessage = reflect.TypeOf(&sqliteMessage{})
+)
 
-var TAddress = reflect.TypeOf(&types.Address{})
-var TSqliteAddress = reflect.TypeOf(&sqliteAddress{})
+var (
+	TAddress       = reflect.TypeOf(&types.Address{})
+	TSqliteAddress = reflect.TypeOf(&sqliteAddress{})
+)
 
-var TSqliteSharedParams = reflect.TypeOf(&sqliteSharedParams{})
-var TSharedParams = reflect.TypeOf(&types.SharedSpec{})
+var (
+	TSqliteSharedParams = reflect.TypeOf(&sqliteSharedParams{})
+	TSharedParams       = reflect.TypeOf(&types.SharedSpec{})
+)
 
-var TNode = reflect.TypeOf(&types.Node{})
-var TSqliteNode = reflect.TypeOf(&sqliteNode{})
+var (
+	TNode       = reflect.TypeOf(&types.Node{})
+	TSqliteNode = reflect.TypeOf(&sqliteNode{})
+)

models/sqlite/message.go

@@ -61,7 +61,7 @@ func (sqlMsg *sqliteMessage) TableName() string {
 }
 
 func (sqlMsg *sqliteMessage) Message() *types.Message {
-	var destMsg = &types.Message{
+	destMsg := &types.Message{
 		ID: sqlMsg.ID,
 		Message: venustypes.Message{
 			Version:    sqlMsg.Version,
@@ -243,7 +243,7 @@ func (m *sqliteMessageRepo) ListUnChainMessageByAddress(addr address.Address, to
 	return result, nil
 }
 
-//todo better batch update
+// todo better batch update
 func (m *sqliteMessageRepo) BatchSaveMessage(msgs []*types.Message) error {
 	for _, msg := range msgs {
 		err := m.SaveMessage(msg)
@@ -433,7 +433,7 @@ func (m *sqliteMessageRepo) ListUnFilledMessage(addr address.Address) ([]*types.
 		return nil, err
 	}
 
-	var result = make([]*types.Message, len(sqlMsgs))
+	result := make([]*types.Message, len(sqlMsgs))
 
 	for idx, msg := range sqlMsgs {
 		result[idx] = msg.Message()
@@ -449,7 +449,7 @@ func (m *sqliteMessageRepo) ListSignedMsgs() ([]*types.Message, error) {
 		return nil, err
 	}
 
-	var result = make([]*types.Message, len(sqlMsgs))
+	result := make([]*types.Message, len(sqlMsgs))
 
 	for idx, msg := range sqlMsgs {
 		result[idx] = msg.Message()
@@ -461,7 +461,8 @@ func (m *sqliteMessageRepo) UpdateMessageInfoByCid(unsignedCid string,
 	receipt *venustypes.MessageReceipt,
 	height abi.ChainEpoch,
 	state types.MessageState,
-	tsKey venustypes.TipSetKey) error {
+	tsKey venustypes.TipSetKey,
+) error {
 	rcp := repo.FromMsgReceipt(receipt)
 	updateClause := map[string]interface{}{
 		"height":               uint64(height),