add change test

plugin/dapp/autonomy/commands/proposal_change.go

@@ -58,14 +58,14 @@ func proposalChange(cmd *cobra.Command, args []string) {
 		if len(per) == 2 {
 			if per[1] == "true" {
 				change := &auty.Change{
-					Cancel:true,
-					Addr:per[0],
+					Cancel: true,
+					Addr:   per[0],
 				}
 				changes = append(changes, change)
 			} else if per[1] == "false" {
 				change := &auty.Change{
-					Cancel:false,
-					Addr:per[0],
+					Cancel: false,
+					Addr:   per[0],
 				}
 				changes = append(changes, change)
 			}

plugin/dapp/autonomy/commands/proposal_project.go

@@ -7,12 +7,13 @@ package commands
 import (
 	"encoding/json"
 
+	"strings"
+
 	jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
 	auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
 	"github.com/spf13/cobra"
-	"strings"
 )
 
 // ProposalProjectCmd 创建提案命令

plugin/dapp/autonomy/commands/proposal_rule.go

@@ -7,12 +7,13 @@ package commands
 import (
 	"encoding/json"
 
+	"strings"
+
 	jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
 	auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
 	"github.com/spf13/cobra"
-	"strings"
 )
 
 // ProposalRuleCmd 创建提案命令

plugin/dapp/autonomy/executor/boardaction.go

@@ -398,7 +398,7 @@ func (a *action) verifyMinerAddr(addrs []string, bindAddr string) (string, error
 		}
 		tkBind := &ticketTy.TicketBind{}
 		err = types.Decode(value, tkBind)
-		if err != nil ||tkBind.MinerAddress != bindAddr {
+		if err != nil || tkBind.MinerAddress != bindAddr {
 			return addr, auty.ErrBindAddr
 		}
 	}

plugin/dapp/autonomy/executor/boardaction_test.go

@@ -20,10 +20,10 @@ import (
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util"
 	auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
+	ticket "github.com/33cn/plugin/plugin/dapp/ticket/executor"
+	ticketTy "github.com/33cn/plugin/plugin/dapp/ticket/types"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	ticketTy "github.com/33cn/plugin/plugin/dapp/ticket/types"
-	ticket "github.com/33cn/plugin/plugin/dapp/ticket/executor"
 )
 
 // ExecEnv exec environment
@@ -58,30 +58,57 @@ var (
 	PrivKey9  = "0x128de4afa7c061c00d854a1bca51b58e80a2c292583739e5aebf4c0f778959e1"
 	PrivKey10 = "0x1c3e6cac2f887e1ab9180e2d5772dc4ba01accb8d4df434faba097003eb35482"
 
+	Addr1  = "12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d"
+	Addr2  = "1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj"
+	Addr3  = "12cjnN5D4DPdBQSwh6vjwJbtsW4EJALTMv"
+	Addr4  = "1Luh4AziYyaC5zP3hUXtXFZS873xAxm6rH"
+	Addr5  = "1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB"
+	Addr6  = "1L1puAUjfmtDECKo2C1qLWsAMZtDGTBWf6"
+	Addr7  = "1LNf9AVXzUMQkQM5hgGLhkdrVtD8UMBSUm"
+	Addr8  = "1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx"
+	Addr9  = "1BM2xhBk95qoae8zKNDWwAVGgBERhb7DQu"
+	Addr10 = "1Q9sQwothzM1gKSzkVZ8Dt1tqKX1uzSagx"
+
+	PrivKey11 = "0xfd0c4a8a1efcd221ee0f36b7d4f57d8ff843cb8bc193b39c7863332d355acafa"
+	PrivKey12 = "0x4c9691bf6acc908ef5c07abcad23cf7f98e46e84101aa5059322aa53eb4dc471"
+	PrivKey13 = "0x50b9c6a4358ef8ffc96d5831a8dfd5e0fae504d49e20c5eafd12b6015423de33"
+	PrivKey14 = "0x96e3c766850a915fe4718b890d96208d5d1a3694b2597e08165480b5b48b84cb"
+	PrivKey15 = "0xeac5e45243c3920cf8a98f3d3a2e3a9b43f30a21769b57f734213913511e7575"
+	PrivKey16 = "0xd2aaa6f050a4db13fbd2c8bf87cbb96e217289172baca6c12e8a8b0680b9aa1a"
+	PrivKey17 = "0x33b3b977c657435a49773b5605a704ad5fdca0fa34fe36a02ea0f13a49099832"
+
+	Addr11 = "15VUiygdxMSZ3rykwe742yomp2cPJ9Tfve"
+	Addr12 = "1DyR84CU5AHbGXLEnhHMwMvWNMeunLZsuJ"
+	Addr13 = "132pBvrgSYgHASxzoeL3bqnsqUpaBbUktm"
+	Addr14 = "1DEV4XwdBUWRkMuy4ARRiEAoxQ2LoDByNG"
+	Addr15 = "18Y87cw2hiYC71bvpD872oYMYXtw66Qp6o"
+	Addr16 = "1Fghq6cgdJEDr6gQBmvba3t6aXAkyZyjr2"
+	Addr17 = "142KsfJLvEA5FJxAgKm9ZDtFVjkRaPdu82"
+
 	boards = []string{
 		AddrA,
 		AddrB,
 		AddrC,
 		AddrD,
 
-		"12HKLEn6g4FH39yUbHh4EVJWcFo5CXg22d",
-		"1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj",
-		"12cjnN5D4DPdBQSwh6vjwJbtsW4EJALTMv",
-		"1Luh4AziYyaC5zP3hUXtXFZS873xAxm6rH",
-		"1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB",
-		"1L1puAUjfmtDECKo2C1qLWsAMZtDGTBWf6",
-		"1LNf9AVXzUMQkQM5hgGLhkdrVtD8UMBSUm",
-		"1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx",
-		"1BM2xhBk95qoae8zKNDWwAVGgBERhb7DQu",
-		"1Q9sQwothzM1gKSzkVZ8Dt1tqKX1uzSagx",
-
-		"15VUiygdxMSZ3rykwe742yomp2cPJ9Tfve",
-		"1DyR84CU5AHbGXLEnhHMwMvWNMeunLZsuJ",
-		"132pBvrgSYgHASxzoeL3bqnsqUpaBbUktm",
-		"1DEV4XwdBUWRkMuy4ARRiEAoxQ2LoDByNG",
-		"18Y87cw2hiYC71bvpD872oYMYXtw66Qp6o",
-		"1Fghq6cgdJEDr6gQBmvba3t6aXAkyZyjr2",
-		"142KsfJLvEA5FJxAgKm9ZDtFVjkRaPdu82",
+		Addr1,
+		Addr2,
+		Addr3,
+		Addr4,
+		Addr5,
+		Addr6,
+		Addr7,
+		Addr8,
+		Addr9,
+		Addr10,
+
+		Addr11,
+		Addr12,
+		Addr13,
+		Addr14,
+		Addr15,
+		Addr16,
+		Addr17,
 	}
 	total = types.Coin * 30000
 )

plugin/dapp/autonomy/executor/changeaction.go

@@ -8,10 +8,8 @@ import (
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/types"
 	auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
-
 )
 
-
 func (a *action) propChange(prob *auty.ProposalChange) (*types.Receipt, error) {
 	//如果全小于等于0,则说明该提案规则参数不正确
 	if prob == nil || len(prob.Changes) == 0 {
@@ -59,7 +57,7 @@ func (a *action) propChange(prob *auty.ProposalChange) (*types.Receipt, error) {
 		PropChange: prob,
 		CurRule:    rule,
 		Board:      new,
-		VoteResult: &auty.VoteResult{TotalVotes:int32(len(act.Boards))},
+		VoteResult: &auty.VoteResult{TotalVotes: int32(len(act.Boards))},
 		Status:     auty.AutonomyStatusProposalChange,
 		Address:    a.fromaddr,
 		Height:     a.height,
@@ -168,15 +166,10 @@ func (a *action) votePropChange(voteProb *auty.VoteProposalChange) (*types.Recei
 	// 更新投票记录
 	votes.Address = append(votes.Address, a.fromaddr)
 
-	// 获取可投票数
-	vtCouts, err := a.getAddressVotes(a.fromaddr, start)
-	if err != nil {
-		return nil, err
-	}
 	if voteProb.Approve {
-		cur.VoteResult.ApproveVotes += vtCouts
+		cur.VoteResult.ApproveVotes++
 	} else {
-		cur.VoteResult.OpposeVotes += vtCouts
+		cur.VoteResult.OpposeVotes++
 	}
 
 	var logs []*types.ReceiptLog
@@ -359,13 +352,14 @@ func copyAutonomyProposalChange(cur *auty.AutonomyProposalChange) *auty.Autonomy
 	}
 	newAut := *cur
 	if cur.PropChange != nil {
-		newPropChange := *cur.GetPropChange()
+		newPropChange := *cur.PropChange
 		newAut.PropChange = &newPropChange
 		if cur.PropChange.Changes != nil {
-			chs := cur.GetPropChange().GetChanges()
-			for _, ch := range chs {
+			newAut.PropChange.Changes = make([]*auty.Change, len(cur.PropChange.Changes))
+			chs := cur.PropChange.Changes
+			for i, ch := range chs {
 				newch := *ch
-				newAut.PropChange.Changes = append(newAut.PropChange.Changes, &newch)
+				newAut.PropChange.Changes[i] = &newch
 			}
 		}
 	}
@@ -375,6 +369,10 @@ func copyAutonomyProposalChange(cur *auty.AutonomyProposalChange) *auty.Autonomy
 	}
 	if cur.Board != nil {
 		newBoard := *cur.GetBoard()
+		newBoard.Boards = make([]string, len(cur.Board.Boards))
+		copy(newBoard.Boards, cur.Board.Boards)
+		newBoard.Revboards = make([]string, len(cur.Board.Revboards))
+		copy(newBoard.Revboards, cur.Board.Revboards)
 		newAut.Board = &newBoard
 	}
 	if cur.VoteResult != nil {

plugin/dapp/autonomy/executor/exec.go

@@ -105,7 +105,6 @@ func (a *Autonomy) Exec_CommentProp(payload *auty.Comment, tx *types.Transaction
 	return action.commentProp(payload)
 }
 
-
 // 提案修改董事会成员相关
 
 // Exec_PropChange 创建提案规则

plugin/dapp/autonomy/executor/exec_local.go

@@ -85,7 +85,6 @@ func (a *Autonomy) ExecLocal_CommentProp(payload *auty.Comment, tx *types.Transa
 	return a.execAutoLocalCommentProp(tx, receiptData)
 }
 
-
 // 提案修改董事会成员相关
 
 // ExecLocal_PropChange 创建提案规则

plugin/dapp/autonomy/executor/projectaction.go

@@ -37,10 +37,10 @@ func (a *action) propProject(prob *auty.ProposalProject) (*types.Receipt, error)
 	}
 	// 检查是否可以对已审批额度归0,如果可以则设置kv
 	var kva *types.KeyValue
-	if a.height > pboard.StartHeight + boardPeriod  {
+	if a.height > pboard.StartHeight+boardPeriod {
 		pboard.StartHeight = a.height
 		pboard.Amount = 0
-		kva = &types.KeyValue{Key:activeBoardID(), Value:types.Encode(pboard)}
+		kva = &types.KeyValue{Key: activeBoardID(), Value: types.Encode(pboard)}
 	}
 	// 检查额度
 	pass := a.checkPeriodAmount(pboard, prob.Amount)
@@ -593,7 +593,7 @@ func (a *action) checkPeriodAmount(act *auty.ActiveBoard, amount int64) bool {
 	if act == nil {
 		return false
 	}
-	if act.Amount + amount >= maxBoardPeriodAmount {
+	if act.Amount+amount >= maxBoardPeriodAmount {
 		return false
 	}
 	return true
@@ -604,10 +604,10 @@ func (a *action) updatePeriodAmount(amount int64) (*types.KeyValue, error) {
 	if err != nil {
 		return nil, err
 	}
-	if a.height > act.StartHeight + boardPeriod  {
+	if a.height > act.StartHeight+boardPeriod {
 		act.StartHeight = a.height
 		act.Amount = 0
 	}
 	act.Amount += amount
-	return &types.KeyValue{Key:activeBoardID(), Value:types.Encode(act)}, nil
+	return &types.KeyValue{Key: activeBoardID(), Value: types.Encode(act)}, nil
 }

plugin/dapp/autonomy/executor/ruleaction.go

@@ -9,8 +9,8 @@ import (
 	"github.com/33cn/chain33/types"
 	auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
 
-	"github.com/33cn/chain33/system/dapp"
 	"github.com/33cn/chain33/common/address"
+	"github.com/33cn/chain33/system/dapp"
 )
 
 const (
@@ -34,13 +34,12 @@ const (
 	minProposalAmount = types.Coin * 20
 	// 最大提案金
 	maxProposalAmount = types.Coin * 2000
-
 )
 
 func (a *action) propRule(prob *auty.ProposalRule) (*types.Receipt, error) {
 	//如果全小于等于0,则说明该提案规则参数不正确
 	if prob.RuleCfg == nil || prob.RuleCfg.BoardApproveRatio <= 0 && prob.RuleCfg.PubOpposeRatio <= 0 &&
-		prob.RuleCfg.ProposalAmount <= 0 && prob.RuleCfg.LargeProjectAmount <= 0 && prob.RuleCfg.PublicPeriod <= 0{
+		prob.RuleCfg.ProposalAmount <= 0 && prob.RuleCfg.LargeProjectAmount <= 0 && prob.RuleCfg.PublicPeriod <= 0 {
 		alog.Error("propRule ", "ProposalRule RuleCfg invaild or have no modify param", prob.RuleCfg)
 		return nil, types.ErrInvalidParam
 	}
@@ -48,7 +47,7 @@ func (a *action) propRule(prob *auty.ProposalRule) (*types.Receipt, error) {
 		prob.RuleCfg.PubOpposeRatio > maxPubOpposeRatio || prob.RuleCfg.PubOpposeRatio < minPubOpposeRatio ||
 		prob.RuleCfg.PublicPeriod > maxPublicPeriod || prob.RuleCfg.PublicPeriod < minPublicPeriod ||
 		prob.RuleCfg.LargeProjectAmount > maxLargeProjectAmount || prob.RuleCfg.LargeProjectAmount < minLargeProjectAmount ||
-		prob.RuleCfg.ProposalAmount > maxProposalAmount || prob.RuleCfg.ProposalAmount < minProposalAmount{
+		prob.RuleCfg.ProposalAmount > maxProposalAmount || prob.RuleCfg.ProposalAmount < minProposalAmount {
 		alog.Error("propRule RuleCfg invaild", "ruleCfg", prob.RuleCfg)
 		return nil, types.ErrInvalidParam
 	}

plugin/dapp/autonomy/types/const.go

@@ -88,8 +88,6 @@ const (
 	AutonomyStatusTmintPropChange
 )
 
-
-
 const (
 	// GetProposalBoard 用于在cmd里面的区分不同的查询
 	GetProposalBoard = "GetProposalBoard"