dapp/vote:update doc

plugin/dapp/vote/executor/checktx.go

@@ -46,7 +46,7 @@ func checkMemberValidity(members []*vty.GroupMember) error {
 	filter := make(map[string]struct{}, len(members))
 	for _, member := range members {
 		if member.GetAddr() == "" {
-			return errNilMember
+			return types.ErrInvalidAddress
 		}
 		if _, ok := filter[member.Addr]; ok {
 			return errDuplicateMember

plugin/dapp/vote/executor/checktx_test.go

@@ -19,7 +19,7 @@ func TestVote_CheckTx_CreateGroup(t *testing.T) {
 	}, {
 		index:          2,
 		payload:        &vty.CreateGroup{Name: "test", Members: []*vty.GroupMember{{}}},
-		expectCheckErr: errNilMember,
+		expectCheckErr: types.ErrInvalidAddress,
 	}, {
 		index: 3,
 		payload: &vty.CreateGroup{

plugin/dapp/vote/executor/errors.go

@@ -3,15 +3,11 @@ package executor
 import "errors"
 
 var (
-	errEmptyName            = errors.New("ErrEmptyName")
-	errInvalidMemberWeights = errors.New("errInvalidMemberWeights")
-	errNilMember            = errors.New("errNilMember")
+	errEmptyName            = errors.New("errEmptyName")
 	errDuplicateMember      = errors.New("errDuplicateMember")
-	errDuplicateGroup       = errors.New("errDuplicateGroup")
 	errDuplicateAdmin       = errors.New("errDuplicateAdmin")
 	errInvalidVoteTime      = errors.New("errInvalidVoteTime")
 	errInvalidVoteOption    = errors.New("errInvalidVoteOption")
-	errEmptyVoteGroup       = errors.New("errEmptyVoteGroup")
 	errVoteNotExist         = errors.New("errVoteNotExist")
 	errGroupNotExist        = errors.New("errGroupNotExist")
 	errStateDBGet           = errors.New("errStateDBGet")
@@ -19,7 +15,6 @@ var (
 	errInvalidGroupID       = errors.New("errInvalidGroupID")
 	errInvalidOptionIndex   = errors.New("errInvalidOptionIndex")
 	errAddrAlreadyVoted     = errors.New("errAddrAlreadyVoted")
-	errInvalidGroupMember   = errors.New("errInvalidGroupMember")
 	errVoteAlreadyFinished  = errors.New("errVoteAlreadyFinished")
 	errVoteNotStarted       = errors.New("errVoteNotStarted")
 	errVoteAlreadyClosed    = errors.New("errVoteAlreadyClosed")

plugin/dapp/vote/proto/vote.proto

@@ -48,7 +48,7 @@ message GroupInfo {
     repeated string admins           = 5; //管理员列表
     repeated GroupMember members     = 6; //成员列表
     string               description = 7; //描述信息
-    uint32 voteNum = 8; //投票数量
+    uint32               voteNum     = 8; //投票数量
 }
 
 message GroupInfos {
@@ -78,9 +78,9 @@ message CommitVote {
 }
 
 message CommitInfo {
-    string addr   = 1; //提交地址
-    string txHash = 2; //提交交易哈希
-    uint32 voteWeight = 3;//投票权重
+    string addr       = 1; //提交地址
+    string txHash     = 2; //提交交易哈希
+    uint32 voteWeight = 3; //投票权重
 }
 
 message CloseVote {

plugin/dapp/vote/readme.md

@@ -45,6 +45,7 @@ message GroupInfo {
     repeated string admins           = 5; //管理员列表
     repeated GroupMember members     = 6; //成员列表
     string               description = 7; //描述信息
+    uint32 voteNum = 8; //投票数量
 }
 
 ```
@@ -89,6 +90,7 @@ message GroupInfo {
     repeated string admins           = 5; //管理员列表
     repeated GroupMember members     = 6; //成员列表
     string               description = 7; //描述信息
+    uint32 voteNum = 8; //投票数量
 }
 
 ```
@@ -178,8 +180,9 @@ message CommitVote {
 
 //投票信息
 message CommitInfo {
-    string addr   = 1; //提交地址
-    string txHash = 2; //提交交易哈希
+    string addr       = 1; //提交地址
+    string txHash     = 2; //提交交易哈希
+    uint32 voteWeight = 3; //投票权重
 }
 ```
 
@@ -451,6 +454,32 @@ message MemberInfos {
 curl -kd  '{"method":"Chain33.Query","params":[{"execer":"vote","funcName":"ListMember","payload":{"startItemID":"","count":1,"direction":1}}],"id":0}' http://localhost:8801
 ```
 
+#### 错误码表
+发送交易和查询等接口可能返回的错误
+
+|名称 |含义
+|---|---|
+errEmptyName|       名称为空
+errInvalidMemberWeights | 非法投票权重
+errDuplicateMember      | 投票组成员重复
+errDuplicateAdmin       | 投票组管理员重复
+errInvalidVoteTime      | 非法投票时间
+errInvalidVoteOption    | 非法投票选项
+errVoteNotExist         | 投票不存在
+errGroupNotExist        | 投票组不存在
+errStateDBGet           | 状态数据获取错误
+errInvalidVoteID        | 非法投票ID
+errInvalidGroupID       | 非法投票组ID
+errInvalidOptionIndex   | 非法投票索引
+errAddrAlreadyVoted     | 已完成投票
+errVoteAlreadyFinished  | 投票已结束
+errVoteNotStarted       | 投票未开始
+errVoteAlreadyClosed    | 投票已关闭
+errAddrPermissionDenied | 地址没有权限
+
+
+
+
 #### 其他
 
 [投票合约proto源文件](proto/vote.proto)