fix ut

plugin/dapp/autonomy/executor/boardaction.go

@@ -92,7 +92,7 @@ func filterPropBoard(boards []string) (map[string]struct{}, error) {
 	mpBd := make(map[string]struct{})
 	for _, board := range boards {
 		if err := address.CheckAddress(board); err != nil {
-			return nil, errors.Wrapf(types.ErrInvalidAddress, "addr", board)
+			return nil, errors.Wrapf(types.ErrInvalidAddress, "addr=%s", board)
 		}
 		// 提案board重复地址去重复
 		if _, ok := mpBd[board]; ok {
@@ -302,11 +302,11 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
 	//fork之后增加了弃权选项
 	if cfg.IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
 		switch voteProb.VoteOption {
-		case auty.VoteOption_APPROVE:
+		case auty.AutonomyVoteOption_APPROVE:
 			cur.VoteResult.ApproveVotes += vtCouts
-		case auty.VoteOption_OPPOSE:
+		case auty.AutonomyVoteOption_OPPOSE:
 			cur.VoteResult.OpposeVotes += vtCouts
-		case auty.VoteOption_QUIT:
+		case auty.AutonomyVoteOption_QUIT:
 			cur.VoteResult.QuitVotes += vtCouts
 		default:
 			return nil, errors.Wrapf(types.ErrInvalidParam, "vote option=%d", voteProb.VoteOption)

plugin/dapp/autonomy/executor/changeaction.go

@@ -217,11 +217,11 @@ func (a *action) votePropChange(voteProb *auty.VoteProposalChange) (*types.Recei
 
 	if cfg.IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
 		switch voteProb.Vote {
-		case auty.VoteOption_APPROVE:
+		case auty.AutonomyVoteOption_APPROVE:
 			cur.VoteResult.ApproveVotes++
-		case auty.VoteOption_OPPOSE:
+		case auty.AutonomyVoteOption_OPPOSE:
 			cur.VoteResult.OpposeVotes++
-		case auty.VoteOption_QUIT:
+		case auty.AutonomyVoteOption_QUIT:
 			cur.VoteResult.QuitVotes++
 		default:
 			return nil, errors.Wrapf(types.ErrInvalidParam, "vote option=%d", voteProb.Vote)
@@ -365,7 +365,7 @@ func (a *action) replaceBoard(act *auty.ActiveBoard, change []*auty.Change) (*au
 
 	//只允许替换，不允许恢复操作
 	if !change[0].Cancel || len(change[0].Addr) <= 0 {
-		return nil, errors.Wrapf(types.ErrInvalidParam, "cancel=%d not allow to addr=%s", change[0].Cancel, change[0].Addr)
+		return nil, errors.Wrapf(types.ErrInvalidParam, "cancel=false not allow to addr=%s", change[0].Addr)
 	}
 
 	mpBd := make(map[string]struct{})

plugin/dapp/autonomy/executor/projectaction.go

@@ -222,11 +222,11 @@ func (a *action) votePropProject(voteProb *auty.VoteProposalProject) (*types.Rec
 	// 更新投票结果
 	if a.api.GetConfig().IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
 		switch voteProb.Vote {
-		case auty.VoteOption_APPROVE:
+		case auty.AutonomyVoteOption_APPROVE:
 			cur.BoardVoteRes.ApproveVotes++
-		case auty.VoteOption_OPPOSE:
+		case auty.AutonomyVoteOption_OPPOSE:
 			cur.BoardVoteRes.OpposeVotes++
-		case auty.VoteOption_QUIT:
+		case auty.AutonomyVoteOption_QUIT:
 			cur.BoardVoteRes.QuitVotes++
 		default:
 			return nil, errors.Wrapf(types.ErrInvalidParam, "vote option=%d", voteProb.Vote)

plugin/dapp/autonomy/executor/ruleaction.go

@@ -256,11 +256,11 @@ func (a *action) votePropRule(voteProb *auty.VoteProposalRule) (*types.Receipt,
 	cfg := a.api.GetConfig()
 	if cfg.IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
 		switch voteProb.Vote {
-		case auty.VoteOption_APPROVE:
+		case auty.AutonomyVoteOption_APPROVE:
 			cur.VoteResult.ApproveVotes += vtCouts
-		case auty.VoteOption_OPPOSE:
+		case auty.AutonomyVoteOption_OPPOSE:
 			cur.VoteResult.OpposeVotes += vtCouts
-		case auty.VoteOption_QUIT:
+		case auty.AutonomyVoteOption_QUIT:
 			cur.VoteResult.QuitVotes += vtCouts
 		default:
 			return nil, errors.Wrapf(types.ErrInvalidParam, "wrong vote value=%d", voteProb.Vote)

plugin/dapp/autonomy/proto/board.proto

@@ -67,7 +67,7 @@ message VoteProposalBoard {
     //真正投票地址
     repeated string originAddr = 3;
     //代替approve，并增加了弃权选项
-    VoteOption voteOption      = 4;
+    AutonomyVoteOption voteOption      = 4;
 }
 
 message TerminateProposalBoard {

plugin/dapp/autonomy/proto/change.proto

@@ -54,7 +54,7 @@ message RevokeProposalChange {
 message VoteProposalChange {
     string proposalID = 1;
     bool   approve    = 2;
-    VoteOption vote   = 3;
+    AutonomyVoteOption vote   = 3;
 }
 
 message TerminateProposalChange {

plugin/dapp/autonomy/proto/lcommon.proto

@@ -54,7 +54,7 @@ message RuleConfig {
 }
 
 //三种投票选项
-enum VoteOption {
+enum AutonomyVoteOption {
     INVALID = 0;
     //支持
     APPROVE = 1;

plugin/dapp/autonomy/proto/project.proto

@@ -59,7 +59,7 @@ message RevokeProposalProject {
 message VoteProposalProject {
     string proposalID = 1;
     bool   approve    = 2;
-    VoteOption vote   = 3;
+    AutonomyVoteOption vote   = 3;
 }
 
 message PubVoteProposalProject {

plugin/dapp/autonomy/proto/rule.proto

@@ -44,7 +44,7 @@ message VoteProposalRule {
     string   proposalID        = 1;
     bool     approve           = 2;
     repeated string originAddr = 3;
-    VoteOption vote            = 4;
+    AutonomyVoteOption vote            = 4;
 }
 
 message TerminateProposalRule {

plugin/dapp/ticket/rpc/rpc_test.go

@@ -396,6 +396,7 @@ ForkUnfreezeIDX= 0
 
 [fork.sub.autonomy]
 Enable=0
+ForkAutonomyDelRule=0
 
 [fork.sub.jsvm]
 Enable=0