Skip to content

P
plugin
Commit cf9a539d authored by vipwzw's avatar vipwzw Committed by 33cn
Browse files
Options

auto ci

parent 8c44c577
Show whitespace changes
Inline Side-by-side
Showing with 1456 additions and 558 deletions
plugin/dapp/autonomy/commands/proposal_board.go
View file @ cf9a539d
......@@ -10,11 +10,10 @@ import (
jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
rpctypes "github.com/33cn/chain33/rpc/types"
"github.com/33cn/chain33/types"
"github.com/spf13/cobra"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/spf13/cobra"
)
// AutonomyCmd 自治系统命令行
func AutonomyCmd() *cobra.Command {
cmd := &cobra.Command{
......@@ -228,7 +227,7 @@ func addShowProposalBoardflags(cmd *cobra.Command) {
func showProposalBoard(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
typ, _ := cmd.Flags().GetUint32("type")
propID, _:= cmd.Flags().GetString("proposalID")
propID, _ := cmd.Flags().GetString("proposalID")
status, _ := cmd.Flags().GetUint32("status")
count, _ := cmd.Flags().GetInt32("count")
direction, _ := cmd.Flags().GetInt32("direction")
......
plugin/dapp/autonomy/commands/proposal_project.go
View file @ cf9a539d
......@@ -5,11 +5,11 @@
package commands
import (
"github.com/spf13/cobra"
"github.com/33cn/chain33/types"
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"
)
// ProposalProjectCmd 创建提案命令
......@@ -78,12 +78,12 @@ func proposalProject(cmd *cobra.Command, args []string) {
Production: production,
Description: description,
Contractor: contractor,
Amount: amount*types.Coin,
Amount: amount * types.Coin,
AmountDetail: amountDetail,
ToAddr: toAddr,
StartBlockHeight: startBlock,
EndBlockHeight: endBlock,
ProjectNeedBlockNum:projectNeedBlockNum,
ProjectNeedBlockNum: projectNeedBlockNum,
}
var res string
......@@ -194,7 +194,6 @@ func pubVoteProposalProject(cmd *cobra.Command, args []string) {
ctx.RunWithoutMarshal()
}
// TerminateProposalProject 终止提案
func TerminateProposalProjectCmd() *cobra.Command {
cmd := &cobra.Command{
......@@ -248,7 +247,7 @@ func addShowProposalProjectflags(cmd *cobra.Command) {
func showProposalProject(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
typ, _ := cmd.Flags().GetUint32("type")
propID, _:= cmd.Flags().GetString("proposalID")
propID, _ := cmd.Flags().GetString("proposalID")
status, _ := cmd.Flags().GetUint32("status")
count, _ := cmd.Flags().GetInt32("count")
direction, _ := cmd.Flags().GetInt32("direction")
......
plugin/dapp/autonomy/commands/proposal_rule.go
View file @ cf9a539d
......@@ -8,8 +8,8 @@ import (
jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
rpctypes "github.com/33cn/chain33/rpc/types"
"github.com/33cn/chain33/types"
"github.com/spf13/cobra"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/spf13/cobra"
)
// ProposalRuleCmd 创建提案命令
......@@ -197,7 +197,7 @@ func addShowProposalRuleflags(cmd *cobra.Command) {
func showProposalRule(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
typ, _ := cmd.Flags().GetUint32("type")
propID, _:= cmd.Flags().GetString("proposalID")
propID, _ := cmd.Flags().GetString("proposalID")
status, _ := cmd.Flags().GetUint32("status")
count, _ := cmd.Flags().GetInt32("count")
direction, _ := cmd.Flags().GetInt32("direction")
......@@ -248,10 +248,10 @@ func addTransferFundflags(cmd *cobra.Command) {
func transferFund(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
amount, _ := cmd.Flags().GetInt64("amount")
note, _:= cmd.Flags().GetString("note")
note, _ := cmd.Flags().GetString("note")
params := &auty.TransferFund{
Amount: amount*types.Coin,
Amount: amount * types.Coin,
Note: note,
}
var res string
......@@ -280,14 +280,14 @@ func addCommentProposalflags(cmd *cobra.Command) {
func commentProposal(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
proposalID, _:= cmd.Flags().GetString("proposalID")
repCmtHash, _:= cmd.Flags().GetString("repCmtHash")
comment, _:= cmd.Flags().GetString("comment")
proposalID, _ := cmd.Flags().GetString("proposalID")
repCmtHash, _ := cmd.Flags().GetString("repCmtHash")
comment, _ := cmd.Flags().GetString("comment")
params := &auty.Comment{
ProposalID:proposalID,
RepCmtHash:repCmtHash,
Comment:comment,
ProposalID: proposalID,
RepCmtHash: repCmtHash,
Comment: comment,
}
var res string
ctx := jsonrpc.NewRPCCtx(rpcLaddr, "autonomy.CommentProposalTx", params, &res)
......@@ -315,7 +315,7 @@ func addShowProposalCommentflags(cmd *cobra.Command) {
func showProposalComment(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
propID, _:= cmd.Flags().GetString("proposalID")
propID, _ := cmd.Flags().GetString("proposalID")
count, _ := cmd.Flags().GetInt32("count")
direction, _ := cmd.Flags().GetInt32("direction")
index, _ := cmd.Flags().GetInt64("index")
......
plugin/dapp/autonomy/executor/autonomy.go
View file @ cf9a539d
......@@ -5,11 +5,11 @@
package executor
import (
"github.com/33cn/chain33/common/address"
log "github.com/33cn/chain33/common/log/log15"
drivers "github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/33cn/chain33/common/address"
)
var (
......@@ -19,7 +19,6 @@ var (
autonomyFundAddr = address.ExecAddress("autonomyfund")
)
func init() {
ety := types.LoadExecutorType(driverName)
ety.InitFuncList(types.ListMethod(&Autonomy{}))
......
plugin/dapp/autonomy/executor/board.go
View file @ cf9a539d
......@@ -5,10 +5,11 @@
package executor
import (
"fmt"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"fmt"
)
func (a *Autonomy) execLocalBoard(receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
......@@ -112,7 +113,7 @@ func (a *Autonomy) getProposalBoard(req *types.ReqString) (types.Message, error)
return rep, nil
}
func(a *Autonomy) listProposalBoard(req *auty.ReqQueryProposalBoard) (types.Message, error) {
func (a *Autonomy) listProposalBoard(req *auty.ReqQueryProposalBoard) (types.Message, error) {
if req == nil {
return nil, types.ErrInvalidParam
}
......
plugin/dapp/autonomy/executor/board_test.go
View file @ cf9a539d
......@@ -6,11 +6,12 @@ package executor
import (
"testing"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/util"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/require"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/util"
)
func TestExecLocalBoard(t *testing.T) {
......@@ -31,7 +32,7 @@ func TestExecLocalBoard(t *testing.T) {
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogPropBoard, Log:types.Encode(receiptBoard)},
{Ty: auty.TyLogPropBoard, Log: types.Encode(receiptBoard)},
},
}
set, err := au.execLocalBoard(receipt)
......@@ -51,7 +52,7 @@ func TestExecLocalBoard(t *testing.T) {
}
set, err = au.execLocalBoard(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogRvkPropBoard, Log:types.Encode(receiptBoard1)},
{Ty: auty.TyLogRvkPropBoard, Log: types.Encode(receiptBoard1)},
},
})
require.NoError(t, err)
......@@ -76,7 +77,7 @@ func TestExecLocalBoard(t *testing.T) {
}
set, err = au.execLocalBoard(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropBoard, Log:types.Encode(receiptBoard2)},
{Ty: auty.TyLogVotePropBoard, Log: types.Encode(receiptBoard2)},
},
})
require.NoError(t, err)
......@@ -106,7 +107,7 @@ func TestExecDelLocalBoard(t *testing.T) {
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogPropBoard, Log:types.Encode(receiptBoard)},
{Ty: auty.TyLogPropBoard, Log: types.Encode(receiptBoard)},
},
}
set, err := au.execDelLocalBoard(receipt)
......@@ -127,7 +128,7 @@ func TestExecDelLocalBoard(t *testing.T) {
}
set, err = au.execDelLocalBoard(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropBoard, Log:types.Encode(receiptBoard2)},
{Ty: auty.TyLogVotePropBoard, Log: types.Encode(receiptBoard2)},
},
})
require.NoError(t, err)
......@@ -148,7 +149,7 @@ func TestGetProposalBoard(t *testing.T) {
au.SetStateDB(storedb)
tx := "1111111111111111111"
storedb.Set(propBoardID(tx), types.Encode(&auty.AutonomyProposalBoard{}))
rsp, err := au.getProposalBoard(&types.ReqString{Data:tx})
rsp, err := au.getProposalBoard(&types.ReqString{Data: tx})
require.NoError(t, err)
require.NotNil(t, rsp)
require.Equal(t, len(rsp.(*auty.ReplyQueryProposalBoard).PropBoards), 1)
......@@ -201,9 +202,9 @@ func TestListProposalBoard(t *testing.T) {
// 反向查找
req := &auty.ReqQueryProposalBoard{
Status:auty.AutonomyStatusProposalBoard,
Count:10,
Direction:0,
Status: auty.AutonomyStatusProposalBoard,
Count: 10,
Direction: 0,
Index: -1,
}
rsp, err := au.listProposalBoard(req)
......@@ -218,9 +219,9 @@ func TestListProposalBoard(t *testing.T) {
// 正向查找
req = &auty.ReqQueryProposalBoard{
Status:auty.AutonomyStatusProposalBoard,
Count:10,
Direction:1,
Status: auty.AutonomyStatusProposalBoard,
Count: 10,
Direction: 1,
Index: -1,
}
rsp, err = au.listProposalBoard(req)
......@@ -233,9 +234,9 @@ func TestListProposalBoard(t *testing.T) {
// 翻页查找
req = &auty.ReqQueryProposalBoard{
Status:auty.AutonomyStatusProposalBoard,
Count:1,
Direction:0,
Status: auty.AutonomyStatusProposalBoard,
Count: 1,
Direction: 0,
Index: -1,
}
rsp, err = au.listProposalBoard(req)
......@@ -248,9 +249,9 @@ func TestListProposalBoard(t *testing.T) {
//
Index := height*types.MaxTxsPerBlock + int64(index)
req = &auty.ReqQueryProposalBoard{
Status:auty.AutonomyStatusProposalBoard,
Count:10,
Direction:0,
Status: auty.AutonomyStatusProposalBoard,
Count: 10,
Direction: 0,
Index: Index,
}
rsp, err = au.listProposalBoard(req)
......
plugin/dapp/autonomy/executor/boardaction.go
View file @ cf9a539d
......@@ -6,11 +6,11 @@ package executor
import (
"github.com/33cn/chain33/account"
"github.com/33cn/chain33/client"
"github.com/33cn/chain33/common"
dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/client"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/33cn/chain33/common/address"
......@@ -21,7 +21,7 @@ const (
maxBoards = 30
publicPeriod int32 = 120960 // 公示一周时间，以区块高度计算
ticketPrice = types.Coin * 3000 // 单张票价
largeProjectAmount = types.Coin * 100 *10000 // 重大项目公示金额阈值
largeProjectAmount = types.Coin * 100 * 10000 // 重大项目公示金额阈值
proposalAmount = types.Coin * 1000 // 创建者消耗金额
boardAttendRatio int32 = 66 // 董事会成员参与率，以%计，可修改
boardApproveRatio int32 = 66 // 董事会成员赞成率，以%计，可修改
......@@ -88,8 +88,8 @@ func (a *action) propBoard(prob *auty.ProposalBoard) (*types.Receipt, error) {
kv = append(kv, receipt.KV...)
cur := &auty.AutonomyProposalBoard{
PropBoard:prob,
CurRule:rule,
PropBoard: prob,
CurRule: rule,
VoteResult: &auty.VoteResult{},
Status: auty.AutonomyStatusProposalBoard,
Address: a.fromaddr,
......@@ -202,7 +202,7 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
if err != nil {
return nil, err
}
cur.VoteResult.TotalVotes = int32(account.Balance/ticketPrice)
cur.VoteResult.TotalVotes = int32(account.Balance / ticketPrice)
}
account, err := a.getStartHeightVoteAccount(a.fromaddr, start)
......@@ -210,9 +210,9 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
return nil, err
}
if voteProb.Approve {
cur.VoteResult.ApproveVotes += int32(account.Balance/ticketPrice)
cur.VoteResult.ApproveVotes += int32(account.Balance / ticketPrice)
} else {
cur.VoteResult.OpposeVotes += int32(account.Balance/ticketPrice)
cur.VoteResult.OpposeVotes += int32(account.Balance / ticketPrice)
}
var logs []*types.ReceiptLog
......@@ -230,9 +230,9 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
}
if cur.VoteResult.TotalVotes != 0 &&
cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes != 0 &&
float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) / float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes) / float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes != 0 &&
float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes)/float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes)/float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
cur.VoteResult.Pass = true
cur.PropBoard.RealEndBlockHeight = a.height
}
......@@ -249,7 +249,7 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
// 更新当前具有权利的董事会成员
if cur.VoteResult.Pass {
kv = append(kv, &types.KeyValue{Key: activeBoardID(), Value:types.Encode(cur.PropBoard)})
kv = append(kv, &types.KeyValue{Key: activeBoardID(), Value: types.Encode(cur.PropBoard)})
}
ty := auty.TyLogVotePropBoard
......@@ -295,11 +295,11 @@ func (a *action) tmintPropBoard(tmintProb *auty.TerminateProposalBoard) (*types.
if err != nil {
return nil, err
}
cur.VoteResult.TotalVotes = int32(account.Balance/ticketPrice)
cur.VoteResult.TotalVotes = int32(account.Balance / ticketPrice)
}
if float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) / float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes) / float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
if float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes)/float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes)/float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
cur.VoteResult.Pass = true
} else {
cur.VoteResult.Pass = false
......@@ -326,7 +326,7 @@ func (a *action) tmintPropBoard(tmintProb *auty.TerminateProposalBoard) (*types.
// 更新当前具有权利的董事会成员
if cur.VoteResult.Pass {
kv = append(kv, &types.KeyValue{Key: activeBoardID(), Value:types.Encode(cur.PropBoard)})
kv = append(kv, &types.KeyValue{Key: activeBoardID(), Value: types.Encode(cur.PropBoard)})
}
receiptLog := getReceiptLog(pre, cur, auty.TyLogTmintPropBoard)
......@@ -338,7 +338,7 @@ func (a *action) tmintPropBoard(tmintProb *auty.TerminateProposalBoard) (*types.
func (a *action) getStartHeightVoteAccount(addr string, height int64) (*types.Account, error) {
param := &types.ReqBlocks{
Start: height,
End:height,
End: height,
}
head, err := a.api.GetHeaders(param)
if err != nil || len(head.Items) == 0 {
......@@ -381,7 +381,7 @@ func (a *action) getActiveRule() (*auty.RuleConfig, error) {
if err != nil {
return nil, err
}
} else {// 载入系统默认值
} else { // 载入系统默认值
rule.BoardAttendRatio = boardAttendRatio
rule.BoardApproveRatio = boardApproveRatio
rule.PubOpposeRatio = pubOpposeRatio
......@@ -440,4 +440,3 @@ func copyAutonomyProposalBoard(cur *auty.AutonomyProposalBoard) *auty.AutonomyPr
}
return &newAut
}
plugin/dapp/autonomy/executor/boardaction_test.go
View file @ cf9a539d
......@@ -7,21 +7,21 @@ package executor
import (
"testing"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/require"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/account"
apimock "github.com/33cn/chain33/client/mocks"
dbmock "github.com/33cn/chain33/common/db/mocks"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/common"
commonlog "github.com/33cn/chain33/common/log"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/crypto"
dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/account"
dbmock "github.com/33cn/chain33/common/db/mocks"
commonlog "github.com/33cn/chain33/common/log"
_ "github.com/33cn/chain33/system"
"github.com/stretchr/testify/mock"
"github.com/33cn/chain33/common/address"
drivers "github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/util"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
type execEnv struct {
......@@ -88,7 +88,6 @@ func InitEnv() (*execEnv, drivers.Driver, dbm.KV, dbm.KVDB) {
stateDB, _ := dbm.NewGoMemDB("state", "state", 100)
_, _, kvdb := util.CreateTestDB()
accCoin := account.NewCoinsAccount()
accCoin.SetDB(stateDB)
accCoin.SaveAccount(&accountA)
......@@ -97,7 +96,7 @@ func InitEnv() (*execEnv, drivers.Driver, dbm.KV, dbm.KVDB) {
accCoin.SaveAccount(&accountC)
accCoin.SaveAccount(&accountD)
//total ticket balance
accCoin.SaveAccount(&types.Account{Balance: total*4,
accCoin.SaveAccount(&types.Account{Balance: total * 4,
Frozen: 0,
Addr: "16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"})
......@@ -198,7 +197,7 @@ func propBoardTx(parm *auty.ProposalBoard) (*types.Transaction, error) {
func revokeProposalBoard(t *testing.T, env *execEnv, exec drivers.Driver, stateDB dbm.KV, kvdb dbm.KVDB, save bool) {
proposalID := env.txHash
opt2 := &auty.RevokeProposalBoard{
ProposalID:proposalID,
ProposalID: proposalID,
}
rtx, err := revokeProposalBoardTx(opt2)
require.NoError(t, err)
......@@ -252,14 +251,14 @@ func voteProposalBoard(t *testing.T, env *execEnv, exec drivers.Driver, stateDB
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
acc = &types.Account{
Currency: 0,
......@@ -267,7 +266,7 @@ func voteProposalBoard(t *testing.T, env *execEnv, exec drivers.Driver, stateDB
}
val1 := types.Encode(acc)
values1 := [][]byte{val1}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values1}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values1}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
......@@ -285,7 +284,7 @@ func voteProposalBoard(t *testing.T, env *execEnv, exec drivers.Driver, stateDB
for _, record := range records {
opt := &auty.VoteProposalBoard{
ProposalID:proposalID,
ProposalID: proposalID,
Approve: record.appr,
}
tx, err := voteProposalBoardTx(opt)
......@@ -324,7 +323,7 @@ func voteProposalBoard(t *testing.T, env *execEnv, exec drivers.Driver, stateDB
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
}
// check
......@@ -364,19 +363,19 @@ func terminateProposalBoard(t *testing.T, env *execEnv, exec drivers.Driver, sta
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
opt := &auty.TerminateProposalBoard{
ProposalID:proposalID,
ProposalID: proposalID,
}
tx, err := terminateProposalBoardTx(opt)
require.NoError(t, err)
......@@ -441,11 +440,11 @@ func TestGetStartHeightVoteAccount(t *testing.T) {
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil)
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil)
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
account, err := action.getStartHeightVoteAccount(addr, 0)
require.NoError(t, err)
require.NotNil(t, account)
......@@ -457,13 +456,13 @@ func TestGetReceiptLog(t *testing.T) {
PropBoard: &auty.ProposalBoard{Year: 1800, Month: 1},
VoteResult: &auty.VoteResult{TotalVotes: 100},
Status: 1,
Address:"121",
Address: "121",
}
cur := &auty.AutonomyProposalBoard{
PropBoard: &auty.ProposalBoard{Year: 1900, Month: 1},
VoteResult: &auty.VoteResult{TotalVotes: 100},
Status: 2,
Address:"123",
Address: "123",
}
log := getReceiptLog(pre, cur, 2)
require.Equal(t, int32(2), log.Ty)
......@@ -481,7 +480,7 @@ func TestCopyAutonomyProposalBoard(t *testing.T) {
CurRule: &auty.RuleConfig{BoardAttendRatio: 100},
VoteResult: &auty.VoteResult{TotalVotes: 100},
Status: 2,
Address:"123",
Address: "123",
}
pre := copyAutonomyProposalBoard(cur)
cur.PropBoard.Year = 1800
......
plugin/dapp/autonomy/executor/exec_del_local.go
View file @ cf9a539d
......@@ -16,7 +16,7 @@ func (a *Autonomy) ExecDelLocal_PropBoard(payload *auty.ProposalBoard, tx *types
}
// ExecDelLocal_RvkPropBoard 撤销提案
func (a *Autonomy) ExecDelLocal_RvkPropBoard(payload *auty.RevokeProposalBoard, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error){
func (a *Autonomy) ExecDelLocal_RvkPropBoard(payload *auty.RevokeProposalBoard, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return a.execDelLocalBoard(receiptData)
}
......@@ -37,7 +37,7 @@ func (a *Autonomy) ExecDelLocal_PropProject(payload *auty.ProposalProject, tx *t
}
// ExecDelLocal_RvkPropProject 撤销提案
func (a *Autonomy) ExecDelLocal_RvkPropProject(payload *auty.RevokeProposalProject, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error){
func (a *Autonomy) ExecDelLocal_RvkPropProject(payload *auty.RevokeProposalProject, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return a.execDelLocalProject(receiptData)
}
......@@ -63,7 +63,7 @@ func (a *Autonomy) ExecDelLocal_PropRule(payload *auty.ProposalRule, tx *types.T
}
// ExecDelLocal_RvkPropRule 撤销提案规则
func (a *Autonomy) ExecDelLocal_RvkPropRule(payload *auty.RevokeProposalRule, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error){
func (a *Autonomy) ExecDelLocal_RvkPropRule(payload *auty.RevokeProposalRule, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return a.execDelLocalRule(receiptData)
}
......
plugin/dapp/autonomy/executor/exec_local.go
View file @ cf9a539d
......@@ -16,7 +16,7 @@ func (a *Autonomy) ExecLocal_PropBoard(payload *auty.ProposalBoard, tx *types.Tr
}
// ExecLocal_RvkPropBoard 撤销提案
func (a *Autonomy) ExecLocal_RvkPropBoard(payload *auty.RevokeProposalBoard, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error){
func (a *Autonomy) ExecLocal_RvkPropBoard(payload *auty.RevokeProposalBoard, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return a.execLocalBoard(receiptData)
}
......@@ -37,7 +37,7 @@ func (a *Autonomy) ExecLocal_PropProject(payload *auty.ProposalProject, tx *type
}
// ExecLocal_RvkPropProject 撤销提案项目
func (a *Autonomy) ExecLocal_RvkPropProject(payload *auty.RevokeProposalProject, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error){
func (a *Autonomy) ExecLocal_RvkPropProject(payload *auty.RevokeProposalProject, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return a.execLocalProject(receiptData)
}
......@@ -63,7 +63,7 @@ func (a *Autonomy) ExecLocal_PropRule(payload *auty.ProposalRule, tx *types.Tran
}
// ExecLocal_RvkPropRule 撤销提案规则
func (a *Autonomy) ExecLocal_RvkPropRule(payload *auty.RevokeProposalRule, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error){
func (a *Autonomy) ExecLocal_RvkPropRule(payload *auty.RevokeProposalRule, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
return a.execLocalRule(receiptData)
}
......
plugin/dapp/autonomy/executor/kv.go
View file @ cf9a539d
......@@ -41,7 +41,7 @@ func boardVotesRecord(txHash string) []byte {
}
func calcBoardKey4StatusHeight(status int32, heightindex string) []byte {
key := fmt.Sprintf(localBoardPrefix + "%d-" +"%s", status, heightindex)
key := fmt.Sprintf(localBoardPrefix+"%d-"+"%s", status, heightindex)
return []byte(key)
}
......@@ -56,7 +56,7 @@ func propProjectID(txHash string) []byte {
}
func calcProjectKey4StatusHeight(status int32, heightindex string) []byte {
key := fmt.Sprintf(localProjectPrefix + "%d-" +"%s", status, heightindex)
key := fmt.Sprintf(localProjectPrefix+"%d-"+"%s", status, heightindex)
return []byte(key)
}
......@@ -75,7 +75,7 @@ func propRuleID(txHash string) []byte {
}
func calcRuleKey4StatusHeight(status int32, heightindex string) []byte {
key := fmt.Sprintf(localRulePrefix + "%d-" +"%s", status, heightindex)
key := fmt.Sprintf(localRulePrefix+"%d-"+"%s", status, heightindex)
return []byte(key)
}
......@@ -85,6 +85,6 @@ var (
)
func calcCommentHeight(ID, heightindex string) []byte {
key := fmt.Sprintf(localCommentPrefix + "%s-" +"%s", ID, heightindex)
key := fmt.Sprintf(localCommentPrefix+"%s-"+"%s", ID, heightindex)
return []byte(key)
}
plugin/dapp/autonomy/executor/project_test.go
View file @ cf9a539d
......@@ -6,11 +6,12 @@ package executor
import (
"testing"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/util"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/require"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/util"
)
func TestExecLocalProject(t *testing.T) {
......@@ -33,7 +34,7 @@ func TestExecLocalProject(t *testing.T) {
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogPropProject, Log:types.Encode(receiptProject)},
{Ty: auty.TyLogPropProject, Log: types.Encode(receiptProject)},
},
}
set, err := au.execLocalProject(receipt)
......@@ -53,7 +54,7 @@ func TestExecLocalProject(t *testing.T) {
}
set, err = au.execLocalProject(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogRvkPropProject, Log:types.Encode(receiptProject1)},
{Ty: auty.TyLogRvkPropProject, Log: types.Encode(receiptProject1)},
},
})
require.NoError(t, err)
......@@ -78,7 +79,7 @@ func TestExecLocalProject(t *testing.T) {
}
set, err = au.execLocalProject(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropProject, Log:types.Encode(receiptProject2)},
{Ty: auty.TyLogVotePropProject, Log: types.Encode(receiptProject2)},
},
})
require.NoError(t, err)
......@@ -110,7 +111,7 @@ func TestExecDelLocalProject(t *testing.T) {
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogPropProject, Log:types.Encode(receiptProject)},
{Ty: auty.TyLogPropProject, Log: types.Encode(receiptProject)},
},
}
set, err := au.execDelLocalProject(receipt)
......@@ -131,7 +132,7 @@ func TestExecDelLocalProject(t *testing.T) {
}
set, err = au.execDelLocalProject(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropProject, Log:types.Encode(receiptProject2)},
{Ty: auty.TyLogVotePropProject, Log: types.Encode(receiptProject2)},
},
})
require.NoError(t, err)
......@@ -152,7 +153,7 @@ func TestGetProposalProject(t *testing.T) {
au.SetStateDB(storedb)
tx := "1111111111111111111"
storedb.Set(propProjectID(tx), types.Encode(&auty.AutonomyProposalProject{}))
rsp, err := au.getProposalProject(&types.ReqString{Data:tx})
rsp, err := au.getProposalProject(&types.ReqString{Data: tx})
require.NoError(t, err)
require.NotNil(t, rsp)
require.Equal(t, len(rsp.(*auty.ReplyQueryProposalProject).PropProjects), 1)
......@@ -207,9 +208,9 @@ func TestListProposalProject(t *testing.T) {
// 反向查找
req := &auty.ReqQueryProposalProject{
Status:auty.AutonomyStatusProposalProject,
Count:10,
Direction:0,
Status: auty.AutonomyStatusProposalProject,
Count: 10,
Direction: 0,
Index: -1,
}
rsp, err := au.listProposalProject(req)
......@@ -224,9 +225,9 @@ func TestListProposalProject(t *testing.T) {
// 正向查找
req = &auty.ReqQueryProposalProject{
Status:auty.AutonomyStatusProposalProject,
Count:10,
Direction:1,
Status: auty.AutonomyStatusProposalProject,
Count: 10,
Direction: 1,
Index: -1,
}
rsp, err = au.listProposalProject(req)
......@@ -239,9 +240,9 @@ func TestListProposalProject(t *testing.T) {
// 翻页查找
req = &auty.ReqQueryProposalProject{
Status:auty.AutonomyStatusProposalProject,
Count:1,
Direction:0,
Status: auty.AutonomyStatusProposalProject,
Count: 1,
Direction: 0,
Index: -1,
}
rsp, err = au.listProposalProject(req)
......@@ -254,9 +255,9 @@ func TestListProposalProject(t *testing.T) {
//
Index := height*types.MaxTxsPerBlock + int64(index)
req = &auty.ReqQueryProposalProject{
Status:auty.AutonomyStatusProposalProject,
Count:10,
Direction:0,
Status: auty.AutonomyStatusProposalProject,
Count: 10,
Direction: 0,
Index: Index,
}
rsp, err = au.listProposalProject(req)
......
plugin/dapp/autonomy/executor/projectaction.go
View file @ cf9a539d
......@@ -12,7 +12,6 @@ import (
"github.com/33cn/chain33/common/address"
)
func (a *action) propProject(prob *auty.ProposalProject) (*types.Receipt, error) {
if err := address.CheckAddress(prob.ToAddr); err != nil {
alog.Error("propProject ", "addr", prob.ToAddr, "check toAddr error", err)
......@@ -64,11 +63,11 @@ func (a *action) propProject(prob *auty.ProposalProject) (*types.Receipt, error)
isPubVote = true
}
cur := &auty.AutonomyProposalProject{
PropProject:prob,
CurRule:rule,
PropProject: prob,
CurRule: rule,
Boards: pboard.Boards,
BoardVoteRes: &auty.VoteResult{TotalVotes: int32(len(pboard.Boards))},
PubVote: &auty.PublicVote{Publicity:isPubVote},
PubVote: &auty.PublicVote{Publicity: isPubVote},
Status: auty.AutonomyStatusProposalProject,
Address: a.fromaddr,
Height: a.height,
......@@ -220,9 +219,9 @@ func (a *action) votePropProject(voteProb *auty.VoteProposalProject) (*types.Rec
}
if cur.BoardVoteRes.TotalVotes != 0 &&
cur.BoardVoteRes.ApproveVotes + cur.BoardVoteRes.OpposeVotes != 0 &&
float32(cur.BoardVoteRes.ApproveVotes + cur.BoardVoteRes.OpposeVotes) / float32(cur.BoardVoteRes.TotalVotes) >= float32(cur.CurRule.BoardAttendRatio)/100.0 &&
float32(cur.BoardVoteRes.ApproveVotes) / float32(cur.BoardVoteRes.ApproveVotes + cur.BoardVoteRes.OpposeVotes) >= float32(cur.CurRule.BoardApproveRatio)/100.0 {
cur.BoardVoteRes.ApproveVotes+cur.BoardVoteRes.OpposeVotes != 0 &&
float32(cur.BoardVoteRes.ApproveVotes+cur.BoardVoteRes.OpposeVotes)/float32(cur.BoardVoteRes.TotalVotes) >= float32(cur.CurRule.BoardAttendRatio)/100.0 &&
float32(cur.BoardVoteRes.ApproveVotes)/float32(cur.BoardVoteRes.ApproveVotes+cur.BoardVoteRes.OpposeVotes) >= float32(cur.CurRule.BoardApproveRatio)/100.0 {
cur.BoardVoteRes.Pass = true
cur.PropProject.RealEndBlockHeight = a.height
}
......@@ -306,7 +305,7 @@ func (a *action) pubVotePropProject(voteProb *auty.PubVoteProposalProject) (*typ
if err != nil {
return nil, err
}
cur.PubVote.TotalVotes = int32(account.Balance/ticketPrice)
cur.PubVote.TotalVotes = int32(account.Balance / ticketPrice)
}
// 获取该地址票数
......@@ -315,14 +314,14 @@ func (a *action) pubVotePropProject(voteProb *auty.PubVoteProposalProject) (*typ
return nil, err
}
if voteProb.Oppose { //投反对票
cur.PubVote.OpposeVotes += int32(account.Balance/ticketPrice)
cur.PubVote.OpposeVotes += int32(account.Balance / ticketPrice)
}
var logs []*types.ReceiptLog
var kv []*types.KeyValue
if cur.PubVote.TotalVotes != 0 &&
float32(cur.PubVote.OpposeVotes) / float32(cur.PubVote.TotalVotes) >= float32(cur.CurRule.PubOpposeRatio) / 100.0 {
float32(cur.PubVote.OpposeVotes)/float32(cur.PubVote.TotalVotes) >= float32(cur.CurRule.PubOpposeRatio)/100.0 {
cur.PubVote.PubPass = false
cur.PropProject.RealEndBlockHeight = a.height
......@@ -374,7 +373,7 @@ func (a *action) tmintPropProject(tmintProb *auty.TerminateProposalProject) (*ty
// 公示期间不能终止
if cur.PubVote.Publicity && cur.PubVote.PubPass &&
a.height <= cur.PropProject.RealEndBlockHeight + int64(cur.CurRule.PublicPeriod) {
a.height <= cur.PropProject.RealEndBlockHeight+int64(cur.CurRule.PublicPeriod) {
err := auty.ErrTerminatePeriod
alog.Error("tmintPropProject ", "addr", a.fromaddr, "status", cur.Status,
"in publicity vote period can not terminate", tmintProb.ProposalID, "err", err)
......@@ -392,9 +391,9 @@ func (a *action) tmintPropProject(tmintProb *auty.TerminateProposalProject) (*ty
}
if cur.BoardVoteRes.TotalVotes != 0 &&
cur.BoardVoteRes.ApproveVotes + cur.BoardVoteRes.OpposeVotes != 0 &&
float32(cur.BoardVoteRes.ApproveVotes + cur.BoardVoteRes.OpposeVotes) / float32(cur.BoardVoteRes.TotalVotes) >= float32(cur.CurRule.BoardAttendRatio)/100.0 &&
float32(cur.BoardVoteRes.ApproveVotes) / float32(cur.BoardVoteRes.ApproveVotes + cur.BoardVoteRes.OpposeVotes) >= float32(cur.CurRule.BoardApproveRatio)/100.0 {
cur.BoardVoteRes.ApproveVotes+cur.BoardVoteRes.OpposeVotes != 0 &&
float32(cur.BoardVoteRes.ApproveVotes+cur.BoardVoteRes.OpposeVotes)/float32(cur.BoardVoteRes.TotalVotes) >= float32(cur.CurRule.BoardAttendRatio)/100.0 &&
float32(cur.BoardVoteRes.ApproveVotes)/float32(cur.BoardVoteRes.ApproveVotes+cur.BoardVoteRes.OpposeVotes) >= float32(cur.CurRule.BoardApproveRatio)/100.0 {
cur.BoardVoteRes.Pass = true
} else {
cur.BoardVoteRes.Pass = false
......@@ -407,10 +406,10 @@ func (a *action) tmintPropProject(tmintProb *auty.TerminateProposalProject) (*ty
if err != nil {
return nil, err
}
cur.PubVote.TotalVotes = int32(account.Balance/ticketPrice)
cur.PubVote.TotalVotes = int32(account.Balance / ticketPrice)
}
if cur.PubVote.TotalVotes != 0 &&
float32(cur.PubVote.OpposeVotes) / float32(cur.PubVote.TotalVotes) >= float32(cur.CurRule.PubOpposeRatio)/ 100.0 {
float32(cur.PubVote.OpposeVotes)/float32(cur.PubVote.TotalVotes) >= float32(cur.CurRule.PubOpposeRatio)/100.0 {
cur.PubVote.PubPass = false
}
}
......@@ -507,7 +506,7 @@ func copyAutonomyProposalProject(cur *auty.AutonomyProposalProject) *auty.Autono
return nil
}
newAut := *cur
if cur.PropProject != nil{
if cur.PropProject != nil {
newProject := *cur.GetPropProject()
newAut.PropProject = &newProject
}
......@@ -525,4 +524,3 @@ func copyAutonomyProposalProject(cur *auty.AutonomyProposalProject) *auty.Autono
}
return &newAut
}
plugin/dapp/autonomy/executor/projectaction_test.go
View file @ cf9a539d
......@@ -7,17 +7,17 @@ package executor
import (
"testing"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/require"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/account"
apimock "github.com/33cn/chain33/client/mocks"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/address"
dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/account"
_ "github.com/33cn/chain33/system"
"github.com/stretchr/testify/mock"
"github.com/33cn/chain33/common/address"
drivers "github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
//const (
......@@ -39,9 +39,9 @@ func InitBoard(stateDB dbm.KV) {
Month: 11,
Day: 1,
Boards: []string{AddrA, AddrB, AddrC, AddrD},
StartBlockHeight:1,
EndBlockHeight:10,
RealEndBlockHeight:5,
StartBlockHeight: 1,
EndBlockHeight: 10,
RealEndBlockHeight: 5,
}
stateDB.Set(activeBoardID(), types.Encode(board))
}
......@@ -53,7 +53,7 @@ func InitRule(stateDB dbm.KV) {
BoardApproveRatio: boardApproveRatio,
PubOpposeRatio: pubOpposeRatio,
ProposalAmount: proposalAmount,
LargeProjectAmount: types.Coin *100,
LargeProjectAmount: types.Coin * 100,
PublicPeriod: publicPeriod,
}
stateDB.Set(activeRuleID(), types.Encode(rule))
......@@ -74,24 +74,24 @@ func TestPropProject(t *testing.T) {
env, exec, _, _ := InitEnv()
opts := []*auty.ProposalProject{
&auty.ProposalProject{ // check toaddr
{ // check toaddr
ToAddr: "1111111111",
StartBlockHeight: env.blockHeight + 5,
EndBlockHeight: env.blockHeight + 10,
},
&auty.ProposalProject{ // check amount
{ // check amount
Amount: 0,
ToAddr: AddrA,
StartBlockHeight: env.blockHeight + 5,
EndBlockHeight: env.blockHeight + 10,
},
&auty.ProposalProject{ // check StartBlockHeight EndBlockHeight
{ // check StartBlockHeight EndBlockHeight
Amount: 10,
ToAddr: AddrA,
StartBlockHeight: env.blockHeight-1,
EndBlockHeight: env.blockHeight-1,
StartBlockHeight: env.blockHeight - 1,
EndBlockHeight: env.blockHeight - 1,
},
&auty.ProposalProject{ // check activeboard
{ // check activeboard
Amount: 100,
ToAddr: AddrA,
StartBlockHeight: env.blockHeight + 5,
......@@ -99,7 +99,7 @@ func TestPropProject(t *testing.T) {
},
}
result := [] error {
result := []error{
types.ErrInvalidAddress,
types.ErrInvalidParam,
types.ErrInvalidParam,
......@@ -232,7 +232,7 @@ func propProjectTx(parm *auty.ProposalProject) (*types.Transaction, error) {
func revokeProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, stateDB dbm.KV, kvdb dbm.KVDB, save bool) {
proposalID := env.txHash
opt2 := &auty.RevokeProposalProject{
ProposalID:proposalID,
ProposalID: proposalID,
}
rtx, err := revokeProposalProjectTx(opt2)
require.NoError(t, err)
......@@ -294,14 +294,14 @@ func voteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, stateD
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
acc = &types.Account{
Currency: 0,
......@@ -309,7 +309,7 @@ func voteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, stateD
}
val1 := types.Encode(acc)
values1 := [][]byte{val1}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values1}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values1}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
......@@ -327,7 +327,7 @@ func voteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, stateD
for _, record := range records {
opt := &auty.VoteProposalProject{
ProposalID:proposalID,
ProposalID: proposalID,
Approve: record.appr,
}
tx, err := voteProposalProjectTx(opt)
......@@ -366,7 +366,7 @@ func voteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, stateD
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
}
}
......@@ -408,14 +408,14 @@ func pubVoteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, sta
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
acc = &types.Account{
Currency: 0,
......@@ -423,7 +423,7 @@ func pubVoteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, sta
}
val1 := types.Encode(acc)
values1 := [][]byte{val1}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values1}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values1}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
......@@ -441,7 +441,7 @@ func pubVoteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, sta
for _, record := range records {
opt := &auty.PubVoteProposalProject{
ProposalID:proposalID,
ProposalID: proposalID,
Oppose: record.appr,
}
tx, err := pubVoteProposalProjectTx(opt)
......@@ -480,7 +480,7 @@ func pubVoteProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, sta
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
}
}
......@@ -493,7 +493,7 @@ func checkPubVoteProposalProjectResult(t *testing.T, stateDB dbm.KV, proposalID
account := accCoin.LoadExecAccount(AddrA, address.ExecAddress(auty.AutonomyX))
require.Equal(t, int64(0), account.Frozen)
account = accCoin.LoadExecAccount(autonomyFundAddr, address.ExecAddress(auty.AutonomyX))
require.Equal(t, int64(proposalAmount) + testProjectAmount, account.Balance)
require.Equal(t, int64(proposalAmount)+testProjectAmount, account.Balance)
// status
value, err := stateDB.Get(propProjectID(proposalID))
require.NoError(t, err)
......@@ -522,19 +522,19 @@ func terminateProposalProject(t *testing.T, env *execEnv, exec drivers.Driver, s
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
opt := &auty.TerminateProposalProject{
ProposalID:proposalID,
ProposalID: proposalID,
}
tx, err := terminateProposalProjectTx(opt)
require.NoError(t, err)
......@@ -592,19 +592,19 @@ func terminateProposalProjectTx(parm *auty.TerminateProposalProject) (*types.Tra
func TestGetProjectReceiptLog(t *testing.T) {
pre := &auty.AutonomyProposalProject{
PropProject: &auty.ProposalProject{Year: 1800, Month: 1},
CurRule: &auty.RuleConfig{BoardAttendRatio:80},
CurRule: &auty.RuleConfig{BoardAttendRatio: 80},
Boards: []string{"111", "222", "333"},
BoardVoteRes: &auty.VoteResult{TotalVotes: 100},
Status: 1,
Address:"121",
Address: "121",
}
cur := &auty.AutonomyProposalProject{
PropProject: &auty.ProposalProject{Year: 1900, Month: 1},
CurRule: &auty.RuleConfig{BoardAttendRatio:90},
CurRule: &auty.RuleConfig{BoardAttendRatio: 90},
Boards: []string{"555", "666", "777"},
BoardVoteRes: &auty.VoteResult{TotalVotes: 100},
Status: 2,
Address:"123",
Address: "123",
}
log := getProjectReceiptLog(pre, cur, 2)
require.Equal(t, int32(2), log.Ty)
......@@ -623,12 +623,12 @@ func TestCopyAutonomyProposalProject(t *testing.T) {
require.Nil(t, copyAutonomyProposalProject(nil))
cur := &auty.AutonomyProposalProject{
PropProject: &auty.ProposalProject{Year: 1800, Month: 1},
CurRule: &auty.RuleConfig{BoardAttendRatio:80},
CurRule: &auty.RuleConfig{BoardAttendRatio: 80},
Boards: []string{"111", "222", "333"},
BoardVoteRes: &auty.VoteResult{TotalVotes: 100},
PubVote: &auty.PublicVote{Publicity:true},
PubVote: &auty.PublicVote{Publicity: true},
Status: 2,
Address:"123",
Address: "123",
}
pre := copyAutonomyProposalProject(cur)
cur.PropProject.Year = 1900
......
plugin/dapp/autonomy/executor/query.go
View file @ cf9a539d
......@@ -19,7 +19,6 @@ func (a *Autonomy) Query_ListProposalBoard(in *auty.ReqQueryProposalBoard) (type
return a.listProposalBoard(in)
}
// Query_GetProposalProject 查询提案项目
func (a *Autonomy) Query_GetProposalProject(in *types.ReqString) (types.Message, error) {
return a.getProposalProject(in)
......@@ -30,7 +29,6 @@ func (a *Autonomy) Query_ListProposalProject(in *auty.ReqQueryProposalProject) (
return a.listProposalProject(in)
}
// Query_GetProposalRule 查询提案规则
func (a *Autonomy) Query_GetProposalRule(in *types.ReqString) (types.Message, error) {
return a.getProposalRule(in)
......@@ -41,7 +39,6 @@ func (a *Autonomy) Query_ListProposalRule(in *auty.ReqQueryProposalRule) (types.
return a.listProposalRule(in)
}
// Query_ListProposalComment 批量查询提案评论
func (a *Autonomy) Query_ListProposalComment(in *auty.ReqQueryProposalComment) (types.Message, error) {
return a.listProposalComment(in)
......
plugin/dapp/autonomy/executor/rule_test.go
View file @ cf9a539d
......@@ -6,11 +6,12 @@ package executor
import (
"testing"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/util"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/require"
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/util"
)
func TestExecLocalRule(t *testing.T) {
......@@ -31,7 +32,7 @@ func TestExecLocalRule(t *testing.T) {
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogPropRule, Log:types.Encode(receiptRule)},
{Ty: auty.TyLogPropRule, Log: types.Encode(receiptRule)},
},
}
set, err := au.execLocalRule(receipt)
......@@ -51,7 +52,7 @@ func TestExecLocalRule(t *testing.T) {
}
set, err = au.execLocalRule(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogRvkPropRule, Log:types.Encode(receiptRule1)},
{Ty: auty.TyLogRvkPropRule, Log: types.Encode(receiptRule1)},
},
})
require.NoError(t, err)
......@@ -76,7 +77,7 @@ func TestExecLocalRule(t *testing.T) {
}
set, err = au.execLocalRule(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropRule, Log:types.Encode(receiptRule2)},
{Ty: auty.TyLogVotePropRule, Log: types.Encode(receiptRule2)},
},
})
require.NoError(t, err)
......@@ -106,7 +107,7 @@ func TestExecDelLocalRule(t *testing.T) {
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogPropRule, Log:types.Encode(receiptRule)},
{Ty: auty.TyLogPropRule, Log: types.Encode(receiptRule)},
},
}
set, err := au.execDelLocalRule(receipt)
......@@ -127,7 +128,7 @@ func TestExecDelLocalRule(t *testing.T) {
}
set, err = au.execDelLocalRule(&types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogVotePropRule, Log:types.Encode(receiptRule2)},
{Ty: auty.TyLogVotePropRule, Log: types.Encode(receiptRule2)},
},
})
require.NoError(t, err)
......@@ -148,7 +149,7 @@ func TestGetProposalRule(t *testing.T) {
au.SetStateDB(storedb)
tx := "1111111111111111111"
storedb.Set(propRuleID(tx), types.Encode(&auty.AutonomyProposalRule{}))
rsp, err := au.getProposalRule(&types.ReqString{Data:tx})
rsp, err := au.getProposalRule(&types.ReqString{Data: tx})
require.NoError(t, err)
require.NotNil(t, rsp)
require.Equal(t, len(rsp.(*auty.ReplyQueryProposalRule).PropRules), 1)
......@@ -201,9 +202,9 @@ func TestListProposalRule(t *testing.T) {
// 反向查找
req := &auty.ReqQueryProposalRule{
Status:auty.AutonomyStatusProposalRule,
Count:10,
Direction:0,
Status: auty.AutonomyStatusProposalRule,
Count: 10,
Direction: 0,
Index: -1,
}
rsp, err := au.listProposalRule(req)
......@@ -218,9 +219,9 @@ func TestListProposalRule(t *testing.T) {
// 正向查找
req = &auty.ReqQueryProposalRule{
Status:auty.AutonomyStatusProposalRule,
Count:10,
Direction:1,
Status: auty.AutonomyStatusProposalRule,
Count: 10,
Direction: 1,
Index: -1,
}
rsp, err = au.listProposalRule(req)
......@@ -233,9 +234,9 @@ func TestListProposalRule(t *testing.T) {
// 翻页查找
req = &auty.ReqQueryProposalRule{
Status:auty.AutonomyStatusProposalRule,
Count:1,
Direction:0,
Status: auty.AutonomyStatusProposalRule,
Count: 1,
Direction: 0,
Index: -1,
}
rsp, err = au.listProposalRule(req)
......@@ -248,9 +249,9 @@ func TestListProposalRule(t *testing.T) {
//
Index := height*types.MaxTxsPerBlock + int64(index)
req = &auty.ReqQueryProposalRule{
Status:auty.AutonomyStatusProposalRule,
Count:10,
Direction:0,
Status: auty.AutonomyStatusProposalRule,
Count: 10,
Direction: 0,
Index: Index,
}
rsp, err = au.listProposalRule(req)
......@@ -266,18 +267,18 @@ func TestExecLocalCommentProp(t *testing.T) {
propID := "11111111111111"
Repcmt := "2222222222"
comment := "3333333333"
receiptCmt := &auty.ReceiptProposalComment {
receiptCmt := &auty.ReceiptProposalComment{
Cmt: &auty.Comment{
ProposalID: propID,
RepCmtHash:Repcmt,
Comment:comment,
RepCmtHash: Repcmt,
Comment: comment,
},
Height: 11,
Index: 1,
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogCommentProp, Log:types.Encode(receiptCmt)},
{Ty: auty.TyLogCommentProp, Log: types.Encode(receiptCmt)},
},
}
set, err := au.execLocalCommentProp(receipt)
......@@ -293,18 +294,18 @@ func TestExecDelLocalCommentProp(t *testing.T) {
propID := "11111111111111"
Repcmt := "2222222222"
comment := "3333333333"
receiptCmt := &auty.ReceiptProposalComment {
receiptCmt := &auty.ReceiptProposalComment{
Cmt: &auty.Comment{
ProposalID: propID,
RepCmtHash:Repcmt,
Comment:comment,
RepCmtHash: Repcmt,
Comment: comment,
},
Height: 11,
Index: 1,
}
receipt := &types.ReceiptData{
Logs: []*types.ReceiptLog{
{Ty: auty.TyLogCommentProp, Log:types.Encode(receiptCmt)},
{Ty: auty.TyLogCommentProp, Log: types.Encode(receiptCmt)},
},
}
set, err := au.execDelLocalCommentProp(receipt)
......@@ -346,8 +347,8 @@ func TestListProposalComment(t *testing.T) {
testcase = append(testcase, testcase1...)
testcase = append(testcase, testcase2...)
cur := &auty.RelationCmt{
RepCmtHash:"aaaaaa",
Comment:"bbbbbbbbbb",
RepCmtHash: "aaaaaa",
Comment: "bbbbbbbbbb",
}
for _, tcase := range testcase {
key := calcCommentHeight(tcase.propId,
......@@ -360,9 +361,9 @@ func TestListProposalComment(t *testing.T) {
// 反向查找
req := &auty.ReqQueryProposalComment{
ProposalID:propID2,
Count:10,
Direction:0,
ProposalID: propID2,
Count: 10,
Direction: 0,
Index: -1,
}
rsp, err := au.listProposalComment(req)
......@@ -377,9 +378,9 @@ func TestListProposalComment(t *testing.T) {
// 正向查找
req = &auty.ReqQueryProposalComment{
ProposalID:propID2,
Count:10,
Direction:1,
ProposalID: propID2,
Count: 10,
Direction: 1,
Index: -1,
}
rsp, err = au.listProposalComment(req)
......@@ -392,9 +393,9 @@ func TestListProposalComment(t *testing.T) {
// 翻页查找
req = &auty.ReqQueryProposalComment{
ProposalID:propID2,
Count:1,
Direction:0,
ProposalID: propID2,
Count: 1,
Direction: 0,
Index: -1,
}
rsp, err = au.listProposalComment(req)
......@@ -407,9 +408,9 @@ func TestListProposalComment(t *testing.T) {
//
Index := height*types.MaxTxsPerBlock + int64(index)
req = &auty.ReqQueryProposalComment{
ProposalID:propID2,
Count:10,
Direction:0,
ProposalID: propID2,
Count: 10,
Direction: 0,
Index: Index,
}
rsp, err = au.listProposalComment(req)
......
plugin/dapp/autonomy/executor/ruleaction.go
View file @ cf9a539d
......@@ -12,8 +12,6 @@ import (
"github.com/33cn/chain33/system/dapp"
)
func (a *action) propRule(prob *auty.ProposalRule) (*types.Receipt, error) {
//如果全小于等于0,则说明该提案规则参数不正确
if prob.RuleCfg == nil || prob.RuleCfg.BoardAttendRatio <= 0 && prob.RuleCfg.BoardApproveRatio <= 0 &&
......@@ -53,7 +51,7 @@ func (a *action) propRule(prob *auty.ProposalRule) (*types.Receipt, error) {
kv = append(kv, receipt.KV...)
cur := &auty.AutonomyProposalRule{
PropRule:prob,
PropRule: prob,
CurRule: rule,
VoteResult: &auty.VoteResult{},
Status: auty.AutonomyStatusProposalRule,
......@@ -169,7 +167,7 @@ func (a *action) votePropRule(voteProb *auty.VoteProposalRule) (*types.Receipt,
if err != nil {
return nil, err
}
cur.VoteResult.TotalVotes = int32(account.Balance/ticketPrice)
cur.VoteResult.TotalVotes = int32(account.Balance / ticketPrice)
}
// 获取可投票数
......@@ -178,9 +176,9 @@ func (a *action) votePropRule(voteProb *auty.VoteProposalRule) (*types.Receipt,
return nil, err
}
if voteProb.Approve {
cur.VoteResult.ApproveVotes += int32(account.Balance/ticketPrice)
cur.VoteResult.ApproveVotes += int32(account.Balance / ticketPrice)
} else {
cur.VoteResult.OpposeVotes += int32(account.Balance/ticketPrice)
cur.VoteResult.OpposeVotes += int32(account.Balance / ticketPrice)
}
var logs []*types.ReceiptLog
......@@ -198,9 +196,9 @@ func (a *action) votePropRule(voteProb *auty.VoteProposalRule) (*types.Receipt,
}
if cur.VoteResult.TotalVotes != 0 &&
cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes != 0 &&
float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) / float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes) / float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes != 0 &&
float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes)/float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes)/float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
cur.VoteResult.Pass = true
cur.PropRule.RealEndBlockHeight = a.height
}
......@@ -218,7 +216,7 @@ func (a *action) votePropRule(voteProb *auty.VoteProposalRule) (*types.Receipt,
// 更新系统规则
if cur.VoteResult.Pass {
upRule := upgradeRule(cur.CurRule, cur.PropRule.RuleCfg)
kv = append(kv, &types.KeyValue{Key: activeRuleID(), Value:types.Encode(upRule)})
kv = append(kv, &types.KeyValue{Key: activeRuleID(), Value: types.Encode(upRule)})
}
ty := auty.TyLogVotePropRule
......@@ -265,11 +263,11 @@ func (a *action) tmintPropRule(tmintProb *auty.TerminateProposalRule) (*types.Re
if err != nil {
return nil, err
}
cur.VoteResult.TotalVotes = int32(account.Balance/ticketPrice)
cur.VoteResult.TotalVotes = int32(account.Balance / ticketPrice)
}
if float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) / float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes) / float32(cur.VoteResult.ApproveVotes + cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
if float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes)/float32(cur.VoteResult.TotalVotes) >= float32(pubAttendRatio)/100.0 &&
float32(cur.VoteResult.ApproveVotes)/float32(cur.VoteResult.ApproveVotes+cur.VoteResult.OpposeVotes) >= float32(pubApproveRatio)/100.0 {
cur.VoteResult.Pass = true
} else {
cur.VoteResult.Pass = false
......@@ -298,7 +296,7 @@ func (a *action) tmintPropRule(tmintProb *auty.TerminateProposalRule) (*types.Re
// 更新系统规则
if cur.VoteResult.Pass {
upRule := upgradeRule(cur.CurRule, cur.PropRule.RuleCfg)
kv = append(kv, &types.KeyValue{Key: activeRuleID(), Value:types.Encode(upRule)})
kv = append(kv, &types.KeyValue{Key: activeRuleID(), Value: types.Encode(upRule)})
}
receiptLog := getRuleReceiptLog(pre, cur, auty.TyLogTmintPropRule)
logs = append(logs, receiptLog)
......@@ -342,7 +340,7 @@ func (a *action) commentProp(cm *auty.Comment) (*types.Receipt, error) {
func getCommentReceiptLog(cur *auty.Comment, height int64, index int32, ty int32) *types.ReceiptLog {
log := &types.ReceiptLog{}
log.Ty = ty
r := &auty.ReceiptProposalComment{Cmt: cur, Height:height, Index:index}
r := &auty.ReceiptProposalComment{Cmt: cur, Height: height, Index: index}
log.Log = types.Encode(r)
return log
}
......@@ -419,5 +417,3 @@ func upgradeRule(cur, modify *auty.RuleConfig) *auty.RuleConfig {
}
return &new
}
plugin/dapp/autonomy/executor/ruleaction_test.go
View file @ cf9a539d
......@@ -7,17 +7,17 @@ package executor
import (
"testing"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/require"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/account"
apimock "github.com/33cn/chain33/client/mocks"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/address"
dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/account"
_ "github.com/33cn/chain33/system"
"github.com/stretchr/testify/mock"
"github.com/33cn/chain33/common/address"
drivers "github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
const (
......@@ -64,8 +64,7 @@ func testPropRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB dbm.K
PubOpposeRatio: testPubOpposeRatio,
ProposalAmount: testProposalAmount,
LargeProjectAmount: testLargeProjectAmount,
PublicPeriod:testPublicPeriod,
PublicPeriod: testPublicPeriod,
},
StartBlockHeight: env.blockHeight + 5,
EndBlockHeight: env.blockHeight + 10,
......@@ -125,7 +124,7 @@ func propRuleTx(parm *auty.ProposalRule) (*types.Transaction, error) {
func revokeProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB dbm.KV, kvdb dbm.KVDB, save bool) {
proposalID := env.txHash
opt2 := &auty.RevokeProposalRule{
ProposalID:proposalID,
ProposalID: proposalID,
}
rtx, err := revokeProposalRuleTx(opt2)
require.NoError(t, err)
......@@ -171,7 +170,7 @@ func revokeProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB
require.Equal(t, rule.BoardAttendRatio, boardAttendRatio)
require.Equal(t, rule.BoardApproveRatio, boardApproveRatio)
require.Equal(t, rule.PubOpposeRatio, pubOpposeRatio)
require.Equal(t, rule.ProposalAmount , proposalAmount)
require.Equal(t, rule.ProposalAmount, proposalAmount)
require.Equal(t, rule.LargeProjectAmount, largeProjectAmount)
require.Equal(t, rule.PublicPeriod, publicPeriod)
}
......@@ -194,14 +193,14 @@ func voteProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB d
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
acc = &types.Account{
Currency: 0,
......@@ -209,7 +208,7 @@ func voteProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB d
}
val1 := types.Encode(acc)
values1 := [][]byte{val1}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values1}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values1}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
......@@ -227,7 +226,7 @@ func voteProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB d
for _, record := range records {
opt := &auty.VoteProposalRule{
ProposalID:proposalID,
ProposalID: proposalID,
Approve: record.appr,
}
tx, err := voteProposalRuleTx(opt)
......@@ -266,7 +265,7 @@ func voteProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB d
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
}
// check
......@@ -298,7 +297,7 @@ func voteProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stateDB d
require.Equal(t, rule.BoardAttendRatio, testBoardAttendRatio)
require.Equal(t, rule.BoardApproveRatio, testBoardApproveRatio)
require.Equal(t, rule.PubOpposeRatio, testPubOpposeRatio)
require.Equal(t, rule.ProposalAmount , proposalAmount)
require.Equal(t, rule.ProposalAmount, proposalAmount)
require.Equal(t, rule.LargeProjectAmount, testLargeProjectAmount)
require.Equal(t, rule.PublicPeriod, testPublicPeriod)
}
......@@ -321,19 +320,19 @@ func terminateProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stat
hear := &types.Header{StateHash: []byte("")}
api.On("GetHeaders", mock.Anything).
Return(&types.Headers{
Items:[]*types.Header{hear}}, nil)
Items: []*types.Header{hear}}, nil)
acc := &types.Account{
Currency: 0,
Balance: total*4,
Balance: total * 4,
}
val := types.Encode(acc)
values := [][]byte{val}
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values:values}, nil).Once()
api.On("StoreGet", mock.Anything).Return(&types.StoreReplyValue{Values: values}, nil).Once()
exec.SetAPI(api)
proposalID := env.txHash
opt := &auty.TerminateProposalRule{
ProposalID:proposalID,
ProposalID: proposalID,
}
tx, err := terminateProposalRuleTx(opt)
require.NoError(t, err)
......@@ -380,7 +379,7 @@ func terminateProposalRule(t *testing.T, env *execEnv, exec drivers.Driver, stat
require.Equal(t, rule.BoardAttendRatio, boardAttendRatio)
require.Equal(t, rule.BoardApproveRatio, boardApproveRatio)
require.Equal(t, rule.PubOpposeRatio, pubOpposeRatio)
require.Equal(t, rule.ProposalAmount , proposalAmount)
require.Equal(t, rule.ProposalAmount, proposalAmount)
require.Equal(t, rule.LargeProjectAmount, largeProjectAmount)
require.Equal(t, rule.PublicPeriod, publicPeriod)
}
......@@ -401,13 +400,13 @@ func TestGetRuleReceiptLog(t *testing.T) {
PropRule: &auty.ProposalRule{Year: 1800, Month: 1},
VoteResult: &auty.VoteResult{TotalVotes: 100},
Status: 1,
Address:"121",
Address: "121",
}
cur := &auty.AutonomyProposalRule{
PropRule: &auty.ProposalRule{Year: 1900, Month: 1},
VoteResult: &auty.VoteResult{TotalVotes: 100},
Status: 2,
Address:"123",
Address: "123",
}
log := getRuleReceiptLog(pre, cur, 2)
require.Equal(t, int32(2), log.Ty)
......@@ -421,11 +420,11 @@ func TestGetRuleReceiptLog(t *testing.T) {
func TestCopyAutonomyProposalRule(t *testing.T) {
require.Nil(t, copyAutonomyProposalRule(nil))
cur := &auty.AutonomyProposalRule{
PropRule: &auty.ProposalRule{Year: 1900, Month: 1, RuleCfg:&auty.RuleConfig{BoardApproveRatio:80}},
CurRule: &auty.RuleConfig{BoardApproveRatio:100},
PropRule: &auty.ProposalRule{Year: 1900, Month: 1, RuleCfg: &auty.RuleConfig{BoardApproveRatio: 80}},
CurRule: &auty.RuleConfig{BoardApproveRatio: 100},
VoteResult: &auty.VoteResult{TotalVotes: 100},
Status: 2,
Address:"123",
Address: "123",
}
pre := copyAutonomyProposalRule(cur)
cur.PropRule.Year = 1800
......@@ -469,7 +468,7 @@ func TestUpgradeRule(t *testing.T) {
require.Equal(t, new.BoardAttendRatio, cur.BoardAttendRatio)
require.Equal(t, new.BoardApproveRatio, cur.BoardApproveRatio)
require.Equal(t, new.PubOpposeRatio, cur.PubOpposeRatio)
require.Equal(t, new.ProposalAmount , cur.ProposalAmount)
require.Equal(t, new.ProposalAmount, cur.ProposalAmount)
require.Equal(t, new.LargeProjectAmount, cur.LargeProjectAmount)
require.Equal(t, new.PublicPeriod, cur.PublicPeriod)
......@@ -486,7 +485,7 @@ func TestUpgradeRule(t *testing.T) {
require.Equal(t, new.BoardAttendRatio, modify.BoardAttendRatio)
require.Equal(t, new.BoardApproveRatio, modify.BoardApproveRatio)
require.Equal(t, new.PubOpposeRatio, modify.PubOpposeRatio)
require.Equal(t, new.ProposalAmount , modify.ProposalAmount)
require.Equal(t, new.ProposalAmount, modify.ProposalAmount)
require.Equal(t, new.LargeProjectAmount, modify.LargeProjectAmount)
require.Equal(t, new.PublicPeriod, modify.PublicPeriod)
}
......@@ -514,9 +513,9 @@ func TestTransfer(t *testing.T) {
accCoin := account.NewCoinsAccount()
accCoin.SetDB(stateDB)
account := accCoin.LoadExecAccount(AddrA, address.ExecAddress(auty.AutonomyX))
require.Equal(t, total - types.Coin * 190, account.Balance)
require.Equal(t, total-types.Coin*190, account.Balance)
account = accCoin.LoadExecAccount(autonomyFundAddr, address.ExecAddress(auty.AutonomyX))
require.Equal(t, types.Coin * 190, account.Balance)
require.Equal(t, types.Coin*190, account.Balance)
}
func transferFundTx(parm *auty.TransferFund) (*types.Transaction, error) {
......@@ -539,7 +538,7 @@ func TestComment(t *testing.T) {
opt1 := &auty.Comment{
ProposalID: propID,
RepCmtHash: Repcmt,
Comment:comment,
Comment: comment,
}
pbtx, err := commentPropTx(opt1)
require.NoError(t, err)
......
plugin/dapp/autonomy/rpc/board_jrpc_channel_test.go
View file @ cf9a539d
......@@ -9,10 +9,10 @@ import (
"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/33cn/chain33/system"
"github.com/33cn/chain33/types"
_ "github.com/33cn/plugin/plugin"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
)
func testPropBoardTxCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
......@@ -58,4 +58,3 @@ func testListProposalBoardCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
rep = &auty.ReplyQueryProposalBoard{}
return jrpc.Call("Chain33.Query", params, rep)
}
plugin/dapp/autonomy/rpc/project_jrpc_channel_test.go
View file @ cf9a539d
......@@ -9,13 +9,12 @@ import (
"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/33cn/chain33/system"
"github.com/33cn/chain33/types"
_ "github.com/33cn/plugin/plugin"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
)
func testPropProjectTxCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
params := &auty.ProposalProject{}
var res string
......@@ -65,4 +64,3 @@ func testListProposalProjectCmd(t *testing.T, jrpc *jsonclient.JSONClient) error
rep = &auty.ReplyQueryProposalProject{}
return jrpc.Call("Chain33.Query", params, rep)
}
plugin/dapp/autonomy/rpc/rule_jrpc_channel_test.go
View file @ cf9a539d
......@@ -9,10 +9,10 @@ import (
"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/33cn/chain33/system"
"github.com/33cn/chain33/types"
_ "github.com/33cn/plugin/plugin"
auty "github.com/33cn/plugin/plugin/dapp/autonomy/types"
)
func testPropRuleTxCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
......
plugin/dapp/autonomy/types/autonomy.pb.go
View file @ cf9a539d
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: autonomy.proto
/*
Package types is a generated protocol buffer package.
It is generated from these files:
autonomy.proto
board.proto
lcommon.proto
project.proto
rule.proto
It has these top-level messages:
AutonomyAction
AutonomyProposalBoard
ProposalBoard
RevokeProposalBoard
VoteProposalBoard
TerminateProposalBoard
ReceiptProposalBoard
LocalProposalBoard
ReqQueryProposalBoard
ReplyQueryProposalBoard
VoteResult
PublicVote
VotesRecord
RuleConfig
AutonomyProposalProject
ProposalProject
RevokeProposalProject
VoteProposalProject
PubVoteProposalProject
TerminateProposalProject
ReceiptProposalProject
LocalProposalProject
ReqQueryProposalProject
ReplyQueryProposalProject
AutonomyProposalRule
ProposalRule
RevokeProposalRule
VoteProposalRule
TerminateProposalRule
ReceiptProposalRule
LocalProposalRule
ReqQueryProposalRule
ReplyQueryProposalRule
TransferFund
Comment
ReceiptProposalComment
ReqQueryProposalComment
RelationCmt
ReplyQueryProposalComment
*/
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
......@@ -88,78 +40,129 @@ type AutonomyAction struct {
// *AutonomyAction_Transfer
// *AutonomyAction_CommentProp
Value isAutonomyAction_Value `protobuf_oneof:"value"`
Ty int32 `protobuf:"varint,16,opt,name=ty" json:"ty,omitempty"`
Ty int32 `protobuf:"varint,16,opt,name=ty,proto3" json:"ty,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *AutonomyAction) Reset() { *m = AutonomyAction{} }
func (m *AutonomyAction) String() string { return proto.CompactTextString(m) }
func (*AutonomyAction) ProtoMessage() {}
func (*AutonomyAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func (*AutonomyAction) Descriptor() ([]byte, []int) {
return fileDescriptor_0246b47df8434d60, []int{0}
}
func (m *AutonomyAction) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AutonomyAction.Unmarshal(m, b)
}
func (m *AutonomyAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_AutonomyAction.Marshal(b, m, deterministic)
}
func (m *AutonomyAction) XXX_Merge(src proto.Message) {
xxx_messageInfo_AutonomyAction.Merge(m, src)
}
func (m *AutonomyAction) XXX_Size() int {
return xxx_messageInfo_AutonomyAction.Size(m)
}
func (m *AutonomyAction) XXX_DiscardUnknown() {
xxx_messageInfo_AutonomyAction.DiscardUnknown(m)
}
var xxx_messageInfo_AutonomyAction proto.InternalMessageInfo
type isAutonomyAction_Value interface {
isAutonomyAction_Value()
}
type AutonomyAction_PropBoard struct {
PropBoard *ProposalBoard `protobuf:"bytes,1,opt,name=propBoard,oneof"`
PropBoard *ProposalBoard `protobuf:"bytes,1,opt,name=propBoard,proto3,oneof"`
}
type AutonomyAction_RvkPropBoard struct {
RvkPropBoard *RevokeProposalBoard `protobuf:"bytes,2,opt,name=rvkPropBoard,oneof"`
RvkPropBoard *RevokeProposalBoard `protobuf:"bytes,2,opt,name=rvkPropBoard,proto3,oneof"`
}
type AutonomyAction_VotePropBoard struct {
VotePropBoard *VoteProposalBoard `protobuf:"bytes,3,opt,name=votePropBoard,oneof"`
VotePropBoard *VoteProposalBoard `protobuf:"bytes,3,opt,name=votePropBoard,proto3,oneof"`
}
type AutonomyAction_TmintPropBoard struct {
TmintPropBoard *TerminateProposalBoard `protobuf:"bytes,4,opt,name=tmintPropBoard,oneof"`
TmintPropBoard *TerminateProposalBoard `protobuf:"bytes,4,opt,name=tmintPropBoard,proto3,oneof"`
}
type AutonomyAction_PropProject struct {
PropProject *ProposalProject `protobuf:"bytes,5,opt,name=propProject,oneof"`
PropProject *ProposalProject `protobuf:"bytes,5,opt,name=propProject,proto3,oneof"`
}
type AutonomyAction_RvkPropProject struct {
RvkPropProject *RevokeProposalProject `protobuf:"bytes,6,opt,name=rvkPropProject,oneof"`
RvkPropProject *RevokeProposalProject `protobuf:"bytes,6,opt,name=rvkPropProject,proto3,oneof"`
}
type AutonomyAction_VotePropProject struct {
VotePropProject *VoteProposalProject `protobuf:"bytes,7,opt,name=votePropProject,oneof"`
VotePropProject *VoteProposalProject `protobuf:"bytes,7,opt,name=votePropProject,proto3,oneof"`
}
type AutonomyAction_PubVotePropProject struct {
PubVotePropProject *PubVoteProposalProject `protobuf:"bytes,8,opt,name=pubVotePropProject,oneof"`
PubVotePropProject *PubVoteProposalProject `protobuf:"bytes,8,opt,name=pubVotePropProject,proto3,oneof"`
}
type AutonomyAction_TmintPropProject struct {
TmintPropProject *TerminateProposalProject `protobuf:"bytes,9,opt,name=tmintPropProject,oneof"`
TmintPropProject *TerminateProposalProject `protobuf:"bytes,9,opt,name=tmintPropProject,proto3,oneof"`
}
type AutonomyAction_PropRule struct {
PropRule *ProposalRule `protobuf:"bytes,10,opt,name=propRule,oneof"`
PropRule *ProposalRule `protobuf:"bytes,10,opt,name=propRule,proto3,oneof"`
}
type AutonomyAction_RvkPropRule struct {
RvkPropRule *RevokeProposalRule `protobuf:"bytes,11,opt,name=rvkPropRule,oneof"`
RvkPropRule *RevokeProposalRule `protobuf:"bytes,11,opt,name=rvkPropRule,proto3,oneof"`
}
type AutonomyAction_VotePropRule struct {
VotePropRule *VoteProposalRule `protobuf:"bytes,12,opt,name=votePropRule,oneof"`
VotePropRule *VoteProposalRule `protobuf:"bytes,12,opt,name=votePropRule,proto3,oneof"`
}
type AutonomyAction_TmintPropRule struct {
TmintPropRule *TerminateProposalRule `protobuf:"bytes,13,opt,name=tmintPropRule,oneof"`
TmintPropRule *TerminateProposalRule `protobuf:"bytes,13,opt,name=tmintPropRule,proto3,oneof"`
}
type AutonomyAction_Transfer struct {
Transfer *TransferFund `protobuf:"bytes,14,opt,name=transfer,oneof"`
Transfer *TransferFund `protobuf:"bytes,14,opt,name=transfer,proto3,oneof"`
}
type AutonomyAction_CommentProp struct {
CommentProp *Comment `protobuf:"bytes,15,opt,name=commentProp,oneof"`
CommentProp *Comment `protobuf:"bytes,15,opt,name=commentProp,proto3,oneof"`
}
func (*AutonomyAction_PropBoard) isAutonomyAction_Value() {}
func (*AutonomyAction_RvkPropBoard) isAutonomyAction_Value() {}
func (*AutonomyAction_VotePropBoard) isAutonomyAction_Value() {}
func (*AutonomyAction_TmintPropBoard) isAutonomyAction_Value() {}
func (*AutonomyAction_PropProject) isAutonomyAction_Value() {}
func (*AutonomyAction_RvkPropProject) isAutonomyAction_Value() {}
func (*AutonomyAction_VotePropProject) isAutonomyAction_Value() {}
func (*AutonomyAction_PubVotePropProject) isAutonomyAction_Value() {}
func (*AutonomyAction_TmintPropProject) isAutonomyAction_Value() {}
func (*AutonomyAction_PropRule) isAutonomyAction_Value() {}
func (*AutonomyAction_RvkPropRule) isAutonomyAction_Value() {}
func (*AutonomyAction_VotePropRule) isAutonomyAction_Value() {}
func (*AutonomyAction_TmintPropRule) isAutonomyAction_Value() {}
func (*AutonomyAction_Transfer) isAutonomyAction_Value() {}
func (*AutonomyAction_CommentProp) isAutonomyAction_Value() {}
func (m *AutonomyAction) GetValue() isAutonomyAction_Value {
......@@ -522,77 +525,77 @@ func _AutonomyAction_OneofSizer(msg proto.Message) (n int) {
switch x := m.Value.(type) {
case *AutonomyAction_PropBoard:
s := proto.Size(x.PropBoard)
n += proto.SizeVarint(1<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_RvkPropBoard:
s := proto.Size(x.RvkPropBoard)
n += proto.SizeVarint(2<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_VotePropBoard:
s := proto.Size(x.VotePropBoard)
n += proto.SizeVarint(3<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_TmintPropBoard:
s := proto.Size(x.TmintPropBoard)
n += proto.SizeVarint(4<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_PropProject:
s := proto.Size(x.PropProject)
n += proto.SizeVarint(5<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_RvkPropProject:
s := proto.Size(x.RvkPropProject)
n += proto.SizeVarint(6<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_VotePropProject:
s := proto.Size(x.VotePropProject)
n += proto.SizeVarint(7<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_PubVotePropProject:
s := proto.Size(x.PubVotePropProject)
n += proto.SizeVarint(8<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_TmintPropProject:
s := proto.Size(x.TmintPropProject)
n += proto.SizeVarint(9<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_PropRule:
s := proto.Size(x.PropRule)
n += proto.SizeVarint(10<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_RvkPropRule:
s := proto.Size(x.RvkPropRule)
n += proto.SizeVarint(11<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_VotePropRule:
s := proto.Size(x.VotePropRule)
n += proto.SizeVarint(12<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_TmintPropRule:
s := proto.Size(x.TmintPropRule)
n += proto.SizeVarint(13<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_Transfer:
s := proto.Size(x.Transfer)
n += proto.SizeVarint(14<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *AutonomyAction_CommentProp:
s := proto.Size(x.CommentProp)
n += proto.SizeVarint(15<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case nil:
......@@ -606,9 +609,9 @@ func init() {
proto.RegisterType((*AutonomyAction)(nil), "types.AutonomyAction")
}
func init() { proto.RegisterFile("autonomy.proto", fileDescriptor0) }
func init() { proto.RegisterFile("autonomy.proto", fileDescriptor_0246b47df8434d60) }
var fileDescriptor0 = []byte{
var fileDescriptor_0246b47df8434d60 = []byte{
// 427 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcf, 0xaf, 0xd2, 0x40,
0x14, 0x85, 0x01, 0xed, 0xe3, 0xbd, 0x5b, 0x5a, 0xc8, 0xd5, 0x68, 0x25, 0x1a, 0x89, 0x2b, 0x56,
......
plugin/dapp/autonomy/types/board.pb.go
View file @ cf9a539d
......@@ -3,32 +3,64 @@
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type AutonomyProposalBoard struct {
PropBoard *ProposalBoard `protobuf:"bytes,1,opt,name=propBoard" json:"propBoard,omitempty"`
PropBoard *ProposalBoard `protobuf:"bytes,1,opt,name=propBoard,proto3" json:"propBoard,omitempty"`
// 投票该提案的规则
CurRule *RuleConfig `protobuf:"bytes,2,opt,name=curRule" json:"curRule,omitempty"`
CurRule *RuleConfig `protobuf:"bytes,2,opt,name=curRule,proto3" json:"curRule,omitempty"`
// 全体持票人投票结果
VoteResult *VoteResult `protobuf:"bytes,3,opt,name=voteResult" json:"voteResult,omitempty"`
VoteResult *VoteResult `protobuf:"bytes,3,opt,name=voteResult,proto3" json:"voteResult,omitempty"`
// 状态
Status int32 `protobuf:"varint,4,opt,name=status" json:"status,omitempty"`
Address string `protobuf:"bytes,5,opt,name=address" json:"address,omitempty"`
Height int64 `protobuf:"varint,6,opt,name=height" json:"height,omitempty"`
Index int32 `protobuf:"varint,7,opt,name=index" json:"index,omitempty"`
Status int32 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
Address string `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"`
Height int64 `protobuf:"varint,6,opt,name=height,proto3" json:"height,omitempty"`
Index int32 `protobuf:"varint,7,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *AutonomyProposalBoard) Reset() { *m = AutonomyProposalBoard{} }
func (m *AutonomyProposalBoard) String() string { return proto.CompactTextString(m) }
func (*AutonomyProposalBoard) ProtoMessage() {}
func (*AutonomyProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
func (*AutonomyProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{0}
}
func (m *AutonomyProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AutonomyProposalBoard.Unmarshal(m, b)
}
func (m *AutonomyProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_AutonomyProposalBoard.Marshal(b, m, deterministic)
}
func (m *AutonomyProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_AutonomyProposalBoard.Merge(m, src)
}
func (m *AutonomyProposalBoard) XXX_Size() int {
return xxx_messageInfo_AutonomyProposalBoard.Size(m)
}
func (m *AutonomyProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_AutonomyProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_AutonomyProposalBoard proto.InternalMessageInfo
func (m *AutonomyProposalBoard) GetPropBoard() *ProposalBoard {
if m != nil {
......@@ -82,21 +114,44 @@ func (m *AutonomyProposalBoard) GetIndex() int32 {
// action
type ProposalBoard struct {
// 提案时间
Year int32 `protobuf:"varint,1,opt,name=year" json:"year,omitempty"`
Month int32 `protobuf:"varint,2,opt,name=month" json:"month,omitempty"`
Day int32 `protobuf:"varint,3,opt,name=day" json:"day,omitempty"`
Year int32 `protobuf:"varint,1,opt,name=year,proto3" json:"year,omitempty"`
Month int32 `protobuf:"varint,2,opt,name=month,proto3" json:"month,omitempty"`
Day int32 `protobuf:"varint,3,opt,name=day,proto3" json:"day,omitempty"`
// 提案董事会成员
Boards []string `protobuf:"bytes,4,rep,name=boards" json:"boards,omitempty"`
Boards []string `protobuf:"bytes,4,rep,name=boards,proto3" json:"boards,omitempty"`
// 投票相关
StartBlockHeight int64 `protobuf:"varint,5,opt,name=startBlockHeight" json:"startBlockHeight,omitempty"`
EndBlockHeight int64 `protobuf:"varint,6,opt,name=endBlockHeight" json:"endBlockHeight,omitempty"`
RealEndBlockHeight int64 `protobuf:"varint,7,opt,name=realEndBlockHeight" json:"realEndBlockHeight,omitempty"`
StartBlockHeight int64 `protobuf:"varint,5,opt,name=startBlockHeight,proto3" json:"startBlockHeight,omitempty"`
EndBlockHeight int64 `protobuf:"varint,6,opt,name=endBlockHeight,proto3" json:"endBlockHeight,omitempty"`
RealEndBlockHeight int64 `protobuf:"varint,7,opt,name=realEndBlockHeight,proto3" json:"realEndBlockHeight,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ProposalBoard) Reset() { *m = ProposalBoard{} }
func (m *ProposalBoard) String() string { return proto.CompactTextString(m) }
func (*ProposalBoard) ProtoMessage() {}
func (*ProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
func (*ProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{1}
}
func (m *ProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ProposalBoard.Unmarshal(m, b)
}
func (m *ProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ProposalBoard.Marshal(b, m, deterministic)
}
func (m *ProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_ProposalBoard.Merge(m, src)
}
func (m *ProposalBoard) XXX_Size() int {
return xxx_messageInfo_ProposalBoard.Size(m)
}
func (m *ProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_ProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_ProposalBoard proto.InternalMessageInfo
func (m *ProposalBoard) GetYear() int32 {
if m != nil {
......@@ -148,13 +203,36 @@ func (m *ProposalBoard) GetRealEndBlockHeight() int64 {
}
type RevokeProposalBoard struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *RevokeProposalBoard) Reset() { *m = RevokeProposalBoard{} }
func (m *RevokeProposalBoard) String() string { return proto.CompactTextString(m) }
func (*RevokeProposalBoard) ProtoMessage() {}
func (*RevokeProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
func (*RevokeProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{2}
}
func (m *RevokeProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RevokeProposalBoard.Unmarshal(m, b)
}
func (m *RevokeProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_RevokeProposalBoard.Marshal(b, m, deterministic)
}
func (m *RevokeProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_RevokeProposalBoard.Merge(m, src)
}
func (m *RevokeProposalBoard) XXX_Size() int {
return xxx_messageInfo_RevokeProposalBoard.Size(m)
}
func (m *RevokeProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_RevokeProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_RevokeProposalBoard proto.InternalMessageInfo
func (m *RevokeProposalBoard) GetProposalID() string {
if m != nil {
......@@ -164,14 +242,37 @@ func (m *RevokeProposalBoard) GetProposalID() string {
}
type VoteProposalBoard struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
Approve bool `protobuf:"varint,2,opt,name=approve" json:"approve,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
Approve bool `protobuf:"varint,2,opt,name=approve,proto3" json:"approve,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VoteProposalBoard) Reset() { *m = VoteProposalBoard{} }
func (m *VoteProposalBoard) String() string { return proto.CompactTextString(m) }
func (*VoteProposalBoard) ProtoMessage() {}
func (*VoteProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
func (*VoteProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{3}
}
func (m *VoteProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_VoteProposalBoard.Unmarshal(m, b)
}
func (m *VoteProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_VoteProposalBoard.Marshal(b, m, deterministic)
}
func (m *VoteProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_VoteProposalBoard.Merge(m, src)
}
func (m *VoteProposalBoard) XXX_Size() int {
return xxx_messageInfo_VoteProposalBoard.Size(m)
}
func (m *VoteProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_VoteProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_VoteProposalBoard proto.InternalMessageInfo
func (m *VoteProposalBoard) GetProposalID() string {
if m != nil {
......@@ -188,13 +289,36 @@ func (m *VoteProposalBoard) GetApprove() bool {
}
type TerminateProposalBoard struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TerminateProposalBoard) Reset() { *m = TerminateProposalBoard{} }
func (m *TerminateProposalBoard) String() string { return proto.CompactTextString(m) }
func (*TerminateProposalBoard) ProtoMessage() {}
func (*TerminateProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
func (*TerminateProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{4}
}
func (m *TerminateProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TerminateProposalBoard.Unmarshal(m, b)
}
func (m *TerminateProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TerminateProposalBoard.Marshal(b, m, deterministic)
}
func (m *TerminateProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_TerminateProposalBoard.Merge(m, src)
}
func (m *TerminateProposalBoard) XXX_Size() int {
return xxx_messageInfo_TerminateProposalBoard.Size(m)
}
func (m *TerminateProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_TerminateProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_TerminateProposalBoard proto.InternalMessageInfo
func (m *TerminateProposalBoard) GetProposalID() string {
if m != nil {
......@@ -205,14 +329,37 @@ func (m *TerminateProposalBoard) GetProposalID() string {
// receipt
type ReceiptProposalBoard struct {
Prev *AutonomyProposalBoard `protobuf:"bytes,1,opt,name=prev" json:"prev,omitempty"`
Current *AutonomyProposalBoard `protobuf:"bytes,2,opt,name=current" json:"current,omitempty"`
Prev *AutonomyProposalBoard `protobuf:"bytes,1,opt,name=prev,proto3" json:"prev,omitempty"`
Current *AutonomyProposalBoard `protobuf:"bytes,2,opt,name=current,proto3" json:"current,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptProposalBoard) Reset() { *m = ReceiptProposalBoard{} }
func (m *ReceiptProposalBoard) String() string { return proto.CompactTextString(m) }
func (*ReceiptProposalBoard) ProtoMessage() {}
func (*ReceiptProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
func (*ReceiptProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{5}
}
func (m *ReceiptProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptProposalBoard.Unmarshal(m, b)
}
func (m *ReceiptProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptProposalBoard.Marshal(b, m, deterministic)
}
func (m *ReceiptProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptProposalBoard.Merge(m, src)
}
func (m *ReceiptProposalBoard) XXX_Size() int {
return xxx_messageInfo_ReceiptProposalBoard.Size(m)
}
func (m *ReceiptProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptProposalBoard proto.InternalMessageInfo
func (m *ReceiptProposalBoard) GetPrev() *AutonomyProposalBoard {
if m != nil {
......@@ -229,14 +376,37 @@ func (m *ReceiptProposalBoard) GetCurrent() *AutonomyProposalBoard {
}
type LocalProposalBoard struct {
PropBd *AutonomyProposalBoard `protobuf:"bytes,1,opt,name=propBd" json:"propBd,omitempty"`
Comments []string `protobuf:"bytes,2,rep,name=comments" json:"comments,omitempty"`
PropBd *AutonomyProposalBoard `protobuf:"bytes,1,opt,name=propBd,proto3" json:"propBd,omitempty"`
Comments []string `protobuf:"bytes,2,rep,name=comments,proto3" json:"comments,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *LocalProposalBoard) Reset() { *m = LocalProposalBoard{} }
func (m *LocalProposalBoard) String() string { return proto.CompactTextString(m) }
func (*LocalProposalBoard) ProtoMessage() {}
func (*LocalProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
func (*LocalProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{6}
}
func (m *LocalProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_LocalProposalBoard.Unmarshal(m, b)
}
func (m *LocalProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_LocalProposalBoard.Marshal(b, m, deterministic)
}
func (m *LocalProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_LocalProposalBoard.Merge(m, src)
}
func (m *LocalProposalBoard) XXX_Size() int {
return xxx_messageInfo_LocalProposalBoard.Size(m)
}
func (m *LocalProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_LocalProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_LocalProposalBoard proto.InternalMessageInfo
func (m *LocalProposalBoard) GetPropBd() *AutonomyProposalBoard {
if m != nil {
......@@ -254,17 +424,40 @@ func (m *LocalProposalBoard) GetComments() []string {
// query
type ReqQueryProposalBoard struct {
// 优先根据status查询
Status int32 `protobuf:"varint,1,opt,name=status" json:"status,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
//优先根据status查询
Status int32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction,proto3" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReqQueryProposalBoard) Reset() { *m = ReqQueryProposalBoard{} }
func (m *ReqQueryProposalBoard) String() string { return proto.CompactTextString(m) }
func (*ReqQueryProposalBoard) ProtoMessage() {}
func (*ReqQueryProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
func (*ReqQueryProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{7}
}
func (m *ReqQueryProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqQueryProposalBoard.Unmarshal(m, b)
}
func (m *ReqQueryProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReqQueryProposalBoard.Marshal(b, m, deterministic)
}
func (m *ReqQueryProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReqQueryProposalBoard.Merge(m, src)
}
func (m *ReqQueryProposalBoard) XXX_Size() int {
return xxx_messageInfo_ReqQueryProposalBoard.Size(m)
}
func (m *ReqQueryProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_ReqQueryProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_ReqQueryProposalBoard proto.InternalMessageInfo
func (m *ReqQueryProposalBoard) GetStatus() int32 {
if m != nil {
......@@ -295,13 +488,36 @@ func (m *ReqQueryProposalBoard) GetIndex() int64 {
}
type ReplyQueryProposalBoard struct {
PropBoards []*AutonomyProposalBoard `protobuf:"bytes,1,rep,name=propBoards" json:"propBoards,omitempty"`
PropBoards []*AutonomyProposalBoard `protobuf:"bytes,1,rep,name=propBoards,proto3" json:"propBoards,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReplyQueryProposalBoard) Reset() { *m = ReplyQueryProposalBoard{} }
func (m *ReplyQueryProposalBoard) String() string { return proto.CompactTextString(m) }
func (*ReplyQueryProposalBoard) ProtoMessage() {}
func (*ReplyQueryProposalBoard) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
func (*ReplyQueryProposalBoard) Descriptor() ([]byte, []int) {
return fileDescriptor_937f74b042f92c0f, []int{8}
}
func (m *ReplyQueryProposalBoard) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyQueryProposalBoard.Unmarshal(m, b)
}
func (m *ReplyQueryProposalBoard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReplyQueryProposalBoard.Marshal(b, m, deterministic)
}
func (m *ReplyQueryProposalBoard) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReplyQueryProposalBoard.Merge(m, src)
}
func (m *ReplyQueryProposalBoard) XXX_Size() int {
return xxx_messageInfo_ReplyQueryProposalBoard.Size(m)
}
func (m *ReplyQueryProposalBoard) XXX_DiscardUnknown() {
xxx_messageInfo_ReplyQueryProposalBoard.DiscardUnknown(m)
}
var xxx_messageInfo_ReplyQueryProposalBoard proto.InternalMessageInfo
func (m *ReplyQueryProposalBoard) GetPropBoards() []*AutonomyProposalBoard {
if m != nil {
......@@ -322,9 +538,9 @@ func init() {
proto.RegisterType((*ReplyQueryProposalBoard)(nil), "types.ReplyQueryProposalBoard")
}
func init() { proto.RegisterFile("board.proto", fileDescriptor1) }
func init() { proto.RegisterFile("board.proto", fileDescriptor_937f74b042f92c0f) }
var fileDescriptor1 = []byte{
var fileDescriptor_937f74b042f92c0f = []byte{
// 524 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
0x10, 0x95, 0x93, 0x6c, 0xd2, 0x4c, 0x55, 0xd4, 0x2e, 0x69, 0xb1, 0xaa, 0x0a, 0x45, 0x3e, 0x20,
......
plugin/dapp/autonomy/types/const.go
View file @ cf9a539d
......@@ -85,7 +85,6 @@ const (
ListProposalComment = "ListProposalComment"
)
//包的名字可以通过配置文件来配置
//建议用github的组织名称，或者用户名字开头, 再加上自己的插件的名字
//如果发生重名，可以通过配置文件修改这些名字
......
plugin/dapp/autonomy/types/lcommon.pb.go
View file @ cf9a539d
......@@ -3,30 +3,62 @@
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type VoteResult struct {
// 总票数
TotalVotes int32 `protobuf:"varint,1,opt,name=totalVotes" json:"totalVotes,omitempty"`
TotalVotes int32 `protobuf:"varint,1,opt,name=totalVotes,proto3" json:"totalVotes,omitempty"`
// 赞成票
ApproveVotes int32 `protobuf:"varint,2,opt,name=approveVotes" json:"approveVotes,omitempty"`
ApproveVotes int32 `protobuf:"varint,2,opt,name=approveVotes,proto3" json:"approveVotes,omitempty"`
// 反对票
OpposeVotes int32 `protobuf:"varint,3,opt,name=opposeVotes" json:"opposeVotes,omitempty"`
OpposeVotes int32 `protobuf:"varint,3,opt,name=opposeVotes,proto3" json:"opposeVotes,omitempty"`
// 是否通过
Pass bool `protobuf:"varint,4,opt,name=pass" json:"pass,omitempty"`
Pass bool `protobuf:"varint,4,opt,name=pass,proto3" json:"pass,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VoteResult) Reset() { *m = VoteResult{} }
func (m *VoteResult) String() string { return proto.CompactTextString(m) }
func (*VoteResult) ProtoMessage() {}
func (*VoteResult) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
func (*VoteResult) Descriptor() ([]byte, []int) {
return fileDescriptor_d916a933dd8220ff, []int{0}
}
func (m *VoteResult) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_VoteResult.Unmarshal(m, b)
}
func (m *VoteResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_VoteResult.Marshal(b, m, deterministic)
}
func (m *VoteResult) XXX_Merge(src proto.Message) {
xxx_messageInfo_VoteResult.Merge(m, src)
}
func (m *VoteResult) XXX_Size() int {
return xxx_messageInfo_VoteResult.Size(m)
}
func (m *VoteResult) XXX_DiscardUnknown() {
xxx_messageInfo_VoteResult.DiscardUnknown(m)
}
var xxx_messageInfo_VoteResult proto.InternalMessageInfo
func (m *VoteResult) GetTotalVotes() int32 {
if m != nil {
......@@ -58,19 +90,42 @@ func (m *VoteResult) GetPass() bool {
type PublicVote struct {
// 是否需要公示
Publicity bool `protobuf:"varint,1,opt,name=publicity" json:"publicity,omitempty"`
Publicity bool `protobuf:"varint,1,opt,name=publicity,proto3" json:"publicity,omitempty"`
// 总票数
TotalVotes int32 `protobuf:"varint,2,opt,name=totalVotes" json:"totalVotes,omitempty"`
TotalVotes int32 `protobuf:"varint,2,opt,name=totalVotes,proto3" json:"totalVotes,omitempty"`
// 全体持票人反对票
OpposeVotes int32 `protobuf:"varint,3,opt,name=opposeVotes" json:"opposeVotes,omitempty"`
OpposeVotes int32 `protobuf:"varint,3,opt,name=opposeVotes,proto3" json:"opposeVotes,omitempty"`
// 是否通过
PubPass bool `protobuf:"varint,4,opt,name=pubPass" json:"pubPass,omitempty"`
PubPass bool `protobuf:"varint,4,opt,name=pubPass,proto3" json:"pubPass,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *PublicVote) Reset() { *m = PublicVote{} }
func (m *PublicVote) String() string { return proto.CompactTextString(m) }
func (*PublicVote) ProtoMessage() {}
func (*PublicVote) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
func (*PublicVote) Descriptor() ([]byte, []int) {
return fileDescriptor_d916a933dd8220ff, []int{1}
}
func (m *PublicVote) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_PublicVote.Unmarshal(m, b)
}
func (m *PublicVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_PublicVote.Marshal(b, m, deterministic)
}
func (m *PublicVote) XXX_Merge(src proto.Message) {
xxx_messageInfo_PublicVote.Merge(m, src)
}
func (m *PublicVote) XXX_Size() int {
return xxx_messageInfo_PublicVote.Size(m)
}
func (m *PublicVote) XXX_DiscardUnknown() {
xxx_messageInfo_PublicVote.DiscardUnknown(m)
}
var xxx_messageInfo_PublicVote proto.InternalMessageInfo
func (m *PublicVote) GetPublicity() bool {
if m != nil {
......@@ -101,13 +156,36 @@ func (m *PublicVote) GetPubPass() bool {
}
type VotesRecord struct {
Address []string `protobuf:"bytes,1,rep,name=address" json:"address,omitempty"`
Address []string `protobuf:"bytes,1,rep,name=address,proto3" json:"address,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VotesRecord) Reset() { *m = VotesRecord{} }
func (m *VotesRecord) String() string { return proto.CompactTextString(m) }
func (*VotesRecord) ProtoMessage() {}
func (*VotesRecord) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
func (*VotesRecord) Descriptor() ([]byte, []int) {
return fileDescriptor_d916a933dd8220ff, []int{2}
}
func (m *VotesRecord) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_VotesRecord.Unmarshal(m, b)
}
func (m *VotesRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_VotesRecord.Marshal(b, m, deterministic)
}
func (m *VotesRecord) XXX_Merge(src proto.Message) {
xxx_messageInfo_VotesRecord.Merge(m, src)
}
func (m *VotesRecord) XXX_Size() int {
return xxx_messageInfo_VotesRecord.Size(m)
}
func (m *VotesRecord) XXX_DiscardUnknown() {
xxx_messageInfo_VotesRecord.DiscardUnknown(m)
}
var xxx_messageInfo_VotesRecord proto.InternalMessageInfo
func (m *VotesRecord) GetAddress() []string {
if m != nil {
......@@ -118,23 +196,46 @@ func (m *VotesRecord) GetAddress() []string {
type RuleConfig struct {
// 董事会成员参与率,以%为单位,只保留整数部分
BoardAttendRatio int32 `protobuf:"varint,1,opt,name=boardAttendRatio" json:"boardAttendRatio,omitempty"`
BoardAttendRatio int32 `protobuf:"varint,1,opt,name=boardAttendRatio,proto3" json:"boardAttendRatio,omitempty"`
// 董事会成员赞成率
BoardApproveRatio int32 `protobuf:"varint,2,opt,name=boardApproveRatio" json:"boardApproveRatio,omitempty"`
BoardApproveRatio int32 `protobuf:"varint,2,opt,name=boardApproveRatio,proto3" json:"boardApproveRatio,omitempty"`
// 全体持票人否决率
PubOpposeRatio int32 `protobuf:"varint,3,opt,name=pubOpposeRatio" json:"pubOpposeRatio,omitempty"`
PubOpposeRatio int32 `protobuf:"varint,3,opt,name=pubOpposeRatio,proto3" json:"pubOpposeRatio,omitempty"`
// 提案金额
ProposalAmount int64 `protobuf:"varint,4,opt,name=proposalAmount" json:"proposalAmount,omitempty"`
ProposalAmount int64 `protobuf:"varint,4,opt,name=proposalAmount,proto3" json:"proposalAmount,omitempty"`
// 重大项目公示金额阈值
LargeProjectAmount int64 `protobuf:"varint,5,opt,name=largeProjectAmount" json:"largeProjectAmount,omitempty"`
LargeProjectAmount int64 `protobuf:"varint,5,opt,name=largeProjectAmount,proto3" json:"largeProjectAmount,omitempty"`
// 重大项目公示时间（以区块数为单位）
PublicPeriod int32 `protobuf:"varint,6,opt,name=publicPeriod" json:"publicPeriod,omitempty"`
PublicPeriod int32 `protobuf:"varint,6,opt,name=publicPeriod,proto3" json:"publicPeriod,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *RuleConfig) Reset() { *m = RuleConfig{} }
func (m *RuleConfig) String() string { return proto.CompactTextString(m) }
func (*RuleConfig) ProtoMessage() {}
func (*RuleConfig) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
func (*RuleConfig) Descriptor() ([]byte, []int) {
return fileDescriptor_d916a933dd8220ff, []int{3}
}
func (m *RuleConfig) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RuleConfig.Unmarshal(m, b)
}
func (m *RuleConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_RuleConfig.Marshal(b, m, deterministic)
}
func (m *RuleConfig) XXX_Merge(src proto.Message) {
xxx_messageInfo_RuleConfig.Merge(m, src)
}
func (m *RuleConfig) XXX_Size() int {
return xxx_messageInfo_RuleConfig.Size(m)
}
func (m *RuleConfig) XXX_DiscardUnknown() {
xxx_messageInfo_RuleConfig.DiscardUnknown(m)
}
var xxx_messageInfo_RuleConfig proto.InternalMessageInfo
func (m *RuleConfig) GetBoardAttendRatio() int32 {
if m != nil {
......@@ -185,9 +286,9 @@ func init() {
proto.RegisterType((*RuleConfig)(nil), "types.RuleConfig")
}
func init() { proto.RegisterFile("lcommon.proto", fileDescriptor2) }
func init() { proto.RegisterFile("lcommon.proto", fileDescriptor_d916a933dd8220ff) }
var fileDescriptor2 = []byte{
var fileDescriptor_d916a933dd8220ff = []byte{
// 314 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3d, 0x4e, 0xf3, 0x40,
0x10, 0x86, 0xe5, 0xfc, 0x7d, 0xc9, 0xe4, 0x03, 0xc1, 0x54, 0x2e, 0x10, 0x8a, 0x5c, 0x40, 0x84,
......
plugin/dapp/autonomy/types/project.pb.go
View file @ cf9a539d
......@@ -3,36 +3,68 @@
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type AutonomyProposalProject struct {
PropProject *ProposalProject `protobuf:"bytes,1,opt,name=propProject" json:"propProject,omitempty"`
PropProject *ProposalProject `protobuf:"bytes,1,opt,name=propProject,proto3" json:"propProject,omitempty"`
// 投票该提案的规则
CurRule *RuleConfig `protobuf:"bytes,2,opt,name=curRule" json:"curRule,omitempty"`
CurRule *RuleConfig `protobuf:"bytes,2,opt,name=curRule,proto3" json:"curRule,omitempty"`
// 投票该提案的董事会成员
Boards []string `protobuf:"bytes,3,rep,name=boards" json:"boards,omitempty"`
Boards []string `protobuf:"bytes,3,rep,name=boards,proto3" json:"boards,omitempty"`
// 董事会投票结果
BoardVoteRes *VoteResult `protobuf:"bytes,4,opt,name=boardVoteRes" json:"boardVoteRes,omitempty"`
BoardVoteRes *VoteResult `protobuf:"bytes,4,opt,name=boardVoteRes,proto3" json:"boardVoteRes,omitempty"`
// 公示投票
PubVote *PublicVote `protobuf:"bytes,5,opt,name=pubVote" json:"pubVote,omitempty"`
PubVote *PublicVote `protobuf:"bytes,5,opt,name=pubVote,proto3" json:"pubVote,omitempty"`
// 状态
Status int32 `protobuf:"varint,6,opt,name=status" json:"status,omitempty"`
Address string `protobuf:"bytes,7,opt,name=address" json:"address,omitempty"`
Height int64 `protobuf:"varint,8,opt,name=height" json:"height,omitempty"`
Index int32 `protobuf:"varint,9,opt,name=index" json:"index,omitempty"`
Status int32 `protobuf:"varint,6,opt,name=status,proto3" json:"status,omitempty"`
Address string `protobuf:"bytes,7,opt,name=address,proto3" json:"address,omitempty"`
Height int64 `protobuf:"varint,8,opt,name=height,proto3" json:"height,omitempty"`
Index int32 `protobuf:"varint,9,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *AutonomyProposalProject) Reset() { *m = AutonomyProposalProject{} }
func (m *AutonomyProposalProject) String() string { return proto.CompactTextString(m) }
func (*AutonomyProposalProject) ProtoMessage() {}
func (*AutonomyProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
func (*AutonomyProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{0}
}
func (m *AutonomyProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AutonomyProposalProject.Unmarshal(m, b)
}
func (m *AutonomyProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_AutonomyProposalProject.Marshal(b, m, deterministic)
}
func (m *AutonomyProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_AutonomyProposalProject.Merge(m, src)
}
func (m *AutonomyProposalProject) XXX_Size() int {
return xxx_messageInfo_AutonomyProposalProject.Size(m)
}
func (m *AutonomyProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_AutonomyProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_AutonomyProposalProject proto.InternalMessageInfo
func (m *AutonomyProposalProject) GetPropProject() *ProposalProject {
if m != nil {
......@@ -99,30 +131,53 @@ func (m *AutonomyProposalProject) GetIndex() int32 {
type ProposalProject struct {
// 提案时间
Year int32 `protobuf:"varint,1,opt,name=year" json:"year,omitempty"`
Month int32 `protobuf:"varint,2,opt,name=month" json:"month,omitempty"`
Day int32 `protobuf:"varint,3,opt,name=day" json:"day,omitempty"`
Year int32 `protobuf:"varint,1,opt,name=year,proto3" json:"year,omitempty"`
Month int32 `protobuf:"varint,2,opt,name=month,proto3" json:"month,omitempty"`
Day int32 `protobuf:"varint,3,opt,name=day,proto3" json:"day,omitempty"`
// 项目相关
FirstStage string `protobuf:"bytes,4,opt,name=firstStage" json:"firstStage,omitempty"`
LastStage string `protobuf:"bytes,5,opt,name=lastStage" json:"lastStage,omitempty"`
Production string `protobuf:"bytes,6,opt,name=production" json:"production,omitempty"`
Description string `protobuf:"bytes,7,opt,name=description" json:"description,omitempty"`
Contractor string `protobuf:"bytes,8,opt,name=contractor" json:"contractor,omitempty"`
Amount int64 `protobuf:"varint,9,opt,name=amount" json:"amount,omitempty"`
AmountDetail string `protobuf:"bytes,10,opt,name=amountDetail" json:"amountDetail,omitempty"`
FirstStage string `protobuf:"bytes,4,opt,name=firstStage,proto3" json:"firstStage,omitempty"`
LastStage string `protobuf:"bytes,5,opt,name=lastStage,proto3" json:"lastStage,omitempty"`
Production string `protobuf:"bytes,6,opt,name=production,proto3" json:"production,omitempty"`
Description string `protobuf:"bytes,7,opt,name=description,proto3" json:"description,omitempty"`
Contractor string `protobuf:"bytes,8,opt,name=contractor,proto3" json:"contractor,omitempty"`
Amount int64 `protobuf:"varint,9,opt,name=amount,proto3" json:"amount,omitempty"`
AmountDetail string `protobuf:"bytes,10,opt,name=amountDetail,proto3" json:"amountDetail,omitempty"`
// 支付相关
ToAddr string `protobuf:"bytes,11,opt,name=toAddr" json:"toAddr,omitempty"`
ToAddr string `protobuf:"bytes,11,opt,name=toAddr,proto3" json:"toAddr,omitempty"`
// 投票相关
StartBlockHeight int64 `protobuf:"varint,12,opt,name=startBlockHeight" json:"startBlockHeight,omitempty"`
EndBlockHeight int64 `protobuf:"varint,13,opt,name=endBlockHeight" json:"endBlockHeight,omitempty"`
RealEndBlockHeight int64 `protobuf:"varint,14,opt,name=realEndBlockHeight" json:"realEndBlockHeight,omitempty"`
ProjectNeedBlockNum int32 `protobuf:"varint,15,opt,name=projectNeedBlockNum" json:"projectNeedBlockNum,omitempty"`
StartBlockHeight int64 `protobuf:"varint,12,opt,name=startBlockHeight,proto3" json:"startBlockHeight,omitempty"`
EndBlockHeight int64 `protobuf:"varint,13,opt,name=endBlockHeight,proto3" json:"endBlockHeight,omitempty"`
RealEndBlockHeight int64 `protobuf:"varint,14,opt,name=realEndBlockHeight,proto3" json:"realEndBlockHeight,omitempty"`
ProjectNeedBlockNum int32 `protobuf:"varint,15,opt,name=projectNeedBlockNum,proto3" json:"projectNeedBlockNum,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ProposalProject) Reset() { *m = ProposalProject{} }
func (m *ProposalProject) String() string { return proto.CompactTextString(m) }
func (*ProposalProject) ProtoMessage() {}
func (*ProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
func (*ProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{1}
}
func (m *ProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ProposalProject.Unmarshal(m, b)
}
func (m *ProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ProposalProject.Marshal(b, m, deterministic)
}
func (m *ProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_ProposalProject.Merge(m, src)
}
func (m *ProposalProject) XXX_Size() int {
return xxx_messageInfo_ProposalProject.Size(m)
}
func (m *ProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_ProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_ProposalProject proto.InternalMessageInfo
func (m *ProposalProject) GetYear() int32 {
if m != nil {
......@@ -230,13 +285,36 @@ func (m *ProposalProject) GetProjectNeedBlockNum() int32 {
}
type RevokeProposalProject struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *RevokeProposalProject) Reset() { *m = RevokeProposalProject{} }
func (m *RevokeProposalProject) String() string { return proto.CompactTextString(m) }
func (*RevokeProposalProject) ProtoMessage() {}
func (*RevokeProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
func (*RevokeProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{2}
}
func (m *RevokeProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RevokeProposalProject.Unmarshal(m, b)
}
func (m *RevokeProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_RevokeProposalProject.Marshal(b, m, deterministic)
}
func (m *RevokeProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_RevokeProposalProject.Merge(m, src)
}
func (m *RevokeProposalProject) XXX_Size() int {
return xxx_messageInfo_RevokeProposalProject.Size(m)
}
func (m *RevokeProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_RevokeProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_RevokeProposalProject proto.InternalMessageInfo
func (m *RevokeProposalProject) GetProposalID() string {
if m != nil {
......@@ -246,14 +324,37 @@ func (m *RevokeProposalProject) GetProposalID() string {
}
type VoteProposalProject struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
Approve bool `protobuf:"varint,2,opt,name=approve" json:"approve,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
Approve bool `protobuf:"varint,2,opt,name=approve,proto3" json:"approve,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VoteProposalProject) Reset() { *m = VoteProposalProject{} }
func (m *VoteProposalProject) String() string { return proto.CompactTextString(m) }
func (*VoteProposalProject) ProtoMessage() {}
func (*VoteProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
func (*VoteProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{3}
}
func (m *VoteProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_VoteProposalProject.Unmarshal(m, b)
}
func (m *VoteProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_VoteProposalProject.Marshal(b, m, deterministic)
}
func (m *VoteProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_VoteProposalProject.Merge(m, src)
}
func (m *VoteProposalProject) XXX_Size() int {
return xxx_messageInfo_VoteProposalProject.Size(m)
}
func (m *VoteProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_VoteProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_VoteProposalProject proto.InternalMessageInfo
func (m *VoteProposalProject) GetProposalID() string {
if m != nil {
......@@ -270,14 +371,37 @@ func (m *VoteProposalProject) GetApprove() bool {
}
type PubVoteProposalProject struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
Oppose bool `protobuf:"varint,2,opt,name=oppose" json:"oppose,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
Oppose bool `protobuf:"varint,2,opt,name=oppose,proto3" json:"oppose,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *PubVoteProposalProject) Reset() { *m = PubVoteProposalProject{} }
func (m *PubVoteProposalProject) String() string { return proto.CompactTextString(m) }
func (*PubVoteProposalProject) ProtoMessage() {}
func (*PubVoteProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} }
func (*PubVoteProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{4}
}
func (m *PubVoteProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_PubVoteProposalProject.Unmarshal(m, b)
}
func (m *PubVoteProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_PubVoteProposalProject.Marshal(b, m, deterministic)
}
func (m *PubVoteProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_PubVoteProposalProject.Merge(m, src)
}
func (m *PubVoteProposalProject) XXX_Size() int {
return xxx_messageInfo_PubVoteProposalProject.Size(m)
}
func (m *PubVoteProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_PubVoteProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_PubVoteProposalProject proto.InternalMessageInfo
func (m *PubVoteProposalProject) GetProposalID() string {
if m != nil {
......@@ -294,13 +418,36 @@ func (m *PubVoteProposalProject) GetOppose() bool {
}
type TerminateProposalProject struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TerminateProposalProject) Reset() { *m = TerminateProposalProject{} }
func (m *TerminateProposalProject) String() string { return proto.CompactTextString(m) }
func (*TerminateProposalProject) ProtoMessage() {}
func (*TerminateProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} }
func (*TerminateProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{5}
}
func (m *TerminateProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TerminateProposalProject.Unmarshal(m, b)
}
func (m *TerminateProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TerminateProposalProject.Marshal(b, m, deterministic)
}
func (m *TerminateProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_TerminateProposalProject.Merge(m, src)
}
func (m *TerminateProposalProject) XXX_Size() int {
return xxx_messageInfo_TerminateProposalProject.Size(m)
}
func (m *TerminateProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_TerminateProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_TerminateProposalProject proto.InternalMessageInfo
func (m *TerminateProposalProject) GetProposalID() string {
if m != nil {
......@@ -311,14 +458,37 @@ func (m *TerminateProposalProject) GetProposalID() string {
// receipt
type ReceiptProposalProject struct {
Prev *AutonomyProposalProject `protobuf:"bytes,1,opt,name=prev" json:"prev,omitempty"`
Current *AutonomyProposalProject `protobuf:"bytes,2,opt,name=current" json:"current,omitempty"`
Prev *AutonomyProposalProject `protobuf:"bytes,1,opt,name=prev,proto3" json:"prev,omitempty"`
Current *AutonomyProposalProject `protobuf:"bytes,2,opt,name=current,proto3" json:"current,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptProposalProject) Reset() { *m = ReceiptProposalProject{} }
func (m *ReceiptProposalProject) String() string { return proto.CompactTextString(m) }
func (*ReceiptProposalProject) ProtoMessage() {}
func (*ReceiptProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{6} }
func (*ReceiptProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{6}
}
func (m *ReceiptProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptProposalProject.Unmarshal(m, b)
}
func (m *ReceiptProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptProposalProject.Marshal(b, m, deterministic)
}
func (m *ReceiptProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptProposalProject.Merge(m, src)
}
func (m *ReceiptProposalProject) XXX_Size() int {
return xxx_messageInfo_ReceiptProposalProject.Size(m)
}
func (m *ReceiptProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptProposalProject proto.InternalMessageInfo
func (m *ReceiptProposalProject) GetPrev() *AutonomyProposalProject {
if m != nil {
......@@ -335,14 +505,37 @@ func (m *ReceiptProposalProject) GetCurrent() *AutonomyProposalProject {
}
type LocalProposalProject struct {
PropPrj *AutonomyProposalProject `protobuf:"bytes,1,opt,name=propPrj" json:"propPrj,omitempty"`
Comments []string `protobuf:"bytes,2,rep,name=comments" json:"comments,omitempty"`
PropPrj *AutonomyProposalProject `protobuf:"bytes,1,opt,name=propPrj,proto3" json:"propPrj,omitempty"`
Comments []string `protobuf:"bytes,2,rep,name=comments,proto3" json:"comments,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *LocalProposalProject) Reset() { *m = LocalProposalProject{} }
func (m *LocalProposalProject) String() string { return proto.CompactTextString(m) }
func (*LocalProposalProject) ProtoMessage() {}
func (*LocalProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{7} }
func (*LocalProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{7}
}
func (m *LocalProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_LocalProposalProject.Unmarshal(m, b)
}
func (m *LocalProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_LocalProposalProject.Marshal(b, m, deterministic)
}
func (m *LocalProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_LocalProposalProject.Merge(m, src)
}
func (m *LocalProposalProject) XXX_Size() int {
return xxx_messageInfo_LocalProposalProject.Size(m)
}
func (m *LocalProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_LocalProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_LocalProposalProject proto.InternalMessageInfo
func (m *LocalProposalProject) GetPropPrj() *AutonomyProposalProject {
if m != nil {
......@@ -360,17 +553,40 @@ func (m *LocalProposalProject) GetComments() []string {
// query
type ReqQueryProposalProject struct {
// 优先根据status查询
Status int32 `protobuf:"varint,1,opt,name=status" json:"status,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
//优先根据status查询
Status int32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction,proto3" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReqQueryProposalProject) Reset() { *m = ReqQueryProposalProject{} }
func (m *ReqQueryProposalProject) String() string { return proto.CompactTextString(m) }
func (*ReqQueryProposalProject) ProtoMessage() {}
func (*ReqQueryProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{8} }
func (*ReqQueryProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{8}
}
func (m *ReqQueryProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqQueryProposalProject.Unmarshal(m, b)
}
func (m *ReqQueryProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReqQueryProposalProject.Marshal(b, m, deterministic)
}
func (m *ReqQueryProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReqQueryProposalProject.Merge(m, src)
}
func (m *ReqQueryProposalProject) XXX_Size() int {
return xxx_messageInfo_ReqQueryProposalProject.Size(m)
}
func (m *ReqQueryProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_ReqQueryProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_ReqQueryProposalProject proto.InternalMessageInfo
func (m *ReqQueryProposalProject) GetStatus() int32 {
if m != nil {
......@@ -401,13 +617,36 @@ func (m *ReqQueryProposalProject) GetIndex() int64 {
}
type ReplyQueryProposalProject struct {
PropProjects []*AutonomyProposalProject `protobuf:"bytes,1,rep,name=propProjects" json:"propProjects,omitempty"`
PropProjects []*AutonomyProposalProject `protobuf:"bytes,1,rep,name=propProjects,proto3" json:"propProjects,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReplyQueryProposalProject) Reset() { *m = ReplyQueryProposalProject{} }
func (m *ReplyQueryProposalProject) String() string { return proto.CompactTextString(m) }
func (*ReplyQueryProposalProject) ProtoMessage() {}
func (*ReplyQueryProposalProject) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{9} }
func (*ReplyQueryProposalProject) Descriptor() ([]byte, []int) {
return fileDescriptor_8340e6318dfdfac2, []int{9}
}
func (m *ReplyQueryProposalProject) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyQueryProposalProject.Unmarshal(m, b)
}
func (m *ReplyQueryProposalProject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReplyQueryProposalProject.Marshal(b, m, deterministic)
}
func (m *ReplyQueryProposalProject) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReplyQueryProposalProject.Merge(m, src)
}
func (m *ReplyQueryProposalProject) XXX_Size() int {
return xxx_messageInfo_ReplyQueryProposalProject.Size(m)
}
func (m *ReplyQueryProposalProject) XXX_DiscardUnknown() {
xxx_messageInfo_ReplyQueryProposalProject.DiscardUnknown(m)
}
var xxx_messageInfo_ReplyQueryProposalProject proto.InternalMessageInfo
func (m *ReplyQueryProposalProject) GetPropProjects() []*AutonomyProposalProject {
if m != nil {
......@@ -429,9 +668,9 @@ func init() {
proto.RegisterType((*ReplyQueryProposalProject)(nil), "types.ReplyQueryProposalProject")
}
func init() { proto.RegisterFile("project.proto", fileDescriptor3) }
func init() { proto.RegisterFile("project.proto", fileDescriptor_8340e6318dfdfac2) }
var fileDescriptor3 = []byte{
var fileDescriptor_8340e6318dfdfac2 = []byte{
// 686 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4d, 0x6f, 0x13, 0x3b,
0x14, 0x55, 0x3a, 0x99, 0xa4, 0xb9, 0x49, 0x3f, 0x9e, 0xdb, 0x97, 0xfa, 0x55, 0x4f, 0x55, 0x34,
......
plugin/dapp/autonomy/types/rule.pb.go
View file @ cf9a539d
......@@ -3,31 +3,63 @@
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type AutonomyProposalRule struct {
PropRule *ProposalRule `protobuf:"bytes,1,opt,name=propRule" json:"propRule,omitempty"`
CurRule *RuleConfig `protobuf:"bytes,2,opt,name=curRule" json:"curRule,omitempty"`
PropRule *ProposalRule `protobuf:"bytes,1,opt,name=propRule,proto3" json:"propRule,omitempty"`
CurRule *RuleConfig `protobuf:"bytes,2,opt,name=curRule,proto3" json:"curRule,omitempty"`
// 全体持票人投票结果
VoteResult *VoteResult `protobuf:"bytes,3,opt,name=voteResult" json:"voteResult,omitempty"`
VoteResult *VoteResult `protobuf:"bytes,3,opt,name=voteResult,proto3" json:"voteResult,omitempty"`
// 状态
Status int32 `protobuf:"varint,4,opt,name=status" json:"status,omitempty"`
Address string `protobuf:"bytes,5,opt,name=address" json:"address,omitempty"`
Height int64 `protobuf:"varint,6,opt,name=height" json:"height,omitempty"`
Index int32 `protobuf:"varint,7,opt,name=index" json:"index,omitempty"`
Status int32 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
Address string `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"`
Height int64 `protobuf:"varint,6,opt,name=height,proto3" json:"height,omitempty"`
Index int32 `protobuf:"varint,7,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *AutonomyProposalRule) Reset() { *m = AutonomyProposalRule{} }
func (m *AutonomyProposalRule) String() string { return proto.CompactTextString(m) }
func (*AutonomyProposalRule) ProtoMessage() {}
func (*AutonomyProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
func (*AutonomyProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{0}
}
func (m *AutonomyProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AutonomyProposalRule.Unmarshal(m, b)
}
func (m *AutonomyProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_AutonomyProposalRule.Marshal(b, m, deterministic)
}
func (m *AutonomyProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_AutonomyProposalRule.Merge(m, src)
}
func (m *AutonomyProposalRule) XXX_Size() int {
return xxx_messageInfo_AutonomyProposalRule.Size(m)
}
func (m *AutonomyProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_AutonomyProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_AutonomyProposalRule proto.InternalMessageInfo
func (m *AutonomyProposalRule) GetPropRule() *ProposalRule {
if m != nil {
......@@ -80,21 +112,44 @@ func (m *AutonomyProposalRule) GetIndex() int32 {
type ProposalRule struct {
// 提案时间
Year int32 `protobuf:"varint,1,opt,name=year" json:"year,omitempty"`
Month int32 `protobuf:"varint,2,opt,name=month" json:"month,omitempty"`
Day int32 `protobuf:"varint,3,opt,name=day" json:"day,omitempty"`
Year int32 `protobuf:"varint,1,opt,name=year,proto3" json:"year,omitempty"`
Month int32 `protobuf:"varint,2,opt,name=month,proto3" json:"month,omitempty"`
Day int32 `protobuf:"varint,3,opt,name=day,proto3" json:"day,omitempty"`
// 规则可修改项,如果某项不修改则置为-1
RuleCfg *RuleConfig `protobuf:"bytes,4,opt,name=ruleCfg" json:"ruleCfg,omitempty"`
RuleCfg *RuleConfig `protobuf:"bytes,4,opt,name=ruleCfg,proto3" json:"ruleCfg,omitempty"`
// 投票相关
StartBlockHeight int64 `protobuf:"varint,5,opt,name=startBlockHeight" json:"startBlockHeight,omitempty"`
EndBlockHeight int64 `protobuf:"varint,6,opt,name=endBlockHeight" json:"endBlockHeight,omitempty"`
RealEndBlockHeight int64 `protobuf:"varint,7,opt,name=realEndBlockHeight" json:"realEndBlockHeight,omitempty"`
StartBlockHeight int64 `protobuf:"varint,5,opt,name=startBlockHeight,proto3" json:"startBlockHeight,omitempty"`
EndBlockHeight int64 `protobuf:"varint,6,opt,name=endBlockHeight,proto3" json:"endBlockHeight,omitempty"`
RealEndBlockHeight int64 `protobuf:"varint,7,opt,name=realEndBlockHeight,proto3" json:"realEndBlockHeight,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ProposalRule) Reset() { *m = ProposalRule{} }
func (m *ProposalRule) String() string { return proto.CompactTextString(m) }
func (*ProposalRule) ProtoMessage() {}
func (*ProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
func (*ProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{1}
}
func (m *ProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ProposalRule.Unmarshal(m, b)
}
func (m *ProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ProposalRule.Marshal(b, m, deterministic)
}
func (m *ProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_ProposalRule.Merge(m, src)
}
func (m *ProposalRule) XXX_Size() int {
return xxx_messageInfo_ProposalRule.Size(m)
}
func (m *ProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_ProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_ProposalRule proto.InternalMessageInfo
func (m *ProposalRule) GetYear() int32 {
if m != nil {
......@@ -146,13 +201,36 @@ func (m *ProposalRule) GetRealEndBlockHeight() int64 {
}
type RevokeProposalRule struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *RevokeProposalRule) Reset() { *m = RevokeProposalRule{} }
func (m *RevokeProposalRule) String() string { return proto.CompactTextString(m) }
func (*RevokeProposalRule) ProtoMessage() {}
func (*RevokeProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
func (*RevokeProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{2}
}
func (m *RevokeProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RevokeProposalRule.Unmarshal(m, b)
}
func (m *RevokeProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_RevokeProposalRule.Marshal(b, m, deterministic)
}
func (m *RevokeProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_RevokeProposalRule.Merge(m, src)
}
func (m *RevokeProposalRule) XXX_Size() int {
return xxx_messageInfo_RevokeProposalRule.Size(m)
}
func (m *RevokeProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_RevokeProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_RevokeProposalRule proto.InternalMessageInfo
func (m *RevokeProposalRule) GetProposalID() string {
if m != nil {
......@@ -162,14 +240,37 @@ func (m *RevokeProposalRule) GetProposalID() string {
}
type VoteProposalRule struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
Approve bool `protobuf:"varint,2,opt,name=approve" json:"approve,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
Approve bool `protobuf:"varint,2,opt,name=approve,proto3" json:"approve,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VoteProposalRule) Reset() { *m = VoteProposalRule{} }
func (m *VoteProposalRule) String() string { return proto.CompactTextString(m) }
func (*VoteProposalRule) ProtoMessage() {}
func (*VoteProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
func (*VoteProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{3}
}
func (m *VoteProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_VoteProposalRule.Unmarshal(m, b)
}
func (m *VoteProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_VoteProposalRule.Marshal(b, m, deterministic)
}
func (m *VoteProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_VoteProposalRule.Merge(m, src)
}
func (m *VoteProposalRule) XXX_Size() int {
return xxx_messageInfo_VoteProposalRule.Size(m)
}
func (m *VoteProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_VoteProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_VoteProposalRule proto.InternalMessageInfo
func (m *VoteProposalRule) GetProposalID() string {
if m != nil {
......@@ -186,13 +287,36 @@ func (m *VoteProposalRule) GetApprove() bool {
}
type TerminateProposalRule struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TerminateProposalRule) Reset() { *m = TerminateProposalRule{} }
func (m *TerminateProposalRule) String() string { return proto.CompactTextString(m) }
func (*TerminateProposalRule) ProtoMessage() {}
func (*TerminateProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
func (*TerminateProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{4}
}
func (m *TerminateProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TerminateProposalRule.Unmarshal(m, b)
}
func (m *TerminateProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TerminateProposalRule.Marshal(b, m, deterministic)
}
func (m *TerminateProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_TerminateProposalRule.Merge(m, src)
}
func (m *TerminateProposalRule) XXX_Size() int {
return xxx_messageInfo_TerminateProposalRule.Size(m)
}
func (m *TerminateProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_TerminateProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_TerminateProposalRule proto.InternalMessageInfo
func (m *TerminateProposalRule) GetProposalID() string {
if m != nil {
......@@ -203,14 +327,37 @@ func (m *TerminateProposalRule) GetProposalID() string {
// receipt
type ReceiptProposalRule struct {
Prev *AutonomyProposalRule `protobuf:"bytes,1,opt,name=prev" json:"prev,omitempty"`
Current *AutonomyProposalRule `protobuf:"bytes,2,opt,name=current" json:"current,omitempty"`
Prev *AutonomyProposalRule `protobuf:"bytes,1,opt,name=prev,proto3" json:"prev,omitempty"`
Current *AutonomyProposalRule `protobuf:"bytes,2,opt,name=current,proto3" json:"current,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptProposalRule) Reset() { *m = ReceiptProposalRule{} }
func (m *ReceiptProposalRule) String() string { return proto.CompactTextString(m) }
func (*ReceiptProposalRule) ProtoMessage() {}
func (*ReceiptProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
func (*ReceiptProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{5}
}
func (m *ReceiptProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptProposalRule.Unmarshal(m, b)
}
func (m *ReceiptProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptProposalRule.Marshal(b, m, deterministic)
}
func (m *ReceiptProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptProposalRule.Merge(m, src)
}
func (m *ReceiptProposalRule) XXX_Size() int {
return xxx_messageInfo_ReceiptProposalRule.Size(m)
}
func (m *ReceiptProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptProposalRule proto.InternalMessageInfo
func (m *ReceiptProposalRule) GetPrev() *AutonomyProposalRule {
if m != nil {
......@@ -227,14 +374,37 @@ func (m *ReceiptProposalRule) GetCurrent() *AutonomyProposalRule {
}
type LocalProposalRule struct {
PropRule *AutonomyProposalRule `protobuf:"bytes,1,opt,name=propRule" json:"propRule,omitempty"`
Comments []string `protobuf:"bytes,2,rep,name=comments" json:"comments,omitempty"`
PropRule *AutonomyProposalRule `protobuf:"bytes,1,opt,name=propRule,proto3" json:"propRule,omitempty"`
Comments []string `protobuf:"bytes,2,rep,name=comments,proto3" json:"comments,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *LocalProposalRule) Reset() { *m = LocalProposalRule{} }
func (m *LocalProposalRule) String() string { return proto.CompactTextString(m) }
func (*LocalProposalRule) ProtoMessage() {}
func (*LocalProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
func (*LocalProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{6}
}
func (m *LocalProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_LocalProposalRule.Unmarshal(m, b)
}
func (m *LocalProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_LocalProposalRule.Marshal(b, m, deterministic)
}
func (m *LocalProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_LocalProposalRule.Merge(m, src)
}
func (m *LocalProposalRule) XXX_Size() int {
return xxx_messageInfo_LocalProposalRule.Size(m)
}
func (m *LocalProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_LocalProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_LocalProposalRule proto.InternalMessageInfo
func (m *LocalProposalRule) GetPropRule() *AutonomyProposalRule {
if m != nil {
......@@ -252,17 +422,40 @@ func (m *LocalProposalRule) GetComments() []string {
// query
type ReqQueryProposalRule struct {
// 优先根据status查询
Status int32 `protobuf:"varint,1,opt,name=status" json:"status,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
//优先根据status查询
Status int32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction,proto3" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReqQueryProposalRule) Reset() { *m = ReqQueryProposalRule{} }
func (m *ReqQueryProposalRule) String() string { return proto.CompactTextString(m) }
func (*ReqQueryProposalRule) ProtoMessage() {}
func (*ReqQueryProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
func (*ReqQueryProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{7}
}
func (m *ReqQueryProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqQueryProposalRule.Unmarshal(m, b)
}
func (m *ReqQueryProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReqQueryProposalRule.Marshal(b, m, deterministic)
}
func (m *ReqQueryProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReqQueryProposalRule.Merge(m, src)
}
func (m *ReqQueryProposalRule) XXX_Size() int {
return xxx_messageInfo_ReqQueryProposalRule.Size(m)
}
func (m *ReqQueryProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_ReqQueryProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_ReqQueryProposalRule proto.InternalMessageInfo
func (m *ReqQueryProposalRule) GetStatus() int32 {
if m != nil {
......@@ -293,13 +486,36 @@ func (m *ReqQueryProposalRule) GetIndex() int64 {
}
type ReplyQueryProposalRule struct {
PropRules []*AutonomyProposalRule `protobuf:"bytes,1,rep,name=propRules" json:"propRules,omitempty"`
PropRules []*AutonomyProposalRule `protobuf:"bytes,1,rep,name=propRules,proto3" json:"propRules,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReplyQueryProposalRule) Reset() { *m = ReplyQueryProposalRule{} }
func (m *ReplyQueryProposalRule) String() string { return proto.CompactTextString(m) }
func (*ReplyQueryProposalRule) ProtoMessage() {}
func (*ReplyQueryProposalRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{8} }
func (*ReplyQueryProposalRule) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{8}
}
func (m *ReplyQueryProposalRule) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyQueryProposalRule.Unmarshal(m, b)
}
func (m *ReplyQueryProposalRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReplyQueryProposalRule.Marshal(b, m, deterministic)
}
func (m *ReplyQueryProposalRule) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReplyQueryProposalRule.Merge(m, src)
}
func (m *ReplyQueryProposalRule) XXX_Size() int {
return xxx_messageInfo_ReplyQueryProposalRule.Size(m)
}
func (m *ReplyQueryProposalRule) XXX_DiscardUnknown() {
xxx_messageInfo_ReplyQueryProposalRule.DiscardUnknown(m)
}
var xxx_messageInfo_ReplyQueryProposalRule proto.InternalMessageInfo
func (m *ReplyQueryProposalRule) GetPropRules() []*AutonomyProposalRule {
if m != nil {
......@@ -310,14 +526,37 @@ func (m *ReplyQueryProposalRule) GetPropRules() []*AutonomyProposalRule {
// TransferFund action
type TransferFund struct {
Amount int64 `protobuf:"varint,1,opt,name=amount" json:"amount,omitempty"`
Note string `protobuf:"bytes,2,opt,name=note" json:"note,omitempty"`
Amount int64 `protobuf:"varint,1,opt,name=amount,proto3" json:"amount,omitempty"`
Note string `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TransferFund) Reset() { *m = TransferFund{} }
func (m *TransferFund) String() string { return proto.CompactTextString(m) }
func (*TransferFund) ProtoMessage() {}
func (*TransferFund) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{9} }
func (*TransferFund) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{9}
}
func (m *TransferFund) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TransferFund.Unmarshal(m, b)
}
func (m *TransferFund) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TransferFund.Marshal(b, m, deterministic)
}
func (m *TransferFund) XXX_Merge(src proto.Message) {
xxx_messageInfo_TransferFund.Merge(m, src)
}
func (m *TransferFund) XXX_Size() int {
return xxx_messageInfo_TransferFund.Size(m)
}
func (m *TransferFund) XXX_DiscardUnknown() {
xxx_messageInfo_TransferFund.DiscardUnknown(m)
}
var xxx_messageInfo_TransferFund proto.InternalMessageInfo
func (m *TransferFund) GetAmount() int64 {
if m != nil {
......@@ -335,15 +574,38 @@ func (m *TransferFund) GetNote() string {
// Comment action
type Comment struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
RepCmtHash string `protobuf:"bytes,2,opt,name=repCmtHash" json:"repCmtHash,omitempty"`
Comment string `protobuf:"bytes,3,opt,name=comment" json:"comment,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
RepCmtHash string `protobuf:"bytes,2,opt,name=repCmtHash,proto3" json:"repCmtHash,omitempty"`
Comment string `protobuf:"bytes,3,opt,name=comment,proto3" json:"comment,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Comment) Reset() { *m = Comment{} }
func (m *Comment) String() string { return proto.CompactTextString(m) }
func (*Comment) ProtoMessage() {}
func (*Comment) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{10} }
func (*Comment) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{10}
}
func (m *Comment) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Comment.Unmarshal(m, b)
}
func (m *Comment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Comment.Marshal(b, m, deterministic)
}
func (m *Comment) XXX_Merge(src proto.Message) {
xxx_messageInfo_Comment.Merge(m, src)
}
func (m *Comment) XXX_Size() int {
return xxx_messageInfo_Comment.Size(m)
}
func (m *Comment) XXX_DiscardUnknown() {
xxx_messageInfo_Comment.DiscardUnknown(m)
}
var xxx_messageInfo_Comment proto.InternalMessageInfo
func (m *Comment) GetProposalID() string {
if m != nil {
......@@ -367,15 +629,38 @@ func (m *Comment) GetComment() string {
}
type ReceiptProposalComment struct {
Cmt *Comment `protobuf:"bytes,1,opt,name=cmt" json:"cmt,omitempty"`
Height int64 `protobuf:"varint,2,opt,name=height" json:"height,omitempty"`
Index int32 `protobuf:"varint,3,opt,name=index" json:"index,omitempty"`
Cmt *Comment `protobuf:"bytes,1,opt,name=cmt,proto3" json:"cmt,omitempty"`
Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
Index int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptProposalComment) Reset() { *m = ReceiptProposalComment{} }
func (m *ReceiptProposalComment) String() string { return proto.CompactTextString(m) }
func (*ReceiptProposalComment) ProtoMessage() {}
func (*ReceiptProposalComment) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{11} }
func (*ReceiptProposalComment) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{11}
}
func (m *ReceiptProposalComment) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptProposalComment.Unmarshal(m, b)
}
func (m *ReceiptProposalComment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptProposalComment.Marshal(b, m, deterministic)
}
func (m *ReceiptProposalComment) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptProposalComment.Merge(m, src)
}
func (m *ReceiptProposalComment) XXX_Size() int {
return xxx_messageInfo_ReceiptProposalComment.Size(m)
}
func (m *ReceiptProposalComment) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptProposalComment.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptProposalComment proto.InternalMessageInfo
func (m *ReceiptProposalComment) GetCmt() *Comment {
if m != nil {
......@@ -400,16 +685,39 @@ func (m *ReceiptProposalComment) GetIndex() int32 {
// query
type ReqQueryProposalComment struct {
ProposalID string `protobuf:"bytes,1,opt,name=proposalID" json:"proposalID,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
ProposalID string `protobuf:"bytes,1,opt,name=proposalID,proto3" json:"proposalID,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
Direction int32 `protobuf:"varint,3,opt,name=direction,proto3" json:"direction,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReqQueryProposalComment) Reset() { *m = ReqQueryProposalComment{} }
func (m *ReqQueryProposalComment) String() string { return proto.CompactTextString(m) }
func (*ReqQueryProposalComment) ProtoMessage() {}
func (*ReqQueryProposalComment) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{12} }
func (*ReqQueryProposalComment) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{12}
}
func (m *ReqQueryProposalComment) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqQueryProposalComment.Unmarshal(m, b)
}
func (m *ReqQueryProposalComment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReqQueryProposalComment.Marshal(b, m, deterministic)
}
func (m *ReqQueryProposalComment) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReqQueryProposalComment.Merge(m, src)
}
func (m *ReqQueryProposalComment) XXX_Size() int {
return xxx_messageInfo_ReqQueryProposalComment.Size(m)
}
func (m *ReqQueryProposalComment) XXX_DiscardUnknown() {
xxx_messageInfo_ReqQueryProposalComment.DiscardUnknown(m)
}
var xxx_messageInfo_ReqQueryProposalComment proto.InternalMessageInfo
func (m *ReqQueryProposalComment) GetProposalID() string {
if m != nil {
......@@ -440,16 +748,39 @@ func (m *ReqQueryProposalComment) GetIndex() int64 {
}
type RelationCmt struct {
RepCmtHash string `protobuf:"bytes,1,opt,name=repCmtHash" json:"repCmtHash,omitempty"`
Comment string `protobuf:"bytes,2,opt,name=comment" json:"comment,omitempty"`
Height int64 `protobuf:"varint,3,opt,name=height" json:"height,omitempty"`
Index int32 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
RepCmtHash string `protobuf:"bytes,1,opt,name=repCmtHash,proto3" json:"repCmtHash,omitempty"`
Comment string `protobuf:"bytes,2,opt,name=comment,proto3" json:"comment,omitempty"`
Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
Index int32 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *RelationCmt) Reset() { *m = RelationCmt{} }
func (m *RelationCmt) String() string { return proto.CompactTextString(m) }
func (*RelationCmt) ProtoMessage() {}
func (*RelationCmt) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{13} }
func (*RelationCmt) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{13}
}
func (m *RelationCmt) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RelationCmt.Unmarshal(m, b)
}
func (m *RelationCmt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_RelationCmt.Marshal(b, m, deterministic)
}
func (m *RelationCmt) XXX_Merge(src proto.Message) {
xxx_messageInfo_RelationCmt.Merge(m, src)
}
func (m *RelationCmt) XXX_Size() int {
return xxx_messageInfo_RelationCmt.Size(m)
}
func (m *RelationCmt) XXX_DiscardUnknown() {
xxx_messageInfo_RelationCmt.DiscardUnknown(m)
}
var xxx_messageInfo_RelationCmt proto.InternalMessageInfo
func (m *RelationCmt) GetRepCmtHash() string {
if m != nil {
......@@ -480,13 +811,36 @@ func (m *RelationCmt) GetIndex() int32 {
}
type ReplyQueryProposalComment struct {
RltCmt []*RelationCmt `protobuf:"bytes,1,rep,name=rltCmt" json:"rltCmt,omitempty"`
RltCmt []*RelationCmt `protobuf:"bytes,1,rep,name=rltCmt,proto3" json:"rltCmt,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReplyQueryProposalComment) Reset() { *m = ReplyQueryProposalComment{} }
func (m *ReplyQueryProposalComment) String() string { return proto.CompactTextString(m) }
func (*ReplyQueryProposalComment) ProtoMessage() {}
func (*ReplyQueryProposalComment) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{14} }
func (*ReplyQueryProposalComment) Descriptor() ([]byte, []int) {
return fileDescriptor_07e8e0fa338d4596, []int{14}
}
func (m *ReplyQueryProposalComment) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyQueryProposalComment.Unmarshal(m, b)
}
func (m *ReplyQueryProposalComment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReplyQueryProposalComment.Marshal(b, m, deterministic)
}
func (m *ReplyQueryProposalComment) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReplyQueryProposalComment.Merge(m, src)
}
func (m *ReplyQueryProposalComment) XXX_Size() int {
return xxx_messageInfo_ReplyQueryProposalComment.Size(m)
}
func (m *ReplyQueryProposalComment) XXX_DiscardUnknown() {
xxx_messageInfo_ReplyQueryProposalComment.DiscardUnknown(m)
}
var xxx_messageInfo_ReplyQueryProposalComment proto.InternalMessageInfo
func (m *ReplyQueryProposalComment) GetRltCmt() []*RelationCmt {
if m != nil {
......@@ -513,9 +867,9 @@ func init() {
proto.RegisterType((*ReplyQueryProposalComment)(nil), "types.ReplyQueryProposalComment")
}
func init() { proto.RegisterFile("rule.proto", fileDescriptor4) }
func init() { proto.RegisterFile("rule.proto", fileDescriptor_07e8e0fa338d4596) }
var fileDescriptor4 = []byte{
var fileDescriptor_07e8e0fa338d4596 = []byte{
// 678 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4d, 0x6f, 0xdb, 0x38,
0x10, 0x85, 0x2c, 0xcb, 0x8e, 0x26, 0xd9, 0x20, 0x61, 0xbc, 0x59, 0x6d, 0x5a, 0x04, 0x86, 0x0e,
......
plugin/dapp/autonomy/types/types.go
View file @ cf9a539d
......@@ -6,6 +6,7 @@ package types
import (
"reflect"
log "github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/types"
)
......@@ -64,7 +65,6 @@ func (a *AutonomyType) GetLogMap() map[int64]*types.LogInfo {
TyLogTmintPropRule: {Ty: reflect.TypeOf(ReceiptProposalRule{}), Name: "LogTmintPropRule"},
TyLogCommentProp: {Ty: reflect.TypeOf(ReceiptProposalComment{}), Name: "LogCommentProp"},
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment