From 8f131e2e0c8d0ef346b12e528fce45eae0cb1cef Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Mon, 2 Mar 2020 09:14:17 -0500 Subject: [PATCH] Fix and updates gov proto types --- x/gov/types/types.pb.go | 718 ++++++---------------------------------- x/gov/types/types.proto | 185 ++++++----- 2 files changed, 208 insertions(+), 695 deletions(-) diff --git a/x/gov/types/types.pb.go b/x/gov/types/types.pb.go index 3f7a18cce..56bba9adf 100644 --- a/x/gov/types/types.pb.go +++ b/x/gov/types/types.pb.go @@ -12,7 +12,6 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/timestamp" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" @@ -291,15 +290,18 @@ func (m *Deposit) XXX_DiscardUnknown() { var xxx_messageInfo_Deposit proto.InternalMessageInfo +// ProposalBase defines the core field members of a governance proposal. It includes +// all static fields (i.e fields excluding the dynamic Content). A full proposal +// extends the ProposalBase with Content. type ProposalBase struct { - ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` - Status ProposalStatus `protobuf:"varint,2,opt,name=status,proto3,enum=cosmos_sdk.x.gov.v1.ProposalStatus" json:"status,omitempty"` - FinalTallyResult TallyResult `protobuf:"bytes,3,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result"` - SubmitTime time.Time `protobuf:"bytes,4,opt,name=submit_time,json=submitTime,proto3,stdtime" json:"submit_time"` - DepositEndTime time.Time `protobuf:"bytes,5,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time"` - TotalDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,6,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total_deposit"` - VotingStartTime time.Time `protobuf:"bytes,7,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time"` - VotingEndTime time.Time `protobuf:"bytes,8,opt,name=voting_end_time,json=votingEndTime,proto3,stdtime" json:"voting_end_time"` + ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id" yaml:"id"` + Status ProposalStatus `protobuf:"varint,2,opt,name=status,proto3,enum=cosmos_sdk.x.gov.v1.ProposalStatus" json:"status,omitempty" yaml:"proposal_status"` + FinalTallyResult TallyResult `protobuf:"bytes,3,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result" yaml:"final_tally_result"` + SubmitTime time.Time `protobuf:"bytes,4,opt,name=submit_time,json=submitTime,proto3,stdtime" json:"submit_time" yaml:"submit_time"` + DepositEndTime time.Time `protobuf:"bytes,5,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time" yaml:"deposit_end_time"` + TotalDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,6,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total_deposit" yaml:"total_deposit"` + VotingStartTime time.Time `protobuf:"bytes,7,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time" yaml:"voting_start_time"` + VotingEndTime time.Time `protobuf:"bytes,8,opt,name=voting_end_time,json=votingEndTime,proto3,stdtime" json:"voting_end_time" yaml:"voting_end_time"` } func (m *ProposalBase) Reset() { *m = ProposalBase{} } @@ -375,6 +377,8 @@ func (m *TallyResult) XXX_DiscardUnknown() { var xxx_messageInfo_TallyResult proto.InternalMessageInfo +// Vote defines a vote on a governance proposal. A vote corresponds to a proposal +// ID, the voter, and the vote option. type Vote struct { ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` Voter github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=voter,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"voter,omitempty"` @@ -413,114 +417,6 @@ func (m *Vote) XXX_DiscardUnknown() { var xxx_messageInfo_Vote proto.InternalMessageInfo -type BasicProposal struct { - *ProposalBase `protobuf:"bytes,1,opt,name=base,proto3,embedded=base" json:"base,omitempty"` - Content *BasicContent `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` -} - -func (m *BasicProposal) Reset() { *m = BasicProposal{} } -func (*BasicProposal) ProtoMessage() {} -func (*BasicProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_a5ae5e91b5b3fb03, []int{8} -} -func (m *BasicProposal) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *BasicProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_BasicProposal.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *BasicProposal) XXX_Merge(src proto.Message) { - xxx_messageInfo_BasicProposal.Merge(m, src) -} -func (m *BasicProposal) XXX_Size() int { - return m.Size() -} -func (m *BasicProposal) XXX_DiscardUnknown() { - xxx_messageInfo_BasicProposal.DiscardUnknown(m) -} - -var xxx_messageInfo_BasicProposal proto.InternalMessageInfo - -type BasicContent struct { - // Types that are valid to be assigned to Sum: - // *BasicContent_Text - Sum isBasicContent_Sum `protobuf_oneof:"sum"` -} - -func (m *BasicContent) Reset() { *m = BasicContent{} } -func (*BasicContent) ProtoMessage() {} -func (*BasicContent) Descriptor() ([]byte, []int) { - return fileDescriptor_a5ae5e91b5b3fb03, []int{9} -} -func (m *BasicContent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *BasicContent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_BasicContent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *BasicContent) XXX_Merge(src proto.Message) { - xxx_messageInfo_BasicContent.Merge(m, src) -} -func (m *BasicContent) XXX_Size() int { - return m.Size() -} -func (m *BasicContent) XXX_DiscardUnknown() { - xxx_messageInfo_BasicContent.DiscardUnknown(m) -} - -var xxx_messageInfo_BasicContent proto.InternalMessageInfo - -type isBasicContent_Sum interface { - isBasicContent_Sum() - MarshalTo([]byte) (int, error) - Size() int -} - -type BasicContent_Text struct { - Text *TextProposal `protobuf:"bytes,1,opt,name=text,proto3,oneof" json:"text,omitempty"` -} - -func (*BasicContent_Text) isBasicContent_Sum() {} - -func (m *BasicContent) GetSum() isBasicContent_Sum { - if m != nil { - return m.Sum - } - return nil -} - -func (m *BasicContent) GetText() *TextProposal { - if x, ok := m.GetSum().(*BasicContent_Text); ok { - return x.Text - } - return nil -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*BasicContent) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*BasicContent_Text)(nil), - } -} - func init() { proto.RegisterEnum("cosmos_sdk.x.gov.v1.VoteOption", VoteOption_name, VoteOption_value) proto.RegisterEnum("cosmos_sdk.x.gov.v1.ProposalStatus", ProposalStatus_name, ProposalStatus_value) @@ -532,90 +428,86 @@ func init() { proto.RegisterType((*ProposalBase)(nil), "cosmos_sdk.x.gov.v1.ProposalBase") proto.RegisterType((*TallyResult)(nil), "cosmos_sdk.x.gov.v1.TallyResult") proto.RegisterType((*Vote)(nil), "cosmos_sdk.x.gov.v1.Vote") - proto.RegisterType((*BasicProposal)(nil), "cosmos_sdk.x.gov.v1.BasicProposal") - proto.RegisterType((*BasicContent)(nil), "cosmos_sdk.x.gov.v1.BasicContent") } func init() { proto.RegisterFile("x/gov/types/types.proto", fileDescriptor_a5ae5e91b5b3fb03) } var fileDescriptor_a5ae5e91b5b3fb03 = []byte{ - // 1208 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcf, 0x8b, 0xdb, 0x46, - 0x1b, 0x96, 0x6c, 0xef, 0x7a, 0xf3, 0xfa, 0x47, 0x94, 0xd9, 0x7c, 0xc9, 0x22, 0x3e, 0x24, 0xd5, - 0x2d, 0x61, 0x9b, 0x10, 0x6d, 0xb3, 0x39, 0x04, 0x36, 0x50, 0x6a, 0xc5, 0x4a, 0xe2, 0x90, 0xb5, - 0x8d, 0x6c, 0x36, 0xa4, 0x50, 0x84, 0xd6, 0x52, 0xbc, 0x4a, 0x6c, 0x8d, 0xf1, 0x8c, 0xdd, 0xdd, - 0x5b, 0x4e, 0xa5, 0xf5, 0x29, 0x14, 0x0a, 0xbd, 0x18, 0x02, 0xcd, 0x21, 0x94, 0x1e, 0x7a, 0xe8, - 0x5f, 0xd0, 0x53, 0xe8, 0xa5, 0x39, 0x86, 0x52, 0x9c, 0x66, 0x73, 0x2b, 0x3d, 0x05, 0x7a, 0xe9, - 0xa9, 0x68, 0x46, 0xca, 0x6a, 0xc9, 0x26, 0xc4, 0x24, 0xa5, 0xd0, 0xcb, 0xb2, 0x9a, 0x79, 0x9e, - 0x67, 0xde, 0xf7, 0x99, 0x57, 0x8f, 0x76, 0xe1, 0xf8, 0xf6, 0x4a, 0x07, 0x8f, 0x56, 0xe8, 0x4e, - 0xdf, 0x23, 0xfc, 0xa7, 0xde, 0x1f, 0x60, 0x8a, 0xd1, 0x62, 0x1b, 0x93, 0x1e, 0x26, 0x36, 0x71, - 0x6f, 0xe9, 0xdb, 0x7a, 0x07, 0x8f, 0xf4, 0xd1, 0x19, 0xf9, 0xc8, 0x0b, 0x38, 0xf9, 0x04, 0xdd, - 0xf2, 0x07, 0xae, 0xdd, 0x77, 0x06, 0x74, 0x67, 0x85, 0x2d, 0xad, 0x74, 0x70, 0x07, 0xef, 0xfd, - 0x16, 0xe1, 0x4e, 0xbd, 0x88, 0xe3, 0x27, 0x9c, 0x4e, 0x3e, 0x44, 0x60, 0xb5, 0x83, 0x71, 0xa7, - 0xeb, 0x71, 0xdc, 0xe6, 0xf0, 0xc6, 0x0a, 0xf5, 0x7b, 0x1e, 0xa1, 0x4e, 0xaf, 0xcf, 0x01, 0xa5, - 0x3f, 0x45, 0xf8, 0xdf, 0x3a, 0xe9, 0x34, 0x87, 0x9b, 0x3d, 0x9f, 0x36, 0x06, 0xb8, 0x8f, 0x89, - 0xd3, 0x35, 0x1c, 0xe2, 0xa1, 0xcf, 0x44, 0x28, 0xfa, 0x01, 0xf5, 0x9d, 0xae, 0xed, 0x7a, 0x7d, - 0x4c, 0x7c, 0xba, 0x24, 0x6a, 0xe9, 0xe5, 0xdc, 0xea, 0xa2, 0x9e, 0xe8, 0x68, 0x74, 0x46, 0xbf, - 0x80, 0xfd, 0xc0, 0xb8, 0xf2, 0x60, 0xaa, 0x0a, 0xcf, 0xa6, 0xea, 0xb1, 0x1d, 0xa7, 0xd7, 0x5d, - 0x2b, 0xf9, 0x81, 0x9f, 0x64, 0x96, 0xbe, 0x7d, 0xac, 0x2e, 0x77, 0x7c, 0xba, 0x35, 0xdc, 0xd4, - 0xdb, 0xb8, 0x17, 0xd5, 0x18, 0xd7, 0x4d, 0xdc, 0x5b, 0x91, 0x13, 0xa1, 0x14, 0xb1, 0x0a, 0xfc, - 0xd8, 0x0a, 0xe7, 0xa2, 0x75, 0x58, 0xe8, 0xb3, 0xc2, 0xbc, 0xc1, 0x52, 0x4a, 0x13, 0x97, 0xf3, - 0xc6, 0x99, 0xbf, 0xa6, 0xea, 0xe9, 0xd7, 0x90, 0x2b, 0xb7, 0xdb, 0x65, 0xd7, 0x1d, 0x78, 0x84, - 0x58, 0xcf, 0x25, 0xd6, 0x32, 0xb7, 0x7f, 0xd5, 0xc4, 0xd2, 0x97, 0x29, 0x80, 0x75, 0xd2, 0x89, - 0xcf, 0x68, 0x41, 0xae, 0x1f, 0x35, 0x6f, 0xfb, 0xee, 0x92, 0xa8, 0x89, 0xcb, 0x19, 0xe3, 0xec, - 0xee, 0x54, 0x85, 0xd8, 0x93, 0x6a, 0xe5, 0xf7, 0xa9, 0x9a, 0x04, 0x3d, 0x9b, 0xaa, 0x88, 0x37, - 0x9b, 0x58, 0x2c, 0x59, 0x10, 0x3f, 0x55, 0x5d, 0x54, 0x87, 0x43, 0x91, 0x01, 0xf8, 0x0d, 0x4a, - 0xdf, 0xd3, 0x40, 0x9f, 0xc0, 0xbc, 0xd3, 0xc3, 0xc3, 0x80, 0x2e, 0xa5, 0x5f, 0x7e, 0x15, 0x1f, - 0x84, 0x57, 0x31, 0x93, 0xe1, 0x91, 0x68, 0xe9, 0x89, 0x08, 0xd9, 0x75, 0xd2, 0xd9, 0xc0, 0xd4, - 0xfb, 0x87, 0x1c, 0xb9, 0x04, 0x73, 0x23, 0x4c, 0xdf, 0xe4, 0x22, 0x39, 0x1f, 0x9d, 0x83, 0x79, - 0xdc, 0xa7, 0x3e, 0x0e, 0x96, 0xd2, 0x9a, 0xb8, 0x5c, 0x5c, 0x55, 0xf5, 0x03, 0x5e, 0x33, 0x3d, - 0xec, 0xa4, 0xce, 0x60, 0x56, 0x04, 0x2f, 0x5d, 0x84, 0x7c, 0xcb, 0xdb, 0x7e, 0x3e, 0xea, 0xe8, - 0x28, 0xcc, 0x51, 0x9f, 0x76, 0x3d, 0xd6, 0xe1, 0x21, 0x8b, 0x3f, 0x20, 0x0d, 0x72, 0xae, 0x47, - 0xda, 0x03, 0x9f, 0x9f, 0x91, 0x62, 0x7b, 0xc9, 0xa5, 0xd2, 0xed, 0x14, 0x64, 0xe3, 0xe9, 0x31, - 0x0f, 0xf2, 0xea, 0xbd, 0xfd, 0x5e, 0xfd, 0x07, 0xc7, 0xe5, 0xab, 0x39, 0xc8, 0xef, 0x8b, 0x8c, - 0xb7, 0xe4, 0xc3, 0x79, 0x98, 0x27, 0xd4, 0xa1, 0x43, 0xc2, 0x4c, 0x28, 0xae, 0xbe, 0x7b, 0xe0, - 0xdd, 0xc6, 0x92, 0x4d, 0x06, 0xb5, 0x22, 0x0a, 0x6a, 0x01, 0xba, 0xe1, 0x07, 0x4e, 0xd7, 0xa6, - 0x4e, 0xb7, 0xbb, 0x63, 0x0f, 0x3c, 0x32, 0xec, 0x52, 0x36, 0x24, 0xb9, 0x55, 0xed, 0x40, 0xa1, - 0x56, 0x08, 0xb4, 0x18, 0xce, 0xc8, 0x84, 0x66, 0x58, 0x12, 0x53, 0x48, 0xac, 0x87, 0x9d, 0x11, - 0x16, 0x91, 0x76, 0x18, 0xa0, 0x4b, 0x19, 0x26, 0x27, 0xeb, 0x3c, 0x5d, 0xf5, 0x38, 0x5d, 0xf5, - 0x56, 0x9c, 0xae, 0xc6, 0x42, 0x28, 0x74, 0xe7, 0xb1, 0x2a, 0x5a, 0xc0, 0x89, 0xe1, 0x16, 0xaa, - 0x81, 0x14, 0xdd, 0x8e, 0xed, 0x05, 0x2e, 0xd7, 0x9a, 0x9b, 0x41, 0xab, 0x18, 0xb1, 0xcd, 0xc0, - 0x65, 0x7a, 0x37, 0xa1, 0x40, 0x31, 0x4d, 0x24, 0xf4, 0xfc, 0xdb, 0xbc, 0xe7, 0x3c, 0xd3, 0x8e, - 0x87, 0xbc, 0x01, 0x47, 0x46, 0x98, 0xfa, 0x41, 0xc7, 0x26, 0xd4, 0x19, 0x44, 0x46, 0x64, 0x67, - 0x28, 0xfe, 0x30, 0xa7, 0x37, 0x43, 0x36, 0xab, 0xfe, 0x2a, 0x44, 0x4b, 0x7b, 0x66, 0x2c, 0xcc, - 0xa0, 0x57, 0xe0, 0xe4, 0xc8, 0x8b, 0xb5, 0x85, 0xaf, 0xef, 0xaa, 0xe2, 0xfd, 0xbb, 0xaa, 0x58, - 0xfa, 0x31, 0x05, 0xb9, 0xe4, 0xe5, 0x7d, 0x04, 0xe9, 0x1d, 0x8f, 0xb0, 0x71, 0xcc, 0x1b, 0x7a, - 0xc8, 0xff, 0x65, 0xaa, 0x9e, 0x78, 0x0d, 0x1b, 0xaa, 0x01, 0xb5, 0x42, 0x2a, 0xba, 0x0c, 0x59, - 0x67, 0x93, 0x50, 0xc7, 0x0f, 0xa2, 0xf7, 0x72, 0x56, 0x95, 0x98, 0x8e, 0x3e, 0x84, 0x54, 0x80, - 0xd9, 0x38, 0xce, 0x2e, 0x92, 0x0a, 0x30, 0xea, 0x40, 0x3e, 0xc0, 0xf6, 0xa7, 0x3e, 0xdd, 0xb2, - 0x47, 0x1e, 0xc5, 0x6c, 0x12, 0xf3, 0x86, 0x39, 0x9b, 0xd2, 0xb3, 0xa9, 0xba, 0xc8, 0xdf, 0xc1, - 0xa4, 0x56, 0xc9, 0x82, 0x00, 0x5f, 0xf3, 0xe9, 0xd6, 0x46, 0xf8, 0xf0, 0xb3, 0x08, 0x19, 0xf6, - 0x21, 0x78, 0x4b, 0x2f, 0xf5, 0xbf, 0x9f, 0xfc, 0x5f, 0x88, 0x50, 0x30, 0x1c, 0xe2, 0xb7, 0x9f, - 0x67, 0xff, 0x79, 0xc8, 0x6c, 0x3a, 0x84, 0x47, 0x7f, 0x6e, 0xf5, 0x9d, 0x57, 0xc6, 0x4c, 0x18, - 0x70, 0x46, 0xe6, 0xe1, 0x54, 0x15, 0x2d, 0x46, 0x42, 0xe7, 0x21, 0xdb, 0xc6, 0x01, 0xf5, 0x02, - 0xca, 0x5a, 0x7a, 0x19, 0x9f, 0x9d, 0x78, 0x81, 0x03, 0xad, 0x98, 0x51, 0xb2, 0x21, 0x9f, 0xdc, - 0x40, 0xe7, 0x20, 0x43, 0xbd, 0x6d, 0xfa, 0xca, 0x4a, 0x92, 0x9f, 0xad, 0xcb, 0x82, 0xc5, 0x08, - 0x6b, 0x87, 0xc3, 0xbf, 0x66, 0x7e, 0xfa, 0xe1, 0x74, 0x36, 0x52, 0x32, 0xe6, 0x20, 0x4d, 0x86, - 0xbd, 0x93, 0xdf, 0x89, 0x00, 0x7b, 0x1e, 0x20, 0x19, 0xe6, 0xcc, 0xf5, 0x46, 0xeb, 0xba, 0x24, - 0xc8, 0x87, 0xc7, 0x13, 0x2d, 0xc7, 0x97, 0xcd, 0x5e, 0x9f, 0xee, 0xa0, 0x63, 0x90, 0xbe, 0x6e, - 0x36, 0x25, 0x51, 0x2e, 0x8c, 0x27, 0xda, 0x21, 0xbe, 0x73, 0xdd, 0x23, 0x48, 0x81, 0x6c, 0xd9, - 0x68, 0xb6, 0xca, 0xd5, 0x9a, 0x94, 0x92, 0x8f, 0x8c, 0x27, 0x5a, 0x81, 0xef, 0x95, 0xa3, 0x51, - 0x3e, 0x0a, 0xa9, 0x5a, 0x5d, 0x4a, 0xcb, 0xf9, 0xf1, 0x44, 0x5b, 0xe0, 0x5b, 0x35, 0x8c, 0x4e, - 0x40, 0xbe, 0x56, 0xb7, 0xaf, 0x55, 0x5b, 0x97, 0xed, 0x0d, 0xb3, 0x55, 0x97, 0x32, 0xf2, 0xd1, - 0xf1, 0x44, 0x93, 0xe2, 0xfd, 0x78, 0xbe, 0xe4, 0xfc, 0xe7, 0xdf, 0x28, 0xc2, 0xfd, 0x7b, 0x8a, - 0xf0, 0xfd, 0x3d, 0x45, 0x38, 0xf9, 0x87, 0x08, 0xc5, 0xfd, 0x81, 0x1e, 0x96, 0x55, 0xab, 0x5e, - 0x95, 0x04, 0x5e, 0x16, 0x5f, 0xac, 0xf9, 0x5d, 0x74, 0x0a, 0x8a, 0x15, 0xb3, 0x51, 0x6f, 0x56, - 0x5b, 0x76, 0xc3, 0xb4, 0xaa, 0xf5, 0x8a, 0x24, 0xca, 0xc7, 0xc7, 0x13, 0x6d, 0x91, 0x43, 0xa2, - 0xb8, 0x6a, 0x78, 0x03, 0x1f, 0xbb, 0xe8, 0x7d, 0x28, 0x6c, 0xd4, 0x5b, 0xd5, 0xda, 0xa5, 0x18, - 0x9b, 0x92, 0x8f, 0x8d, 0x27, 0x1a, 0xe2, 0xd8, 0x0d, 0x16, 0x20, 0x11, 0xf4, 0xff, 0x30, 0xdf, - 0x28, 0x37, 0x9b, 0x66, 0x45, 0x4a, 0xcb, 0xd2, 0x78, 0xa2, 0xe5, 0x39, 0xa6, 0xe1, 0x10, 0xe2, - 0xb9, 0x48, 0x83, 0x05, 0xcb, 0xbc, 0x62, 0x5e, 0x68, 0x99, 0x15, 0x29, 0x23, 0xa3, 0xf1, 0x44, - 0x2b, 0x46, 0x1f, 0x1e, 0xef, 0xa6, 0xd7, 0xa6, 0x1e, 0xe3, 0x5f, 0x2c, 0x57, 0xaf, 0x9a, 0x15, - 0x69, 0x2e, 0xc9, 0xbf, 0xe8, 0xf8, 0x5d, 0xcf, 0xdd, 0xdf, 0xae, 0x51, 0x7b, 0xf0, 0x44, 0x11, - 0x1e, 0x3d, 0x51, 0x84, 0xdb, 0xbb, 0x8a, 0xf0, 0x60, 0x57, 0x11, 0x1f, 0xee, 0x2a, 0xe2, 0x6f, - 0xbb, 0x8a, 0x78, 0xe7, 0xa9, 0x22, 0x3c, 0x7c, 0xaa, 0x08, 0x8f, 0x9e, 0x2a, 0xc2, 0xc7, 0xaf, - 0x4e, 0xea, 0xc4, 0xff, 0x1b, 0x9b, 0xf3, 0x2c, 0x28, 0xcf, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, - 0xaa, 0x0c, 0xd1, 0xcc, 0x85, 0x0c, 0x00, 0x00, + // 1181 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xc1, 0x6f, 0xd3, 0x56, + 0x18, 0xb7, 0x93, 0x36, 0x6d, 0x5f, 0xd2, 0x60, 0x5e, 0x3b, 0xc8, 0xac, 0xc9, 0x36, 0x06, 0xa1, + 0x8e, 0x09, 0x67, 0x94, 0xc3, 0x24, 0x0e, 0xd3, 0x62, 0x62, 0x20, 0x88, 0x26, 0x91, 0x13, 0x15, + 0xb1, 0x69, 0xb2, 0xdc, 0xd8, 0xb8, 0x1e, 0x8e, 0x5f, 0x96, 0xf7, 0x92, 0x91, 0x1b, 0xda, 0x61, + 0x9a, 0x72, 0x42, 0x3b, 0xed, 0x12, 0x09, 0x69, 0x1c, 0xd0, 0xb4, 0xc3, 0xfe, 0x86, 0x9d, 0x90, + 0x76, 0x18, 0x47, 0x34, 0x4d, 0x61, 0x94, 0xdb, 0xb4, 0x13, 0xd2, 0x2e, 0x3b, 0x4d, 0xf6, 0x7b, + 0xa6, 0x0e, 0x2d, 0x83, 0x8a, 0x4d, 0x93, 0x76, 0x69, 0xeb, 0xef, 0x7d, 0xdf, 0xef, 0xf7, 0xbe, + 0xdf, 0xfb, 0xde, 0xef, 0xa9, 0xe0, 0xe8, 0xcd, 0xb2, 0x87, 0x86, 0x65, 0x32, 0xea, 0xb9, 0x98, + 0xfe, 0xd4, 0x7a, 0x7d, 0x44, 0x10, 0x5c, 0xe9, 0x20, 0xdc, 0x45, 0xd8, 0xc2, 0xce, 0x0d, 0xed, + 0xa6, 0xe6, 0xa1, 0xa1, 0x36, 0x3c, 0x23, 0x1e, 0xde, 0x93, 0x27, 0x9e, 0x24, 0xdb, 0x7e, 0xdf, + 0xb1, 0x7a, 0x76, 0x9f, 0x8c, 0xca, 0x71, 0xa8, 0xec, 0x21, 0x0f, 0xed, 0xfe, 0xc5, 0xf2, 0x64, + 0x0f, 0x21, 0x2f, 0x70, 0x69, 0xca, 0xd6, 0xe0, 0x7a, 0x99, 0xf8, 0x5d, 0x17, 0x13, 0xbb, 0xdb, + 0xa3, 0x09, 0xea, 0x1f, 0x3c, 0x78, 0x63, 0x03, 0x7b, 0xad, 0xc1, 0x56, 0xd7, 0x27, 0xcd, 0x3e, + 0xea, 0x21, 0x6c, 0x07, 0xba, 0x8d, 0x5d, 0xf8, 0x05, 0x0f, 0x8a, 0x7e, 0x48, 0x7c, 0x3b, 0xb0, + 0x1c, 0xb7, 0x87, 0xb0, 0x4f, 0x4a, 0xbc, 0x92, 0x5d, 0xcb, 0xaf, 0xaf, 0x68, 0xa9, 0x4d, 0x0e, + 0xcf, 0x68, 0xe7, 0x91, 0x1f, 0xea, 0x97, 0xef, 0x4f, 0x65, 0xee, 0xe9, 0x54, 0x3e, 0x32, 0xb2, + 0xbb, 0xc1, 0x39, 0xd5, 0x0f, 0xfd, 0x74, 0xa5, 0xfa, 0xed, 0x23, 0x79, 0xcd, 0xf3, 0xc9, 0xf6, + 0x60, 0x4b, 0xeb, 0xa0, 0x6e, 0x99, 0x02, 0xb0, 0x5f, 0xa7, 0xb1, 0x73, 0x83, 0x35, 0x17, 0x41, + 0x61, 0x73, 0x99, 0xd2, 0x56, 0x69, 0x2d, 0xdc, 0x00, 0x8b, 0xbd, 0x78, 0x63, 0x6e, 0xbf, 0x94, + 0x51, 0xf8, 0xb5, 0x82, 0x7e, 0xe6, 0xcf, 0xa9, 0x7c, 0xfa, 0x15, 0xe0, 0x2a, 0x9d, 0x4e, 0xc5, + 0x71, 0xfa, 0x2e, 0xc6, 0xe6, 0x33, 0x88, 0x73, 0x73, 0xb7, 0x7e, 0x51, 0x78, 0xf5, 0xab, 0x0c, + 0x00, 0x1b, 0xd8, 0x4b, 0x38, 0xda, 0x20, 0xdf, 0x63, 0xcd, 0x5b, 0xbe, 0x53, 0xe2, 0x15, 0x7e, + 0x6d, 0x4e, 0x3f, 0xbb, 0x33, 0x95, 0x41, 0xa2, 0x49, 0xad, 0xfa, 0xdb, 0x54, 0x4e, 0x27, 0x3d, + 0x9d, 0xca, 0x90, 0x36, 0x9b, 0x0a, 0xaa, 0x26, 0x48, 0xbe, 0x6a, 0x0e, 0x6c, 0x80, 0x25, 0x26, + 0x00, 0x7a, 0x8d, 0xad, 0xef, 0x62, 0xc0, 0x8f, 0x41, 0xce, 0xee, 0xa2, 0x41, 0x48, 0x4a, 0xd9, + 0x17, 0x1f, 0xc5, 0xbb, 0xd1, 0x51, 0x1c, 0x48, 0x70, 0x06, 0xaa, 0x3e, 0xe6, 0xc1, 0xc2, 0x06, + 0xf6, 0x36, 0x11, 0x71, 0xff, 0x25, 0x45, 0x2e, 0x82, 0xf9, 0x21, 0x22, 0xaf, 0x73, 0x90, 0xb4, + 0x1e, 0xbe, 0x07, 0x72, 0xa8, 0x47, 0x7c, 0x14, 0x96, 0xb2, 0x0a, 0xbf, 0x56, 0x5c, 0x97, 0xb5, + 0x7d, 0x6e, 0x8e, 0x16, 0x75, 0xd2, 0x88, 0xd3, 0x4c, 0x96, 0xae, 0x5e, 0x00, 0x85, 0xb6, 0x7b, + 0xf3, 0xd9, 0xa8, 0xc3, 0x55, 0x30, 0x4f, 0x7c, 0x12, 0xb8, 0x71, 0x87, 0x4b, 0x26, 0xfd, 0x80, + 0x0a, 0xc8, 0x3b, 0x2e, 0xee, 0xf4, 0x7d, 0xca, 0x91, 0x89, 0xd7, 0xd2, 0x21, 0xf5, 0x56, 0x06, + 0x2c, 0x24, 0xd3, 0x63, 0xec, 0xa7, 0xd5, 0x89, 0x59, 0xad, 0xfe, 0x87, 0xe3, 0xf2, 0x63, 0x0e, + 0x14, 0x66, 0x2c, 0x43, 0xdf, 0x4f, 0x87, 0x63, 0x7b, 0x66, 0x26, 0x13, 0x8f, 0xca, 0x12, 0x73, + 0x8a, 0xe7, 0x44, 0xb8, 0x0a, 0x72, 0x98, 0xd8, 0x64, 0x80, 0x63, 0x05, 0x8a, 0xeb, 0xc7, 0xf7, + 0x3d, 0xd8, 0x04, 0xaf, 0x15, 0xa7, 0xea, 0xe2, 0xae, 0xf3, 0x3c, 0xdb, 0x00, 0x45, 0x51, 0x4d, + 0x06, 0x07, 0x3f, 0x05, 0xf0, 0xba, 0x1f, 0xda, 0x81, 0x45, 0xec, 0x20, 0x18, 0x59, 0x7d, 0x17, + 0x0f, 0x02, 0x12, 0x4f, 0x4f, 0x7e, 0x5d, 0xd9, 0x97, 0xa4, 0x1d, 0x25, 0x9a, 0x71, 0x9e, 0x7e, + 0x8c, 0xf9, 0xdb, 0x9b, 0x94, 0x65, 0x2f, 0x92, 0x6a, 0x0a, 0x71, 0x30, 0x55, 0x04, 0x3f, 0x02, + 0x79, 0x1c, 0x1b, 0xab, 0x15, 0xd9, 0x6e, 0x69, 0x2e, 0xe6, 0x12, 0x35, 0xea, 0xc9, 0x5a, 0xe2, + 0xc9, 0x5a, 0x3b, 0xf1, 0x64, 0x5d, 0x62, 0x2c, 0x6c, 0x52, 0x52, 0xc5, 0xea, 0xed, 0x47, 0x32, + 0x6f, 0x02, 0x1a, 0x89, 0x0a, 0xa0, 0x0f, 0x04, 0x76, 0xd2, 0x96, 0x1b, 0x3a, 0x94, 0x61, 0xfe, + 0xa5, 0x0c, 0xc7, 0x19, 0xc3, 0x51, 0xca, 0xf0, 0x3c, 0x02, 0xa5, 0x29, 0xb2, 0xb0, 0x11, 0x3a, + 0x31, 0xd5, 0xe7, 0x3c, 0x58, 0x26, 0x88, 0xa4, 0x5e, 0x82, 0xdc, 0x8b, 0xe7, 0xe9, 0x12, 0x63, + 0x58, 0xa5, 0x0c, 0x33, 0x75, 0x07, 0x7b, 0x07, 0x0a, 0x71, 0x6d, 0x72, 0xc9, 0x02, 0x70, 0x78, + 0x88, 0x88, 0x1f, 0x7a, 0xd1, 0xc9, 0xf6, 0x99, 0xa4, 0x0b, 0x2f, 0x6d, 0xf8, 0x04, 0xdb, 0x4e, + 0x89, 0x6e, 0x67, 0x0f, 0x04, 0xed, 0xf8, 0x10, 0x8d, 0xb7, 0xa2, 0x70, 0xdc, 0xf2, 0x75, 0xc0, + 0x42, 0xbb, 0xe2, 0x2e, 0xbe, 0x94, 0x4b, 0x9d, 0x7d, 0x04, 0x9f, 0x03, 0xa0, 0x4c, 0xcb, 0x34, + 0xca, 0xa4, 0x3d, 0xb7, 0xf8, 0xf5, 0x1d, 0x99, 0xbf, 0x77, 0x47, 0xe6, 0xd5, 0x1f, 0x32, 0x20, + 0x9f, 0x1e, 0x9e, 0x0f, 0x40, 0x76, 0xe4, 0x62, 0x6a, 0x4b, 0xba, 0x16, 0x21, 0xff, 0x3c, 0x95, + 0x4f, 0xbe, 0x82, 0x78, 0xb5, 0x90, 0x98, 0x51, 0x29, 0xbc, 0x04, 0x16, 0xec, 0x2d, 0x4c, 0x6c, + 0x9f, 0x19, 0xd8, 0x81, 0x51, 0x92, 0x72, 0xf8, 0x3e, 0xc8, 0x84, 0x28, 0xbe, 0x2b, 0x07, 0x07, + 0xc9, 0x84, 0x08, 0x7a, 0xa0, 0x10, 0x22, 0xeb, 0x33, 0x9f, 0x6c, 0x5b, 0x43, 0x97, 0xa0, 0xf8, + 0x26, 0x2c, 0xe9, 0xc6, 0xc1, 0x90, 0x9e, 0x4e, 0xe5, 0x15, 0x2a, 0x6c, 0x1a, 0x4b, 0x35, 0x41, + 0x88, 0xae, 0xfa, 0x64, 0x7b, 0x33, 0xfa, 0xf8, 0x89, 0x07, 0x73, 0xf1, 0xf3, 0xf5, 0x0f, 0x59, + 0xf2, 0x7f, 0xfe, 0x5e, 0x9d, 0xfa, 0x8e, 0x07, 0x60, 0x37, 0x0c, 0x45, 0x30, 0x6f, 0x6c, 0x34, + 0xdb, 0xd7, 0x04, 0x4e, 0x3c, 0x34, 0x9e, 0x28, 0x79, 0x1a, 0x36, 0xba, 0x3d, 0x32, 0x82, 0x47, + 0x40, 0xf6, 0x9a, 0xd1, 0x12, 0x78, 0x71, 0x79, 0x3c, 0x51, 0x96, 0xe8, 0xca, 0x35, 0x17, 0x43, + 0x09, 0x2c, 0x54, 0xf4, 0x56, 0xbb, 0x52, 0xab, 0x0b, 0x19, 0xf1, 0xf0, 0x78, 0xa2, 0x2c, 0xd3, + 0xb5, 0x0a, 0x3b, 0xdd, 0x55, 0x90, 0xa9, 0x37, 0x84, 0xac, 0x58, 0x18, 0x4f, 0x94, 0x45, 0xba, + 0x54, 0x47, 0xf0, 0x24, 0x28, 0xd4, 0x1b, 0xd6, 0xd5, 0x5a, 0xfb, 0x92, 0xb5, 0x69, 0xb4, 0x1b, + 0xc2, 0x9c, 0xb8, 0x3a, 0x9e, 0x28, 0x42, 0xb2, 0x9e, 0x48, 0x2e, 0x16, 0xbe, 0xfc, 0x46, 0xe2, + 0xee, 0xdd, 0x95, 0xb8, 0xef, 0xef, 0x4a, 0xdc, 0xa9, 0xdf, 0x79, 0x50, 0x9c, 0x35, 0xe7, 0x68, + 0x5b, 0xf5, 0xda, 0x15, 0x81, 0xa3, 0xdb, 0xa2, 0xc1, 0xba, 0x1f, 0xc0, 0x77, 0x40, 0xb1, 0x6a, + 0x34, 0x1b, 0xad, 0x5a, 0xdb, 0x6a, 0x1a, 0x66, 0xad, 0x51, 0x15, 0x78, 0xf1, 0xe8, 0x78, 0xa2, + 0xac, 0xd0, 0x14, 0x76, 0xef, 0x9b, 0x6e, 0xdf, 0x47, 0x0e, 0x7c, 0x1b, 0x2c, 0x6f, 0x36, 0xda, + 0xb5, 0xfa, 0xc5, 0x24, 0x37, 0x23, 0x1e, 0x19, 0x4f, 0x14, 0x48, 0x73, 0x37, 0xe3, 0x3b, 0xc5, + 0x52, 0xdf, 0x02, 0xb9, 0x66, 0xa5, 0xd5, 0x32, 0xaa, 0x42, 0x56, 0x14, 0xc6, 0x13, 0xa5, 0x40, + 0x73, 0x9a, 0x36, 0xc6, 0xae, 0x03, 0x15, 0xb0, 0x68, 0x1a, 0x97, 0x8d, 0xf3, 0x6d, 0xa3, 0x2a, + 0xcc, 0x89, 0x70, 0x3c, 0x51, 0x8a, 0x74, 0xdd, 0x74, 0x3f, 0x71, 0x3b, 0xc4, 0x8d, 0xeb, 0x2f, + 0x54, 0x6a, 0x57, 0x8c, 0xaa, 0x30, 0x9f, 0xae, 0xbf, 0x60, 0xfb, 0x81, 0xeb, 0xcc, 0xb6, 0xab, + 0xd7, 0xef, 0x3f, 0x96, 0xb8, 0x87, 0x8f, 0x25, 0xee, 0xd6, 0x8e, 0xc4, 0xdd, 0xdf, 0x91, 0xf8, + 0x07, 0x3b, 0x12, 0xff, 0xeb, 0x8e, 0xc4, 0xdf, 0x7e, 0x22, 0x71, 0x0f, 0x9e, 0x48, 0xdc, 0xc3, + 0x27, 0x12, 0xf7, 0xe1, 0xdf, 0x5b, 0x5e, 0xea, 0x7f, 0x81, 0xad, 0x5c, 0xec, 0x2a, 0x67, 0xff, + 0x0a, 0x00, 0x00, 0xff, 0xff, 0x48, 0xe7, 0x6e, 0x7f, 0x21, 0x0c, 0x00, 0x00, } type ProposalBaseFace interface { @@ -683,29 +575,6 @@ func NewProposalBaseFromFace(that ProposalBaseFace) *ProposalBase { return this } -func (this *BasicContent) GetContent() Content { - if x := this.GetText(); x != nil { - return x - } - return nil -} - -func (this *BasicContent) SetContent(value Content) error { - if value == nil { - this.Sum = nil - return nil - } - switch vt := value.(type) { - case *TextProposal: - this.Sum = &BasicContent_Text{vt} - return nil - case TextProposal: - this.Sum = &BasicContent_Text{&vt} - return nil - } - return fmt.Errorf("can't encode value of type %T as message BasicContent", value) -} - func (m *MsgSubmitProposalBase) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1117,106 +986,6 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *BasicProposal) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *BasicProposal) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *BasicProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Content != nil { - { - size, err := m.Content.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ProposalBase != nil { - { - size, err := m.ProposalBase.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *BasicContent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *BasicContent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *BasicContent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Sum != nil { - { - size := m.Sum.Size() - i -= size - if _, err := m.Sum.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - return len(dAtA) - i, nil -} - -func (m *BasicContent_Text) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *BasicContent_Text) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Text != nil { - { - size, err := m.Text.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { offset -= sovTypes(v) base := offset @@ -1394,48 +1163,6 @@ func (m *Vote) Size() (n int) { return n } -func (m *BasicProposal) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ProposalBase != nil { - l = m.ProposalBase.Size() - n += 1 + l + sovTypes(uint64(l)) - } - if m.Content != nil { - l = m.Content.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - -func (m *BasicContent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Sum != nil { - n += m.Sum.Size() - } - return n -} - -func (m *BasicContent_Text) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Text != nil { - l = m.Text.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - func sovTypes(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1458,26 +1185,6 @@ func (this *MsgSubmitProposalBase) String() string { }, "") return s } -func (this *BasicContent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&BasicContent{`, - `Sum:` + fmt.Sprintf("%v", this.Sum) + `,`, - `}`, - }, "") - return s -} -func (this *BasicContent_Text) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&BasicContent_Text{`, - `Text:` + strings.Replace(fmt.Sprintf("%v", this.Text), "TextProposal", "TextProposal", 1) + `,`, - `}`, - }, "") - return s -} func valueToStringTypes(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -2452,7 +2159,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Yes", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -2462,15 +2169,16 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTypes } @@ -2485,7 +2193,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Abstain", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -2495,15 +2203,16 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTypes } @@ -2518,7 +2227,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field No", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -2528,15 +2237,16 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTypes } @@ -2551,7 +2261,7 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field NoWithVeto", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -2561,15 +2271,16 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTypes } @@ -2729,219 +2440,6 @@ func (m *Vote) Unmarshal(dAtA []byte) error { } return nil } -func (m *BasicProposal) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: BasicProposal: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BasicProposal: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProposalBase", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ProposalBase == nil { - m.ProposalBase = &ProposalBase{} - } - if err := m.ProposalBase.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Content", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Content == nil { - m.Content = &BasicContent{} - } - if err := m.Content.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *BasicContent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: BasicContent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BasicContent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Text", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &TextProposal{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Sum = &BasicContent_Text{v} - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipTypes(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/types.proto b/x/gov/types/types.proto index 967b847d5..d590397ca 100644 --- a/x/gov/types/types.proto +++ b/x/gov/types/types.proto @@ -3,131 +3,146 @@ package cosmos_sdk.x.gov.v1; import "types/types.proto"; import "third_party/proto/gogoproto/gogo.proto"; -import "third_party/proto/cosmos-proto/cosmos.proto"; +// import "third_party/proto/cosmos-proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.stringer_all) = false; -option (gogoproto.goproto_getters_all) = false; +option (gogoproto.stringer_all) = false; +option (gogoproto.goproto_getters_all) = false; message MsgSubmitProposalBase { - option (gogoproto.stringer) = true; - repeated cosmos_sdk.v1.Coin intial_deposit = 1 [(gogoproto.nullable) = false - ,(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ,(gogoproto.moretags) = "yaml:\"initial_deposit\""]; - bytes proposer = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; + option (gogoproto.stringer) = true; + + repeated cosmos_sdk.v1.Coin intial_deposit = 1 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (gogoproto.moretags) = "yaml:\"initial_deposit\"" + ]; + bytes proposer = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; } // MsgDeposit defines a message to submit a deposit to an existing proposal message MsgDeposit { - uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID" - ,(gogoproto.moretags) = "yaml:\"proposal_id\"" - ,(gogoproto.jsontag) = "proposal_id"]; - bytes depositor = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - repeated cosmos_sdk.v1.Coin amount = 3 [(gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + uint64 proposal_id = 1 [ + (gogoproto.customname) = "ProposalID", + (gogoproto.moretags) = "yaml:\"proposal_id\"", + (gogoproto.jsontag) = "proposal_id" + ]; + bytes depositor = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; + repeated cosmos_sdk.v1.Coin amount = 3 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } // VoteOption defines a vote option enum VoteOption { - option (gogoproto.enum_stringer) = false; - option (gogoproto.goproto_enum_stringer) = false; - option (gogoproto.goproto_enum_prefix) = false; - EMPTY = 0 [(gogoproto.enumvalue_customname) = "OptionEmpty"]; - YES = 1 [(gogoproto.enumvalue_customname) = "OptionYes"]; - ABSTAIN = 2 [(gogoproto.enumvalue_customname) = "OptionAbstain"]; - NO = 3 [(gogoproto.enumvalue_customname) = "OptionNo"]; - NO_WITH_VETO = 4 [(gogoproto.enumvalue_customname) = "OptionNoWithVeto"]; + option (gogoproto.enum_stringer) = false; + option (gogoproto.goproto_enum_stringer) = false; + option (gogoproto.goproto_enum_prefix) = false; + + EMPTY = 0 [(gogoproto.enumvalue_customname) = "OptionEmpty"]; + YES = 1 [(gogoproto.enumvalue_customname) = "OptionYes"]; + ABSTAIN = 2 [(gogoproto.enumvalue_customname) = "OptionAbstain"]; + NO = 3 [(gogoproto.enumvalue_customname) = "OptionNo"]; + NO_WITH_VETO = 4 [(gogoproto.enumvalue_customname) = "OptionNoWithVeto"]; } // MsgVote defines a message to cast a vote message MsgVote { - uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID" - ,(gogoproto.moretags) = "yaml:\"proposal_id\"" - ,(gogoproto.jsontag) = "proposal_id"]; - bytes voter = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - VoteOption option = 3; + uint64 proposal_id = 1 [ + (gogoproto.customname) = "ProposalID", + (gogoproto.moretags) = "yaml:\"proposal_id\"", + (gogoproto.jsontag) = "proposal_id" + ]; + bytes voter = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; + VoteOption option = 3; } // TextProposal defines a standard text proposal whose changes need to be // manually updated in case of approval message TextProposal { - string title = 1; - string description = 2; + string title = 1; + string description = 2; } // Deposit defines an amount deposited by an account address to an active proposal message Deposit { - uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID" - ,(gogoproto.moretags) = "yaml:\"proposal_id\""]; - bytes depositor = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - repeated cosmos_sdk.v1.Coin amount = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID", (gogoproto.moretags) = "yaml:\"proposal_id\""]; + bytes depositor = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; + repeated cosmos_sdk.v1.Coin amount = 3 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } +// ProposalBase defines the core field members of a governance proposal. It includes +// all static fields (i.e fields excluding the dynamic Content). A full proposal +// extends the ProposalBase with Content. message ProposalBase { - option (gogoproto.goproto_stringer) = true; - option (gogoproto.face) = true; - uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID" - ,(gogoproto.moretags) = "yaml:\"id\""]; - ProposalStatus status = 2 [(gogoproto.moretags) = "yaml:\"proposal_status\""]; - TallyResult final_tally_result = 3 [(gogoproto.nullable) = false - ,(gogoproto.moretags) = "yaml:\"final_tally_result\""]; - google.protobuf.Timestamp submit_time = 4 [(gogoproto.stdtime) = true - ,(gogoproto.nullable) = false - ,(gogoproto.moretags) = "yaml:\"submit_time\""]; - google.protobuf.Timestamp deposit_end_time = 5 [(gogoproto.stdtime) = true - ,(gogoproto.nullable) = false - ,(gogoproto.moretags) = "yaml:\"deposit_end_time\""]; - repeated cosmos_sdk.v1.Coin total_deposit = 6 [(gogoproto.nullable) = false - ,(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ,(gogoproto.moretags) = "yaml:\"total_deposit\""]; - google.protobuf.Timestamp voting_start_time = 7 [(gogoproto.stdtime) = true - ,(gogoproto.nullable) = false - ,(gogoproto.moretags) = "yaml:\"voting_start_time\""]; - google.protobuf.Timestamp voting_end_time = 8 [(gogoproto.stdtime) = true - ,(gogoproto.nullable) = false - ,(gogoproto.moretags) = "yaml:\"voting_end_time\""]; + option (gogoproto.goproto_stringer) = true; + option (gogoproto.face) = true; + + uint64 proposal_id = 1 + [(gogoproto.customname) = "ProposalID", (gogoproto.jsontag) = "id", (gogoproto.moretags) = "yaml:\"id\""]; + ProposalStatus status = 2 [(gogoproto.moretags) = "yaml:\"proposal_status\""]; + TallyResult final_tally_result = 3 + [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"final_tally_result\""]; + google.protobuf.Timestamp submit_time = 4 + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"submit_time\""]; + google.protobuf.Timestamp deposit_end_time = 5 + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"deposit_end_time\""]; + repeated cosmos_sdk.v1.Coin total_deposit = 6 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (gogoproto.moretags) = "yaml:\"total_deposit\"" + ]; + google.protobuf.Timestamp voting_start_time = 7 + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_start_time\""]; + google.protobuf.Timestamp voting_end_time = 8 + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_end_time\""]; } // ProposalStatus is a type alias that represents a proposal status as a byte enum ProposalStatus { - option (gogoproto.enum_stringer) = false; - option (gogoproto.goproto_enum_stringer) = false; - option (gogoproto.goproto_enum_prefix) = false; - NIL = 0 [(gogoproto.enumvalue_customname) = "StatusNil"]; - DEPOSIT_PERIOD = 1 [(gogoproto.enumvalue_customname) = "StatusDepositPeriod"]; - VOTING_PERIOD = 2 [(gogoproto.enumvalue_customname) = "StatusVotingPeriod"]; - PASSED = 3 [(gogoproto.enumvalue_customname) = "StatusPassed"]; - REJECTED = 4 [(gogoproto.enumvalue_customname) = "StatusRejected"]; - FAILED = 5 [(gogoproto.enumvalue_customname) = "StatusFailed"]; + option (gogoproto.enum_stringer) = false; + option (gogoproto.goproto_enum_stringer) = false; + option (gogoproto.goproto_enum_prefix) = false; + + NIL = 0 [(gogoproto.enumvalue_customname) = "StatusNil"]; + DEPOSIT_PERIOD = 1 [(gogoproto.enumvalue_customname) = "StatusDepositPeriod"]; + VOTING_PERIOD = 2 [(gogoproto.enumvalue_customname) = "StatusVotingPeriod"]; + PASSED = 3 [(gogoproto.enumvalue_customname) = "StatusPassed"]; + REJECTED = 4 [(gogoproto.enumvalue_customname) = "StatusRejected"]; + FAILED = 5 [(gogoproto.enumvalue_customname) = "StatusFailed"]; } // TallyResult defines a standard tally for a proposal message TallyResult { - bytes yes = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; - bytes abstain = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; - bytes no = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; - bytes no_with_veto = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false - ,(gogoproto.moretags) = "yaml:\"no_with_veto\""]; + string yes = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string abstain = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string no = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string no_with_veto = 4 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"no_with_veto\"" + ]; } +// Vote defines a vote on a governance proposal. A vote corresponds to a proposal +// ID, the voter, and the vote option. message Vote { - uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID" - ,(gogoproto.moretags) = "yaml:\"proposal_id\""]; - bytes voter = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - VoteOption option = 3; + uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID", (gogoproto.moretags) = "yaml:\"proposal_id\""]; + bytes voter = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; + VoteOption option = 3; } -message BasicProposal { - ProposalBase base = 1 [(gogoproto.embed) = true]; - BasicContent content = 2; -} +// message BasicProposal { +// ProposalBase base = 1 [(gogoproto.embed) = true]; +// BasicContent content = 2; +// } -message BasicContent { - option (cosmos_proto.interface_type) = "Content"; - option (gogoproto.stringer) = true; - oneof sum { - TextProposal text = 1; - } -} +// message BasicContent { +// option (cosmos_proto.interface_type) = "Content"; +// option (gogoproto.stringer) = true; +// oneof sum { +// TextProposal text = 1; +// } +// }