Eliminate the warning

plugin/dapp/autonomy/executor/boardaction.go

@@ -244,8 +244,8 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
 
 	start := cur.GetPropBoard().StartBlockHeight
 	end := cur.GetPropBoard().EndBlockHeight
-	real := cur.GetPropBoard().RealEndBlockHeight
-	if a.height < start || a.height > end || real != 0 {
+	realHeight := cur.GetPropBoard().RealEndBlockHeight
+	if a.height < start || a.height > end || realHeight != 0 {
 		err := auty.ErrVotePeriod
 		alog.Error("votePropBoard ", "addr", a.fromaddr, "execaddr", a.execaddr, "ProposalID",
 			voteProb.ProposalID, "err", err)
@@ -498,11 +498,11 @@ func (a *action) getTotalVotes(height int64) (int32, error) {
 	if subcfg.Total != "" {
 		addr = subcfg.Total
 	}
-	account, err := a.getStartHeightVoteAccount(addr, "", height)
+	voteAccount, err := a.getStartHeightVoteAccount(addr, "", height)
 	if err != nil {
 		return 0, err
 	}
-	return int32(account.Balance / (ticketPrice * a.api.GetConfig().GetCoinPrecision())), nil
+	return int32(voteAccount.Balance / (ticketPrice * a.api.GetConfig().GetCoinPrecision())), nil
 }
 
 func (a *action) verifyMinerAddr(addrs []string, bindAddr string) (string, error) {
@@ -539,13 +539,13 @@ func (a *action) batchGetAddressVotes(addrs []string, height int64) (int32, erro
 }
 
 func (a *action) getAddressVotes(addr string, height int64) (int32, error) {
-	account, err := a.getStartHeightVoteAccount(addr, ticketName, height)
+	voteAccount, err := a.getStartHeightVoteAccount(addr, ticketName, height)
 	if err != nil {
 		return 0, err
 	}
-	amount := account.Frozen
+	amount := voteAccount.Frozen
 	if subcfg.UseBalance {
-		amount = account.Balance
+		amount = voteAccount.Balance
 	}
 	return int32(amount / (ticketPrice * a.api.GetConfig().GetCoinPrecision())), nil
 }
@@ -563,16 +563,16 @@ func (a *action) getStartHeightVoteAccount(addr, execer string, height int64) (*
 
 	stateHash := common.ToHex(head.Items[0].StateHash)
 
-	account, err := a.coinsAccount.GetBalance(a.api, &types.ReqBalance{
+	accounts, err := a.coinsAccount.GetBalance(a.api, &types.ReqBalance{
 		Addresses: []string{addr},
 		Execer:    execer,
 		StateHash: stateHash,
 	})
-	if err != nil || len(account) == 0 {
+	if err != nil || len(accounts) == 0 {
 		alog.Error("GetStartVoteAccount ", "addr", addr, "height", height, "GetBalance failed", err)
 		return nil, err
 	}
-	return account[0], nil
+	return accounts[0], nil
 }
 
 func (a *action) getProposalBoard(ID string) (*auty.AutonomyProposalBoard, error) {

plugin/dapp/autonomy/executor/boardtable.go

@@ -27,11 +27,11 @@ var boardOpt = &table.Option{
 //NewBoardTable 新建表
 func NewBoardTable(kvdb db.KV) *table.Table {
 	rowmeta := NewBoardRow()
-	table, err := table.NewTable(rowmeta, kvdb, boardOpt)
+	newTable, err := table.NewTable(rowmeta, kvdb, boardOpt)
 	if err != nil {
 		panic(err)
 	}
-	return table
+	return newTable
 }
 
 //BoardRow table meta 结构

plugin/dapp/autonomy/executor/changeaction.go

@@ -34,15 +34,15 @@ func (a *action) propChange(prob *auty.ProposalChange) (*types.Receipt, error) {
 	}
 
 	// 检查是否符合提案修改
-	var new *auty.ActiveBoard
+	var newBoard *auty.ActiveBoard
 	if a.api.GetConfig().IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
 		//替换成员方案
-		new, err = a.replaceBoard(act, prob.Changes)
+		newBoard, err = a.replaceBoard(act, prob.Changes)
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		new, err = a.checkChangeable(act, prob.Changes)
+		newBoard, err = a.checkChangeable(act, prob.Changes)
 		if err != nil {
 			alog.Error("propChange ", "addr", a.fromaddr, "execaddr", a.execaddr, "checkChangeable failed", err)
 			return nil, err
@@ -71,7 +71,7 @@ func (a *action) propChange(prob *auty.ProposalChange) (*types.Receipt, error) {
 	cur := &auty.AutonomyProposalChange{
 		PropChange: prob,
 		CurRule:    rule,
-		Board:      new,
+		Board:      newBoard,
 		VoteResult: &auty.VoteResult{TotalVotes: int32(len(act.Boards))},
 		Status:     auty.AutonomyStatusProposalChange,
 		Address:    a.fromaddr,
@@ -163,8 +163,8 @@ func (a *action) votePropChange(voteProb *auty.VoteProposalChange) (*types.Recei
 
 	start := cur.GetPropChange().StartBlockHeight
 	end := cur.GetPropChange().EndBlockHeight
-	real := cur.GetPropChange().RealEndBlockHeight
-	if a.height < start || a.height > end || real != 0 {
+	realHeight := cur.GetPropChange().RealEndBlockHeight
+	if a.height < start || a.height > end || realHeight != 0 {
 		err := auty.ErrVotePeriod
 		alog.Error("votePropChange ", "addr", a.fromaddr, "execaddr", a.execaddr, "ProposalID",
 			voteProb.ProposalID, "err", err)
@@ -431,19 +431,19 @@ func (a *action) checkChangeable(act *auty.ActiveBoard, change []*auty.Change) (
 	if len(mpBd) > maxBoards || len(mpBd) < minBoards {
 		return nil, auty.ErrBoardNumber
 	}
-	new := &auty.ActiveBoard{
+	newBoard := &auty.ActiveBoard{
 		Amount:      act.Amount,
 		StartHeight: act.StartHeight,
 	}
 	for k := range mpBd {
-		new.Boards = append(new.Boards, k)
+		newBoard.Boards = append(newBoard.Boards, k)
 	}
-	sort.Strings(new.Boards)
+	sort.Strings(newBoard.Boards)
 	for k := range mpRbd {
-		new.Revboards = append(new.Revboards, k)
+		newBoard.Revboards = append(newBoard.Revboards, k)
 	}
-	sort.Strings(new.Revboards)
-	return new, nil
+	sort.Strings(newBoard.Revboards)
+	return newBoard, nil
 }
 
 // getReceiptLog 根据提案信息获取log

plugin/dapp/autonomy/executor/changetable.go

@@ -27,11 +27,11 @@ var changeOpt = &table.Option{
 //NewChangeTable 新建表
 func NewChangeTable(kvdb db.KV) *table.Table {
 	rowmeta := NewChangeRow()
-	table, err := table.NewTable(rowmeta, kvdb, changeOpt)
+	newTable, err := table.NewTable(rowmeta, kvdb, changeOpt)
 	if err != nil {
 		panic(err)
 	}
-	return table
+	return newTable
 }
 
 //ChangeRow table meta 结构

plugin/dapp/autonomy/executor/projectaction.go

@@ -185,8 +185,8 @@ func (a *action) votePropProject(voteProb *auty.VoteProposalProject) (*types.Rec
 
 	start := cur.GetPropProject().StartBlockHeight
 	end := cur.GetPropProject().EndBlockHeight
-	real := cur.GetPropProject().RealEndBlockHeight
-	if a.height < start || a.height > end || real != 0 {
+	realHeight := cur.GetPropProject().RealEndBlockHeight
+	if a.height < start || a.height > end || realHeight != 0 {
 		err := auty.ErrVotePeriod
 		alog.Error("votePropProject ", "addr", a.fromaddr, "execaddr", a.execaddr, "ProposalID",
 			voteProb.ProposalID, "err", err)

plugin/dapp/autonomy/executor/projecttable.go

@@ -27,11 +27,11 @@ var projectOpt = &table.Option{
 //NewProjectTable 新建表
 func NewProjectTable(kvdb db.KV) *table.Table {
 	rowmeta := NewProjectRow()
-	table, err := table.NewTable(rowmeta, kvdb, projectOpt)
+	newTable, err := table.NewTable(rowmeta, kvdb, projectOpt)
 	if err != nil {
 		panic(err)
 	}
-	return table
+	return newTable
 }
 
 //ProjectRow table meta 结构

plugin/dapp/autonomy/executor/ruleaction.go

@@ -196,8 +196,8 @@ func (a *action) votePropRule(voteProb *auty.VoteProposalRule) (*types.Receipt,
 
 	start := cur.GetPropRule().StartBlockHeight
 	end := cur.GetPropRule().EndBlockHeight
-	real := cur.GetPropRule().RealEndBlockHeight
-	if a.height < start || a.height > end || real != 0 {
+	realHeight := cur.GetPropRule().RealEndBlockHeight
+	if a.height < start || a.height > end || realHeight != 0 {
 		err := auty.ErrVotePeriod
 		alog.Error("votePropRule ", "addr", a.fromaddr, "execaddr", a.execaddr, "ProposalID",
 			voteProb.ProposalID, "err", err)
@@ -500,28 +500,28 @@ func upgradeRule(cur, modify *auty.RuleConfig) *auty.RuleConfig {
 	if cur == nil || modify == nil {
 		return nil
 	}
-	new := *cur
+	newConfig := *cur
 	if modify.BoardApproveRatio > 0 {
-		new.BoardApproveRatio = modify.BoardApproveRatio
+		newConfig.BoardApproveRatio = modify.BoardApproveRatio
 	}
 	if modify.PubOpposeRatio > 0 {
-		new.PubOpposeRatio = modify.PubOpposeRatio
+		newConfig.PubOpposeRatio = modify.PubOpposeRatio
 	}
 	if modify.ProposalAmount > 0 {
-		new.ProposalAmount = modify.ProposalAmount
+		newConfig.ProposalAmount = modify.ProposalAmount
 	}
 	if modify.LargeProjectAmount > 0 {
-		new.LargeProjectAmount = modify.LargeProjectAmount
+		newConfig.LargeProjectAmount = modify.LargeProjectAmount
 	}
 	if modify.PublicPeriod > 0 {
-		new.PublicPeriod = modify.PublicPeriod
+		newConfig.PublicPeriod = modify.PublicPeriod
 	}
 	if modify.PubAttendRatio > 0 {
-		new.PubAttendRatio = modify.PubAttendRatio
+		newConfig.PubAttendRatio = modify.PubAttendRatio
 	}
 	if modify.PubApproveRatio > 0 {
-		new.PubApproveRatio = modify.PubApproveRatio
+		newConfig.PubApproveRatio = modify.PubApproveRatio
 	}
 
-	return &new
+	return &newConfig
 }

plugin/dapp/autonomy/executor/ruletable.go

@@ -27,11 +27,11 @@ var ruleOpt = &table.Option{
 //NewRuleTable 新建表
 func NewRuleTable(kvdb db.KV) *table.Table {
 	rowmeta := NewRuleRow()
-	table, err := table.NewTable(rowmeta, kvdb, ruleOpt)
+	newTable, err := table.NewTable(rowmeta, kvdb, ruleOpt)
 	if err != nil {
 		panic(err)
 	}
-	return table
+	return newTable
 }
 
 //RuleRow table meta 结构