proto: reorganize Protobuf schemas (#5102)

Reorganizes the Protobuf schemas. It is mostly bikeshedding, so if something is contentious or causes a lot of extra work then I'm fine with reverting. Some Protobuf and Go import paths will change.

* Move `abci/types/types.proto` to `abci/types.proto`.

* Move `crypto/keys/types.proto` and `crypto/merkle/types.proto` to `crypto/keys.proto` and `crypto/proof.proto`.

* Drop the use of `msgs` in filenames, as "message" is a very overloaded term (all Protobuf types are messages, and we also have `message Message`). Use `types.proto` as a catch-all, and otherwise name files by conceptual grouping instead of message kind.
This commit is contained in:
Erik Grinaker
2020-07-08 17:47:01 +02:00
committed by GitHub
parent 59a17b28a7
commit 66ed8ec39d
44 changed files with 4370 additions and 4421 deletions

View File

@@ -22,7 +22,7 @@ import (
servertest "github.com/tendermint/tendermint/abci/tests/server"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/abci/version"
"github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"
"github.com/tendermint/tendermint/proto/tendermint/crypto"
)
// client is a global variable so it can be reused by the console
@@ -101,7 +101,7 @@ type queryResponse struct {
Key []byte
Value []byte
Height int64
ProofOps *merkle.ProofOps
ProofOps *crypto.ProofOps
}
func Execute() error {

View File

@@ -13,7 +13,7 @@ import (
"github.com/tendermint/tendermint/abci/types"
cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
"github.com/tendermint/tendermint/libs/log"
pc "github.com/tendermint/tendermint/proto/tendermint/crypto/keys"
pc "github.com/tendermint/tendermint/proto/tendermint/crypto"
tmtypes "github.com/tendermint/tendermint/types"
)

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@ import (
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
pc "github.com/tendermint/tendermint/proto/tendermint/crypto/keys"
pc "github.com/tendermint/tendermint/proto/tendermint/crypto"
)
// PubKeyToProto takes crypto.PubKey and transforms it to a protobuf Pubkey

View File

@@ -6,7 +6,7 @@ import (
"fmt"
"github.com/tendermint/tendermint/crypto/tmhash"
tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"
tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
)
const (
@@ -116,11 +116,11 @@ func (sp *Proof) ValidateBasic() error {
return nil
}
func (sp *Proof) ToProto() *tmmerkle.Proof {
func (sp *Proof) ToProto() *tmcrypto.Proof {
if sp == nil {
return nil
}
pb := new(tmmerkle.Proof)
pb := new(tmcrypto.Proof)
pb.Total = sp.Total
pb.Index = sp.Index
@@ -130,7 +130,7 @@ func (sp *Proof) ToProto() *tmmerkle.Proof {
return pb
}
func ProofFromProto(pb *tmmerkle.Proof) (*Proof, error) {
func ProofFromProto(pb *tmcrypto.Proof) (*Proof, error) {
if pb == nil {
return nil, errors.New("nil proof")
}

View File

@@ -5,7 +5,7 @@ import (
"errors"
"fmt"
tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"
tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
)
//----------------------------------------
@@ -21,7 +21,7 @@ import (
type ProofOperator interface {
Run([][]byte) ([][]byte, error)
GetKey() []byte
ProofOp() tmmerkle.ProofOp
ProofOp() tmcrypto.ProofOp
}
//----------------------------------------
@@ -71,7 +71,7 @@ func (poz ProofOperators) Verify(root []byte, keypath string, args [][]byte) (er
//----------------------------------------
// ProofRuntime - main entrypoint
type OpDecoder func(tmmerkle.ProofOp) (ProofOperator, error)
type OpDecoder func(tmcrypto.ProofOp) (ProofOperator, error)
type ProofRuntime struct {
decoders map[string]OpDecoder
@@ -91,7 +91,7 @@ func (prt *ProofRuntime) RegisterOpDecoder(typ string, dec OpDecoder) {
prt.decoders[typ] = dec
}
func (prt *ProofRuntime) Decode(pop tmmerkle.ProofOp) (ProofOperator, error) {
func (prt *ProofRuntime) Decode(pop tmcrypto.ProofOp) (ProofOperator, error) {
decoder := prt.decoders[pop.Type]
if decoder == nil {
return nil, fmt.Errorf("unrecognized proof type %v", pop.Type)
@@ -99,7 +99,7 @@ func (prt *ProofRuntime) Decode(pop tmmerkle.ProofOp) (ProofOperator, error) {
return decoder(pop)
}
func (prt *ProofRuntime) DecodeProof(proof *tmmerkle.ProofOps) (ProofOperators, error) {
func (prt *ProofRuntime) DecodeProof(proof *tmcrypto.ProofOps) (ProofOperators, error) {
poz := make(ProofOperators, 0, len(proof.Ops))
for _, pop := range proof.Ops {
operator, err := prt.Decode(pop)
@@ -111,17 +111,17 @@ func (prt *ProofRuntime) DecodeProof(proof *tmmerkle.ProofOps) (ProofOperators,
return poz, nil
}
func (prt *ProofRuntime) VerifyValue(proof *tmmerkle.ProofOps, root []byte, keypath string, value []byte) (err error) {
func (prt *ProofRuntime) VerifyValue(proof *tmcrypto.ProofOps, root []byte, keypath string, value []byte) (err error) {
return prt.Verify(proof, root, keypath, [][]byte{value})
}
// TODO In the long run we'll need a method of classifcation of ops,
// whether existence or absence or perhaps a third?
func (prt *ProofRuntime) VerifyAbsence(proof *tmmerkle.ProofOps, root []byte, keypath string) (err error) {
func (prt *ProofRuntime) VerifyAbsence(proof *tmcrypto.ProofOps, root []byte, keypath string) (err error) {
return prt.Verify(proof, root, keypath, nil)
}
func (prt *ProofRuntime) Verify(proof *tmmerkle.ProofOps, root []byte, keypath string, args [][]byte) (err error) {
func (prt *ProofRuntime) Verify(proof *tmcrypto.ProofOps, root []byte, keypath string, args [][]byte) (err error) {
poz, err := prt.DecodeProof(proof)
if err != nil {
return fmt.Errorf("decoding proof: %w", err)

View File

@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"
tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
)
const ProofOpDomino = "test:domino"
@@ -29,8 +29,8 @@ func NewDominoOp(key, input, output string) DominoOp {
}
}
func (dop DominoOp) ProofOp() tmmerkle.ProofOp {
dopb := tmmerkle.DominoOp{
func (dop DominoOp) ProofOp() tmcrypto.ProofOp {
dopb := tmcrypto.DominoOp{
Key: dop.key,
Input: dop.Input,
Output: dop.Output,
@@ -40,7 +40,7 @@ func (dop DominoOp) ProofOp() tmmerkle.ProofOp {
panic(err)
}
return tmmerkle.ProofOp{
return tmcrypto.ProofOp{
Type: ProofOpDomino,
Key: []byte(dop.key),
Data: bz,

View File

@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/tendermint/tendermint/crypto/tmhash"
tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"
tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
)
const ProofOpValue = "simple:v"
@@ -37,11 +37,11 @@ func NewValueOp(key []byte, proof *Proof) ValueOp {
}
}
func ValueOpDecoder(pop tmmerkle.ProofOp) (ProofOperator, error) {
func ValueOpDecoder(pop tmcrypto.ProofOp) (ProofOperator, error) {
if pop.Type != ProofOpValue {
return nil, fmt.Errorf("unexpected ProofOp.Type; got %v, want %v", pop.Type, ProofOpValue)
}
var pbop tmmerkle.ValueOp // a bit strange as we'll discard this, but it works.
var pbop tmcrypto.ValueOp // a bit strange as we'll discard this, but it works.
err := pbop.Unmarshal(pop.Data)
if err != nil {
return nil, fmt.Errorf("decoding ProofOp.Data into ValueOp: %w", err)
@@ -54,8 +54,8 @@ func ValueOpDecoder(pop tmmerkle.ProofOp) (ProofOperator, error) {
return NewValueOp(pop.Key, sp), nil
}
func (op ValueOp) ProofOp() tmmerkle.ProofOp {
pbval := tmmerkle.ValueOp{
func (op ValueOp) ProofOp() tmcrypto.ProofOp {
pbval := tmcrypto.ValueOp{
Key: op.key,
Proof: op.Proof.ToProto(),
}
@@ -63,7 +63,7 @@ func (op ValueOp) ProofOp() tmmerkle.ProofOp {
if err != nil {
panic(err)
}
return tmmerkle.ProofOp{
return tmcrypto.ProofOp{
Type: ProofOpValue,
Key: op.key,
Data: bz,

View File

@@ -1,13 +1,13 @@
syntax = "proto3";
package tendermint.abci.types;
package tendermint.abci;
option go_package = "github.com/tendermint/tendermint/abci/types";
// For more information on gogo.proto, see:
// https://github.com/gogo/protobuf/blob/master/extensions.md
import "tendermint/crypto/merkle/types.proto";
import "tendermint/crypto/proof.proto";
import "tendermint/types/types.proto";
import "tendermint/crypto/keys/types.proto";
import "tendermint/crypto/keys.proto";
import "tendermint/types/params.proto";
import "google/protobuf/timestamp.proto";
import "gogoproto/gogo.proto";
@@ -185,14 +185,14 @@ message ResponseInitChain {
message ResponseQuery {
uint32 code = 1;
// bytes data = 2; // use "value" instead.
string log = 3; // nondeterministic
string info = 4; // nondeterministic
int64 index = 5;
bytes key = 6;
bytes value = 7;
tendermint.crypto.merkle.ProofOps proof_ops = 8;
int64 height = 9;
string codespace = 10;
string log = 3; // nondeterministic
string info = 4; // nondeterministic
int64 index = 5;
bytes key = 6;
bytes value = 7;
tendermint.crypto.ProofOps proof_ops = 8;
int64 height = 9;
string codespace = 10;
}
message ResponseBeginBlock {
@@ -336,8 +336,8 @@ message Validator {
// ValidatorUpdate
message ValidatorUpdate {
tendermint.crypto.keys.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
int64 power = 2;
tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
int64 power = 2;
}
// VoteInfo

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/blockchain/msgs.proto
// source: tendermint/blockchain/types.proto
package blockchain
@@ -32,7 +32,7 @@ func (m *BlockRequest) Reset() { *m = BlockRequest{} }
func (m *BlockRequest) String() string { return proto.CompactTextString(m) }
func (*BlockRequest) ProtoMessage() {}
func (*BlockRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_e5c108580a5f04a9, []int{0}
return fileDescriptor_2927480384e78499, []int{0}
}
func (m *BlockRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -77,7 +77,7 @@ func (m *NoBlockResponse) Reset() { *m = NoBlockResponse{} }
func (m *NoBlockResponse) String() string { return proto.CompactTextString(m) }
func (*NoBlockResponse) ProtoMessage() {}
func (*NoBlockResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_e5c108580a5f04a9, []int{1}
return fileDescriptor_2927480384e78499, []int{1}
}
func (m *NoBlockResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -122,7 +122,7 @@ func (m *BlockResponse) Reset() { *m = BlockResponse{} }
func (m *BlockResponse) String() string { return proto.CompactTextString(m) }
func (*BlockResponse) ProtoMessage() {}
func (*BlockResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_e5c108580a5f04a9, []int{2}
return fileDescriptor_2927480384e78499, []int{2}
}
func (m *BlockResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -168,7 +168,7 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} }
func (m *StatusRequest) String() string { return proto.CompactTextString(m) }
func (*StatusRequest) ProtoMessage() {}
func (*StatusRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_e5c108580a5f04a9, []int{3}
return fileDescriptor_2927480384e78499, []int{3}
}
func (m *StatusRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -221,7 +221,7 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} }
func (m *StatusResponse) String() string { return proto.CompactTextString(m) }
func (*StatusResponse) ProtoMessage() {}
func (*StatusResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_e5c108580a5f04a9, []int{4}
return fileDescriptor_2927480384e78499, []int{4}
}
func (m *StatusResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -278,7 +278,7 @@ func (m *Message) Reset() { *m = Message{} }
func (m *Message) String() string { return proto.CompactTextString(m) }
func (*Message) ProtoMessage() {}
func (*Message) Descriptor() ([]byte, []int) {
return fileDescriptor_e5c108580a5f04a9, []int{5}
return fileDescriptor_2927480384e78499, []int{5}
}
func (m *Message) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -397,34 +397,34 @@ func init() {
proto.RegisterType((*Message)(nil), "tendermint.blockchain.Message")
}
func init() { proto.RegisterFile("tendermint/blockchain/msgs.proto", fileDescriptor_e5c108580a5f04a9) }
func init() { proto.RegisterFile("tendermint/blockchain/types.proto", fileDescriptor_2927480384e78499) }
var fileDescriptor_e5c108580a5f04a9 = []byte{
// 374 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcf, 0x4e, 0xea, 0x40,
0x14, 0x87, 0xdb, 0x5b, 0xe0, 0x26, 0x07, 0x0a, 0xb1, 0x89, 0x4a, 0x8c, 0x69, 0x48, 0x55, 0xa2,
0x0b, 0xa7, 0x09, 0x2e, 0x25, 0x2e, 0x58, 0x11, 0x13, 0x8c, 0xa9, 0xc6, 0x85, 0x1b, 0xd2, 0xe2,
0xa4, 0x6d, 0xb4, 0x1d, 0xe4, 0x4c, 0x17, 0xbe, 0x85, 0xcf, 0xe0, 0xd3, 0xb8, 0x64, 0xe9, 0xd2,
0xc0, 0x8b, 0x18, 0xa6, 0xa5, 0xb4, 0x0d, 0x7f, 0x76, 0x33, 0xc3, 0xef, 0x7c, 0xf3, 0x71, 0xce,
0x14, 0x5a, 0x9c, 0x86, 0x2f, 0x74, 0x12, 0xf8, 0x21, 0x37, 0x9d, 0x37, 0x36, 0x7a, 0x1d, 0x79,
0xb6, 0x1f, 0x9a, 0x01, 0xba, 0x48, 0xc6, 0x13, 0xc6, 0x99, 0xb6, 0xbf, 0x4a, 0x90, 0x55, 0xe2,
0xe8, 0x38, 0x53, 0xc8, 0x3f, 0xc6, 0x14, 0xe3, 0xf2, 0xb8, 0xc8, 0x68, 0x43, 0xad, 0xb7, 0xd8,
0x5a, 0xf4, 0x3d, 0xa2, 0xc8, 0xb5, 0x03, 0xa8, 0x78, 0xd4, 0x77, 0x3d, 0xde, 0x94, 0x5b, 0xf2,
0xb9, 0x62, 0x25, 0x3b, 0xe3, 0x02, 0x1a, 0x77, 0x2c, 0x49, 0xe2, 0x98, 0x85, 0x48, 0x37, 0x46,
0x6f, 0x40, 0xcd, 0x07, 0x2f, 0xa1, 0x2c, 0xae, 0x14, 0xb9, 0x6a, 0xe7, 0x90, 0x64, 0x44, 0x85,
0x11, 0x89, 0xf3, 0x71, 0xca, 0xb8, 0x06, 0xf5, 0x81, 0xdb, 0x3c, 0xc2, 0x1d, 0x4e, 0x9a, 0x06,
0x25, 0xc7, 0x46, 0xda, 0xfc, 0x27, 0x4e, 0xc5, 0xda, 0xe8, 0x42, 0x7d, 0x59, 0xbc, 0x5d, 0x73,
0x6d, 0xf5, 0x97, 0x02, 0xff, 0x07, 0x14, 0xd1, 0x76, 0xa9, 0x76, 0x0b, 0xaa, 0xf0, 0x19, 0x4e,
0x62, 0x8d, 0xc4, 0xfe, 0x84, 0xac, 0x6d, 0x33, 0xc9, 0x76, 0xb1, 0x2f, 0x59, 0x35, 0x27, 0xdb,
0xd5, 0x47, 0xd8, 0x0b, 0xd9, 0x70, 0x89, 0x8b, 0xc5, 0xc4, 0xc5, 0xd5, 0x4e, 0x7b, 0x03, 0xaf,
0xd0, 0xed, 0xbe, 0x64, 0x35, 0xc2, 0xc2, 0x00, 0x06, 0x50, 0x2f, 0x20, 0x15, 0x81, 0x3c, 0xdd,
0xae, 0x98, 0x02, 0x55, 0xa7, 0x88, 0x43, 0xd1, 0xba, 0xf4, 0x1f, 0x97, 0xb6, 0xe2, 0x72, 0x43,
0x5a, 0xe0, 0x30, 0x37, 0xb5, 0x7b, 0x68, 0xa4, 0xb8, 0x44, 0xaf, 0x2c, 0x78, 0x67, 0x3b, 0x78,
0xa9, 0x5f, 0x1d, 0x73, 0x27, 0xbd, 0x32, 0x28, 0x18, 0x05, 0xbd, 0xa7, 0xef, 0x99, 0x2e, 0x4f,
0x67, 0xba, 0xfc, 0x3b, 0xd3, 0xe5, 0xcf, 0xb9, 0x2e, 0x4d, 0xe7, 0xba, 0xf4, 0x33, 0xd7, 0xa5,
0xe7, 0xae, 0xeb, 0x73, 0x2f, 0x72, 0xc8, 0x88, 0x05, 0x66, 0xf6, 0xd5, 0xaf, 0x96, 0xe2, 0xd1,
0x9b, 0x6b, 0x3f, 0x25, 0xa7, 0x22, 0x7e, 0xbc, 0xfa, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x75, 0xd6,
0x7d, 0xd0, 0x6a, 0x03, 0x00, 0x00,
var fileDescriptor_2927480384e78499 = []byte{
// 373 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0x4e, 0xce, 0x48, 0xcc,
0xcc, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45,
0x28, 0xd1, 0x43, 0x28, 0x91, 0x92, 0x41, 0xd2, 0x09, 0x56, 0x0e, 0xd1, 0x0f, 0xd1, 0xa4, 0xa4,
0xc6, 0xc5, 0xe3, 0x04, 0xe2, 0x06, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x08, 0x89, 0x71, 0xb1,
0x65, 0xa4, 0x66, 0xa6, 0x67, 0x94, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x41, 0x79, 0x4a,
0x9a, 0x5c, 0xfc, 0x7e, 0xf9, 0x50, 0x95, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x38, 0x95, 0xda,
0x71, 0xf1, 0xa2, 0x2a, 0xd4, 0xe5, 0x62, 0x05, 0x5b, 0x09, 0x56, 0xc7, 0x6d, 0x24, 0xae, 0x87,
0xe4, 0x50, 0x88, 0x07, 0x20, 0xea, 0x21, 0xaa, 0x94, 0xac, 0xb9, 0x78, 0x83, 0x4b, 0x12, 0x4b,
0x4a, 0x8b, 0x09, 0xb8, 0x49, 0x48, 0x88, 0x8b, 0x25, 0x29, 0xb1, 0x38, 0x55, 0x82, 0x09, 0x2c,
0x0a, 0x66, 0x2b, 0xd9, 0x70, 0xf1, 0xc1, 0x34, 0xe3, 0x77, 0x26, 0x56, 0xdd, 0x8b, 0x98, 0xb9,
0xd8, 0x7d, 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0xbc, 0xb8, 0x78, 0xc1, 0xee, 0x89, 0x2f,
0x82, 0x38, 0x03, 0xea, 0x7a, 0x65, 0x3d, 0xac, 0xc1, 0xac, 0x87, 0x1c, 0x8a, 0x1e, 0x0c, 0x41,
0x3c, 0x49, 0xc8, 0xa1, 0x1a, 0xc2, 0x25, 0x98, 0x97, 0x1f, 0x0f, 0x33, 0x0e, 0xe2, 0x30, 0xb0,
0xc5, 0xdc, 0x46, 0x6a, 0x38, 0xcc, 0x43, 0x0b, 0x6d, 0x0f, 0x86, 0x20, 0xfe, 0x3c, 0xb4, 0x08,
0xf0, 0xe5, 0xe2, 0x43, 0x33, 0x92, 0x19, 0x6c, 0xa4, 0x0a, 0x7e, 0x27, 0xc2, 0x0d, 0xe4, 0x4d,
0x42, 0x37, 0xae, 0x18, 0x1c, 0x74, 0x70, 0x1f, 0xb3, 0xe0, 0x35, 0x0e, 0x25, 0x92, 0x40, 0xc6,
0x15, 0xa3, 0xc4, 0x5a, 0x00, 0x17, 0x3f, 0xdc, 0x38, 0xa8, 0xf3, 0x58, 0xc1, 0xe6, 0xa9, 0x12,
0x30, 0x0f, 0xee, 0x3e, 0xbe, 0x62, 0x14, 0x11, 0x27, 0x56, 0x2e, 0xe6, 0xe2, 0xd2, 0x5c, 0xa7,
0xb0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63,
0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x49, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0x4e, 0xf5, 0x08, 0x26, 0x38, 0xd1, 0xeb, 0x63,
0xcd, 0x4b, 0x49, 0x6c, 0x60, 0x49, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0x4d, 0xe0,
0x91, 0x6b, 0x03, 0x00, 0x00,
}
func (m *BlockRequest) Marshal() (dAtA []byte, err error) {
@@ -448,7 +448,7 @@ func (m *BlockRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.Height != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Height))
i = encodeVarintTypes(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x8
}
@@ -476,7 +476,7 @@ func (m *NoBlockResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.Height != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Height))
i = encodeVarintTypes(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x8
}
@@ -510,7 +510,7 @@ func (m *BlockResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -539,12 +539,12 @@ func (m *StatusRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.Base != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Base))
i = encodeVarintTypes(dAtA, i, uint64(m.Base))
i--
dAtA[i] = 0x10
}
if m.Height != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Height))
i = encodeVarintTypes(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x8
}
@@ -572,12 +572,12 @@ func (m *StatusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.Base != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Base))
i = encodeVarintTypes(dAtA, i, uint64(m.Base))
i--
dAtA[i] = 0x10
}
if m.Height != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Height))
i = encodeVarintTypes(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x8
}
@@ -630,7 +630,7 @@ func (m *Message_BlockRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -651,7 +651,7 @@ func (m *Message_NoBlockResponse) MarshalToSizedBuffer(dAtA []byte) (int, error)
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
@@ -672,7 +672,7 @@ func (m *Message_BlockResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
@@ -693,7 +693,7 @@ func (m *Message_StatusRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x22
@@ -714,15 +714,15 @@ func (m *Message_StatusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error)
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
return len(dAtA) - i, nil
}
func encodeVarintMsgs(dAtA []byte, offset int, v uint64) int {
offset -= sovMsgs(v)
func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
offset -= sovTypes(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -739,7 +739,7 @@ func (m *BlockRequest) Size() (n int) {
var l int
_ = l
if m.Height != 0 {
n += 1 + sovMsgs(uint64(m.Height))
n += 1 + sovTypes(uint64(m.Height))
}
return n
}
@@ -751,7 +751,7 @@ func (m *NoBlockResponse) Size() (n int) {
var l int
_ = l
if m.Height != 0 {
n += 1 + sovMsgs(uint64(m.Height))
n += 1 + sovTypes(uint64(m.Height))
}
return n
}
@@ -764,7 +764,7 @@ func (m *BlockResponse) Size() (n int) {
_ = l
if m.Block != nil {
l = m.Block.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -776,10 +776,10 @@ func (m *StatusRequest) Size() (n int) {
var l int
_ = l
if m.Height != 0 {
n += 1 + sovMsgs(uint64(m.Height))
n += 1 + sovTypes(uint64(m.Height))
}
if m.Base != 0 {
n += 1 + sovMsgs(uint64(m.Base))
n += 1 + sovTypes(uint64(m.Base))
}
return n
}
@@ -791,10 +791,10 @@ func (m *StatusResponse) Size() (n int) {
var l int
_ = l
if m.Height != 0 {
n += 1 + sovMsgs(uint64(m.Height))
n += 1 + sovTypes(uint64(m.Height))
}
if m.Base != 0 {
n += 1 + sovMsgs(uint64(m.Base))
n += 1 + sovTypes(uint64(m.Base))
}
return n
}
@@ -819,7 +819,7 @@ func (m *Message_BlockRequest) Size() (n int) {
_ = l
if m.BlockRequest != nil {
l = m.BlockRequest.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -831,7 +831,7 @@ func (m *Message_NoBlockResponse) Size() (n int) {
_ = l
if m.NoBlockResponse != nil {
l = m.NoBlockResponse.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -843,7 +843,7 @@ func (m *Message_BlockResponse) Size() (n int) {
_ = l
if m.BlockResponse != nil {
l = m.BlockResponse.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -855,7 +855,7 @@ func (m *Message_StatusRequest) Size() (n int) {
_ = l
if m.StatusRequest != nil {
l = m.StatusRequest.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -867,16 +867,16 @@ func (m *Message_StatusResponse) Size() (n int) {
_ = l
if m.StatusResponse != nil {
l = m.StatusResponse.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
func sovMsgs(x uint64) (n int) {
func sovTypes(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozMsgs(x uint64) (n int) {
return sovMsgs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozTypes(x uint64) (n int) {
return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *BlockRequest) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -886,7 +886,7 @@ func (m *BlockRequest) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -914,7 +914,7 @@ func (m *BlockRequest) Unmarshal(dAtA []byte) error {
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -928,15 +928,15 @@ func (m *BlockRequest) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -958,7 +958,7 @@ func (m *NoBlockResponse) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -986,7 +986,7 @@ func (m *NoBlockResponse) Unmarshal(dAtA []byte) error {
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1000,15 +1000,15 @@ func (m *NoBlockResponse) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1030,7 +1030,7 @@ func (m *BlockResponse) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1058,7 +1058,7 @@ func (m *BlockResponse) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1071,11 +1071,11 @@ func (m *BlockResponse) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1089,15 +1089,15 @@ func (m *BlockResponse) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1119,7 +1119,7 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1147,7 +1147,7 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error {
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1166,7 +1166,7 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error {
m.Base = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1180,15 +1180,15 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1210,7 +1210,7 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1238,7 +1238,7 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error {
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1257,7 +1257,7 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error {
m.Base = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1271,15 +1271,15 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1301,7 +1301,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1329,7 +1329,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1342,11 +1342,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1364,7 +1364,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1377,11 +1377,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1399,7 +1399,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1412,11 +1412,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1434,7 +1434,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1447,11 +1447,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1469,7 +1469,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1482,11 +1482,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1499,15 +1499,15 @@ func (m *Message) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1521,7 +1521,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipMsgs(dAtA []byte) (n int, err error) {
func skipTypes(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -1529,7 +1529,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1546,7 +1546,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1562,7 +1562,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1575,14 +1575,14 @@ func skipMsgs(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthMsgs
return 0, ErrInvalidLengthTypes
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupMsgs
return 0, ErrUnexpectedEndOfGroupTypes
}
depth--
case 5:
@@ -1591,7 +1591,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthMsgs
return 0, ErrInvalidLengthTypes
}
if depth == 0 {
return iNdEx, nil
@@ -1601,7 +1601,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthMsgs = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowMsgs = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupMsgs = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/consensus/walmsgs.proto
// source: tendermint/consensus/wal.proto
package consensus
@@ -39,7 +39,7 @@ func (m *MsgInfo) Reset() { *m = MsgInfo{} }
func (m *MsgInfo) String() string { return proto.CompactTextString(m) }
func (*MsgInfo) ProtoMessage() {}
func (*MsgInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_ba295fe8d98f7e98, []int{0}
return fileDescriptor_ed0b60c2d348ab09, []int{0}
}
func (m *MsgInfo) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -94,7 +94,7 @@ func (m *TimeoutInfo) Reset() { *m = TimeoutInfo{} }
func (m *TimeoutInfo) String() string { return proto.CompactTextString(m) }
func (*TimeoutInfo) ProtoMessage() {}
func (*TimeoutInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_ba295fe8d98f7e98, []int{1}
return fileDescriptor_ed0b60c2d348ab09, []int{1}
}
func (m *TimeoutInfo) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -161,7 +161,7 @@ func (m *EndHeight) Reset() { *m = EndHeight{} }
func (m *EndHeight) String() string { return proto.CompactTextString(m) }
func (*EndHeight) ProtoMessage() {}
func (*EndHeight) Descriptor() ([]byte, []int) {
return fileDescriptor_ba295fe8d98f7e98, []int{2}
return fileDescriptor_ed0b60c2d348ab09, []int{2}
}
func (m *EndHeight) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -210,7 +210,7 @@ func (m *WALMessage) Reset() { *m = WALMessage{} }
func (m *WALMessage) String() string { return proto.CompactTextString(m) }
func (*WALMessage) ProtoMessage() {}
func (*WALMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_ba295fe8d98f7e98, []int{3}
return fileDescriptor_ed0b60c2d348ab09, []int{3}
}
func (m *WALMessage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -318,7 +318,7 @@ func (m *TimedWALMessage) Reset() { *m = TimedWALMessage{} }
func (m *TimedWALMessage) String() string { return proto.CompactTextString(m) }
func (*TimedWALMessage) ProtoMessage() {}
func (*TimedWALMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_ba295fe8d98f7e98, []int{4}
return fileDescriptor_ed0b60c2d348ab09, []int{4}
}
func (m *TimedWALMessage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -369,44 +369,44 @@ func init() {
proto.RegisterType((*TimedWALMessage)(nil), "tendermint.consensus.TimedWALMessage")
}
func init() { proto.RegisterFile("tendermint/consensus/walmsgs.proto", fileDescriptor_ba295fe8d98f7e98) }
func init() { proto.RegisterFile("tendermint/consensus/wal.proto", fileDescriptor_ed0b60c2d348ab09) }
var fileDescriptor_ba295fe8d98f7e98 = []byte{
// 542 bytes of a gzipped FileDescriptorProto
var fileDescriptor_ed0b60c2d348ab09 = []byte{
// 539 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdd, 0x8a, 0xd3, 0x40,
0x14, 0xce, 0x6c, 0xff, 0xa7, 0x8a, 0x10, 0xcb, 0x52, 0x0b, 0x9b, 0xd6, 0x2c, 0x42, 0xaf, 0x12,
0x58, 0x11, 0x44, 0x2f, 0xd4, 0xd2, 0x95, 0x16, 0x5c, 0x90, 0x71, 0x45, 0x10, 0x21, 0xa4, 0x9b,
0xd3, 0x69, 0x60, 0x33, 0x53, 0x32, 0x13, 0xc5, 0x2b, 0x5f, 0xa1, 0x97, 0xbe, 0x89, 0xaf, 0xb0,
0x97, 0x7b, 0xe9, 0xd5, 0x2a, 0xed, 0x8b, 0x48, 0x66, 0x92, 0x26, 0xb8, 0xd9, 0xbb, 0x39, 0x73,
0xbe, 0xf3, 0x9d, 0x73, 0xbe, 0x6f, 0x06, 0xdb, 0x12, 0x58, 0x00, 0x71, 0x14, 0x32, 0xe9, 0x5e,
0x70, 0x26, 0x80, 0x89, 0x44, 0xb8, 0xdf, 0xfc, 0xcb, 0x48, 0x50, 0xe1, 0xac, 0x63, 0x2e, 0xb9,
0xd9, 0x2b, 0x30, 0xce, 0x1e, 0x33, 0xe8, 0x51, 0x4e, 0xb9, 0x02, 0xb8, 0xe9, 0x49, 0x63, 0x07,
0xc3, 0x4a, 0xbe, 0x82, 0x6c, 0x70, 0x54, 0x02, 0xc8, 0xef, 0x6b, 0x10, 0x2e, 0x7c, 0x05, 0x26,
0xf3, 0xb4, 0x45, 0x39, 0xa7, 0x97, 0xe0, 0xaa, 0x68, 0x91, 0x2c, 0xdd, 0x20, 0x89, 0x7d, 0x19,
0x72, 0x96, 0xf3, 0xff, 0x9f, 0x97, 0x61, 0x04, 0x42, 0xfa, 0xd1, 0x5a, 0x03, 0x6c, 0xc0, 0xad,
0x33, 0x41, 0xe7, 0x6c, 0xc9, 0xcd, 0x67, 0xb8, 0x16, 0x09, 0xda, 0x47, 0x23, 0x34, 0xee, 0x9e,
0x1c, 0x39, 0x55, 0x5b, 0x38, 0x67, 0x20, 0x84, 0x4f, 0x61, 0x52, 0xbf, 0xba, 0x19, 0x1a, 0x24,
0xc5, 0x9b, 0xc7, 0xb8, 0xb5, 0x06, 0x88, 0xbd, 0x30, 0xe8, 0x1f, 0x8c, 0xd0, 0xb8, 0x33, 0xc1,
0xdb, 0x9b, 0x61, 0xf3, 0x3d, 0x40, 0x3c, 0x9f, 0x92, 0x66, 0x9a, 0x9a, 0x07, 0xf6, 0x06, 0xe1,
0xee, 0x79, 0x18, 0x01, 0x4f, 0xa4, 0xea, 0xf5, 0x0a, 0xb7, 0xf3, 0x49, 0xb3, 0x86, 0x8f, 0x1c,
0x3d, 0xaa, 0x93, 0x8f, 0xea, 0x4c, 0x33, 0xc0, 0xa4, 0x9d, 0x36, 0xfb, 0xf9, 0x67, 0x88, 0xc8,
0xbe, 0xc8, 0x3c, 0xc4, 0xcd, 0x15, 0x84, 0x74, 0x25, 0x55, 0xd3, 0x1a, 0xc9, 0x22, 0xb3, 0x87,
0x1b, 0x31, 0x4f, 0x58, 0xd0, 0xaf, 0x8d, 0xd0, 0xb8, 0x41, 0x74, 0x60, 0x9a, 0xb8, 0x2e, 0x24,
0xac, 0xfb, 0xf5, 0x11, 0x1a, 0xdf, 0x27, 0xea, 0x6c, 0x1f, 0xe3, 0xce, 0x29, 0x0b, 0x66, 0xba,
0xac, 0xa0, 0x43, 0x65, 0x3a, 0xfb, 0xd7, 0x01, 0xc6, 0x9f, 0xde, 0xbc, 0xcb, 0xd6, 0x36, 0xbf,
0xe0, 0x43, 0x25, 0xbf, 0x17, 0xf8, 0xd2, 0xf7, 0x14, 0xb7, 0x27, 0xa4, 0x2f, 0x21, 0x5b, 0xe2,
0x49, 0x59, 0x35, 0x65, 0x97, 0x73, 0x9a, 0xe2, 0xa7, 0xbe, 0xf4, 0x49, 0x8a, 0xfe, 0x90, 0x82,
0x67, 0x06, 0x79, 0x08, 0xb7, 0xaf, 0xcd, 0x17, 0xb8, 0x1d, 0x09, 0xea, 0x85, 0x6c, 0xc9, 0xd5,
0x56, 0x77, 0xbb, 0xa0, 0x1d, 0x9b, 0x19, 0xa4, 0x15, 0x65, 0xe6, 0xbd, 0xc5, 0xf7, 0xa4, 0xd6,
0x57, 0xd7, 0xd7, 0x54, 0xfd, 0xe3, 0xea, 0xfa, 0x92, 0x13, 0x33, 0x83, 0x74, 0x65, 0xc9, 0x98,
0xd7, 0x18, 0x03, 0x0b, 0xbc, 0x4c, 0x8c, 0xba, 0x62, 0x19, 0x56, 0xb3, 0xec, 0xd5, 0x9b, 0x19,
0xa4, 0x03, 0x79, 0x30, 0x69, 0xe0, 0x9a, 0x48, 0x22, 0xfb, 0x07, 0x7e, 0x90, 0xb6, 0x09, 0x4a,
0xea, 0x3d, 0xc7, 0xf5, 0xb4, 0x55, 0xa6, 0xd5, 0xe0, 0x96, 0xe1, 0xe7, 0xf9, 0xdb, 0xd4, 0x8e,
0x6f, 0x52, 0xc7, 0x55, 0x85, 0x79, 0xa2, 0x9f, 0xa6, 0x16, 0x65, 0x54, 0x3d, 0x4e, 0xd1, 0x48,
0xbd, 0xcb, 0xc9, 0xc7, 0xab, 0xad, 0x85, 0xae, 0xb7, 0x16, 0xfa, 0xbb, 0xb5, 0xd0, 0x66, 0x67,
0x19, 0xd7, 0x3b, 0xcb, 0xf8, 0xbd, 0xb3, 0x8c, 0xcf, 0x2f, 0x69, 0x28, 0x57, 0xc9, 0xc2, 0xb9,
0xe0, 0x91, 0x5b, 0xfe, 0x5e, 0xc5, 0x51, 0xff, 0xd3, 0xaa, 0xbf, 0xb9, 0x68, 0xaa, 0xdc, 0xd3,
0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x53, 0x86, 0xb6, 0xb9, 0x0a, 0x04, 0x00, 0x00,
0x14, 0xce, 0x6c, 0xff, 0x4f, 0x15, 0x21, 0x96, 0xa5, 0x16, 0x36, 0x8d, 0x5d, 0x84, 0x5e, 0x25,
0xb0, 0x22, 0x88, 0x5e, 0xa8, 0xa5, 0x2b, 0x2d, 0xb8, 0x20, 0xe3, 0x8a, 0x20, 0x42, 0x48, 0x37,
0xa7, 0x69, 0x60, 0x33, 0x53, 0x32, 0x13, 0xc5, 0x2b, 0x5f, 0xa1, 0x97, 0xbe, 0x89, 0xaf, 0xb0,
0x97, 0x7b, 0xe9, 0xd5, 0x2a, 0xed, 0x8b, 0x48, 0x66, 0xd2, 0x36, 0xb8, 0xd9, 0xbb, 0x39, 0x73,
0xbe, 0x73, 0xbe, 0x73, 0xbe, 0x6f, 0x06, 0x2c, 0x89, 0x2c, 0xc0, 0x24, 0x8e, 0x98, 0x74, 0x2f,
0x38, 0x13, 0xc8, 0x44, 0x2a, 0xdc, 0x6f, 0xfe, 0xa5, 0xb3, 0x4c, 0xb8, 0xe4, 0x66, 0x67, 0x9f,
0x77, 0x76, 0xf9, 0x5e, 0x27, 0xe4, 0x21, 0x57, 0x00, 0x37, 0x3b, 0x69, 0x6c, 0xcf, 0x2e, 0xed,
0x25, 0xbf, 0x2f, 0x51, 0xe4, 0x88, 0xa3, 0x02, 0x42, 0xdd, 0xbb, 0xf8, 0x15, 0x99, 0xdc, 0xa6,
0xad, 0x90, 0xf3, 0xf0, 0x12, 0x5d, 0x15, 0xcd, 0xd2, 0xb9, 0x1b, 0xa4, 0x89, 0x2f, 0x23, 0xce,
0xf2, 0x7c, 0xff, 0xff, 0xbc, 0x8c, 0x62, 0x14, 0xd2, 0x8f, 0x97, 0x1a, 0x30, 0x40, 0x68, 0x9c,
0x89, 0x70, 0xca, 0xe6, 0xdc, 0x7c, 0x06, 0x95, 0x58, 0x84, 0x5d, 0x62, 0x93, 0x61, 0xfb, 0xe4,
0xc8, 0x29, 0x5b, 0xc3, 0x39, 0x43, 0x21, 0xfc, 0x10, 0x47, 0xd5, 0xab, 0x9b, 0xbe, 0x41, 0x33,
0xbc, 0x79, 0x0c, 0x8d, 0x25, 0x62, 0xe2, 0x45, 0x41, 0xf7, 0xc0, 0x26, 0xc3, 0xd6, 0x08, 0xd6,
0x37, 0xfd, 0xfa, 0x7b, 0xc4, 0x64, 0x3a, 0xa6, 0xf5, 0x2c, 0x35, 0x0d, 0x06, 0x2b, 0x02, 0xed,
0xf3, 0x28, 0x46, 0x9e, 0x4a, 0xc5, 0xf5, 0x0a, 0x9a, 0xdb, 0x49, 0x73, 0xc2, 0x47, 0x8e, 0x1e,
0xd5, 0xd9, 0x8e, 0xea, 0x8c, 0x73, 0xc0, 0xa8, 0x99, 0x91, 0xfd, 0xfc, 0xd3, 0x27, 0x74, 0x57,
0x64, 0x1e, 0x42, 0x7d, 0x81, 0x51, 0xb8, 0x90, 0x8a, 0xb4, 0x42, 0xf3, 0xc8, 0xec, 0x40, 0x2d,
0xe1, 0x29, 0x0b, 0xba, 0x15, 0x9b, 0x0c, 0x6b, 0x54, 0x07, 0xa6, 0x09, 0x55, 0x21, 0x71, 0xd9,
0xad, 0xda, 0x64, 0x78, 0x9f, 0xaa, 0xf3, 0xe0, 0x18, 0x5a, 0xa7, 0x2c, 0x98, 0xe8, 0xb2, 0x7d,
0x3b, 0x52, 0x6c, 0x37, 0xf8, 0x75, 0x00, 0xf0, 0xe9, 0xcd, 0xbb, 0x7c, 0x6d, 0xf3, 0x0b, 0x1c,
0x2a, 0xf9, 0xbd, 0xc0, 0x97, 0xbe, 0xa7, 0x7a, 0x7b, 0x42, 0xfa, 0x12, 0xf3, 0x25, 0x9e, 0x14,
0x55, 0xd3, 0x36, 0x9e, 0x66, 0xf8, 0xb1, 0x2f, 0x7d, 0x9a, 0xa1, 0x3f, 0x64, 0xe0, 0x89, 0x41,
0x1f, 0xe2, 0xed, 0x6b, 0xf3, 0x05, 0x34, 0x63, 0x11, 0x7a, 0x11, 0x9b, 0x73, 0xb5, 0xd5, 0xdd,
0x2e, 0x68, 0xc7, 0x26, 0x06, 0x6d, 0xc4, 0xb9, 0x79, 0x6f, 0xe1, 0x9e, 0xd4, 0xfa, 0xea, 0xfa,
0x8a, 0xaa, 0x7f, 0x5c, 0x5e, 0x5f, 0x70, 0x62, 0x62, 0xd0, 0xb6, 0x2c, 0x18, 0xf3, 0x1a, 0x00,
0x59, 0xe0, 0xe5, 0x62, 0x54, 0x55, 0x97, 0x7e, 0x79, 0x97, 0x9d, 0x7a, 0x13, 0x83, 0xb6, 0x70,
0x1b, 0x8c, 0x6a, 0x50, 0x11, 0x69, 0x3c, 0xf8, 0x01, 0x0f, 0x32, 0x9a, 0xa0, 0xa0, 0xde, 0x73,
0xa8, 0x66, 0x54, 0xb9, 0x56, 0xbd, 0x5b, 0x86, 0x9f, 0x6f, 0xdf, 0xa6, 0x76, 0x7c, 0x95, 0x39,
0xae, 0x2a, 0xcc, 0x13, 0xfd, 0x34, 0xb5, 0x28, 0x76, 0xf9, 0x38, 0x7b, 0x22, 0xf5, 0x2e, 0x47,
0x1f, 0xaf, 0xd6, 0x16, 0xb9, 0x5e, 0x5b, 0xe4, 0xef, 0xda, 0x22, 0xab, 0x8d, 0x65, 0x5c, 0x6f,
0x2c, 0xe3, 0xf7, 0xc6, 0x32, 0x3e, 0xbf, 0x0c, 0x23, 0xb9, 0x48, 0x67, 0xce, 0x05, 0x8f, 0xdd,
0xe2, 0xf7, 0xda, 0x1f, 0xf5, 0x47, 0x2d, 0xfb, 0x9c, 0xb3, 0xba, 0xca, 0x3d, 0xfd, 0x17, 0x00,
0x00, 0xff, 0xff, 0x0b, 0xad, 0x1c, 0x1b, 0x07, 0x04, 0x00, 0x00,
}
func (m *MsgInfo) Marshal() (dAtA []byte, err error) {
@@ -432,7 +432,7 @@ func (m *MsgInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.PeerID) > 0 {
i -= len(m.PeerID)
copy(dAtA[i:], m.PeerID)
i = encodeVarintWalmsgs(dAtA, i, uint64(len(m.PeerID)))
i = encodeVarintWal(dAtA, i, uint64(len(m.PeerID)))
i--
dAtA[i] = 0x12
}
@@ -442,7 +442,7 @@ func (m *MsgInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintWalmsgs(dAtA, i, uint64(size))
i = encodeVarintWal(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -470,17 +470,17 @@ func (m *TimeoutInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.Step != 0 {
i = encodeVarintWalmsgs(dAtA, i, uint64(m.Step))
i = encodeVarintWal(dAtA, i, uint64(m.Step))
i--
dAtA[i] = 0x20
}
if m.Round != 0 {
i = encodeVarintWalmsgs(dAtA, i, uint64(m.Round))
i = encodeVarintWal(dAtA, i, uint64(m.Round))
i--
dAtA[i] = 0x18
}
if m.Height != 0 {
i = encodeVarintWalmsgs(dAtA, i, uint64(m.Height))
i = encodeVarintWal(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x10
}
@@ -489,7 +489,7 @@ func (m *TimeoutInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err2
}
i -= n2
i = encodeVarintWalmsgs(dAtA, i, uint64(n2))
i = encodeVarintWal(dAtA, i, uint64(n2))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
@@ -516,7 +516,7 @@ func (m *EndHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.Height != 0 {
i = encodeVarintWalmsgs(dAtA, i, uint64(m.Height))
i = encodeVarintWal(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x8
}
@@ -569,7 +569,7 @@ func (m *WALMessage_EventDataRoundState) MarshalToSizedBuffer(dAtA []byte) (int,
return 0, err
}
i -= size
i = encodeVarintWalmsgs(dAtA, i, uint64(size))
i = encodeVarintWal(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -590,7 +590,7 @@ func (m *WALMessage_MsgInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintWalmsgs(dAtA, i, uint64(size))
i = encodeVarintWal(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
@@ -611,7 +611,7 @@ func (m *WALMessage_TimeoutInfo) MarshalToSizedBuffer(dAtA []byte) (int, error)
return 0, err
}
i -= size
i = encodeVarintWalmsgs(dAtA, i, uint64(size))
i = encodeVarintWal(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
@@ -632,7 +632,7 @@ func (m *WALMessage_EndHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintWalmsgs(dAtA, i, uint64(size))
i = encodeVarintWal(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x22
@@ -666,7 +666,7 @@ func (m *TimedWALMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintWalmsgs(dAtA, i, uint64(size))
i = encodeVarintWal(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
@@ -676,14 +676,14 @@ func (m *TimedWALMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err8
}
i -= n8
i = encodeVarintWalmsgs(dAtA, i, uint64(n8))
i = encodeVarintWal(dAtA, i, uint64(n8))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
func encodeVarintWalmsgs(dAtA []byte, offset int, v uint64) int {
offset -= sovWalmsgs(v)
func encodeVarintWal(dAtA []byte, offset int, v uint64) int {
offset -= sovWal(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -700,10 +700,10 @@ func (m *MsgInfo) Size() (n int) {
var l int
_ = l
l = m.Msg.Size()
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
l = len(m.PeerID)
if l > 0 {
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
}
return n
}
@@ -715,15 +715,15 @@ func (m *TimeoutInfo) Size() (n int) {
var l int
_ = l
l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration)
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
if m.Height != 0 {
n += 1 + sovWalmsgs(uint64(m.Height))
n += 1 + sovWal(uint64(m.Height))
}
if m.Round != 0 {
n += 1 + sovWalmsgs(uint64(m.Round))
n += 1 + sovWal(uint64(m.Round))
}
if m.Step != 0 {
n += 1 + sovWalmsgs(uint64(m.Step))
n += 1 + sovWal(uint64(m.Step))
}
return n
}
@@ -735,7 +735,7 @@ func (m *EndHeight) Size() (n int) {
var l int
_ = l
if m.Height != 0 {
n += 1 + sovWalmsgs(uint64(m.Height))
n += 1 + sovWal(uint64(m.Height))
}
return n
}
@@ -760,7 +760,7 @@ func (m *WALMessage_EventDataRoundState) Size() (n int) {
_ = l
if m.EventDataRoundState != nil {
l = m.EventDataRoundState.Size()
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
}
return n
}
@@ -772,7 +772,7 @@ func (m *WALMessage_MsgInfo) Size() (n int) {
_ = l
if m.MsgInfo != nil {
l = m.MsgInfo.Size()
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
}
return n
}
@@ -784,7 +784,7 @@ func (m *WALMessage_TimeoutInfo) Size() (n int) {
_ = l
if m.TimeoutInfo != nil {
l = m.TimeoutInfo.Size()
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
}
return n
}
@@ -796,7 +796,7 @@ func (m *WALMessage_EndHeight) Size() (n int) {
_ = l
if m.EndHeight != nil {
l = m.EndHeight.Size()
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
}
return n
}
@@ -807,19 +807,19 @@ func (m *TimedWALMessage) Size() (n int) {
var l int
_ = l
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time)
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
if m.Msg != nil {
l = m.Msg.Size()
n += 1 + l + sovWalmsgs(uint64(l))
n += 1 + l + sovWal(uint64(l))
}
return n
}
func sovWalmsgs(x uint64) (n int) {
func sovWal(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozWalmsgs(x uint64) (n int) {
return sovWalmsgs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozWal(x uint64) (n int) {
return sovWal(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *MsgInfo) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -829,7 +829,7 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -857,7 +857,7 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -870,11 +870,11 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -890,7 +890,7 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error {
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -904,11 +904,11 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error {
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -917,15 +917,15 @@ func (m *MsgInfo) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipWalmsgs(dAtA[iNdEx:])
skippy, err := skipWal(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -947,7 +947,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -975,7 +975,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -988,11 +988,11 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1008,7 +1008,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1027,7 +1027,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
m.Round = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1046,7 +1046,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
m.Step = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1060,15 +1060,15 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipWalmsgs(dAtA[iNdEx:])
skippy, err := skipWal(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1090,7 +1090,7 @@ func (m *EndHeight) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1118,7 +1118,7 @@ func (m *EndHeight) Unmarshal(dAtA []byte) error {
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1132,15 +1132,15 @@ func (m *EndHeight) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipWalmsgs(dAtA[iNdEx:])
skippy, err := skipWal(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1162,7 +1162,7 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1190,7 +1190,7 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1203,11 +1203,11 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1225,7 +1225,7 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1238,11 +1238,11 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1260,7 +1260,7 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1273,11 +1273,11 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1295,7 +1295,7 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1308,11 +1308,11 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1325,15 +1325,15 @@ func (m *WALMessage) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipWalmsgs(dAtA[iNdEx:])
skippy, err := skipWal(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1355,7 +1355,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1383,7 +1383,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1396,11 +1396,11 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1416,7 +1416,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowWalmsgs
return ErrIntOverflowWal
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1429,11 +1429,11 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1447,15 +1447,15 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipWalmsgs(dAtA[iNdEx:])
skippy, err := skipWal(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthWalmsgs
return ErrInvalidLengthWal
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1469,7 +1469,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipWalmsgs(dAtA []byte) (n int, err error) {
func skipWal(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -1477,7 +1477,7 @@ func skipWalmsgs(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowWalmsgs
return 0, ErrIntOverflowWal
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1494,7 +1494,7 @@ func skipWalmsgs(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowWalmsgs
return 0, ErrIntOverflowWal
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1510,7 +1510,7 @@ func skipWalmsgs(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowWalmsgs
return 0, ErrIntOverflowWal
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1523,14 +1523,14 @@ func skipWalmsgs(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthWalmsgs
return 0, ErrInvalidLengthWal
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupWalmsgs
return 0, ErrUnexpectedEndOfGroupWal
}
depth--
case 5:
@@ -1539,7 +1539,7 @@ func skipWalmsgs(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthWalmsgs
return 0, ErrInvalidLengthWal
}
if depth == 0 {
return iNdEx, nil
@@ -1549,7 +1549,7 @@ func skipWalmsgs(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthWalmsgs = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowWalmsgs = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupWalmsgs = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthWal = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowWal = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupWal = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -4,7 +4,7 @@ package tendermint.consensus;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus";
import "gogoproto/gogo.proto";
import "tendermint/consensus/msgs.proto";
import "tendermint/consensus/types.proto";
import "tendermint/types/events.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";

View File

@@ -1,7 +1,7 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/crypto/keys/types.proto
// source: tendermint/crypto/keys.proto
package keys
package crypto
import (
bytes "bytes"
@@ -35,7 +35,7 @@ func (m *PublicKey) Reset() { *m = PublicKey{} }
func (m *PublicKey) String() string { return proto.CompactTextString(m) }
func (*PublicKey) ProtoMessage() {}
func (*PublicKey) Descriptor() ([]byte, []int) {
return fileDescriptor_6e4a90a3275dcf41, []int{0}
return fileDescriptor_cb048658b234868c, []int{0}
}
func (m *PublicKey) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -111,7 +111,7 @@ func (m *PrivateKey) Reset() { *m = PrivateKey{} }
func (m *PrivateKey) String() string { return proto.CompactTextString(m) }
func (*PrivateKey) ProtoMessage() {}
func (*PrivateKey) Descriptor() ([]byte, []int) {
return fileDescriptor_6e4a90a3275dcf41, []int{1}
return fileDescriptor_cb048658b234868c, []int{1}
}
func (m *PrivateKey) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -174,27 +174,27 @@ func (*PrivateKey) XXX_OneofWrappers() []interface{} {
}
func init() {
proto.RegisterType((*PublicKey)(nil), "tendermint.crypto.keys.PublicKey")
proto.RegisterType((*PrivateKey)(nil), "tendermint.crypto.keys.PrivateKey")
proto.RegisterType((*PublicKey)(nil), "tendermint.crypto.PublicKey")
proto.RegisterType((*PrivateKey)(nil), "tendermint.crypto.PrivateKey")
}
func init() { proto.RegisterFile("tendermint/crypto/keys/types.proto", fileDescriptor_6e4a90a3275dcf41) }
func init() { proto.RegisterFile("tendermint/crypto/keys.proto", fileDescriptor_cb048658b234868c) }
var fileDescriptor_6e4a90a3275dcf41 = []byte{
// 205 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2a, 0x49, 0xcd, 0x4b,
var fileDescriptor_cb048658b234868c = []byte{
// 195 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x4e,
0xad, 0x2c, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12,
0x43, 0xa8, 0xd1, 0x83, 0xa8, 0xd1, 0x03, 0xa9, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b,
0xd1, 0x07, 0xb1, 0x20, 0xaa, 0x95, 0x2c, 0xb8, 0x38, 0x03, 0x4a, 0x93, 0x72, 0x32, 0x93, 0xbd,
0x53, 0x2b, 0x85, 0xa4, 0xb8, 0xd8, 0x53, 0x53, 0x8c, 0x4c, 0x4d, 0x0d, 0x2d, 0x25, 0x18, 0x15,
0x18, 0x35, 0x78, 0x3c, 0x18, 0x82, 0x60, 0x02, 0x56, 0x1c, 0x2f, 0x16, 0xc8, 0x33, 0xbe, 0x58,
0x28, 0xcf, 0xe8, 0xc4, 0xca, 0xc5, 0x5c, 0x5c, 0x9a, 0xab, 0xa4, 0xcf, 0xc5, 0x15, 0x50, 0x94,
0x59, 0x96, 0x58, 0x92, 0x4a, 0x40, 0x2b, 0x54, 0x83, 0x53, 0xf8, 0x89, 0x47, 0x72, 0x8c, 0x17,
0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c,
0x37, 0x1e, 0xcb, 0x31, 0x44, 0xd9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7,
0xea, 0x23, 0xf9, 0x10, 0x89, 0x09, 0x71, 0x37, 0x76, 0xdf, 0x27, 0xb1, 0x81, 0x65, 0x8d, 0x01,
0x01, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xd7, 0x81, 0x10, 0x1e, 0x01, 0x00, 0x00,
0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x44, 0xc8, 0xea, 0x41, 0x64, 0xa5,
0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xb2, 0xfa, 0x20, 0x16, 0x44, 0xa1, 0x92, 0x05, 0x17, 0x67,
0x40, 0x69, 0x52, 0x4e, 0x66, 0xb2, 0x77, 0x6a, 0xa5, 0x90, 0x14, 0x17, 0x7b, 0x6a, 0x8a, 0x91,
0xa9, 0xa9, 0xa1, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x07, 0x43, 0x10, 0x4c, 0xc0, 0x8a,
0xe3, 0xc5, 0x02, 0x79, 0xc6, 0x17, 0x0b, 0xe5, 0x19, 0x9d, 0x58, 0xb9, 0x98, 0x8b, 0x4b, 0x73,
0x95, 0xf4, 0xb9, 0xb8, 0x02, 0x8a, 0x32, 0xcb, 0x12, 0x4b, 0x52, 0x09, 0x68, 0x85, 0x6a, 0x70,
0x0a, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c,
0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x8b, 0xf4, 0xcc, 0x92,
0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x24, 0x6f, 0x21, 0x31, 0x21, 0xee, 0xc6, 0xf0,
0x72, 0x12, 0x1b, 0x58, 0xc2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x95, 0xd2, 0x85, 0x0e,
0x01, 0x00, 0x00,
}
func (this *PublicKey) Compare(that interface{}) int {
@@ -381,7 +381,7 @@ func (m *PublicKey_Ed25519) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if m.Ed25519 != nil {
i -= len(m.Ed25519)
copy(dAtA[i:], m.Ed25519)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Ed25519)))
i = encodeVarintKeys(dAtA, i, uint64(len(m.Ed25519)))
i--
dAtA[i] = 0xa
}
@@ -429,14 +429,14 @@ func (m *PrivateKey_Ed25519) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if m.Ed25519 != nil {
i -= len(m.Ed25519)
copy(dAtA[i:], m.Ed25519)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Ed25519)))
i = encodeVarintKeys(dAtA, i, uint64(len(m.Ed25519)))
i--
dAtA[i] = 0xa
}
return len(dAtA) - i, nil
}
func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
offset -= sovTypes(v)
func encodeVarintKeys(dAtA []byte, offset int, v uint64) int {
offset -= sovKeys(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -466,7 +466,7 @@ func (m *PublicKey_Ed25519) Size() (n int) {
_ = l
if m.Ed25519 != nil {
l = len(m.Ed25519)
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovKeys(uint64(l))
}
return n
}
@@ -490,16 +490,16 @@ func (m *PrivateKey_Ed25519) Size() (n int) {
_ = l
if m.Ed25519 != nil {
l = len(m.Ed25519)
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovKeys(uint64(l))
}
return n
}
func sovTypes(x uint64) (n int) {
func sovKeys(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozTypes(x uint64) (n int) {
return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozKeys(x uint64) (n int) {
return sovKeys(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *PublicKey) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -509,7 +509,7 @@ func (m *PublicKey) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowKeys
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -537,7 +537,7 @@ func (m *PublicKey) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowKeys
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -550,11 +550,11 @@ func (m *PublicKey) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -565,15 +565,15 @@ func (m *PublicKey) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipKeys(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -595,7 +595,7 @@ func (m *PrivateKey) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowKeys
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -623,7 +623,7 @@ func (m *PrivateKey) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowKeys
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -636,11 +636,11 @@ func (m *PrivateKey) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -651,15 +651,15 @@ func (m *PrivateKey) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipKeys(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthKeys
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -673,7 +673,7 @@ func (m *PrivateKey) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipTypes(dAtA []byte) (n int, err error) {
func skipKeys(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -681,7 +681,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowTypes
return 0, ErrIntOverflowKeys
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -698,7 +698,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowTypes
return 0, ErrIntOverflowKeys
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -714,7 +714,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowTypes
return 0, ErrIntOverflowKeys
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -727,14 +727,14 @@ func skipTypes(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthTypes
return 0, ErrInvalidLengthKeys
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupTypes
return 0, ErrUnexpectedEndOfGroupKeys
}
depth--
case 5:
@@ -743,7 +743,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthTypes
return 0, ErrInvalidLengthKeys
}
if depth == 0 {
return iNdEx, nil
@@ -753,7 +753,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthKeys = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowKeys = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupKeys = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -1,7 +1,7 @@
syntax = "proto3";
package tendermint.crypto.keys;
package tendermint.crypto;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto/keys";
option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto";
import "gogoproto/gogo.proto";

View File

@@ -1,7 +1,7 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/crypto/merkle/types.proto
// source: tendermint/crypto/proof.proto
package merkle
package crypto
import (
fmt "fmt"
@@ -34,7 +34,7 @@ func (m *Proof) Reset() { *m = Proof{} }
func (m *Proof) String() string { return proto.CompactTextString(m) }
func (*Proof) ProtoMessage() {}
func (*Proof) Descriptor() ([]byte, []int) {
return fileDescriptor_ae49ae2f7da97579, []int{0}
return fileDescriptor_6b60b6ba2ab5b856, []int{0}
}
func (m *Proof) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -102,7 +102,7 @@ func (m *ValueOp) Reset() { *m = ValueOp{} }
func (m *ValueOp) String() string { return proto.CompactTextString(m) }
func (*ValueOp) ProtoMessage() {}
func (*ValueOp) Descriptor() ([]byte, []int) {
return fileDescriptor_ae49ae2f7da97579, []int{1}
return fileDescriptor_6b60b6ba2ab5b856, []int{1}
}
func (m *ValueOp) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -155,7 +155,7 @@ func (m *DominoOp) Reset() { *m = DominoOp{} }
func (m *DominoOp) String() string { return proto.CompactTextString(m) }
func (*DominoOp) ProtoMessage() {}
func (*DominoOp) Descriptor() ([]byte, []int) {
return fileDescriptor_ae49ae2f7da97579, []int{2}
return fileDescriptor_6b60b6ba2ab5b856, []int{2}
}
func (m *DominoOp) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -218,7 +218,7 @@ func (m *ProofOp) Reset() { *m = ProofOp{} }
func (m *ProofOp) String() string { return proto.CompactTextString(m) }
func (*ProofOp) ProtoMessage() {}
func (*ProofOp) Descriptor() ([]byte, []int) {
return fileDescriptor_ae49ae2f7da97579, []int{3}
return fileDescriptor_6b60b6ba2ab5b856, []int{3}
}
func (m *ProofOp) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -277,7 +277,7 @@ func (m *ProofOps) Reset() { *m = ProofOps{} }
func (m *ProofOps) String() string { return proto.CompactTextString(m) }
func (*ProofOps) ProtoMessage() {}
func (*ProofOps) Descriptor() ([]byte, []int) {
return fileDescriptor_ae49ae2f7da97579, []int{4}
return fileDescriptor_6b60b6ba2ab5b856, []int{4}
}
func (m *ProofOps) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -314,42 +314,39 @@ func (m *ProofOps) GetOps() []ProofOp {
}
func init() {
proto.RegisterType((*Proof)(nil), "tendermint.crypto.merkle.Proof")
proto.RegisterType((*ValueOp)(nil), "tendermint.crypto.merkle.ValueOp")
proto.RegisterType((*DominoOp)(nil), "tendermint.crypto.merkle.DominoOp")
proto.RegisterType((*ProofOp)(nil), "tendermint.crypto.merkle.ProofOp")
proto.RegisterType((*ProofOps)(nil), "tendermint.crypto.merkle.ProofOps")
proto.RegisterType((*Proof)(nil), "tendermint.crypto.Proof")
proto.RegisterType((*ValueOp)(nil), "tendermint.crypto.ValueOp")
proto.RegisterType((*DominoOp)(nil), "tendermint.crypto.DominoOp")
proto.RegisterType((*ProofOp)(nil), "tendermint.crypto.ProofOp")
proto.RegisterType((*ProofOps)(nil), "tendermint.crypto.ProofOps")
}
func init() {
proto.RegisterFile("tendermint/crypto/merkle/types.proto", fileDescriptor_ae49ae2f7da97579)
}
func init() { proto.RegisterFile("tendermint/crypto/proof.proto", fileDescriptor_6b60b6ba2ab5b856) }
var fileDescriptor_ae49ae2f7da97579 = []byte{
// 367 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xbd, 0x6a, 0xeb, 0x30,
0x18, 0xb5, 0x63, 0xe7, 0xef, 0x4b, 0x86, 0x8b, 0x08, 0x17, 0x73, 0x2f, 0x38, 0xbe, 0xe6, 0x0e,
0x9e, 0x6c, 0x48, 0xe9, 0xd0, 0xa9, 0x90, 0xb6, 0x50, 0xba, 0xa4, 0x68, 0x28, 0xb4, 0x4b, 0x51,
0x12, 0x25, 0x36, 0xb1, 0x2d, 0x61, 0xcb, 0xd0, 0xbc, 0x45, 0x1f, 0x2b, 0x63, 0xc6, 0x4e, 0xa5,
0x24, 0x2f, 0x52, 0x24, 0xb9, 0x24, 0x1d, 0x42, 0xb7, 0x73, 0x8e, 0x8f, 0x8e, 0xce, 0x67, 0x7d,
0xf0, 0x5f, 0xd0, 0x7c, 0x4e, 0x8b, 0x2c, 0xc9, 0x45, 0x34, 0x2b, 0xd6, 0x5c, 0xb0, 0x28, 0xa3,
0xc5, 0x2a, 0xa5, 0x91, 0x58, 0x73, 0x5a, 0x86, 0xbc, 0x60, 0x82, 0x21, 0xe7, 0xe0, 0x0a, 0xb5,
0x2b, 0xd4, 0xae, 0x3f, 0x83, 0x25, 0x5b, 0x32, 0x65, 0x8a, 0x24, 0xd2, 0x7e, 0x7f, 0x01, 0xcd,
0xfb, 0x82, 0xb1, 0x05, 0x1a, 0x40, 0x53, 0x30, 0x41, 0x52, 0xc7, 0xf4, 0xcc, 0xc0, 0xc2, 0x9a,
0x48, 0x35, 0xc9, 0xe7, 0xf4, 0xc5, 0x69, 0x68, 0x55, 0x11, 0xf4, 0x17, 0xba, 0x29, 0x25, 0x8b,
0xe7, 0x98, 0x94, 0xb1, 0x63, 0x79, 0x66, 0xd0, 0xc7, 0x1d, 0x29, 0xdc, 0x92, 0x32, 0x96, 0x47,
0x48, 0x95, 0x8b, 0xd2, 0xb1, 0x3d, 0x2b, 0xe8, 0x63, 0x4d, 0x7c, 0x0c, 0xed, 0x07, 0x92, 0x56,
0x74, 0xc2, 0xd1, 0x2f, 0xb0, 0x56, 0x74, 0xad, 0xee, 0xe9, 0x63, 0x09, 0xd1, 0x39, 0x34, 0xb9,
0x2c, 0xa1, 0x6e, 0xe9, 0x8d, 0x86, 0xe1, 0xa9, 0x21, 0x42, 0xd5, 0x15, 0x6b, 0xb7, 0x7f, 0x07,
0x9d, 0x6b, 0x96, 0x25, 0x39, 0xfb, 0x1e, 0xda, 0xd5, 0xa1, 0xaa, 0x3a, 0xaf, 0x84, 0x0a, 0xed,
0x62, 0x4d, 0xd0, 0x6f, 0x68, 0xb1, 0x4a, 0x48, 0xd9, 0x52, 0x72, 0xcd, 0xfc, 0x2b, 0x68, 0xab,
0xec, 0x09, 0x47, 0x08, 0x6c, 0xf9, 0x47, 0xeb, 0x2c, 0x85, 0xbf, 0xe2, 0x1b, 0x87, 0xce, 0x08,
0xec, 0x39, 0x11, 0xa4, 0x1e, 0x5f, 0x61, 0xff, 0x06, 0x3a, 0x75, 0x48, 0x89, 0x2e, 0xc0, 0x62,
0xbc, 0x74, 0x4c, 0xcf, 0x0a, 0x7a, 0xa3, 0x7f, 0x3f, 0x4c, 0x34, 0xe1, 0x63, 0x7b, 0xf3, 0x3e,
0x34, 0xb0, 0x3c, 0x33, 0x7e, 0xdc, 0xec, 0x5c, 0x73, 0xbb, 0x73, 0xcd, 0x8f, 0x9d, 0x6b, 0xbe,
0xee, 0x5d, 0x63, 0xbb, 0x77, 0x8d, 0xb7, 0xbd, 0x6b, 0x3c, 0x5d, 0x2e, 0x13, 0x11, 0x57, 0xd3,
0x70, 0xc6, 0xb2, 0xe8, 0x68, 0x1d, 0x8e, 0xa0, 0x7e, 0xe0, 0x53, 0xab, 0x32, 0x6d, 0xa9, 0xef,
0x67, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xed, 0xa1, 0x41, 0x4d, 0x02, 0x00, 0x00,
var fileDescriptor_6b60b6ba2ab5b856 = []byte{
// 351 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbb, 0x4e, 0xc3, 0x30,
0x14, 0x4d, 0xea, 0xf4, 0x75, 0xdb, 0x01, 0xac, 0x0a, 0x45, 0x45, 0x84, 0x28, 0x53, 0xa6, 0x44,
0x2a, 0x0b, 0x13, 0x43, 0x61, 0x40, 0x30, 0x14, 0x79, 0x60, 0x60, 0x41, 0x6e, 0xeb, 0x36, 0x11,
0x6d, 0x6c, 0x25, 0x8e, 0x44, 0xff, 0x82, 0xcf, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0xf6, 0x47, 0x90,
0xed, 0xa0, 0x16, 0x55, 0x6c, 0xe7, 0x71, 0x7d, 0x7c, 0xac, 0x6b, 0xb8, 0x90, 0x2c, 0x9b, 0xb2,
0x7c, 0x99, 0x66, 0x32, 0x9e, 0xe4, 0x2b, 0x21, 0x79, 0x2c, 0x72, 0xce, 0x67, 0x91, 0xc8, 0xb9,
0xe4, 0xf8, 0x74, 0x6f, 0x47, 0xc6, 0xee, 0xf7, 0xe6, 0x7c, 0xce, 0xb5, 0x1b, 0x2b, 0x64, 0x06,
0x83, 0x19, 0xd4, 0x9f, 0xd4, 0x39, 0xdc, 0x83, 0xba, 0xe4, 0x92, 0x2e, 0x5c, 0xdb, 0xb7, 0x43,
0x44, 0x0c, 0x51, 0x6a, 0x9a, 0x4d, 0xd9, 0xbb, 0x5b, 0x33, 0xaa, 0x26, 0xf8, 0x1c, 0xda, 0x0b,
0x46, 0x67, 0xaf, 0x09, 0x2d, 0x12, 0x17, 0xf9, 0x76, 0xd8, 0x25, 0x2d, 0x25, 0xdc, 0xd3, 0x22,
0x51, 0x47, 0x68, 0x99, 0xc9, 0xc2, 0x75, 0x7c, 0x14, 0x76, 0x89, 0x21, 0xc1, 0x23, 0x34, 0x9f,
0xe9, 0xa2, 0x64, 0x23, 0x81, 0x4f, 0x00, 0xbd, 0xb1, 0x95, 0xbe, 0xa7, 0x4b, 0x14, 0xc4, 0x11,
0xd4, 0x75, 0x79, 0x7d, 0x4b, 0x67, 0xe0, 0x46, 0x47, 0xed, 0x23, 0x5d, 0x92, 0x98, 0xb1, 0xe0,
0x01, 0x5a, 0x77, 0x7c, 0x99, 0x66, 0xfc, 0x6f, 0x5a, 0xdb, 0xa4, 0xe9, 0xce, 0xa2, 0x94, 0x3a,
0xad, 0x4d, 0x0c, 0xc1, 0x67, 0xd0, 0xe0, 0xa5, 0x54, 0x32, 0xd2, 0x72, 0xc5, 0x82, 0x5b, 0x68,
0xea, 0xec, 0x91, 0xc0, 0x18, 0x1c, 0xb9, 0x12, 0xac, 0xca, 0xd2, 0xf8, 0x37, 0xbe, 0xb6, 0x2f,
0x8b, 0xc1, 0x99, 0x52, 0x49, 0xab, 0x77, 0x6b, 0x1c, 0xdc, 0x40, 0xab, 0x0a, 0x29, 0xf0, 0x00,
0x10, 0x17, 0x85, 0x6b, 0xfb, 0x28, 0xec, 0x0c, 0xfa, 0xff, 0x3d, 0x65, 0x24, 0x86, 0xce, 0xfa,
0xeb, 0xd2, 0x22, 0x6a, 0x78, 0x48, 0xd6, 0x5b, 0xcf, 0xde, 0x6c, 0x3d, 0xfb, 0x7b, 0xeb, 0xd9,
0x1f, 0x3b, 0xcf, 0xda, 0xec, 0x3c, 0xeb, 0x73, 0xe7, 0x59, 0x2f, 0xd7, 0xf3, 0x54, 0x26, 0xe5,
0x38, 0x9a, 0xf0, 0x65, 0x7c, 0xb0, 0xf2, 0x03, 0x68, 0x56, 0x7a, 0xf4, 0x1d, 0xc6, 0x0d, 0x6d,
0x5c, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0x43, 0x5d, 0xb9, 0x45, 0x2a, 0x02, 0x00, 0x00,
}
func (m *Proof) Marshal() (dAtA []byte, err error) {
@@ -376,7 +373,7 @@ func (m *Proof) MarshalToSizedBuffer(dAtA []byte) (int, error) {
for iNdEx := len(m.Aunts) - 1; iNdEx >= 0; iNdEx-- {
i -= len(m.Aunts[iNdEx])
copy(dAtA[i:], m.Aunts[iNdEx])
i = encodeVarintTypes(dAtA, i, uint64(len(m.Aunts[iNdEx])))
i = encodeVarintProof(dAtA, i, uint64(len(m.Aunts[iNdEx])))
i--
dAtA[i] = 0x22
}
@@ -384,17 +381,17 @@ func (m *Proof) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.LeafHash) > 0 {
i -= len(m.LeafHash)
copy(dAtA[i:], m.LeafHash)
i = encodeVarintTypes(dAtA, i, uint64(len(m.LeafHash)))
i = encodeVarintProof(dAtA, i, uint64(len(m.LeafHash)))
i--
dAtA[i] = 0x1a
}
if m.Index != 0 {
i = encodeVarintTypes(dAtA, i, uint64(m.Index))
i = encodeVarintProof(dAtA, i, uint64(m.Index))
i--
dAtA[i] = 0x10
}
if m.Total != 0 {
i = encodeVarintTypes(dAtA, i, uint64(m.Total))
i = encodeVarintProof(dAtA, i, uint64(m.Total))
i--
dAtA[i] = 0x8
}
@@ -428,7 +425,7 @@ func (m *ValueOp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintTypes(dAtA, i, uint64(size))
i = encodeVarintProof(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
@@ -436,7 +433,7 @@ func (m *ValueOp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Key) > 0 {
i -= len(m.Key)
copy(dAtA[i:], m.Key)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Key)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Key)))
i--
dAtA[i] = 0xa
}
@@ -466,21 +463,21 @@ func (m *DominoOp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Output) > 0 {
i -= len(m.Output)
copy(dAtA[i:], m.Output)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Output)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Output)))
i--
dAtA[i] = 0x1a
}
if len(m.Input) > 0 {
i -= len(m.Input)
copy(dAtA[i:], m.Input)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Input)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Input)))
i--
dAtA[i] = 0x12
}
if len(m.Key) > 0 {
i -= len(m.Key)
copy(dAtA[i:], m.Key)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Key)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Key)))
i--
dAtA[i] = 0xa
}
@@ -510,21 +507,21 @@ func (m *ProofOp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Data) > 0 {
i -= len(m.Data)
copy(dAtA[i:], m.Data)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Data)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Data)))
i--
dAtA[i] = 0x1a
}
if len(m.Key) > 0 {
i -= len(m.Key)
copy(dAtA[i:], m.Key)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Key)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Key)))
i--
dAtA[i] = 0x12
}
if len(m.Type) > 0 {
i -= len(m.Type)
copy(dAtA[i:], m.Type)
i = encodeVarintTypes(dAtA, i, uint64(len(m.Type)))
i = encodeVarintProof(dAtA, i, uint64(len(m.Type)))
i--
dAtA[i] = 0xa
}
@@ -559,7 +556,7 @@ func (m *ProofOps) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintTypes(dAtA, i, uint64(size))
i = encodeVarintProof(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -568,8 +565,8 @@ func (m *ProofOps) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil
}
func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
offset -= sovTypes(v)
func encodeVarintProof(dAtA []byte, offset int, v uint64) int {
offset -= sovProof(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -586,19 +583,19 @@ func (m *Proof) Size() (n int) {
var l int
_ = l
if m.Total != 0 {
n += 1 + sovTypes(uint64(m.Total))
n += 1 + sovProof(uint64(m.Total))
}
if m.Index != 0 {
n += 1 + sovTypes(uint64(m.Index))
n += 1 + sovProof(uint64(m.Index))
}
l = len(m.LeafHash)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
if len(m.Aunts) > 0 {
for _, b := range m.Aunts {
l = len(b)
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
}
return n
@@ -612,11 +609,11 @@ func (m *ValueOp) Size() (n int) {
_ = l
l = len(m.Key)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
if m.Proof != nil {
l = m.Proof.Size()
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
return n
}
@@ -629,15 +626,15 @@ func (m *DominoOp) Size() (n int) {
_ = l
l = len(m.Key)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
l = len(m.Input)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
l = len(m.Output)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
return n
}
@@ -650,15 +647,15 @@ func (m *ProofOp) Size() (n int) {
_ = l
l = len(m.Type)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
l = len(m.Key)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
l = len(m.Data)
if l > 0 {
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
return n
}
@@ -672,17 +669,17 @@ func (m *ProofOps) Size() (n int) {
if len(m.Ops) > 0 {
for _, e := range m.Ops {
l = e.Size()
n += 1 + l + sovTypes(uint64(l))
n += 1 + l + sovProof(uint64(l))
}
}
return n
}
func sovTypes(x uint64) (n int) {
func sovProof(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozTypes(x uint64) (n int) {
return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozProof(x uint64) (n int) {
return sovProof(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *Proof) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -692,7 +689,7 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -720,7 +717,7 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
m.Total = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -739,7 +736,7 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
m.Index = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -758,7 +755,7 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -771,11 +768,11 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -792,7 +789,7 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -805,11 +802,11 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -819,15 +816,15 @@ func (m *Proof) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipProof(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -849,7 +846,7 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -877,7 +874,7 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -890,11 +887,11 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -911,7 +908,7 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -924,11 +921,11 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -942,15 +939,15 @@ func (m *ValueOp) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipProof(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -972,7 +969,7 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1000,7 +997,7 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1014,11 +1011,11 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1032,7 +1029,7 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1046,11 +1043,11 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1064,7 +1061,7 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1078,11 +1075,11 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1091,15 +1088,15 @@ func (m *DominoOp) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipProof(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1121,7 +1118,7 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1149,7 +1146,7 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1163,11 +1160,11 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1181,7 +1178,7 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1194,11 +1191,11 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1215,7 +1212,7 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1228,11 +1225,11 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1244,15 +1241,15 @@ func (m *ProofOp) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipProof(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1274,7 +1271,7 @@ func (m *ProofOps) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1302,7 +1299,7 @@ func (m *ProofOps) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTypes
return ErrIntOverflowProof
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1315,11 +1312,11 @@ func (m *ProofOps) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1331,15 +1328,15 @@ func (m *ProofOps) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipTypes(dAtA[iNdEx:])
skippy, err := skipProof(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthTypes
return ErrInvalidLengthProof
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1353,7 +1350,7 @@ func (m *ProofOps) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipTypes(dAtA []byte) (n int, err error) {
func skipProof(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -1361,7 +1358,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowTypes
return 0, ErrIntOverflowProof
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1378,7 +1375,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowTypes
return 0, ErrIntOverflowProof
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1394,7 +1391,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowTypes
return 0, ErrIntOverflowProof
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1407,14 +1404,14 @@ func skipTypes(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthTypes
return 0, ErrInvalidLengthProof
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupTypes
return 0, ErrUnexpectedEndOfGroupProof
}
depth--
case 5:
@@ -1423,7 +1420,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthTypes
return 0, ErrInvalidLengthProof
}
if depth == 0 {
return iNdEx, nil
@@ -1433,7 +1430,7 @@ func skipTypes(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthProof = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowProof = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupProof = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -1,7 +1,7 @@
syntax = "proto3";
package tendermint.crypto.merkle;
package tendermint.crypto;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle";
option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto";
import "gogoproto/gogo.proto";

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/evidence/msgs.proto
// source: tendermint/evidence/types.proto
package evidence
@@ -32,7 +32,7 @@ func (m *List) Reset() { *m = List{} }
func (m *List) String() string { return proto.CompactTextString(m) }
func (*List) ProtoMessage() {}
func (*List) Descriptor() ([]byte, []int) {
return fileDescriptor_241b0b668c736d2f, []int{0}
return fileDescriptor_5e804d1c041a0e47, []int{0}
}
func (m *List) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -78,7 +78,7 @@ func (m *Info) Reset() { *m = Info{} }
func (m *Info) String() string { return proto.CompactTextString(m) }
func (*Info) ProtoMessage() {}
func (*Info) Descriptor() ([]byte, []int) {
return fileDescriptor_241b0b668c736d2f, []int{1}
return fileDescriptor_5e804d1c041a0e47, []int{1}
}
func (m *Info) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -133,26 +133,26 @@ func init() {
proto.RegisterType((*Info)(nil), "tendermint.evidence.Info")
}
func init() { proto.RegisterFile("tendermint/evidence/msgs.proto", fileDescriptor_241b0b668c736d2f) }
func init() { proto.RegisterFile("tendermint/evidence/types.proto", fileDescriptor_5e804d1c041a0e47) }
var fileDescriptor_241b0b668c736d2f = []byte{
// 246 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b,
var fileDescriptor_5e804d1c041a0e47 = []byte{
// 243 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x2d, 0xcb, 0x4c, 0x49, 0xcd, 0x4b, 0x4e, 0xd5,
0xcf, 0x2d, 0x4e, 0x2f, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0xc8, 0xeb, 0xc1,
0xe4, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xf2, 0xfa, 0x20, 0x16, 0x44, 0xa9, 0x94, 0x3c,
0x92, 0x51, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x70, 0x03, 0x21, 0x0a, 0x94, 0xec, 0xb8, 0x58, 0x7c,
0x32, 0x8b, 0x4b, 0x84, 0xcc, 0xb8, 0x38, 0x60, 0x32, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46,
0x52, 0x7a, 0x48, 0xd6, 0x80, 0xf5, 0xea, 0xb9, 0x42, 0x55, 0x04, 0xc1, 0xd5, 0x2a, 0xd5, 0x71,
0xb1, 0x78, 0xe6, 0xa5, 0xe5, 0x0b, 0xc9, 0x70, 0x71, 0x26, 0xe7, 0xe7, 0xe6, 0x66, 0x96, 0x94,
0xa4, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x04, 0x21, 0x04, 0x84, 0xa4, 0xb8, 0x38, 0x0a,
0x8a, 0x32, 0xf3, 0x8b, 0x32, 0x4b, 0x2a, 0x25, 0x98, 0x14, 0x18, 0x35, 0x98, 0x83, 0xe0, 0x7c,
0x21, 0x1b, 0x24, 0x9b, 0x99, 0x15, 0x18, 0xf1, 0xdb, 0xec, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x03,
0xc2, 0x7e, 0xa7, 0x90, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e,
0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4a,
0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0x0e, 0x05, 0x04, 0x13, 0x12,
0x5a, 0x58, 0x02, 0x3b, 0x89, 0x0d, 0x2c, 0x65, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xec, 0x27,
0xa7, 0x19, 0x8a, 0x01, 0x00, 0x00,
0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0x28, 0xd0,
0x83, 0x29, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, 0x83, 0x58, 0x10, 0xa5, 0x52,
0xc8, 0x66, 0x81, 0x8d, 0x80, 0x9b, 0x08, 0x51, 0xa0, 0x64, 0xc7, 0xc5, 0xe2, 0x93, 0x59, 0x5c,
0x22, 0x64, 0xc6, 0xc5, 0x01, 0x93, 0x91, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x36, 0x92, 0xd2, 0x43,
0xb2, 0x06, 0x62, 0xbd, 0x2b, 0x54, 0x45, 0x10, 0x5c, 0xad, 0x52, 0x1d, 0x17, 0x8b, 0x67, 0x5e,
0x5a, 0xbe, 0x90, 0x0c, 0x17, 0x67, 0x72, 0x7e, 0x6e, 0x6e, 0x66, 0x49, 0x49, 0x6a, 0x8a, 0x04,
0xa3, 0x02, 0xa3, 0x06, 0x47, 0x10, 0x42, 0x40, 0x48, 0x8a, 0x8b, 0xa3, 0xa0, 0x28, 0x33, 0xbf,
0x28, 0xb3, 0xa4, 0x52, 0x82, 0x49, 0x81, 0x51, 0x83, 0x39, 0x08, 0xce, 0x17, 0xb2, 0x41, 0xb2,
0x99, 0x59, 0x81, 0x11, 0xbf, 0xcd, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x20, 0xec, 0x77, 0x0a,
0x39, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96,
0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xab, 0xf4, 0xcc, 0x92, 0x8c,
0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xe4, 0x50, 0x40, 0x30, 0x21, 0xa1, 0x85, 0x25, 0xb4,
0x93, 0xd8, 0xc0, 0x52, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0x95, 0x45, 0x68, 0x8b,
0x01, 0x00, 0x00,
}
func (m *List) Marshal() (dAtA []byte, err error) {
@@ -183,7 +183,7 @@ func (m *List) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -218,12 +218,12 @@ func (m *Info) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
if m.Priority != 0 {
i = encodeVarintMsgs(dAtA, i, uint64(m.Priority))
i = encodeVarintTypes(dAtA, i, uint64(m.Priority))
i--
dAtA[i] = 0x10
}
@@ -240,8 +240,8 @@ func (m *Info) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil
}
func encodeVarintMsgs(dAtA []byte, offset int, v uint64) int {
offset -= sovMsgs(v)
func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
offset -= sovTypes(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -260,7 +260,7 @@ func (m *List) Size() (n int) {
if len(m.Evidence) > 0 {
for _, e := range m.Evidence {
l = e.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
}
return n
@@ -276,18 +276,18 @@ func (m *Info) Size() (n int) {
n += 2
}
if m.Priority != 0 {
n += 1 + sovMsgs(uint64(m.Priority))
n += 1 + sovTypes(uint64(m.Priority))
}
l = m.Evidence.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
return n
}
func sovMsgs(x uint64) (n int) {
func sovTypes(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozMsgs(x uint64) (n int) {
return sovMsgs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozTypes(x uint64) (n int) {
return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *List) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -297,7 +297,7 @@ func (m *List) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -325,7 +325,7 @@ func (m *List) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -338,11 +338,11 @@ func (m *List) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -354,15 +354,15 @@ func (m *List) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -384,7 +384,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -412,7 +412,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
var v int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -432,7 +432,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
m.Priority = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -451,7 +451,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -464,11 +464,11 @@ func (m *Info) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -479,15 +479,15 @@ func (m *Info) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -501,7 +501,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipMsgs(dAtA []byte) (n int, err error) {
func skipTypes(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -509,7 +509,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -526,7 +526,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -542,7 +542,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -555,14 +555,14 @@ func skipMsgs(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthMsgs
return 0, ErrInvalidLengthTypes
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupMsgs
return 0, ErrUnexpectedEndOfGroupTypes
}
depth--
case 5:
@@ -571,7 +571,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthMsgs
return 0, ErrInvalidLengthTypes
}
if depth == 0 {
return iNdEx, nil
@@ -581,7 +581,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthMsgs = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowMsgs = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupMsgs = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/mempool/msgs.proto
// source: tendermint/mempool/types.proto
package mempool
@@ -30,7 +30,7 @@ func (m *Tx) Reset() { *m = Tx{} }
func (m *Tx) String() string { return proto.CompactTextString(m) }
func (*Tx) ProtoMessage() {}
func (*Tx) Descriptor() ([]byte, []int) {
return fileDescriptor_340c1e3d9295ab7c, []int{0}
return fileDescriptor_2af51926fdbcbc05, []int{0}
}
func (m *Tx) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -76,7 +76,7 @@ func (m *Message) Reset() { *m = Message{} }
func (m *Message) String() string { return proto.CompactTextString(m) }
func (*Message) ProtoMessage() {}
func (*Message) Descriptor() ([]byte, []int) {
return fileDescriptor_340c1e3d9295ab7c, []int{1}
return fileDescriptor_2af51926fdbcbc05, []int{1}
}
func (m *Message) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -143,21 +143,21 @@ func init() {
proto.RegisterType((*Message)(nil), "tendermint.mempool.Message")
}
func init() { proto.RegisterFile("tendermint/mempool/msgs.proto", fileDescriptor_340c1e3d9295ab7c) }
func init() { proto.RegisterFile("tendermint/mempool/types.proto", fileDescriptor_2af51926fdbcbc05) }
var fileDescriptor_340c1e3d9295ab7c = []byte{
// 174 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, 0xcf, 0xcf, 0xd1, 0xcf,
0x2d, 0x4e, 0x2f, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0x48, 0xeb, 0x41, 0xa5,
0x95, 0x44, 0xb8, 0x98, 0x42, 0x2a, 0x84, 0xf8, 0xb8, 0x98, 0x4a, 0x2a, 0x24, 0x18, 0x15, 0x18,
0x35, 0x78, 0x82, 0x98, 0x4a, 0x2a, 0x94, 0xac, 0xb8, 0xd8, 0x7d, 0x53, 0x8b, 0x8b, 0x13, 0xd3,
0x53, 0x85, 0x34, 0xe0, 0x52, 0xdc, 0x46, 0x62, 0x7a, 0x98, 0x26, 0xe8, 0x85, 0x54, 0x78, 0x30,
0x80, 0x34, 0x39, 0xb1, 0x72, 0x31, 0x17, 0x97, 0xe6, 0x3a, 0x05, 0x9f, 0x78, 0x24, 0xc7, 0x78,
0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7,
0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x65, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e,
0xae, 0x3e, 0x92, 0x4b, 0x91, 0x98, 0x60, 0x77, 0xea, 0x63, 0xfa, 0x22, 0x89, 0x0d, 0x2c, 0x63,
0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x3f, 0xaf, 0x64, 0xe2, 0x00, 0x00, 0x00,
var fileDescriptor_2af51926fdbcbc05 = []byte{
// 175 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, 0xcf, 0xcf, 0xd1, 0x2f,
0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41,
0xe5, 0x95, 0x44, 0xb8, 0x98, 0x42, 0x2a, 0x84, 0xf8, 0xb8, 0x98, 0x4a, 0x2a, 0x24, 0x18, 0x15,
0x18, 0x35, 0x78, 0x82, 0x98, 0x4a, 0x2a, 0x94, 0xac, 0xb8, 0xd8, 0x7d, 0x53, 0x8b, 0x8b, 0x13,
0xd3, 0x53, 0x85, 0x34, 0xe0, 0x52, 0xdc, 0x46, 0x62, 0x7a, 0x98, 0x26, 0xe8, 0x85, 0x54, 0x78,
0x30, 0x80, 0x34, 0x39, 0xb1, 0x72, 0x31, 0x17, 0x97, 0xe6, 0x3a, 0x05, 0x9f, 0x78, 0x24, 0xc7,
0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c,
0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x65, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72,
0x7e, 0xae, 0x3e, 0x92, 0x53, 0x91, 0x98, 0x60, 0x77, 0xea, 0x63, 0x7a, 0x23, 0x89, 0x0d, 0x2c,
0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x21, 0xe2, 0x11, 0x57, 0xe3, 0x00, 0x00, 0x00,
}
func (m *Tx) Marshal() (dAtA []byte, err error) {
@@ -183,7 +183,7 @@ func (m *Tx) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Tx) > 0 {
i -= len(m.Tx)
copy(dAtA[i:], m.Tx)
i = encodeVarintMsgs(dAtA, i, uint64(len(m.Tx)))
i = encodeVarintTypes(dAtA, i, uint64(len(m.Tx)))
i--
dAtA[i] = 0xa
}
@@ -236,15 +236,15 @@ func (m *Message_Tx) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintMsgs(dAtA, i, uint64(size))
i = encodeVarintTypes(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
return len(dAtA) - i, nil
}
func encodeVarintMsgs(dAtA []byte, offset int, v uint64) int {
offset -= sovMsgs(v)
func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
offset -= sovTypes(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -262,7 +262,7 @@ func (m *Tx) Size() (n int) {
_ = l
l = len(m.Tx)
if l > 0 {
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -287,16 +287,16 @@ func (m *Message_Tx) Size() (n int) {
_ = l
if m.Tx != nil {
l = m.Tx.Size()
n += 1 + l + sovMsgs(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
func sovMsgs(x uint64) (n int) {
func sovTypes(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozMsgs(x uint64) (n int) {
return sovMsgs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozTypes(x uint64) (n int) {
return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *Tx) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -306,7 +306,7 @@ func (m *Tx) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -334,7 +334,7 @@ func (m *Tx) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -347,11 +347,11 @@ func (m *Tx) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -363,15 +363,15 @@ func (m *Tx) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -393,7 +393,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -421,7 +421,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMsgs
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -434,11 +434,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -451,15 +451,15 @@ func (m *Message) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMsgs(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthMsgs
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -473,7 +473,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipMsgs(dAtA []byte) (n int, err error) {
func skipTypes(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -481,7 +481,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -498,7 +498,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -514,7 +514,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowMsgs
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -527,14 +527,14 @@ func skipMsgs(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthMsgs
return 0, ErrInvalidLengthTypes
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupMsgs
return 0, ErrUnexpectedEndOfGroupTypes
}
depth--
case 5:
@@ -543,7 +543,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthMsgs
return 0, ErrInvalidLengthTypes
}
if depth == 0 {
return iNdEx, nil
@@ -553,7 +553,7 @@ func skipMsgs(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthMsgs = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowMsgs = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupMsgs = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/p2p/conn_msgs.proto
// source: tendermint/p2p/conn.proto
package p2p
@@ -7,7 +7,7 @@ import (
fmt "fmt"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys"
crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
io "io"
math "math"
math_bits "math/bits"
@@ -31,7 +31,7 @@ func (m *PacketPing) Reset() { *m = PacketPing{} }
func (m *PacketPing) String() string { return proto.CompactTextString(m) }
func (*PacketPing) ProtoMessage() {}
func (*PacketPing) Descriptor() ([]byte, []int) {
return fileDescriptor_be90553d47cad78e, []int{0}
return fileDescriptor_22474b5527c8fa9f, []int{0}
}
func (m *PacketPing) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -67,7 +67,7 @@ func (m *PacketPong) Reset() { *m = PacketPong{} }
func (m *PacketPong) String() string { return proto.CompactTextString(m) }
func (*PacketPong) ProtoMessage() {}
func (*PacketPong) Descriptor() ([]byte, []int) {
return fileDescriptor_be90553d47cad78e, []int{1}
return fileDescriptor_22474b5527c8fa9f, []int{1}
}
func (m *PacketPong) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -106,7 +106,7 @@ func (m *PacketMsg) Reset() { *m = PacketMsg{} }
func (m *PacketMsg) String() string { return proto.CompactTextString(m) }
func (*PacketMsg) ProtoMessage() {}
func (*PacketMsg) Descriptor() ([]byte, []int) {
return fileDescriptor_be90553d47cad78e, []int{2}
return fileDescriptor_22474b5527c8fa9f, []int{2}
}
func (m *PacketMsg) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -168,7 +168,7 @@ func (m *Packet) Reset() { *m = Packet{} }
func (m *Packet) String() string { return proto.CompactTextString(m) }
func (*Packet) ProtoMessage() {}
func (*Packet) Descriptor() ([]byte, []int) {
return fileDescriptor_be90553d47cad78e, []int{3}
return fileDescriptor_22474b5527c8fa9f, []int{3}
}
func (m *Packet) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -255,15 +255,15 @@ func (*Packet) XXX_OneofWrappers() []interface{} {
}
type AuthSigMessage struct {
PubKey keys.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"`
Sig []byte `protobuf:"bytes,2,opt,name=sig,proto3" json:"sig,omitempty"`
PubKey crypto.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"`
Sig []byte `protobuf:"bytes,2,opt,name=sig,proto3" json:"sig,omitempty"`
}
func (m *AuthSigMessage) Reset() { *m = AuthSigMessage{} }
func (m *AuthSigMessage) String() string { return proto.CompactTextString(m) }
func (*AuthSigMessage) ProtoMessage() {}
func (*AuthSigMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_be90553d47cad78e, []int{4}
return fileDescriptor_22474b5527c8fa9f, []int{4}
}
func (m *AuthSigMessage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -292,11 +292,11 @@ func (m *AuthSigMessage) XXX_DiscardUnknown() {
var xxx_messageInfo_AuthSigMessage proto.InternalMessageInfo
func (m *AuthSigMessage) GetPubKey() keys.PublicKey {
func (m *AuthSigMessage) GetPubKey() crypto.PublicKey {
if m != nil {
return m.PubKey
}
return keys.PublicKey{}
return crypto.PublicKey{}
}
func (m *AuthSigMessage) GetSig() []byte {
@@ -314,36 +314,35 @@ func init() {
proto.RegisterType((*AuthSigMessage)(nil), "tendermint.p2p.AuthSigMessage")
}
func init() { proto.RegisterFile("tendermint/p2p/conn_msgs.proto", fileDescriptor_be90553d47cad78e) }
func init() { proto.RegisterFile("tendermint/p2p/conn.proto", fileDescriptor_22474b5527c8fa9f) }
var fileDescriptor_be90553d47cad78e = []byte{
// 401 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbb, 0x8e, 0xd3, 0x40,
0x14, 0xb5, 0xf1, 0x6e, 0x56, 0xbe, 0x09, 0x2b, 0x34, 0xa2, 0xc8, 0xa6, 0x70, 0x16, 0x57, 0x5b,
0x20, 0x5b, 0x32, 0xa2, 0x41, 0x42, 0x02, 0xf3, 0x10, 0xab, 0x55, 0x94, 0xc8, 0x74, 0x34, 0x96,
0x1f, 0xc3, 0x78, 0x94, 0x78, 0x66, 0x94, 0x19, 0x17, 0xfe, 0x0b, 0x3e, 0x2b, 0x74, 0x29, 0xa9,
0x22, 0xe4, 0xfc, 0x08, 0xf2, 0xd8, 0x10, 0x47, 0x62, 0xbb, 0x73, 0xee, 0xdc, 0x73, 0x1f, 0x73,
0x0f, 0x38, 0x0a, 0xb3, 0x1c, 0x6f, 0x4b, 0xca, 0x94, 0x2f, 0x02, 0xe1, 0x67, 0x9c, 0xb1, 0xb8,
0x94, 0x44, 0x7a, 0x62, 0xcb, 0x15, 0x47, 0xd7, 0xa7, 0x77, 0x4f, 0x04, 0x62, 0xf6, 0x9c, 0x70,
0xc2, 0xf5, 0x93, 0xdf, 0xa2, 0x2e, 0x6b, 0xe6, 0x0e, 0xaa, 0x64, 0xdb, 0x5a, 0x28, 0xee, 0xaf,
0x71, 0x2d, 0x7d, 0x55, 0x0b, 0xdc, 0x57, 0x72, 0x27, 0x00, 0xab, 0x24, 0x5b, 0x63, 0xb5, 0xa2,
0x8c, 0x0c, 0x18, 0x67, 0xc4, 0x2d, 0xc0, 0xee, 0xd8, 0x42, 0x12, 0xf4, 0x12, 0x20, 0x2b, 0x12,
0xc6, 0xf0, 0x26, 0xa6, 0xf9, 0xd4, 0xbc, 0x35, 0xef, 0x2e, 0xc3, 0xa7, 0xcd, 0x61, 0x6e, 0x7f,
0xe8, 0xa2, 0xf7, 0x1f, 0x23, 0xbb, 0x4f, 0xb8, 0xcf, 0xd1, 0x0d, 0x58, 0x98, 0x7f, 0x9f, 0x3e,
0xd1, 0x69, 0x57, 0xcd, 0x61, 0x6e, 0x7d, 0x5a, 0x7e, 0x8e, 0xda, 0x18, 0x42, 0x70, 0x91, 0x27,
0x2a, 0x99, 0x5a, 0xb7, 0xe6, 0xdd, 0x24, 0xd2, 0xd8, 0xfd, 0x69, 0xc2, 0xa8, 0x6b, 0x85, 0xde,
0xc2, 0x58, 0x68, 0x14, 0x0b, 0xca, 0x88, 0x6e, 0x34, 0x0e, 0x66, 0xde, 0xf9, 0xc2, 0xde, 0x69,
0xe6, 0x2f, 0x46, 0x04, 0xe2, 0x1f, 0x1b, 0xca, 0x39, 0x23, 0x7a, 0x80, 0xc7, 0xe5, 0xfc, 0x4c,
0xce, 0x19, 0x41, 0x6f, 0xa0, 0x67, 0xed, 0x6f, 0xeb, 0x11, 0xc7, 0xc1, 0xcd, 0xff, 0xd5, 0x0b,
0xd9, 0x8a, 0x6d, 0xf1, 0x97, 0x84, 0x97, 0x60, 0xc9, 0xaa, 0x74, 0x73, 0xb8, 0x7e, 0x5f, 0xa9,
0xe2, 0x2b, 0x25, 0x0b, 0x2c, 0x65, 0x42, 0x30, 0x7a, 0x07, 0x57, 0xa2, 0x4a, 0xe3, 0x35, 0xae,
0xfb, 0x75, 0x5e, 0x0c, 0x2b, 0x76, 0x97, 0xf1, 0xda, 0xcb, 0x78, 0xab, 0x2a, 0xdd, 0xd0, 0xec,
0x01, 0xd7, 0xe1, 0xc5, 0xee, 0x30, 0x37, 0xa2, 0x91, 0xa8, 0xd2, 0x07, 0x5c, 0xa3, 0x67, 0x60,
0x49, 0xda, 0x6d, 0x33, 0x89, 0x5a, 0x18, 0x2e, 0x77, 0x8d, 0x63, 0xee, 0x1b, 0xc7, 0xfc, 0xdd,
0x38, 0xe6, 0x8f, 0xa3, 0x63, 0xec, 0x8f, 0x8e, 0xf1, 0xeb, 0xe8, 0x18, 0xdf, 0x5e, 0x13, 0xaa,
0x8a, 0x2a, 0xf5, 0x32, 0x5e, 0xfa, 0x03, 0x03, 0x0c, 0x1d, 0xa5, 0x8d, 0x72, 0x6e, 0xb1, 0x74,
0xa4, 0xa3, 0xaf, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x80, 0x74, 0x2d, 0x94, 0x7b, 0x02, 0x00,
0x00,
var fileDescriptor_22474b5527c8fa9f = []byte{
// 391 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x3d, 0x8b, 0xdb, 0x40,
0x10, 0x95, 0xa2, 0x3b, 0x1f, 0x1a, 0x3b, 0x47, 0x58, 0x52, 0xd8, 0xe6, 0x90, 0x0f, 0x55, 0x57,
0x04, 0x09, 0x14, 0xd2, 0x24, 0xa4, 0x88, 0xf2, 0x41, 0x0e, 0x63, 0x6c, 0x94, 0x2e, 0x8d, 0xd0,
0xc7, 0x66, 0xb5, 0xd8, 0xda, 0x5d, 0xbc, 0xab, 0x42, 0xff, 0x22, 0x3f, 0xcb, 0xe9, 0x5c, 0xa6,
0x32, 0x41, 0xfe, 0x23, 0x41, 0x2b, 0x27, 0x96, 0x21, 0xe9, 0xde, 0x9b, 0x99, 0x37, 0x1f, 0xcc,
0x83, 0x89, 0xc2, 0x2c, 0xc7, 0xdb, 0x92, 0x32, 0xe5, 0x8b, 0x40, 0xf8, 0x19, 0x67, 0xcc, 0x13,
0x5b, 0xae, 0x38, 0xba, 0x3d, 0xa7, 0x3c, 0x11, 0x88, 0xe9, 0x73, 0xc2, 0x09, 0xd7, 0x29, 0xbf,
0x45, 0x5d, 0xd5, 0xf4, 0xae, 0xd7, 0x20, 0xdb, 0xd6, 0x42, 0x71, 0x7f, 0x8d, 0x6b, 0xd9, 0x65,
0xdd, 0x11, 0xc0, 0x2a, 0xc9, 0xd6, 0x58, 0xad, 0x28, 0x23, 0x3d, 0xc6, 0x19, 0x71, 0x0b, 0xb0,
0x3b, 0xb6, 0x90, 0x04, 0xbd, 0x00, 0xc8, 0x8a, 0x84, 0x31, 0xbc, 0x89, 0x69, 0x3e, 0x36, 0xef,
0xcd, 0x87, 0xeb, 0xf0, 0x69, 0x73, 0x98, 0xd9, 0xef, 0xbb, 0xe8, 0xe3, 0x87, 0xc8, 0x3e, 0x15,
0x3c, 0xe6, 0x68, 0x02, 0x16, 0xe6, 0xdf, 0xc6, 0x4f, 0x74, 0xd9, 0x4d, 0x73, 0x98, 0x59, 0x1f,
0x97, 0x9f, 0xa2, 0x36, 0x86, 0x10, 0x5c, 0xe5, 0x89, 0x4a, 0xc6, 0xd6, 0xbd, 0xf9, 0x30, 0x8a,
0x34, 0x76, 0x7f, 0x98, 0x30, 0xe8, 0x46, 0xa1, 0xb7, 0x30, 0x14, 0x1a, 0xc5, 0x82, 0x32, 0xa2,
0x07, 0x0d, 0x83, 0xa9, 0x77, 0x79, 0xaa, 0x77, 0xde, 0xf9, 0xb3, 0x11, 0x81, 0xf8, 0xcb, 0xfa,
0x72, 0xce, 0x88, 0x5e, 0xe0, 0xff, 0x72, 0x7e, 0x21, 0xe7, 0x8c, 0xa0, 0xd7, 0x70, 0x62, 0x71,
0x29, 0x89, 0x5e, 0x71, 0x18, 0x4c, 0xfe, 0xad, 0x5e, 0xc8, 0x56, 0x6c, 0x8b, 0x3f, 0x24, 0xbc,
0x06, 0x4b, 0x56, 0xa5, 0x1b, 0xc3, 0xed, 0xbb, 0x4a, 0x15, 0x5f, 0x28, 0x59, 0x60, 0x29, 0x13,
0x82, 0xd1, 0x1b, 0xb8, 0x11, 0x55, 0x1a, 0xaf, 0x71, 0x7d, 0x3a, 0xe7, 0xae, 0xdf, 0xb1, 0xfb,
0x89, 0xb7, 0xaa, 0xd2, 0x0d, 0xcd, 0xe6, 0xb8, 0x0e, 0xaf, 0x76, 0x87, 0x99, 0x11, 0x0d, 0x44,
0x95, 0xce, 0x71, 0x8d, 0x9e, 0x81, 0x25, 0x69, 0x77, 0xc8, 0x28, 0x6a, 0x61, 0xb8, 0xdc, 0x35,
0x8e, 0xb9, 0x6f, 0x1c, 0xf3, 0x57, 0xe3, 0x98, 0xdf, 0x8f, 0x8e, 0xb1, 0x3f, 0x3a, 0xc6, 0xcf,
0xa3, 0x63, 0x7c, 0x7d, 0x45, 0xa8, 0x2a, 0xaa, 0xd4, 0xcb, 0x78, 0xe9, 0xf7, 0xbe, 0xde, 0x77,
0x90, 0x76, 0xc7, 0xa5, 0xa5, 0xd2, 0x81, 0x8e, 0xbe, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x2a,
0x08, 0x6f, 0x5b, 0x6b, 0x02, 0x00, 0x00,
}
func (m *PacketPing) Marshal() (dAtA []byte, err error) {
@@ -415,17 +414,17 @@ func (m *PacketMsg) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Data) > 0 {
i -= len(m.Data)
copy(dAtA[i:], m.Data)
i = encodeVarintConnMsgs(dAtA, i, uint64(len(m.Data)))
i = encodeVarintConn(dAtA, i, uint64(len(m.Data)))
i--
dAtA[i] = 0x1a
}
if m.EOF != 0 {
i = encodeVarintConnMsgs(dAtA, i, uint64(m.EOF))
i = encodeVarintConn(dAtA, i, uint64(m.EOF))
i--
dAtA[i] = 0x10
}
if m.ChannelID != 0 {
i = encodeVarintConnMsgs(dAtA, i, uint64(m.ChannelID))
i = encodeVarintConn(dAtA, i, uint64(m.ChannelID))
i--
dAtA[i] = 0x8
}
@@ -478,7 +477,7 @@ func (m *Packet_PacketPing) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintConnMsgs(dAtA, i, uint64(size))
i = encodeVarintConn(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -499,7 +498,7 @@ func (m *Packet_PacketPong) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintConnMsgs(dAtA, i, uint64(size))
i = encodeVarintConn(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
@@ -520,7 +519,7 @@ func (m *Packet_PacketMsg) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintConnMsgs(dAtA, i, uint64(size))
i = encodeVarintConn(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
@@ -550,7 +549,7 @@ func (m *AuthSigMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Sig) > 0 {
i -= len(m.Sig)
copy(dAtA[i:], m.Sig)
i = encodeVarintConnMsgs(dAtA, i, uint64(len(m.Sig)))
i = encodeVarintConn(dAtA, i, uint64(len(m.Sig)))
i--
dAtA[i] = 0x12
}
@@ -560,15 +559,15 @@ func (m *AuthSigMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintConnMsgs(dAtA, i, uint64(size))
i = encodeVarintConn(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
func encodeVarintConnMsgs(dAtA []byte, offset int, v uint64) int {
offset -= sovConnMsgs(v)
func encodeVarintConn(dAtA []byte, offset int, v uint64) int {
offset -= sovConn(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -603,14 +602,14 @@ func (m *PacketMsg) Size() (n int) {
var l int
_ = l
if m.ChannelID != 0 {
n += 1 + sovConnMsgs(uint64(m.ChannelID))
n += 1 + sovConn(uint64(m.ChannelID))
}
if m.EOF != 0 {
n += 1 + sovConnMsgs(uint64(m.EOF))
n += 1 + sovConn(uint64(m.EOF))
}
l = len(m.Data)
if l > 0 {
n += 1 + l + sovConnMsgs(uint64(l))
n += 1 + l + sovConn(uint64(l))
}
return n
}
@@ -635,7 +634,7 @@ func (m *Packet_PacketPing) Size() (n int) {
_ = l
if m.PacketPing != nil {
l = m.PacketPing.Size()
n += 1 + l + sovConnMsgs(uint64(l))
n += 1 + l + sovConn(uint64(l))
}
return n
}
@@ -647,7 +646,7 @@ func (m *Packet_PacketPong) Size() (n int) {
_ = l
if m.PacketPong != nil {
l = m.PacketPong.Size()
n += 1 + l + sovConnMsgs(uint64(l))
n += 1 + l + sovConn(uint64(l))
}
return n
}
@@ -659,7 +658,7 @@ func (m *Packet_PacketMsg) Size() (n int) {
_ = l
if m.PacketMsg != nil {
l = m.PacketMsg.Size()
n += 1 + l + sovConnMsgs(uint64(l))
n += 1 + l + sovConn(uint64(l))
}
return n
}
@@ -670,19 +669,19 @@ func (m *AuthSigMessage) Size() (n int) {
var l int
_ = l
l = m.PubKey.Size()
n += 1 + l + sovConnMsgs(uint64(l))
n += 1 + l + sovConn(uint64(l))
l = len(m.Sig)
if l > 0 {
n += 1 + l + sovConnMsgs(uint64(l))
n += 1 + l + sovConn(uint64(l))
}
return n
}
func sovConnMsgs(x uint64) (n int) {
func sovConn(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozConnMsgs(x uint64) (n int) {
return sovConnMsgs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozConn(x uint64) (n int) {
return sovConn(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *PacketPing) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -692,7 +691,7 @@ func (m *PacketPing) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -715,15 +714,15 @@ func (m *PacketPing) Unmarshal(dAtA []byte) error {
switch fieldNum {
default:
iNdEx = preIndex
skippy, err := skipConnMsgs(dAtA[iNdEx:])
skippy, err := skipConn(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -745,7 +744,7 @@ func (m *PacketPong) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -768,15 +767,15 @@ func (m *PacketPong) Unmarshal(dAtA []byte) error {
switch fieldNum {
default:
iNdEx = preIndex
skippy, err := skipConnMsgs(dAtA[iNdEx:])
skippy, err := skipConn(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -798,7 +797,7 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -826,7 +825,7 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error {
m.ChannelID = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -845,7 +844,7 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error {
m.EOF = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -864,7 +863,7 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -877,11 +876,11 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -893,15 +892,15 @@ func (m *PacketMsg) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipConnMsgs(dAtA[iNdEx:])
skippy, err := skipConn(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -923,7 +922,7 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -951,7 +950,7 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -964,11 +963,11 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -986,7 +985,7 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -999,11 +998,11 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1021,7 +1020,7 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1034,11 +1033,11 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1051,15 +1050,15 @@ func (m *Packet) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipConnMsgs(dAtA[iNdEx:])
skippy, err := skipConn(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1081,7 +1080,7 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1109,7 +1108,7 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1122,11 +1121,11 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1142,7 +1141,7 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConnMsgs
return ErrIntOverflowConn
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -1155,11 +1154,11 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
}
}
if byteLen < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -1171,15 +1170,15 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipConnMsgs(dAtA[iNdEx:])
skippy, err := skipConn(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthConnMsgs
return ErrInvalidLengthConn
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -1193,7 +1192,7 @@ func (m *AuthSigMessage) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipConnMsgs(dAtA []byte) (n int, err error) {
func skipConn(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -1201,7 +1200,7 @@ func skipConnMsgs(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowConnMsgs
return 0, ErrIntOverflowConn
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1218,7 +1217,7 @@ func skipConnMsgs(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowConnMsgs
return 0, ErrIntOverflowConn
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1234,7 +1233,7 @@ func skipConnMsgs(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowConnMsgs
return 0, ErrIntOverflowConn
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -1247,14 +1246,14 @@ func skipConnMsgs(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthConnMsgs
return 0, ErrInvalidLengthConn
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupConnMsgs
return 0, ErrUnexpectedEndOfGroupConn
}
depth--
case 5:
@@ -1263,7 +1262,7 @@ func skipConnMsgs(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthConnMsgs
return 0, ErrInvalidLengthConn
}
if depth == 0 {
return iNdEx, nil
@@ -1273,7 +1272,7 @@ func skipConnMsgs(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthConnMsgs = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowConnMsgs = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupConnMsgs = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthConn = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowConn = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupConn = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -4,7 +4,7 @@ package tendermint.p2p;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
import "gogoproto/gogo.proto";
import "tendermint/crypto/keys/types.proto";
import "tendermint/crypto/keys.proto";
message PacketPing {}
@@ -25,6 +25,6 @@ message Packet {
}
message AuthSigMessage {
tendermint.crypto.keys.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
bytes sig = 2;
tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
bytes sig = 2;
}

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/p2p/pex_msgs.proto
// source: tendermint/p2p/pex.proto
package p2p
@@ -30,7 +30,7 @@ func (m *PexRequest) Reset() { *m = PexRequest{} }
func (m *PexRequest) String() string { return proto.CompactTextString(m) }
func (*PexRequest) ProtoMessage() {}
func (*PexRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_44a0de202547e95e, []int{0}
return fileDescriptor_81c2f011fd13be57, []int{0}
}
func (m *PexRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -67,7 +67,7 @@ func (m *PexAddrs) Reset() { *m = PexAddrs{} }
func (m *PexAddrs) String() string { return proto.CompactTextString(m) }
func (*PexAddrs) ProtoMessage() {}
func (*PexAddrs) Descriptor() ([]byte, []int) {
return fileDescriptor_44a0de202547e95e, []int{1}
return fileDescriptor_81c2f011fd13be57, []int{1}
}
func (m *PexAddrs) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -114,7 +114,7 @@ func (m *Message) Reset() { *m = Message{} }
func (m *Message) String() string { return proto.CompactTextString(m) }
func (*Message) ProtoMessage() {}
func (*Message) Descriptor() ([]byte, []int) {
return fileDescriptor_44a0de202547e95e, []int{2}
return fileDescriptor_81c2f011fd13be57, []int{2}
}
func (m *Message) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -194,27 +194,27 @@ func init() {
proto.RegisterType((*Message)(nil), "tendermint.p2p.Message")
}
func init() { proto.RegisterFile("tendermint/p2p/pex_msgs.proto", fileDescriptor_44a0de202547e95e) }
func init() { proto.RegisterFile("tendermint/p2p/pex.proto", fileDescriptor_81c2f011fd13be57) }
var fileDescriptor_44a0de202547e95e = []byte{
// 270 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0x88, 0xcf,
0x2d, 0x4e, 0x2f, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x43, 0x48, 0xeb, 0x15, 0x18,
0x15, 0x48, 0x49, 0xa1, 0x29, 0x2f, 0xa9, 0x2c, 0x48, 0x85, 0xaa, 0x95, 0x12, 0x49, 0xcf, 0x4f,
0xcf, 0x07, 0x33, 0xf5, 0x41, 0x2c, 0x88, 0xa8, 0x12, 0x0f, 0x17, 0x57, 0x40, 0x6a, 0x45, 0x50,
0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x92, 0x13, 0x17, 0x47, 0x40, 0x6a, 0x85, 0x63, 0x4a, 0x4a,
0x51, 0xb1, 0x90, 0x19, 0x17, 0x6b, 0x22, 0x88, 0x21, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0x24,
0xa5, 0x87, 0x6a, 0x97, 0x9e, 0x5f, 0x6a, 0x09, 0x48, 0x61, 0x6a, 0x71, 0xb1, 0x13, 0xcb, 0x89,
0x7b, 0xf2, 0x0c, 0x41, 0x10, 0xe5, 0x4a, 0x1d, 0x8c, 0x5c, 0xec, 0xbe, 0xa9, 0xc5, 0xc5, 0x89,
0xe9, 0xa9, 0x42, 0xb6, 0x5c, 0xdc, 0x20, 0x17, 0x17, 0x41, 0x8c, 0x97, 0x60, 0x54, 0x60, 0xc4,
0x66, 0x12, 0xc2, 0x01, 0x1e, 0x0c, 0x41, 0x5c, 0x05, 0x70, 0x9e, 0x90, 0x39, 0x17, 0x27, 0x48,
0x3b, 0xc4, 0x19, 0x4c, 0x60, 0xcd, 0x12, 0x58, 0x34, 0x83, 0xdd, 0xeb, 0xc1, 0x10, 0xc4, 0x51,
0x00, 0x65, 0x3b, 0xb1, 0x72, 0x31, 0x17, 0x97, 0xe6, 0x3a, 0xf9, 0x9f, 0x78, 0x24, 0xc7, 0x78,
0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7,
0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x69, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e,
0xae, 0x3e, 0x52, 0x98, 0x21, 0x07, 0x1f, 0x38, 0xa4, 0x50, 0xc3, 0x33, 0x89, 0x0d, 0x2c, 0x6a,
0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa7, 0xb9, 0x50, 0x0f, 0x97, 0x01, 0x00, 0x00,
var fileDescriptor_81c2f011fd13be57 = []byte{
// 268 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0xd0, 0x2b,
0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x43, 0xc8, 0xe8, 0x15, 0x18, 0x15, 0x48, 0x49, 0xa1, 0xa9,
0x2c, 0xa9, 0x2c, 0x48, 0x2d, 0x86, 0xa8, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x33, 0xf5,
0x41, 0x2c, 0x88, 0xa8, 0x12, 0x0f, 0x17, 0x57, 0x40, 0x6a, 0x45, 0x50, 0x6a, 0x61, 0x69, 0x6a,
0x71, 0x89, 0x92, 0x13, 0x17, 0x47, 0x40, 0x6a, 0x85, 0x63, 0x4a, 0x4a, 0x51, 0xb1, 0x90, 0x19,
0x17, 0x6b, 0x22, 0x88, 0x21, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0x24, 0xa5, 0x87, 0x6a, 0x97,
0x9e, 0x5f, 0x6a, 0x09, 0x48, 0x61, 0x6a, 0x71, 0xb1, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41,
0x10, 0xe5, 0x4a, 0x1d, 0x8c, 0x5c, 0xec, 0xbe, 0xa9, 0xc5, 0xc5, 0x89, 0xe9, 0xa9, 0x42, 0xb6,
0x5c, 0xdc, 0x05, 0xa9, 0x15, 0xf1, 0x45, 0x10, 0xe3, 0x25, 0x18, 0x15, 0x18, 0xb1, 0x99, 0x84,
0x70, 0x80, 0x07, 0x43, 0x10, 0x57, 0x01, 0x9c, 0x27, 0x64, 0xce, 0xc5, 0x09, 0xd2, 0x0e, 0x71,
0x06, 0x13, 0x58, 0xb3, 0x04, 0x16, 0xcd, 0x60, 0xf7, 0x7a, 0x30, 0x04, 0x71, 0x14, 0x40, 0xd9,
0x4e, 0xac, 0x5c, 0xcc, 0xc5, 0xa5, 0xb9, 0x4e, 0xfe, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24,
0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78,
0x2c, 0xc7, 0x10, 0x65, 0x9a, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f,
0x14, 0x66, 0xc8, 0xc1, 0x07, 0x0e, 0x29, 0xd4, 0xf0, 0x4c, 0x62, 0x03, 0x8b, 0x1a, 0x03, 0x02,
0x00, 0x00, 0xff, 0xff, 0x3c, 0x0b, 0xcb, 0x40, 0x92, 0x01, 0x00, 0x00,
}
func (m *PexRequest) Marshal() (dAtA []byte, err error) {
@@ -268,7 +268,7 @@ func (m *PexAddrs) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintPexMsgs(dAtA, i, uint64(size))
i = encodeVarintPex(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -323,7 +323,7 @@ func (m *Message_PexRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintPexMsgs(dAtA, i, uint64(size))
i = encodeVarintPex(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
@@ -344,15 +344,15 @@ func (m *Message_PexAddrs) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return 0, err
}
i -= size
i = encodeVarintPexMsgs(dAtA, i, uint64(size))
i = encodeVarintPex(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
return len(dAtA) - i, nil
}
func encodeVarintPexMsgs(dAtA []byte, offset int, v uint64) int {
offset -= sovPexMsgs(v)
func encodeVarintPex(dAtA []byte, offset int, v uint64) int {
offset -= sovPex(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -380,7 +380,7 @@ func (m *PexAddrs) Size() (n int) {
if len(m.Addrs) > 0 {
for _, e := range m.Addrs {
l = e.Size()
n += 1 + l + sovPexMsgs(uint64(l))
n += 1 + l + sovPex(uint64(l))
}
}
return n
@@ -406,7 +406,7 @@ func (m *Message_PexRequest) Size() (n int) {
_ = l
if m.PexRequest != nil {
l = m.PexRequest.Size()
n += 1 + l + sovPexMsgs(uint64(l))
n += 1 + l + sovPex(uint64(l))
}
return n
}
@@ -418,16 +418,16 @@ func (m *Message_PexAddrs) Size() (n int) {
_ = l
if m.PexAddrs != nil {
l = m.PexAddrs.Size()
n += 1 + l + sovPexMsgs(uint64(l))
n += 1 + l + sovPex(uint64(l))
}
return n
}
func sovPexMsgs(x uint64) (n int) {
func sovPex(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozPexMsgs(x uint64) (n int) {
return sovPexMsgs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozPex(x uint64) (n int) {
return sovPex(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *PexRequest) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -437,7 +437,7 @@ func (m *PexRequest) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowPexMsgs
return ErrIntOverflowPex
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -460,15 +460,15 @@ func (m *PexRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
default:
iNdEx = preIndex
skippy, err := skipPexMsgs(dAtA[iNdEx:])
skippy, err := skipPex(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -490,7 +490,7 @@ func (m *PexAddrs) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowPexMsgs
return ErrIntOverflowPex
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -518,7 +518,7 @@ func (m *PexAddrs) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowPexMsgs
return ErrIntOverflowPex
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -531,11 +531,11 @@ func (m *PexAddrs) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -547,15 +547,15 @@ func (m *PexAddrs) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipPexMsgs(dAtA[iNdEx:])
skippy, err := skipPex(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -577,7 +577,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowPexMsgs
return ErrIntOverflowPex
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -605,7 +605,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowPexMsgs
return ErrIntOverflowPex
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -618,11 +618,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -640,7 +640,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowPexMsgs
return ErrIntOverflowPex
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -653,11 +653,11 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
}
if msglen < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -670,15 +670,15 @@ func (m *Message) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipPexMsgs(dAtA[iNdEx:])
skippy, err := skipPex(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthPexMsgs
return ErrInvalidLengthPex
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -692,7 +692,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipPexMsgs(dAtA []byte) (n int, err error) {
func skipPex(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -700,7 +700,7 @@ func skipPexMsgs(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowPexMsgs
return 0, ErrIntOverflowPex
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -717,7 +717,7 @@ func skipPexMsgs(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowPexMsgs
return 0, ErrIntOverflowPex
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -733,7 +733,7 @@ func skipPexMsgs(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowPexMsgs
return 0, ErrIntOverflowPex
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -746,14 +746,14 @@ func skipPexMsgs(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthPexMsgs
return 0, ErrInvalidLengthPex
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupPexMsgs
return 0, ErrUnexpectedEndOfGroupPex
}
depth--
case 5:
@@ -762,7 +762,7 @@ func skipPexMsgs(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthPexMsgs
return 0, ErrInvalidLengthPex
}
if depth == 0 {
return iNdEx, nil
@@ -772,7 +772,7 @@ func skipPexMsgs(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthPexMsgs = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowPexMsgs = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupPexMsgs = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthPex = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowPex = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupPex = fmt.Errorf("proto: unexpected end of group")
)

File diff suppressed because it is too large Load Diff

View File

@@ -1,63 +0,0 @@
syntax = "proto3";
package tendermint.privval;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval";
import "gogoproto/gogo.proto";
import "tendermint/crypto/keys/types.proto";
import "tendermint/types/types.proto";
message RemoteSignerError {
int32 code = 1;
string description = 2;
}
// PubKeyRequest requests the consensus public key from the remote signer.
message PubKeyRequest {}
// PubKeyResponse is a response message containing the public key.
message PubKeyResponse {
tendermint.crypto.keys.PublicKey pub_key = 1;
RemoteSignerError error = 2;
}
// SignVoteRequest is a request to sign a vote
message SignVoteRequest {
tendermint.types.Vote vote = 1;
}
// SignedVoteResponse is a response containing a signed vote or an error
message SignedVoteResponse {
tendermint.types.Vote vote = 1;
RemoteSignerError error = 2;
}
// SignProposalRequest is a request to sign a proposal
message SignProposalRequest {
tendermint.types.Proposal proposal = 1 [(gogoproto.nullable) = false];
}
// SignedProposalResponse is response containing a signed proposal or an error
message SignedProposalResponse {
tendermint.types.Proposal proposal = 1;
RemoteSignerError error = 2;
}
// PingRequest is a request to confirm that the connection is alive.
message PingRequest {}
// PingResponse is a response to confirm that the connection is alive.
message PingResponse {}
message Message {
oneof sum {
PubKeyRequest pub_key_request = 1;
PubKeyResponse pub_key_response = 2;
SignVoteRequest sign_vote_request = 3;
SignedVoteResponse signed_vote_response = 4;
SignProposalRequest sign_proposal_request = 5;
SignedProposalResponse signed_proposal_response = 6;
PingRequest ping_request = 7;
PingResponse ping_response = 8;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,10 @@
syntax = "proto3";
package tendermint.privval;
import "gogoproto/gogo.proto";
import "tendermint/crypto/keys.proto";
import "tendermint/types/types.proto";
option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval";
enum Errors {
@@ -11,3 +15,59 @@ enum Errors {
ERRORS_READ_TIMEOUT = 4;
ERRORS_WRITE_TIMEOUT = 5;
}
message RemoteSignerError {
int32 code = 1;
string description = 2;
}
// PubKeyRequest requests the consensus public key from the remote signer.
message PubKeyRequest {}
// PubKeyResponse is a response message containing the public key.
message PubKeyResponse {
tendermint.crypto.PublicKey pub_key = 1;
RemoteSignerError error = 2;
}
// SignVoteRequest is a request to sign a vote
message SignVoteRequest {
tendermint.types.Vote vote = 1;
}
// SignedVoteResponse is a response containing a signed vote or an error
message SignedVoteResponse {
tendermint.types.Vote vote = 1;
RemoteSignerError error = 2;
}
// SignProposalRequest is a request to sign a proposal
message SignProposalRequest {
tendermint.types.Proposal proposal = 1 [(gogoproto.nullable) = false];
}
// SignedProposalResponse is response containing a signed proposal or an error
message SignedProposalResponse {
tendermint.types.Proposal proposal = 1;
RemoteSignerError error = 2;
}
// PingRequest is a request to confirm that the connection is alive.
message PingRequest {}
// PingResponse is a response to confirm that the connection is alive.
message PingResponse {}
message Message {
oneof sum {
PubKeyRequest pub_key_request = 1;
PubKeyResponse pub_key_response = 2;
SignVoteRequest sign_vote_request = 3;
SignedVoteResponse signed_vote_response = 4;
SignProposalRequest sign_proposal_request = 5;
SignedProposalResponse signed_proposal_response = 6;
PingRequest ping_request = 7;
PingResponse ping_response = 8;
}
}

View File

@@ -2,7 +2,7 @@ syntax = "proto3";
package tendermint.rpc.grpc;
option go_package = "github.com/tendermint/tendermint/rpc/grpc;coregrpc";
import "tendermint/abci/types/types.proto";
import "tendermint/abci/types.proto";
//----------------------------------------
// Request types
@@ -19,8 +19,8 @@ message RequestBroadcastTx {
message ResponsePing {}
message ResponseBroadcastTx {
tendermint.abci.types.ResponseCheckTx check_tx = 1;
tendermint.abci.types.ResponseDeliverTx deliver_tx = 2;
tendermint.abci.ResponseCheckTx check_tx = 1;
tendermint.abci.ResponseDeliverTx deliver_tx = 2;
}
//----------------------------------------

View File

@@ -414,55 +414,54 @@ func init() {
func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) }
var fileDescriptor_ccfacf933f22bf93 = []byte{
// 753 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x41, 0x6f, 0xd3, 0x3c,
0x18, 0xc7, 0x9b, 0xb7, 0xdb, 0xda, 0x3a, 0xeb, 0xba, 0xd7, 0x7b, 0x0f, 0x5d, 0x5f, 0x96, 0x76,
0x15, 0x82, 0xc2, 0x21, 0x95, 0xc6, 0x01, 0x71, 0x41, 0x5a, 0x5a, 0xc4, 0x82, 0x26, 0x04, 0xde,
0xb4, 0x03, 0x97, 0xc8, 0x6d, 0xbc, 0x24, 0xa2, 0x4d, 0xa2, 0xd8, 0x2d, 0xe3, 0x03, 0x70, 0xdf,
0x95, 0xaf, 0xc2, 0x27, 0xd8, 0x71, 0x47, 0x4e, 0x03, 0x75, 0x57, 0x3e, 0x04, 0xb2, 0x9d, 0xa4,
0x5e, 0x3b, 0x69, 0x43, 0x9c, 0xe2, 0xf8, 0x79, 0x9e, 0x9f, 0xff, 0xb6, 0xff, 0x8f, 0x0c, 0x1e,
0x30, 0x12, 0xba, 0x24, 0x19, 0x07, 0x21, 0xeb, 0x52, 0x86, 0x19, 0xe9, 0xb2, 0xcf, 0x31, 0xa1,
0x66, 0x9c, 0x44, 0x2c, 0x82, 0x9b, 0xf3, 0xa8, 0x29, 0xa2, 0x8d, 0xff, 0xbc, 0xc8, 0x8b, 0x44,
0xb0, 0xcb, 0x47, 0x32, 0xaf, 0xb1, 0xab, 0x50, 0xf0, 0x60, 0x18, 0x48, 0x88, 0x8a, 0x6a, 0xa8,
0x0b, 0x2d, 0x47, 0x5b, 0x4b, 0xd1, 0x29, 0x1e, 0x05, 0x2e, 0x66, 0x51, 0x92, 0x66, 0xec, 0x2c,
0x65, 0xc4, 0x38, 0xc1, 0xe3, 0xdb, 0x00, 0x53, 0x92, 0xd0, 0x20, 0x0a, 0xb3, 0x6f, 0x9a, 0xd1,
0xf4, 0xa2, 0xc8, 0x1b, 0x91, 0xae, 0xf8, 0x1b, 0x4c, 0x4e, 0xbb, 0x2c, 0x18, 0x13, 0xca, 0xf0,
0x38, 0x96, 0x09, 0xed, 0x5f, 0x1a, 0xa8, 0xee, 0x5b, 0x3d, 0x1b, 0x11, 0x1a, 0x47, 0x21, 0x25,
0x14, 0xda, 0x40, 0x77, 0xc9, 0x28, 0x98, 0x92, 0xc4, 0x61, 0x67, 0xb4, 0xae, 0xb5, 0x8a, 0x1d,
0x7d, 0xaf, 0x63, 0x2a, 0x87, 0xc2, 0x37, 0x6b, 0xca, 0x8d, 0x64, 0x65, 0x7d, 0x59, 0x71, 0x7c,
0x86, 0x80, 0x9b, 0x0d, 0x29, 0xec, 0x83, 0x0a, 0x09, 0x5d, 0x67, 0x30, 0x8a, 0x86, 0x1f, 0xeb,
0xff, 0xb4, 0xb4, 0x8e, 0xbe, 0xf7, 0xf8, 0x0e, 0xd0, 0xab, 0xd0, 0xb5, 0x78, 0x3a, 0x2a, 0x93,
0x74, 0x04, 0xdf, 0x00, 0x7d, 0x40, 0xbc, 0x20, 0x4c, 0x39, 0x45, 0xc1, 0x79, 0x72, 0x07, 0xc7,
0xe2, 0x15, 0x92, 0x04, 0x06, 0xf9, 0xb8, 0xfd, 0x45, 0x03, 0x1b, 0x27, 0xd9, 0x21, 0x53, 0x3b,
0x3c, 0x8d, 0x60, 0x0f, 0x54, 0xf3, 0x63, 0x77, 0x28, 0x61, 0x75, 0x4d, 0x2c, 0x60, 0xa8, 0x0b,
0x48, 0x76, 0x5e, 0x78, 0x44, 0x18, 0x5a, 0x9f, 0x2a, 0x7f, 0xd0, 0x04, 0x5b, 0x23, 0x4c, 0x99,
0xe3, 0x93, 0xc0, 0xf3, 0x99, 0x33, 0xf4, 0x71, 0xe8, 0x11, 0x57, 0xec, 0xb9, 0x88, 0xfe, 0xe5,
0xa1, 0x03, 0x11, 0xe9, 0xc9, 0x40, 0xfb, 0xab, 0x06, 0xb6, 0x7a, 0x5c, 0x67, 0x48, 0x27, 0xf4,
0x9d, 0xb8, 0x53, 0x21, 0x06, 0x81, 0xcd, 0x61, 0x36, 0xed, 0xc8, 0xbb, 0x4e, 0xf5, 0xec, 0x2e,
0xeb, 0x59, 0x00, 0x58, 0x2b, 0x17, 0x57, 0xcd, 0x02, 0xaa, 0x0d, 0x6f, 0x4e, 0xff, 0xb1, 0x36,
0x1f, 0x94, 0x4e, 0xa4, 0x89, 0xe0, 0x3e, 0xa8, 0xe4, 0xb4, 0x54, 0xc7, 0x8e, 0xaa, 0x23, 0x33,
0x5b, 0xae, 0x24, 0xd5, 0x30, 0xaf, 0x82, 0x0d, 0x50, 0xa6, 0xd1, 0x29, 0xfb, 0x84, 0x13, 0x22,
0x96, 0xac, 0xa0, 0xfc, 0xbf, 0xfd, 0x6d, 0x0d, 0xac, 0x1e, 0xf1, 0x0e, 0x83, 0x2f, 0x40, 0x29,
0x65, 0xa5, 0xcb, 0x6c, 0x9b, 0x8b, 0x5d, 0x68, 0xa6, 0xa2, 0xd2, 0x25, 0xb2, 0x7c, 0xf8, 0x08,
0x94, 0x87, 0x3e, 0x0e, 0x42, 0x27, 0x90, 0x7b, 0xaa, 0x58, 0xfa, 0xec, 0xaa, 0x59, 0xea, 0xf1,
0x39, 0xbb, 0x8f, 0x4a, 0x22, 0x68, 0xbb, 0xf0, 0x29, 0x10, 0x7b, 0x95, 0x2e, 0x4a, 0x0f, 0x43,
0x98, 0xa9, 0x88, 0x6a, 0x3c, 0x20, 0x0c, 0x22, 0x4f, 0x02, 0x22, 0x50, 0x55, 0x72, 0x03, 0xb7,
0xbe, 0xb2, 0x2c, 0x4a, 0xde, 0x81, 0xa8, 0xb2, 0xfb, 0xd6, 0x16, 0x17, 0x35, 0xbb, 0x6a, 0xea,
0x87, 0x19, 0xca, 0xee, 0x23, 0x3d, 0xe7, 0xda, 0x2e, 0x3c, 0x04, 0x35, 0x85, 0xc9, 0xfb, 0xb0,
0xbe, 0x2a, 0xa8, 0x0d, 0x53, 0x36, 0xa9, 0x99, 0x35, 0xa9, 0x79, 0x9c, 0x35, 0xa9, 0x55, 0xe6,
0xd8, 0xf3, 0x1f, 0x4d, 0x0d, 0x55, 0x73, 0x16, 0x8f, 0xc2, 0xd7, 0xa0, 0x16, 0x92, 0x33, 0xe6,
0xe4, 0x2e, 0xa4, 0xf5, 0xb5, 0x7b, 0xf9, 0x76, 0x83, 0x97, 0xcd, 0x5b, 0x00, 0xbe, 0x04, 0x40,
0x61, 0x94, 0xee, 0xc5, 0x50, 0x2a, 0xb8, 0x10, 0xb1, 0x2d, 0x05, 0x52, 0xbe, 0x9f, 0x10, 0x5e,
0xa6, 0x08, 0xe9, 0x01, 0x43, 0xb5, 0xe9, 0x9c, 0x97, 0x3b, 0xb6, 0x22, 0x2e, 0xeb, 0xff, 0xb9,
0x63, 0xe7, 0xd5, 0xa9, 0x77, 0x6f, 0xed, 0x1f, 0xf0, 0x97, 0xfd, 0xf3, 0x16, 0x3c, 0xbc, 0xd1,
0x3f, 0x0b, 0xfc, 0x5c, 0x9e, 0x2e, 0xe4, 0xb5, 0x94, 0x86, 0xba, 0x09, 0xca, 0x34, 0x66, 0x46,
0x4c, 0x08, 0x9d, 0x8c, 0x18, 0x75, 0x7c, 0x4c, 0xfd, 0xfa, 0x7a, 0x4b, 0xeb, 0xac, 0x4b, 0x23,
0x22, 0x39, 0x7f, 0x80, 0xa9, 0x0f, 0xb7, 0x41, 0x19, 0xc7, 0xb1, 0x4c, 0xa9, 0x8a, 0x94, 0x12,
0x8e, 0x63, 0x1e, 0xb2, 0xde, 0x5f, 0xcc, 0x0c, 0xed, 0x72, 0x66, 0x68, 0x3f, 0x67, 0x86, 0x76,
0x7e, 0x6d, 0x14, 0x2e, 0xaf, 0x8d, 0xc2, 0xf7, 0x6b, 0xa3, 0xf0, 0xe1, 0xb9, 0x17, 0x30, 0x7f,
0x32, 0x30, 0x87, 0xd1, 0xb8, 0xab, 0x3e, 0x20, 0xf3, 0xa1, 0x7c, 0xcb, 0x16, 0x5f, 0xc1, 0xc1,
0x9a, 0x98, 0x7f, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x95, 0x91, 0x6b, 0x20, 0x07, 0x00,
0x00,
// 750 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6f, 0xd3, 0x3e,
0x18, 0xc7, 0x9b, 0x5f, 0xb7, 0xb5, 0x75, 0xd6, 0x75, 0x3f, 0x8f, 0x43, 0xd7, 0xb1, 0xb4, 0x2b,
0x08, 0x4d, 0x1c, 0x52, 0x69, 0x1c, 0x10, 0x97, 0x49, 0x4b, 0x8b, 0x58, 0xa5, 0x09, 0x81, 0x37,
0xed, 0xc0, 0x25, 0x72, 0x1b, 0x2f, 0x89, 0x68, 0x93, 0x28, 0x76, 0xcb, 0x78, 0x01, 0xdc, 0x77,
0xe5, 0xad, 0xf0, 0x0a, 0x76, 0xdc, 0x11, 0x71, 0x18, 0xa8, 0x7b, 0x23, 0xc8, 0x76, 0xfe, 0xb8,
0x2d, 0x93, 0x86, 0xb8, 0x39, 0x7e, 0x9e, 0xe7, 0xe3, 0xaf, 0x1f, 0x7f, 0x1f, 0x05, 0x3c, 0x66,
0x24, 0x70, 0x48, 0x3c, 0xf6, 0x03, 0xd6, 0xa1, 0x0c, 0x33, 0xd2, 0x61, 0x9f, 0x23, 0x42, 0xcd,
0x28, 0x0e, 0x59, 0x08, 0x37, 0xf3, 0xa8, 0x29, 0xa2, 0x8d, 0x47, 0x6e, 0xe8, 0x86, 0x22, 0xd8,
0xe1, 0x2b, 0x99, 0xd7, 0xd8, 0x51, 0x28, 0x78, 0x30, 0xf4, 0x55, 0x48, 0x43, 0x3d, 0x42, 0xec,
0xcf, 0x45, 0x5b, 0x4b, 0xd1, 0x29, 0x1e, 0xf9, 0x0e, 0x66, 0x61, 0x9c, 0x64, 0xec, 0x2e, 0x65,
0x44, 0x38, 0xc6, 0xe3, 0x14, 0x60, 0x28, 0xe1, 0x29, 0x89, 0xa9, 0x1f, 0x06, 0x73, 0x07, 0x34,
0xdd, 0x30, 0x74, 0x47, 0xa4, 0x23, 0xbe, 0x06, 0x93, 0x8b, 0x0e, 0xf3, 0xc7, 0x84, 0x32, 0x3c,
0x8e, 0x64, 0x42, 0xfb, 0x87, 0x06, 0xaa, 0x47, 0x56, 0xb7, 0x8f, 0x08, 0x8d, 0xc2, 0x80, 0x12,
0x0a, 0xbb, 0x40, 0x77, 0xc8, 0xc8, 0x9f, 0x92, 0xd8, 0x66, 0x97, 0xb4, 0xae, 0xb5, 0x8a, 0xfb,
0xfa, 0x41, 0xdb, 0x54, 0x9a, 0xc1, 0x2f, 0x69, 0xa6, 0x05, 0x3d, 0x99, 0x7b, 0x76, 0x89, 0x80,
0x93, 0x2e, 0x29, 0x3c, 0x04, 0x15, 0x12, 0x38, 0xf6, 0x60, 0x14, 0x0e, 0x3f, 0xd6, 0xff, 0x6b,
0x69, 0xfb, 0xfa, 0xc1, 0xde, 0xbd, 0x88, 0xd7, 0x81, 0x63, 0xf1, 0x44, 0x54, 0x26, 0xc9, 0x0a,
0xf6, 0x80, 0x3e, 0x20, 0xae, 0x1f, 0x24, 0x84, 0xa2, 0x20, 0x3c, 0xb9, 0x97, 0x60, 0xf1, 0x5c,
0xc9, 0x00, 0x83, 0x6c, 0xdd, 0xfe, 0xa2, 0x81, 0x8d, 0xf3, 0xb4, 0xa1, 0xb4, 0x1f, 0x5c, 0x84,
0xb0, 0x0b, 0xaa, 0x59, 0x8b, 0x6d, 0x4a, 0x58, 0x5d, 0x13, 0x68, 0x43, 0x45, 0xcb, 0x06, 0x66,
0x85, 0xa7, 0x84, 0xa1, 0xf5, 0xa9, 0xf2, 0x05, 0x4d, 0xb0, 0x35, 0xc2, 0x94, 0xd9, 0x1e, 0xf1,
0x5d, 0x8f, 0xd9, 0x43, 0x0f, 0x07, 0x2e, 0x71, 0xc4, 0x3d, 0x8b, 0xe8, 0x7f, 0x1e, 0x3a, 0x16,
0x91, 0xae, 0x0c, 0xb4, 0xbf, 0x6a, 0x60, 0xab, 0xcb, 0x75, 0x06, 0x74, 0x42, 0xdf, 0x89, 0xf7,
0x13, 0x62, 0x10, 0xd8, 0x1c, 0xa6, 0xdb, 0xb6, 0x7c, 0xd7, 0x44, 0xcf, 0xde, 0xb2, 0x9e, 0x05,
0x80, 0xb5, 0x72, 0x7d, 0xdb, 0x2c, 0xa0, 0xda, 0x70, 0x7e, 0xfb, 0xaf, 0xb5, 0x79, 0xa0, 0x74,
0x2e, 0x8d, 0x03, 0x8f, 0x40, 0x25, 0xa3, 0x25, 0x3a, 0x76, 0x55, 0x1d, 0x89, 0xc1, 0x72, 0x25,
0x89, 0x86, 0xbc, 0x0a, 0x36, 0x40, 0x99, 0x86, 0x17, 0xec, 0x13, 0x8e, 0x89, 0x38, 0xb2, 0x82,
0xb2, 0xef, 0xf6, 0xb7, 0x35, 0xb0, 0x7a, 0xca, 0xe7, 0x08, 0xbe, 0x02, 0xa5, 0x84, 0x95, 0x1c,
0xb3, 0x6d, 0x2e, 0xce, 0x9a, 0x99, 0x88, 0x4a, 0x8e, 0x48, 0xf3, 0xe1, 0x33, 0x50, 0x1e, 0x7a,
0xd8, 0x0f, 0x6c, 0x5f, 0xde, 0xa9, 0x62, 0xe9, 0xb3, 0xdb, 0x66, 0xa9, 0xcb, 0xf7, 0xfa, 0x3d,
0x54, 0x12, 0xc1, 0xbe, 0x03, 0x9f, 0x03, 0x71, 0x57, 0xe9, 0x9f, 0xa4, 0x19, 0xc2, 0x46, 0x45,
0x54, 0xe3, 0x01, 0x61, 0x10, 0xd9, 0x09, 0x88, 0x40, 0x55, 0xc9, 0xf5, 0x9d, 0xfa, 0xca, 0xb2,
0x28, 0xf9, 0x06, 0xa2, 0xaa, 0xdf, 0xb3, 0xb6, 0xb8, 0xa8, 0xd9, 0x6d, 0x53, 0x3f, 0x49, 0x51,
0xfd, 0x1e, 0xd2, 0x33, 0x6e, 0xdf, 0x81, 0x27, 0xa0, 0xa6, 0x30, 0xf9, 0xd4, 0xd5, 0x57, 0x05,
0xb5, 0x61, 0xca, 0x91, 0x34, 0xd3, 0x91, 0x34, 0xcf, 0xd2, 0x91, 0xb4, 0xca, 0x1c, 0x7b, 0xf5,
0xb3, 0xa9, 0xa1, 0x6a, 0xc6, 0xe2, 0x51, 0xf8, 0x06, 0xd4, 0x02, 0x72, 0xc9, 0xec, 0xcc, 0x85,
0xb4, 0xbe, 0xf6, 0x20, 0xdf, 0x6e, 0xf0, 0xb2, 0x7c, 0x04, 0xe0, 0x21, 0x00, 0x0a, 0xa3, 0xf4,
0x20, 0x86, 0x52, 0xc1, 0x85, 0x88, 0x6b, 0x29, 0x90, 0xf2, 0xc3, 0x84, 0xf0, 0x32, 0x45, 0x48,
0x17, 0x18, 0xaa, 0x4d, 0x73, 0x5e, 0xe6, 0xd8, 0x8a, 0x78, 0xac, 0x9d, 0xdc, 0xb1, 0x79, 0x75,
0xe2, 0xdd, 0x3f, 0xce, 0x0f, 0xf8, 0xc7, 0xf9, 0x79, 0x0b, 0x9e, 0xce, 0xcd, 0xcf, 0x02, 0x3f,
0x93, 0xa7, 0x0b, 0x79, 0x2d, 0x65, 0xa0, 0xe6, 0x41, 0xa9, 0xc6, 0xd4, 0x88, 0x31, 0xa1, 0x93,
0x11, 0xa3, 0xb6, 0x87, 0xa9, 0x57, 0x5f, 0x6f, 0x69, 0xfb, 0xeb, 0xd2, 0x88, 0x48, 0xee, 0x1f,
0x63, 0xea, 0xc1, 0x6d, 0x50, 0xc6, 0x51, 0x24, 0x53, 0xaa, 0x22, 0xa5, 0x84, 0xa3, 0x88, 0x87,
0xac, 0xf7, 0xd7, 0x33, 0x43, 0xbb, 0x99, 0x19, 0xda, 0xaf, 0x99, 0xa1, 0x5d, 0xdd, 0x19, 0x85,
0x9b, 0x3b, 0xa3, 0xf0, 0xfd, 0xce, 0x28, 0x7c, 0x78, 0xe9, 0xfa, 0xcc, 0x9b, 0x0c, 0xcc, 0x61,
0x38, 0xee, 0xa8, 0x3f, 0x8b, 0x7c, 0x29, 0xff, 0x58, 0x8b, 0xff, 0xba, 0xc1, 0x9a, 0xd8, 0x7f,
0xf1, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xd2, 0xe7, 0x00, 0x06, 0x07, 0x00, 0x00,
}
func (m *ABCIResponses) Marshal() (dAtA []byte, err error) {

View File

@@ -4,20 +4,20 @@ package tendermint.state;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/state";
import "gogoproto/gogo.proto";
import "tendermint/abci/types/types.proto";
import "tendermint/abci/types.proto";
import "tendermint/types/types.proto";
import "tendermint/types/validator.proto";
import "tendermint/types/params.proto";
import "tendermint/version/version.proto";
import "tendermint/version/types.proto";
import "google/protobuf/timestamp.proto";
// ABCIResponses retains the responses
// of the various ABCI calls during block processing.
// It is persisted to disk for each height before calling Commit.
message ABCIResponses {
repeated tendermint.abci.types.ResponseDeliverTx deliver_txs = 1;
tendermint.abci.types.ResponseEndBlock end_block = 2;
tendermint.abci.types.ResponseBeginBlock begin_block = 3;
repeated tendermint.abci.ResponseDeliverTx deliver_txs = 1;
tendermint.abci.ResponseEndBlock end_block = 2;
tendermint.abci.ResponseBeginBlock begin_block = 3;
}
// ValidatorsInfo represents the latest validator set, or the last height it changed

View File

@@ -7,7 +7,7 @@ import (
fmt "fmt"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys"
crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
io "io"
math "math"
math_bits "math/bits"
@@ -545,8 +545,8 @@ func (m *EvidenceData) GetHash() []byte {
}
type ProofOfLockChange struct {
Votes []*Vote `protobuf:"bytes,1,rep,name=votes,proto3" json:"votes,omitempty"`
PubKey *keys.PublicKey `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"`
Votes []*Vote `protobuf:"bytes,1,rep,name=votes,proto3" json:"votes,omitempty"`
PubKey *crypto.PublicKey `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"`
}
func (m *ProofOfLockChange) Reset() { *m = ProofOfLockChange{} }
@@ -589,7 +589,7 @@ func (m *ProofOfLockChange) GetVotes() []*Vote {
return nil
}
func (m *ProofOfLockChange) GetPubKey() *keys.PublicKey {
func (m *ProofOfLockChange) GetPubKey() *crypto.PublicKey {
if m != nil {
return m.PubKey
}
@@ -611,53 +611,53 @@ func init() {
func init() { proto.RegisterFile("tendermint/types/evidence.proto", fileDescriptor_6825fabc78e0a168) }
var fileDescriptor_6825fabc78e0a168 = []byte{
// 733 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x6f, 0xd3, 0x30,
0x1c, 0x6d, 0xd6, 0xae, 0x8c, 0xdf, 0x26, 0x6d, 0x44, 0x1b, 0x44, 0x65, 0xea, 0xb6, 0x70, 0x60,
0x9a, 0x46, 0xba, 0x95, 0xc3, 0x24, 0xc4, 0x65, 0xff, 0x50, 0xd1, 0x26, 0x18, 0x99, 0x34, 0x24,
0x2e, 0xc1, 0x4d, 0xdc, 0xc4, 0x5b, 0x6a, 0x47, 0x8d, 0x53, 0x54, 0x09, 0x3e, 0x02, 0x12, 0x77,
0xbe, 0x01, 0x67, 0x3e, 0xc4, 0x8e, 0x3b, 0x72, 0x42, 0x68, 0xfb, 0x16, 0x9c, 0x50, 0x1c, 0x37,
0xed, 0x9a, 0x66, 0x83, 0x0b, 0x97, 0x28, 0xf2, 0xef, 0xf9, 0xbd, 0x67, 0xfb, 0xfd, 0x6c, 0x58,
0xe2, 0x98, 0x3a, 0xb8, 0xd3, 0x26, 0x94, 0xd7, 0x78, 0x2f, 0xc0, 0x61, 0x0d, 0x77, 0x89, 0x83,
0xa9, 0x8d, 0x8d, 0xa0, 0xc3, 0x38, 0x53, 0xe7, 0x06, 0x00, 0x43, 0x00, 0x2a, 0xf3, 0x2e, 0x73,
0x99, 0x28, 0xd6, 0xe2, 0xbf, 0x04, 0x57, 0x59, 0xcc, 0x10, 0x89, 0xaf, 0xac, 0xea, 0x43, 0x55,
0xbb, 0xd3, 0x0b, 0x38, 0xab, 0x9d, 0xe1, 0xde, 0x35, 0x8c, 0x1e, 0xc1, 0xc2, 0x5e, 0x14, 0xf8,
0xc4, 0x46, 0x1c, 0x9f, 0x30, 0x8e, 0xf7, 0xa5, 0x11, 0xf5, 0x09, 0x94, 0xbb, 0x8c, 0x63, 0x0b,
0x69, 0xca, 0xb2, 0xb2, 0x3a, 0x5d, 0xbf, 0x6f, 0x8c, 0x7a, 0x32, 0x62, 0xbc, 0x39, 0x19, 0xa3,
0xb6, 0x53, 0x78, 0x53, 0x9b, 0xb8, 0x1d, 0xbe, 0xa3, 0x7f, 0x55, 0x40, 0x3b, 0x62, 0x1c, 0x53,
0x4e, 0x90, 0xbf, 0xdd, 0xa6, 0x38, 0x24, 0xe8, 0xff, 0x48, 0xab, 0x2b, 0x30, 0xe3, 0x61, 0xe2,
0x7a, 0xdc, 0x0a, 0x39, 0x6a, 0x07, 0x5a, 0x71, 0x59, 0x59, 0x2d, 0x9a, 0xd3, 0xc9, 0xd8, 0x71,
0x3c, 0xa4, 0x7f, 0x57, 0x60, 0x76, 0xd4, 0x94, 0x07, 0x95, 0xa0, 0x6f, 0xd8, 0x42, 0x49, 0xd1,
0xea, 0x1f, 0x9b, 0x34, 0xba, 0x96, 0x55, 0xce, 0x5b, 0xa4, 0xa9, 0x05, 0x79, 0xcb, 0xdf, 0x82,
0x52, 0xc0, 0x7c, 0x5b, 0xae, 0xe6, 0xd1, 0x18, 0xce, 0x0e, 0x63, 0xad, 0xd7, 0xad, 0x43, 0x66,
0x9f, 0xed, 0x7a, 0x88, 0xba, 0xd8, 0x14, 0x13, 0xf4, 0x8f, 0x50, 0xd9, 0x65, 0xb4, 0xe5, 0x13,
0x9b, 0x13, 0xea, 0x36, 0x30, 0x72, 0x70, 0x27, 0x4c, 0x69, 0x0d, 0x98, 0xf0, 0x36, 0xa5, 0xd1,
0x6a, 0x96, 0xf4, 0x98, 0xb8, 0x14, 0x3b, 0xc9, 0x24, 0x73, 0xc2, 0xdb, 0x14, 0xf8, 0xba, 0x34,
0x71, 0x3b, 0xbe, 0xae, 0x7f, 0x53, 0x40, 0x3b, 0x8c, 0x28, 0xe2, 0xc4, 0x3e, 0x41, 0x3e, 0x71,
0x10, 0x67, 0x9d, 0x54, 0x7c, 0x03, 0xca, 0x9e, 0x80, 0x4a, 0x03, 0x5a, 0x96, 0x50, 0x52, 0x49,
0x9c, 0xba, 0x06, 0xa5, 0xf8, 0xbc, 0x6e, 0x39, 0x53, 0x81, 0x51, 0x37, 0x60, 0x9e, 0xd0, 0x6e,
0x2c, 0x6a, 0x25, 0xb3, 0xad, 0x16, 0xc1, 0xbe, 0x23, 0x8e, 0xf6, 0xae, 0xa9, 0xca, 0x5a, 0x22,
0xf0, 0x22, 0xae, 0xe8, 0x9f, 0xe3, 0xfc, 0x79, 0x88, 0x72, 0xd6, 0xce, 0x9a, 0xed, 0x4b, 0x2b,
0x7f, 0x21, 0xbd, 0x0f, 0xcb, 0x3e, 0x0a, 0xb9, 0x25, 0x23, 0xd5, 0xed, 0x93, 0x59, 0x1f, 0x50,
0x68, 0x11, 0x6a, 0x85, 0x98, 0x8b, 0x25, 0x14, 0xcd, 0x87, 0x31, 0xae, 0x21, 0x60, 0xa9, 0xe4,
0x5b, 0x14, 0xbe, 0xa4, 0xc7, 0x98, 0xeb, 0xbf, 0x4b, 0x30, 0x95, 0xea, 0x23, 0x78, 0xe0, 0xf4,
0x7b, 0xd2, 0x12, 0xd1, 0x1e, 0xc9, 0xd9, 0xe3, 0xac, 0xa5, 0xb1, 0x4d, 0xdc, 0x28, 0x98, 0x0b,
0xce, 0xd8, 0xee, 0x0e, 0x60, 0xd1, 0x1e, 0x44, 0x45, 0xee, 0x5a, 0x38, 0xd0, 0x49, 0x76, 0x7d,
0x3d, 0xab, 0x93, 0x1f, 0xb0, 0x46, 0xc1, 0xac, 0xd8, 0xf9, 0xf1, 0x3b, 0x85, 0x8a, 0x9f, 0xa4,
0x63, 0x68, 0x93, 0x52, 0xbd, 0x62, 0x5e, 0xff, 0xe4, 0x25, 0xaa, 0x51, 0x30, 0x35, 0x3f, 0x2f,
0x6d, 0xa7, 0x37, 0xf6, 0x6a, 0xe9, 0x5f, 0x7b, 0x35, 0xd6, 0xca, 0xed, 0xd6, 0x57, 0x30, 0x97,
0x51, 0x98, 0x14, 0x0a, 0x2b, 0x59, 0x85, 0x2c, 0xf1, 0x2c, 0x1a, 0xe1, 0x8b, 0xbd, 0x27, 0xc1,
0x1c, 0xb7, 0x4f, 0xe5, 0x5c, 0xef, 0x39, 0x61, 0x16, 0xde, 0x73, 0x6a, 0x3b, 0x93, 0x50, 0x0c,
0xa3, 0xb6, 0xfe, 0x1e, 0x66, 0xfa, 0x43, 0x7b, 0x88, 0x23, 0xf5, 0x39, 0x4c, 0x0d, 0x05, 0xae,
0xb8, 0x3a, 0x5d, 0xaf, 0x64, 0x05, 0x53, 0x92, 0xd2, 0xf9, 0xcf, 0xa5, 0x82, 0x99, 0xce, 0x50,
0x55, 0x28, 0x79, 0x28, 0xf4, 0x44, 0x84, 0x66, 0x4c, 0xf1, 0xaf, 0x7f, 0x82, 0x7b, 0x99, 0x4b,
0x4b, 0x5d, 0x07, 0x71, 0x23, 0x87, 0x52, 0xe3, 0xc6, 0x6b, 0x3b, 0x54, 0x9f, 0xc1, 0x9d, 0x20,
0x6a, 0x5a, 0x67, 0xb8, 0x27, 0xc3, 0x79, 0x6d, 0x7b, 0x93, 0xe7, 0xcd, 0x88, 0x9f, 0x37, 0xe3,
0x28, 0x6a, 0xfa, 0xc4, 0x3e, 0xc0, 0x3d, 0xb3, 0x1c, 0x44, 0xcd, 0x03, 0xdc, 0xdb, 0x79, 0x73,
0x7e, 0x59, 0x55, 0x2e, 0x2e, 0xab, 0xca, 0xaf, 0xcb, 0xaa, 0xf2, 0xe5, 0xaa, 0x5a, 0xb8, 0xb8,
0xaa, 0x16, 0x7e, 0x5c, 0x55, 0x0b, 0xef, 0xb6, 0x5c, 0xc2, 0xbd, 0xa8, 0x69, 0xd8, 0xac, 0x5d,
0x1b, 0x7e, 0x4b, 0x07, 0xbf, 0xc9, 0x9b, 0x3b, 0xfa, 0xce, 0x36, 0xcb, 0x62, 0xfc, 0xe9, 0x9f,
0x00, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x3e, 0xd5, 0x42, 0xcb, 0x07, 0x00, 0x00,
// 728 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x4e, 0xdb, 0x4a,
0x18, 0x8d, 0x49, 0xc8, 0xe5, 0x7e, 0x20, 0xc1, 0xb5, 0xe0, 0xd6, 0x4a, 0x91, 0x01, 0x77, 0x51,
0x84, 0xa8, 0x03, 0xa9, 0x2a, 0x36, 0xdd, 0xf0, 0x57, 0xa5, 0x02, 0xb5, 0xd4, 0x48, 0x54, 0xea,
0xc6, 0x9d, 0xd8, 0x13, 0x7b, 0xc0, 0x99, 0xb1, 0xe2, 0x71, 0xda, 0x48, 0x7d, 0x85, 0x4a, 0xdd,
0xf7, 0x0d, 0xba, 0xee, 0x43, 0xb0, 0x64, 0xd9, 0x55, 0x55, 0xc1, 0x5b, 0x74, 0x55, 0x79, 0x3c,
0x71, 0xa2, 0x38, 0x86, 0x76, 0xd3, 0x8d, 0x65, 0xcd, 0x77, 0xe6, 0x9c, 0x33, 0x33, 0xe7, 0x9b,
0x81, 0x15, 0x8e, 0xa9, 0x8b, 0xbb, 0x1d, 0x42, 0x79, 0x9d, 0xf7, 0x43, 0x1c, 0xd5, 0x71, 0x8f,
0xb8, 0x98, 0x3a, 0xd8, 0x0c, 0xbb, 0x8c, 0x33, 0x75, 0x61, 0x08, 0x30, 0x05, 0xa0, 0xb6, 0xe8,
0x31, 0x8f, 0x89, 0x62, 0x3d, 0xf9, 0x4b, 0x71, 0xb5, 0xe5, 0x1c, 0x91, 0xf8, 0x4e, 0xa8, 0x3a,
0xdd, 0x7e, 0xc8, 0x59, 0xfd, 0x02, 0xf7, 0x65, 0xd5, 0x88, 0x61, 0xe9, 0x20, 0x0e, 0x03, 0xe2,
0x20, 0x8e, 0xcf, 0x18, 0xc7, 0x87, 0xd2, 0x82, 0xfa, 0x08, 0xaa, 0x3d, 0xc6, 0xb1, 0x8d, 0x34,
0x65, 0x55, 0x59, 0x9f, 0x6d, 0xfc, 0x6f, 0x8e, 0xbb, 0x31, 0x13, 0xbc, 0x35, 0x9d, 0xa0, 0x76,
0x33, 0x78, 0x4b, 0x9b, 0xba, 0x1b, 0xbe, 0x67, 0x7c, 0x56, 0x40, 0x3b, 0x61, 0x1c, 0x53, 0x4e,
0x50, 0xb0, 0xdb, 0xa1, 0x38, 0x22, 0xe8, 0xef, 0x48, 0xab, 0x6b, 0x30, 0xe7, 0x63, 0xe2, 0xf9,
0xdc, 0x8e, 0x38, 0xea, 0x84, 0x5a, 0x79, 0x55, 0x59, 0x2f, 0x5b, 0xb3, 0xe9, 0xd8, 0x69, 0x32,
0x64, 0x7c, 0x55, 0x60, 0x7e, 0xdc, 0x94, 0x0f, 0xb5, 0x70, 0x60, 0xd8, 0x46, 0x69, 0xd1, 0x1e,
0x1c, 0x98, 0x34, 0xba, 0x91, 0x57, 0x2e, 0x5a, 0xa4, 0xa5, 0x85, 0x45, 0xcb, 0xdf, 0x81, 0x4a,
0xc8, 0x02, 0x47, 0xae, 0xe6, 0xc1, 0x04, 0xce, 0x2e, 0x63, 0xed, 0x97, 0xed, 0x63, 0xe6, 0x5c,
0xec, 0xfb, 0x88, 0x7a, 0xd8, 0x12, 0x13, 0x8c, 0x0f, 0x50, 0xdb, 0x67, 0xb4, 0x1d, 0x10, 0x87,
0x13, 0xea, 0x35, 0x31, 0x72, 0x71, 0x37, 0xca, 0x68, 0x4d, 0x98, 0xf2, 0xb7, 0xa5, 0x51, 0x3d,
0x4f, 0x7a, 0x4a, 0x3c, 0x8a, 0xdd, 0x74, 0x92, 0x35, 0xe5, 0x6f, 0x0b, 0x7c, 0x43, 0x9a, 0xb8,
0x1b, 0xdf, 0x30, 0xbe, 0x28, 0xa0, 0x1d, 0xc7, 0x14, 0x71, 0xe2, 0x9c, 0xa1, 0x80, 0xb8, 0x88,
0xb3, 0x6e, 0x26, 0xbe, 0x05, 0x55, 0x5f, 0x40, 0xa5, 0x01, 0x2d, 0x4f, 0x28, 0xa9, 0x24, 0x4e,
0xdd, 0x80, 0x4a, 0x72, 0x5e, 0x77, 0x9c, 0xa9, 0xc0, 0xa8, 0x5b, 0xb0, 0x48, 0x68, 0x2f, 0x11,
0xb5, 0xd3, 0xd9, 0x76, 0x9b, 0xe0, 0xc0, 0x15, 0x47, 0xfb, 0xaf, 0xa5, 0xca, 0x5a, 0x2a, 0xf0,
0x2c, 0xa9, 0x18, 0x1f, 0x93, 0xfc, 0xf9, 0x88, 0x72, 0xd6, 0xc9, 0x9b, 0x1d, 0x48, 0x2b, 0xbf,
0x21, 0x7d, 0x08, 0xab, 0x01, 0x8a, 0xb8, 0x2d, 0x23, 0xd5, 0x1b, 0x90, 0xd9, 0xef, 0x50, 0x64,
0x13, 0x6a, 0x47, 0x98, 0x8b, 0x25, 0x94, 0xad, 0xfb, 0x09, 0xae, 0x29, 0x60, 0x99, 0xe4, 0x6b,
0x14, 0x3d, 0xa7, 0xa7, 0x98, 0x1b, 0x3f, 0x2b, 0x30, 0x93, 0xe9, 0x23, 0xb8, 0xe7, 0x0e, 0x7a,
0xd2, 0x16, 0xd1, 0x1e, 0xcb, 0xd9, 0xc3, 0xbc, 0xa5, 0x89, 0x4d, 0xdc, 0x2c, 0x59, 0x4b, 0xee,
0xc4, 0xee, 0x0e, 0x61, 0xd9, 0x19, 0x46, 0x45, 0xee, 0x5a, 0x34, 0xd4, 0x49, 0x77, 0x7d, 0x33,
0xaf, 0x53, 0x1c, 0xb0, 0x66, 0xc9, 0xaa, 0x39, 0xc5, 0xf1, 0x3b, 0x87, 0x5a, 0x90, 0xa6, 0x63,
0x64, 0x93, 0x32, 0xbd, 0x72, 0x51, 0xff, 0x14, 0x25, 0xaa, 0x59, 0xb2, 0xb4, 0xa0, 0x28, 0x6d,
0xe7, 0xb7, 0xf6, 0x6a, 0xe5, 0x4f, 0x7b, 0x35, 0xd1, 0x2a, 0xec, 0xd6, 0x17, 0xb0, 0x90, 0x53,
0x98, 0x16, 0x0a, 0x6b, 0x79, 0x85, 0x3c, 0xf1, 0x3c, 0x1a, 0xe3, 0x4b, 0xbc, 0xa7, 0xc1, 0x9c,
0xb4, 0x4f, 0xd5, 0x42, 0xef, 0x05, 0x61, 0x16, 0xde, 0x0b, 0x6a, 0x7b, 0xd3, 0x50, 0x8e, 0xe2,
0x8e, 0xf1, 0x16, 0xe6, 0x06, 0x43, 0x07, 0x88, 0x23, 0xf5, 0x29, 0xcc, 0x8c, 0x04, 0xae, 0xbc,
0x3e, 0xdb, 0xa8, 0xe5, 0x05, 0x33, 0x92, 0xca, 0xe5, 0xf7, 0x95, 0x92, 0x95, 0xcd, 0x50, 0x55,
0xa8, 0xf8, 0x28, 0xf2, 0x45, 0x84, 0xe6, 0x2c, 0xf1, 0x6f, 0xbc, 0x87, 0xff, 0x72, 0x97, 0x96,
0xba, 0x09, 0xe2, 0x46, 0x8e, 0xa4, 0xc6, 0xad, 0xd7, 0x76, 0xa4, 0x3e, 0x81, 0x7f, 0xc2, 0xb8,
0x65, 0x5f, 0xe0, 0xbe, 0x0c, 0xe7, 0xf2, 0x28, 0x3e, 0x7d, 0xd8, 0xcc, 0x93, 0xb8, 0x15, 0x10,
0xe7, 0x08, 0xf7, 0xad, 0x6a, 0x18, 0xb7, 0x8e, 0x70, 0x7f, 0xef, 0xd5, 0xe5, 0xb5, 0xae, 0x5c,
0x5d, 0xeb, 0xca, 0x8f, 0x6b, 0x5d, 0xf9, 0x74, 0xa3, 0x97, 0xae, 0x6e, 0xf4, 0xd2, 0xb7, 0x1b,
0xbd, 0xf4, 0x66, 0xc7, 0x23, 0xdc, 0x8f, 0x5b, 0xa6, 0xc3, 0x3a, 0xf5, 0xd1, 0x07, 0x74, 0xf8,
0x9b, 0x3e, 0xb4, 0xe3, 0x8f, 0x6b, 0xab, 0x2a, 0xc6, 0x1f, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff,
0xdc, 0x62, 0x93, 0xc8, 0xc0, 0x07, 0x00, 0x00,
}
func (m *DuplicateVoteEvidence) Marshal() (dAtA []byte, err error) {
@@ -2706,7 +2706,7 @@ func (m *ProofOfLockChange) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF
}
if m.PubKey == nil {
m.PubKey = &keys.PublicKey{}
m.PubKey = &crypto.PublicKey{}
}
if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err

View File

@@ -5,7 +5,7 @@ option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
import "gogoproto/gogo.proto";
import "tendermint/types/types.proto";
import "tendermint/crypto/keys/types.proto";
import "tendermint/crypto/keys.proto";
// DuplicateVoteEvidence contains evidence a validator signed two conflicting
// votes.
@@ -60,6 +60,6 @@ message EvidenceData {
}
message ProofOfLockChange {
repeated Vote votes = 1;
tendermint.crypto.keys.PublicKey pub_key = 2;
repeated Vote votes = 1;
tendermint.crypto.PublicKey pub_key = 2;
}

View File

@@ -9,7 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
_ "github.com/gogo/protobuf/types"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
merkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"
crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
bits "github.com/tendermint/tendermint/proto/tendermint/libs/bits"
version "github.com/tendermint/tendermint/proto/tendermint/version"
io "io"
@@ -152,7 +152,7 @@ func (m *PartSetHeader) GetHash() []byte {
type Part struct {
Index uint32 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"`
Bytes []byte `protobuf:"bytes,2,opt,name=bytes,proto3" json:"bytes,omitempty"`
Proof merkle.Proof `protobuf:"bytes,3,opt,name=proof,proto3" json:"proof"`
Proof crypto.Proof `protobuf:"bytes,3,opt,name=proof,proto3" json:"proof"`
}
func (m *Part) Reset() { *m = Part{} }
@@ -202,11 +202,11 @@ func (m *Part) GetBytes() []byte {
return nil
}
func (m *Part) GetProof() merkle.Proof {
func (m *Part) GetProof() crypto.Proof {
if m != nil {
return m.Proof
}
return merkle.Proof{}
return crypto.Proof{}
}
// BlockID
@@ -945,7 +945,7 @@ func (m *BlockMeta) GetNumTxs() int64 {
type TxProof struct {
RootHash []byte `protobuf:"bytes,1,opt,name=root_hash,json=rootHash,proto3" json:"root_hash,omitempty"`
Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
Proof *merkle.Proof `protobuf:"bytes,3,opt,name=proof,proto3" json:"proof,omitempty"`
Proof *crypto.Proof `protobuf:"bytes,3,opt,name=proof,proto3" json:"proof,omitempty"`
}
func (m *TxProof) Reset() { *m = TxProof{} }
@@ -995,7 +995,7 @@ func (m *TxProof) GetData() []byte {
return nil
}
func (m *TxProof) GetProof() *merkle.Proof {
func (m *TxProof) GetProof() *crypto.Proof {
if m != nil {
return m.Proof
}
@@ -1022,90 +1022,89 @@ func init() {
func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) }
var fileDescriptor_d3a6e55e2345de56 = []byte{
// 1318 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4d, 0x6f, 0xdb, 0x46,
0x13, 0x36, 0x25, 0xca, 0x92, 0x46, 0x96, 0x2d, 0x2f, 0x9c, 0x44, 0x51, 0x12, 0x99, 0xd0, 0xfb,
0xb6, 0x75, 0xd2, 0x40, 0x4a, 0x1d, 0xf4, 0x0b, 0x41, 0x0f, 0x92, 0xed, 0x24, 0x42, 0x6c, 0x59,
0xa5, 0x94, 0x14, 0xed, 0x85, 0xa0, 0xc4, 0x8d, 0x44, 0x84, 0xe2, 0xb2, 0xe4, 0xca, 0xb5, 0xf3,
0x0b, 0x0a, 0x9f, 0xd2, 0x1f, 0xa0, 0x53, 0x7b, 0xe8, 0xbd, 0xff, 0xa0, 0xa7, 0x1c, 0x73, 0x6b,
0x2f, 0x4d, 0x0b, 0x07, 0x28, 0xfa, 0x33, 0x8a, 0xfd, 0xa0, 0x44, 0x5a, 0x76, 0x3f, 0x82, 0xa0,
0x17, 0x7b, 0x77, 0xf6, 0x99, 0x99, 0x9d, 0x67, 0x9f, 0xdd, 0xa1, 0xe0, 0x2a, 0xc5, 0xae, 0x85,
0xfd, 0x91, 0xed, 0xd2, 0x1a, 0x3d, 0xf2, 0x70, 0x20, 0xfe, 0x56, 0x3d, 0x9f, 0x50, 0x82, 0x0a,
0xb3, 0xd5, 0x2a, 0xb7, 0x97, 0xd6, 0x06, 0x64, 0x40, 0xf8, 0x62, 0x8d, 0x8d, 0x04, 0xae, 0xb4,
0x3e, 0x20, 0x64, 0xe0, 0xe0, 0x1a, 0x9f, 0xf5, 0xc6, 0x8f, 0x6b, 0xd4, 0x1e, 0xe1, 0x80, 0x9a,
0x23, 0x4f, 0x02, 0xb4, 0x48, 0x1a, 0xc7, 0xee, 0x05, 0xb5, 0x9e, 0x4d, 0x63, 0xa9, 0x4a, 0xff,
0x8f, 0x20, 0xfa, 0xfe, 0x91, 0x47, 0x49, 0x6d, 0x84, 0xfd, 0x27, 0x0e, 0x8e, 0xa1, 0xa2, 0x71,
0x0e, 0xb0, 0x1f, 0xd8, 0xc4, 0x0d, 0xff, 0x0b, 0x44, 0xe5, 0x63, 0xc8, 0xb7, 0x4d, 0x9f, 0x76,
0x30, 0xbd, 0x8f, 0x4d, 0x0b, 0xfb, 0x68, 0x0d, 0x52, 0x94, 0x50, 0xd3, 0x29, 0x2a, 0x9a, 0xb2,
0x91, 0xd7, 0xc5, 0x04, 0x21, 0x50, 0x87, 0x66, 0x30, 0x2c, 0x26, 0x34, 0x65, 0x63, 0x49, 0xe7,
0xe3, 0x0a, 0x01, 0x95, 0xb9, 0x32, 0x0f, 0xdb, 0xb5, 0xf0, 0x61, 0xe8, 0xc1, 0x27, 0xcc, 0xda,
0x3b, 0xa2, 0x38, 0x90, 0x2e, 0x62, 0x82, 0xee, 0x40, 0xca, 0xf3, 0x09, 0x79, 0x5c, 0x4c, 0x6a,
0xca, 0x46, 0x6e, 0x73, 0xbd, 0x1a, 0x61, 0x4c, 0x94, 0x51, 0x15, 0x65, 0x54, 0xdb, 0x0c, 0xd6,
0x50, 0x9f, 0xbf, 0x5c, 0x5f, 0xd0, 0x85, 0x4f, 0xc5, 0x81, 0x74, 0xc3, 0x21, 0xfd, 0x27, 0xcd,
0xed, 0xe9, 0x7e, 0x94, 0xd9, 0x7e, 0xd0, 0x1e, 0xac, 0x78, 0xa6, 0x4f, 0x8d, 0x00, 0x53, 0x63,
0xc8, 0x8b, 0xe1, 0xb9, 0x4f, 0x65, 0x11, 0xf4, 0xc4, 0x6a, 0x96, 0x59, 0xf2, 0x5e, 0xd4, 0x58,
0xf9, 0x5d, 0x85, 0x45, 0xc9, 0xc9, 0x27, 0x90, 0x96, 0xac, 0xf1, 0x84, 0xb9, 0xcd, 0x6b, 0xd1,
0x88, 0x21, 0xa1, 0x5b, 0xc4, 0x0d, 0xb0, 0x1b, 0x8c, 0x03, 0x19, 0x2f, 0xf4, 0x41, 0x6f, 0x43,
0xa6, 0x3f, 0x34, 0x6d, 0xd7, 0xb0, 0x2d, 0xbe, 0xa3, 0x6c, 0x23, 0x77, 0xf2, 0x72, 0x3d, 0xbd,
0xc5, 0x6c, 0xcd, 0x6d, 0x3d, 0xcd, 0x17, 0x9b, 0x16, 0xba, 0x08, 0x8b, 0x43, 0x6c, 0x0f, 0x86,
0x94, 0xb3, 0x93, 0xd4, 0xe5, 0x0c, 0x7d, 0x04, 0x2a, 0x13, 0x48, 0x51, 0xe5, 0xb9, 0x4b, 0x55,
0xa1, 0x9e, 0x6a, 0xa8, 0x9e, 0x6a, 0x37, 0x54, 0x4f, 0x23, 0xc3, 0x12, 0x3f, 0xfb, 0x75, 0x5d,
0xd1, 0xb9, 0x07, 0xda, 0x82, 0xbc, 0x63, 0x06, 0xd4, 0xe8, 0x31, 0xda, 0x58, 0xfa, 0x14, 0x0f,
0x71, 0x79, 0x9e, 0x10, 0x49, 0xac, 0xdc, 0x7a, 0x8e, 0x79, 0x09, 0x93, 0x85, 0x36, 0xa0, 0xc0,
0x83, 0xf4, 0xc9, 0x68, 0x64, 0x53, 0x83, 0xf3, 0xbe, 0xc8, 0x79, 0x5f, 0x66, 0xf6, 0x2d, 0x6e,
0xbe, 0xcf, 0x4e, 0xe0, 0x0a, 0x64, 0x2d, 0x93, 0x9a, 0x02, 0x92, 0xe6, 0x90, 0x0c, 0x33, 0xf0,
0xc5, 0x77, 0x60, 0xe5, 0xc0, 0x74, 0x6c, 0xcb, 0xa4, 0xc4, 0x0f, 0x04, 0x24, 0x23, 0xa2, 0xcc,
0xcc, 0x1c, 0x78, 0x0b, 0xd6, 0x5c, 0x7c, 0x48, 0x8d, 0xd3, 0xe8, 0x2c, 0x47, 0x23, 0xb6, 0xf6,
0x28, 0xee, 0xf1, 0x16, 0x2c, 0xf7, 0x43, 0xf2, 0x05, 0x16, 0x38, 0x36, 0x3f, 0xb5, 0x72, 0xd8,
0x65, 0xc8, 0x98, 0x9e, 0x27, 0x00, 0x39, 0x0e, 0x48, 0x9b, 0x9e, 0xc7, 0x97, 0x6e, 0xc0, 0x2a,
0xaf, 0xd1, 0xc7, 0xc1, 0xd8, 0xa1, 0x32, 0xc8, 0x12, 0xc7, 0xac, 0xb0, 0x05, 0x5d, 0xd8, 0x39,
0xf6, 0x7f, 0x90, 0xc7, 0x07, 0xb6, 0x85, 0xdd, 0x3e, 0x16, 0xb8, 0x3c, 0xc7, 0x2d, 0x85, 0x46,
0x0e, 0xba, 0x0e, 0x05, 0xcf, 0x27, 0x1e, 0x09, 0xb0, 0x6f, 0x98, 0x96, 0xe5, 0xe3, 0x20, 0x28,
0x2e, 0x8b, 0x78, 0xa1, 0xbd, 0x2e, 0xcc, 0x95, 0x9b, 0xa0, 0x6e, 0x9b, 0xd4, 0x44, 0x05, 0x48,
0xd2, 0xc3, 0xa0, 0xa8, 0x68, 0xc9, 0x8d, 0x25, 0x9d, 0x0d, 0xcf, 0xbc, 0x75, 0x7f, 0x24, 0x40,
0x7d, 0x44, 0x28, 0x46, 0xb7, 0x41, 0x65, 0x47, 0xc7, 0x15, 0xb9, 0x7c, 0x96, 0xc6, 0x3b, 0xf6,
0xc0, 0xc5, 0xd6, 0x5e, 0x30, 0xe8, 0x1e, 0x79, 0x58, 0xe7, 0xe0, 0x88, 0xc4, 0x12, 0x31, 0x89,
0xad, 0x41, 0xca, 0x27, 0x63, 0xd7, 0xe2, 0xca, 0x4b, 0xe9, 0x62, 0x82, 0x76, 0x20, 0x33, 0x55,
0x8e, 0xfa, 0x77, 0xca, 0x59, 0x61, 0xca, 0x61, 0xba, 0x96, 0x06, 0x3d, 0xdd, 0x93, 0x02, 0x6a,
0x40, 0x76, 0xfa, 0xc0, 0x49, 0x05, 0xfe, 0x33, 0x11, 0xcf, 0xdc, 0xd0, 0xbb, 0xb0, 0x3a, 0xd5,
0xc3, 0x94, 0x50, 0xa1, 0xc2, 0xc2, 0x74, 0x41, 0x32, 0x1a, 0x93, 0x9a, 0x21, 0xde, 0xa6, 0x34,
0xaf, 0x6b, 0x26, 0xb5, 0x26, 0x7f, 0xa4, 0xae, 0x42, 0x36, 0xb0, 0x07, 0xae, 0x49, 0xc7, 0x3e,
0x96, 0x6a, 0x9c, 0x19, 0x2a, 0xdf, 0x24, 0x60, 0x51, 0xa8, 0x3b, 0xc2, 0x9b, 0x72, 0x36, 0x6f,
0x89, 0xf3, 0x78, 0x4b, 0xbe, 0x3e, 0x6f, 0x75, 0x80, 0xe9, 0x66, 0x82, 0xa2, 0xaa, 0x25, 0x37,
0x72, 0x9b, 0x57, 0xe6, 0x03, 0x89, 0x2d, 0x76, 0xec, 0x81, 0xbc, 0xbc, 0x11, 0xa7, 0xa9, 0x82,
0x52, 0x91, 0x77, 0xf2, 0x0e, 0x64, 0x7b, 0x36, 0x35, 0x4c, 0xdf, 0x37, 0x8f, 0x38, 0x85, 0xb9,
0xcd, 0x72, 0x34, 0x2a, 0x6b, 0x38, 0x55, 0xd6, 0x70, 0xaa, 0x0d, 0x9b, 0xd6, 0x19, 0x4a, 0xcf,
0xf4, 0xe4, 0xa8, 0xf2, 0x8b, 0x02, 0xd9, 0x69, 0x42, 0x54, 0x87, 0x7c, 0x58, 0xa8, 0xf1, 0xd8,
0x31, 0x07, 0x52, 0x8c, 0xd7, 0xce, 0xad, 0xf6, 0xae, 0x63, 0x0e, 0xf4, 0x9c, 0x2c, 0x90, 0x4d,
0xce, 0x3e, 0xd8, 0xc4, 0x39, 0x07, 0x1b, 0x53, 0x52, 0xf2, 0xf5, 0x94, 0x14, 0x3b, 0x73, 0xf5,
0xf4, 0x99, 0xff, 0x90, 0x80, 0x4c, 0x9b, 0x5f, 0x50, 0xd3, 0xf9, 0x2f, 0xae, 0xd8, 0x15, 0xc8,
0x7a, 0xc4, 0x31, 0xc4, 0x8a, 0xca, 0x57, 0x32, 0x1e, 0x71, 0xf4, 0x39, 0x1d, 0xa5, 0xde, 0xd0,
0xfd, 0x5b, 0x7c, 0x03, 0xac, 0xa5, 0x4f, 0xb3, 0xe6, 0xc3, 0x92, 0xa0, 0x42, 0x36, 0xcc, 0x5b,
0x8c, 0x03, 0xde, 0x81, 0x45, 0xbf, 0x2c, 0xce, 0x6f, 0x5b, 0x20, 0x75, 0x89, 0x63, 0x1e, 0xa2,
0xbf, 0xc8, 0x9e, 0x5d, 0x3c, 0x4f, 0xe7, 0xba, 0xc4, 0x55, 0x7e, 0x54, 0x20, 0xcb, 0x4b, 0xdd,
0xc3, 0xd4, 0x8c, 0x51, 0xa5, 0xbc, 0x3e, 0x55, 0xd7, 0x00, 0x44, 0x98, 0xc0, 0x7e, 0x8a, 0xe5,
0x01, 0x66, 0xb9, 0xa5, 0x63, 0x3f, 0xc5, 0xe8, 0x83, 0x69, 0x5d, 0xc9, 0xbf, 0xae, 0x4b, 0x5e,
0xc5, 0xb0, 0xba, 0x4b, 0x90, 0x76, 0xc7, 0x23, 0x83, 0x3d, 0xef, 0xaa, 0x10, 0x85, 0x3b, 0x1e,
0x75, 0x0f, 0x83, 0xca, 0x97, 0x90, 0xee, 0x1e, 0xf2, 0x4f, 0x1d, 0xa6, 0x04, 0x9f, 0x10, 0xd9,
0x5f, 0xc5, 0x77, 0x4d, 0x86, 0x19, 0x78, 0x3b, 0x41, 0xa0, 0xb2, 0x46, 0x1a, 0x76, 0x02, 0x36,
0x46, 0xef, 0xff, 0xbb, 0x6f, 0x29, 0xf9, 0x15, 0x75, 0xe3, 0x27, 0x05, 0x72, 0x91, 0xdb, 0x88,
0xde, 0x83, 0x0b, 0x8d, 0xdd, 0xfd, 0xad, 0x07, 0x46, 0x73, 0xdb, 0xb8, 0xbb, 0x5b, 0xbf, 0x67,
0x3c, 0x6c, 0x3d, 0x68, 0xed, 0x7f, 0xd6, 0x2a, 0x2c, 0x94, 0x2e, 0x1e, 0x4f, 0x34, 0x14, 0xc1,
0x3e, 0x74, 0x9f, 0xb8, 0xe4, 0x2b, 0x17, 0xd5, 0x60, 0x2d, 0xee, 0x52, 0x6f, 0x74, 0x76, 0x5a,
0xdd, 0x82, 0x52, 0xba, 0x70, 0x3c, 0xd1, 0x56, 0x23, 0x1e, 0xf5, 0x5e, 0x80, 0x5d, 0x3a, 0xef,
0xb0, 0xb5, 0xbf, 0xb7, 0xd7, 0xec, 0x16, 0x12, 0x73, 0x0e, 0xf2, 0xbd, 0xbd, 0x0e, 0xab, 0x71,
0x87, 0x56, 0x73, 0xb7, 0x90, 0x2c, 0xa1, 0xe3, 0x89, 0xb6, 0x1c, 0x41, 0xb7, 0x6c, 0xa7, 0x94,
0xf9, 0xfa, 0xdb, 0xf2, 0xc2, 0xf7, 0xdf, 0x95, 0x15, 0x56, 0x59, 0x3e, 0x76, 0x23, 0xd1, 0x4d,
0xb8, 0xd4, 0x69, 0xde, 0x6b, 0xed, 0x6c, 0x1b, 0x7b, 0x9d, 0x7b, 0x46, 0xf7, 0xf3, 0xf6, 0x4e,
0xa4, 0xba, 0x95, 0xe3, 0x89, 0x96, 0x93, 0x25, 0x9d, 0x87, 0x6e, 0xeb, 0x3b, 0x8f, 0xf6, 0xbb,
0x3b, 0x05, 0x45, 0xa0, 0xdb, 0x3e, 0x3e, 0x20, 0x14, 0x73, 0xf4, 0x2d, 0xb8, 0x7c, 0x06, 0x7a,
0x5a, 0xd8, 0xea, 0xf1, 0x44, 0xcb, 0xb7, 0x7d, 0x2c, 0xd4, 0xca, 0x3d, 0xaa, 0x50, 0x9c, 0xf7,
0xd8, 0x6f, 0xef, 0x77, 0xea, 0xbb, 0x05, 0xad, 0x54, 0x38, 0x9e, 0x68, 0x4b, 0xe1, 0xd3, 0xc3,
0xf0, 0xb3, 0xca, 0x1a, 0x9f, 0x3e, 0x3f, 0x29, 0x2b, 0x2f, 0x4e, 0xca, 0xca, 0x6f, 0x27, 0x65,
0xe5, 0xd9, 0xab, 0xf2, 0xc2, 0x8b, 0x57, 0xe5, 0x85, 0x9f, 0x5f, 0x95, 0x17, 0xbe, 0xf8, 0x70,
0x60, 0xd3, 0xe1, 0xb8, 0x57, 0xed, 0x93, 0x51, 0x2d, 0xfa, 0xdb, 0x64, 0x36, 0x14, 0xbf, 0x3e,
0x4e, 0xff, 0x6e, 0xe9, 0x2d, 0x72, 0xfb, 0xed, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x43, 0x91,
0x60, 0x8d, 0xd2, 0x0c, 0x00, 0x00,
// 1312 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6e, 0xdb, 0xc6,
0x13, 0x36, 0x25, 0xca, 0x92, 0x46, 0x96, 0x2d, 0x2f, 0x9c, 0x44, 0x51, 0x62, 0x99, 0xd0, 0x0f,
0xbf, 0xd6, 0x49, 0x03, 0x2a, 0x75, 0x8a, 0xfe, 0x41, 0xd1, 0x83, 0x64, 0x3b, 0x89, 0x10, 0x5b,
0x56, 0x29, 0x25, 0x45, 0x7b, 0x21, 0x28, 0x71, 0x23, 0xb1, 0xa1, 0xb8, 0x04, 0xb9, 0x72, 0xed,
0x3c, 0x41, 0xe1, 0x53, 0xfa, 0x00, 0x3a, 0xb5, 0x87, 0xde, 0xfb, 0x06, 0x3d, 0xe5, 0x98, 0x5b,
0x7b, 0x69, 0x5a, 0x38, 0x40, 0xd1, 0xc7, 0x28, 0xf6, 0x8f, 0x28, 0xca, 0xb2, 0xdb, 0x20, 0x08,
0x7a, 0x11, 0x76, 0x67, 0xbe, 0x99, 0xdd, 0xf9, 0xf6, 0xdb, 0x1d, 0x0a, 0xae, 0x53, 0xec, 0xd9,
0x38, 0x18, 0x3a, 0x1e, 0xad, 0xd2, 0x63, 0x1f, 0x87, 0xe2, 0x57, 0xf7, 0x03, 0x42, 0x09, 0x2a,
0x4c, 0xbd, 0x3a, 0xb7, 0x97, 0xd6, 0xfa, 0xa4, 0x4f, 0xb8, 0xb3, 0xca, 0x46, 0x02, 0x57, 0xda,
0xe8, 0x13, 0xd2, 0x77, 0x71, 0x95, 0xcf, 0xba, 0xa3, 0xc7, 0x55, 0xea, 0x0c, 0x71, 0x48, 0xad,
0xa1, 0x2f, 0x01, 0x5a, 0x6c, 0x19, 0xd7, 0xe9, 0x86, 0xd5, 0xae, 0x43, 0x67, 0x96, 0x2a, 0xad,
0xc7, 0x10, 0xbd, 0xe0, 0xd8, 0xa7, 0x84, 0x65, 0x23, 0x8f, 0xa5, 0xbb, 0x1c, 0x73, 0x1f, 0xe2,
0x20, 0x74, 0x88, 0x17, 0x0f, 0xaf, 0x7c, 0x02, 0xf9, 0x96, 0x15, 0xd0, 0x36, 0xa6, 0xf7, 0xb1,
0x65, 0xe3, 0x00, 0xad, 0x41, 0x8a, 0x12, 0x6a, 0xb9, 0x45, 0x45, 0x53, 0x36, 0xf3, 0x86, 0x98,
0x20, 0x04, 0xea, 0xc0, 0x0a, 0x07, 0xc5, 0x84, 0xa6, 0x6c, 0x2e, 0x19, 0x7c, 0x5c, 0x19, 0x80,
0xca, 0x42, 0x59, 0x84, 0xe3, 0xd9, 0xf8, 0x68, 0x12, 0xc1, 0x27, 0xcc, 0xda, 0x3d, 0xa6, 0x38,
0x94, 0x21, 0x62, 0x82, 0x3e, 0x80, 0x14, 0xdf, 0x5d, 0x31, 0xa9, 0x29, 0x9b, 0xb9, 0xad, 0xa2,
0x1e, 0x23, 0x4a, 0xec, 0x5e, 0x6f, 0x31, 0x7f, 0x5d, 0x7d, 0xfe, 0x72, 0x63, 0xc1, 0x10, 0xe0,
0x8a, 0x0b, 0xe9, 0xba, 0x4b, 0x7a, 0x4f, 0x1a, 0x3b, 0xd1, 0x46, 0x94, 0xe9, 0x46, 0xd0, 0x3e,
0xac, 0xf8, 0x56, 0x40, 0xcd, 0x10, 0x53, 0x73, 0xc0, 0xab, 0xe0, 0x8b, 0xe6, 0xb6, 0x36, 0xf4,
0xb3, 0xe7, 0xa0, 0xcf, 0x14, 0x2b, 0x57, 0xc9, 0xfb, 0x71, 0x63, 0xe5, 0x4f, 0x15, 0x16, 0x25,
0x19, 0x9f, 0x41, 0x5a, 0x92, 0xc6, 0x17, 0xcc, 0x6d, 0xad, 0xc7, 0x33, 0x4a, 0x97, 0xbe, 0x4d,
0xbc, 0x10, 0x7b, 0xe1, 0x28, 0x94, 0xf9, 0x26, 0x31, 0xe8, 0x1d, 0xc8, 0xf4, 0x06, 0x96, 0xe3,
0x99, 0x8e, 0xcd, 0x77, 0x94, 0xad, 0xe7, 0x4e, 0x5f, 0x6e, 0xa4, 0xb7, 0x99, 0xad, 0xb1, 0x63,
0xa4, 0xb9, 0xb3, 0x61, 0xa3, 0xcb, 0xb0, 0x38, 0xc0, 0x4e, 0x7f, 0x40, 0x39, 0x2d, 0x49, 0x43,
0xce, 0xd0, 0xc7, 0xa0, 0x32, 0x41, 0x14, 0x55, 0xbe, 0x76, 0x49, 0x17, 0x6a, 0xd1, 0x27, 0x6a,
0xd1, 0x3b, 0x13, 0xb5, 0xd4, 0x33, 0x6c, 0xe1, 0x67, 0xbf, 0x6f, 0x28, 0x06, 0x8f, 0x40, 0xdb,
0x90, 0x77, 0xad, 0x90, 0x9a, 0x5d, 0x46, 0x1b, 0x5b, 0x3e, 0xc5, 0x53, 0x5c, 0x9d, 0x27, 0x44,
0x12, 0x2b, 0xb7, 0x9e, 0x63, 0x51, 0xc2, 0x64, 0xa3, 0x4d, 0x28, 0xf0, 0x24, 0x3d, 0x32, 0x1c,
0x3a, 0xd4, 0xe4, 0xbc, 0x2f, 0x72, 0xde, 0x97, 0x99, 0x7d, 0x9b, 0x9b, 0xef, 0xb3, 0x13, 0xb8,
0x06, 0x59, 0xdb, 0xa2, 0x96, 0x80, 0xa4, 0x39, 0x24, 0xc3, 0x0c, 0xdc, 0xf9, 0x2e, 0xac, 0x1c,
0x5a, 0xae, 0x63, 0x5b, 0x94, 0x04, 0xa1, 0x80, 0x64, 0x44, 0x96, 0xa9, 0x99, 0x03, 0x6f, 0xc3,
0x9a, 0x87, 0x8f, 0xa8, 0x79, 0x16, 0x9d, 0xe5, 0x68, 0xc4, 0x7c, 0x8f, 0x66, 0x23, 0xfe, 0x0f,
0xcb, 0xbd, 0x09, 0xf9, 0x02, 0x0b, 0x1c, 0x9b, 0x8f, 0xac, 0x1c, 0x76, 0x15, 0x32, 0x96, 0xef,
0x0b, 0x40, 0x8e, 0x03, 0xd2, 0x96, 0xef, 0x73, 0xd7, 0x4d, 0x58, 0xe5, 0x35, 0x06, 0x38, 0x1c,
0xb9, 0x54, 0x26, 0x59, 0xe2, 0x98, 0x15, 0xe6, 0x30, 0x84, 0x9d, 0x63, 0xff, 0x07, 0x79, 0x7c,
0xe8, 0xd8, 0xd8, 0xeb, 0x61, 0x81, 0xcb, 0x73, 0xdc, 0xd2, 0xc4, 0xc8, 0x41, 0x37, 0xa0, 0xe0,
0x07, 0xc4, 0x27, 0x21, 0x0e, 0x4c, 0xcb, 0xb6, 0x03, 0x1c, 0x86, 0xc5, 0x65, 0x91, 0x6f, 0x62,
0xaf, 0x09, 0x73, 0xe5, 0x16, 0xa8, 0x3b, 0x16, 0xb5, 0x50, 0x01, 0x92, 0xf4, 0x28, 0x2c, 0x2a,
0x5a, 0x72, 0x73, 0xc9, 0x60, 0xc3, 0x73, 0xaf, 0xdb, 0x5f, 0x09, 0x50, 0x1f, 0x11, 0x8a, 0xd1,
0x1d, 0x50, 0xd9, 0xd1, 0x71, 0x45, 0x2e, 0x9f, 0xa7, 0xf1, 0xb6, 0xd3, 0xf7, 0xb0, 0xbd, 0x1f,
0xf6, 0x3b, 0xc7, 0x3e, 0x36, 0x38, 0x38, 0x26, 0xb1, 0xc4, 0x8c, 0xc4, 0xd6, 0x20, 0x15, 0x90,
0x91, 0x67, 0x73, 0xe5, 0xa5, 0x0c, 0x31, 0x41, 0xbb, 0x90, 0x89, 0x94, 0xa3, 0xfe, 0x9b, 0x72,
0x56, 0x98, 0x72, 0x98, 0xae, 0xa5, 0xc1, 0x48, 0x77, 0xa5, 0x80, 0xea, 0x90, 0x8d, 0x1e, 0x34,
0xa9, 0xc0, 0xd7, 0x13, 0xf1, 0x34, 0x0c, 0xbd, 0x07, 0xab, 0x91, 0x1e, 0x22, 0x42, 0x85, 0x0a,
0x0b, 0x91, 0x43, 0x32, 0x3a, 0x23, 0x35, 0x53, 0x3c, 0x4a, 0x69, 0x5e, 0xd7, 0x54, 0x6a, 0x0d,
0xfe, 0x3a, 0x5d, 0x87, 0x6c, 0xe8, 0xf4, 0x3d, 0x8b, 0x8e, 0x02, 0x2c, 0xd5, 0x38, 0x35, 0x54,
0xbe, 0x4b, 0xc0, 0xa2, 0x50, 0x77, 0x8c, 0x37, 0xe5, 0x7c, 0xde, 0x12, 0x17, 0xf1, 0x96, 0x7c,
0x73, 0xde, 0x6a, 0x00, 0xd1, 0x66, 0xc2, 0xa2, 0xaa, 0x25, 0x37, 0x73, 0x5b, 0xd7, 0xe6, 0x13,
0x89, 0x2d, 0xb6, 0x9d, 0xbe, 0xbc, 0xbc, 0xb1, 0xa0, 0x48, 0x41, 0xa9, 0xd8, 0x3b, 0xf9, 0x29,
0x64, 0xbb, 0x0e, 0x35, 0xad, 0x20, 0xb0, 0x8e, 0x39, 0x85, 0xb9, 0xad, 0x72, 0x3c, 0x2b, 0x6b,
0x30, 0x3a, 0x6b, 0x30, 0x7a, 0xdd, 0xa1, 0x35, 0x86, 0x32, 0x32, 0x5d, 0x39, 0xaa, 0xfc, 0xa6,
0x40, 0x36, 0x5a, 0x10, 0xd5, 0x20, 0x3f, 0x29, 0xd4, 0x7c, 0xec, 0x5a, 0x7d, 0x29, 0xc6, 0xf5,
0x0b, 0xab, 0xbd, 0xeb, 0x5a, 0x7d, 0x23, 0x27, 0x0b, 0x64, 0x93, 0xf3, 0x0f, 0x36, 0x71, 0xc1,
0xc1, 0xce, 0x28, 0x29, 0xf9, 0x66, 0x4a, 0x9a, 0x39, 0x73, 0xf5, 0xec, 0x99, 0xff, 0x94, 0x80,
0x4c, 0x8b, 0x5f, 0x50, 0xcb, 0xfd, 0x2f, 0xae, 0xd8, 0x35, 0xc8, 0xfa, 0xc4, 0x35, 0x85, 0x47,
0xe5, 0x9e, 0x8c, 0x4f, 0x5c, 0x63, 0x4e, 0x47, 0xa9, 0xb7, 0x74, 0xff, 0x16, 0xdf, 0x02, 0x6b,
0xe9, 0xb3, 0xac, 0x05, 0xb0, 0x24, 0xa8, 0x90, 0x0d, 0xf3, 0x36, 0xe3, 0x80, 0x77, 0x60, 0x65,
0xbe, 0xc1, 0x8b, 0x6d, 0x0b, 0xa4, 0x21, 0x71, 0x2c, 0x42, 0xf4, 0x17, 0xd9, 0xb3, 0x8b, 0x17,
0xe9, 0xdc, 0x90, 0xb8, 0xca, 0xcf, 0x0a, 0x64, 0x79, 0xa9, 0xfb, 0x98, 0x5a, 0x33, 0x54, 0x29,
0x6f, 0x4e, 0xd5, 0x3a, 0x80, 0x48, 0x13, 0x3a, 0x4f, 0xb1, 0x3c, 0xc0, 0x2c, 0xb7, 0xb4, 0x9d,
0xa7, 0x18, 0x7d, 0x18, 0xd5, 0x95, 0xfc, 0xe7, 0xba, 0xe4, 0x55, 0x9c, 0x54, 0x77, 0x05, 0xd2,
0xde, 0x68, 0x68, 0xb2, 0xe7, 0x5d, 0x15, 0xa2, 0xf0, 0x46, 0xc3, 0xce, 0x51, 0x58, 0xf9, 0x1a,
0xd2, 0x9d, 0x23, 0xfe, 0xa9, 0xc3, 0x94, 0x10, 0x10, 0x22, 0xfb, 0xab, 0xf8, 0xae, 0xc9, 0x30,
0x03, 0x6f, 0x27, 0x08, 0x54, 0xd6, 0x48, 0x27, 0x9d, 0x80, 0x8d, 0x91, 0xfe, 0x9a, 0x1f, 0x51,
0xf2, 0xf3, 0xe9, 0xe6, 0x2f, 0x0a, 0xe4, 0x62, 0xd7, 0x10, 0xbd, 0x0f, 0x97, 0xea, 0x7b, 0x07,
0xdb, 0x0f, 0xcc, 0xc6, 0x8e, 0x79, 0x77, 0xaf, 0x76, 0xcf, 0x7c, 0xd8, 0x7c, 0xd0, 0x3c, 0xf8,
0xa2, 0x59, 0x58, 0x28, 0x5d, 0x3e, 0x19, 0x6b, 0x28, 0x86, 0x7d, 0xe8, 0x3d, 0xf1, 0xc8, 0x37,
0x1e, 0xaa, 0xc2, 0xda, 0x6c, 0x48, 0xad, 0xde, 0xde, 0x6d, 0x76, 0x0a, 0x4a, 0xe9, 0xd2, 0xc9,
0x58, 0x5b, 0x8d, 0x45, 0xd4, 0xba, 0x21, 0xf6, 0xe8, 0x7c, 0xc0, 0xf6, 0xc1, 0xfe, 0x7e, 0xa3,
0x53, 0x48, 0xcc, 0x05, 0xc8, 0x87, 0xf6, 0x06, 0xac, 0xce, 0x06, 0x34, 0x1b, 0x7b, 0x85, 0x64,
0x09, 0x9d, 0x8c, 0xb5, 0xe5, 0x18, 0xba, 0xe9, 0xb8, 0xa5, 0xcc, 0xb7, 0xdf, 0x97, 0x17, 0x7e,
0xfc, 0xa1, 0xac, 0xb0, 0xca, 0xf2, 0x33, 0x57, 0x11, 0xdd, 0x82, 0x2b, 0xed, 0xc6, 0xbd, 0xe6,
0xee, 0x8e, 0xb9, 0xdf, 0xbe, 0x67, 0x76, 0xbe, 0x6c, 0xed, 0xc6, 0xaa, 0x5b, 0x39, 0x19, 0x6b,
0x39, 0x59, 0xd2, 0x45, 0xe8, 0x96, 0xb1, 0xfb, 0xe8, 0xa0, 0xb3, 0x5b, 0x50, 0x04, 0xba, 0x15,
0xe0, 0x43, 0x42, 0x31, 0x47, 0xdf, 0x86, 0xab, 0xe7, 0xa0, 0xa3, 0xc2, 0x56, 0x4f, 0xc6, 0x5a,
0xbe, 0x15, 0x60, 0x21, 0x53, 0x1e, 0xa1, 0x43, 0x71, 0x3e, 0xe2, 0xa0, 0x75, 0xd0, 0xae, 0xed,
0x15, 0xb4, 0x52, 0xe1, 0x64, 0xac, 0x2d, 0x4d, 0xde, 0x1c, 0x86, 0x9f, 0x56, 0x56, 0xff, 0xfc,
0xf9, 0x69, 0x59, 0x79, 0x71, 0x5a, 0x56, 0xfe, 0x38, 0x2d, 0x2b, 0xcf, 0x5e, 0x95, 0x17, 0x5e,
0xbc, 0x2a, 0x2f, 0xfc, 0xfa, 0xaa, 0xbc, 0xf0, 0xd5, 0x47, 0x7d, 0x87, 0x0e, 0x46, 0x5d, 0xbd,
0x47, 0x86, 0xd5, 0xf8, 0x9f, 0x90, 0xe9, 0x50, 0xfc, 0xcd, 0x38, 0xfb, 0x07, 0xa5, 0xbb, 0xc8,
0xed, 0x77, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x5b, 0x78, 0xe7, 0xbb, 0x0c, 0x00, 0x00,
}
func (m *PartSetHeader) Marshal() (dAtA []byte, err error) {
@@ -4421,7 +4420,7 @@ func (m *TxProof) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF
}
if m.Proof == nil {
m.Proof = &merkle.Proof{}
m.Proof = &crypto.Proof{}
}
if err := m.Proof.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err

View File

@@ -6,8 +6,8 @@ option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto";
import "tendermint/libs/bits/types.proto";
import "tendermint/crypto/merkle/types.proto";
import "tendermint/version/version.proto";
import "tendermint/crypto/proof.proto";
import "tendermint/version/types.proto";
// BlockIdFlag indicates which BlcokID the signature is for
enum BlockIDFlag {
@@ -41,9 +41,9 @@ message PartSetHeader {
}
message Part {
uint32 index = 1;
bytes bytes = 2;
tendermint.crypto.merkle.Proof proof = 3 [(gogoproto.nullable) = false];
uint32 index = 1;
bytes bytes = 2;
tendermint.crypto.Proof proof = 3 [(gogoproto.nullable) = false];
}
// BlockID
@@ -150,7 +150,7 @@ message BlockMeta {
// TxProof represents a Merkle proof of the presence of a transaction in the Merkle tree.
message TxProof {
bytes root_hash = 1;
bytes data = 2;
tendermint.crypto.merkle.Proof proof = 3;
bytes root_hash = 1;
bytes data = 2;
tendermint.crypto.Proof proof = 3;
}

View File

@@ -7,7 +7,7 @@ import (
fmt "fmt"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys"
crypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
io "io"
math "math"
math_bits "math/bits"
@@ -85,10 +85,10 @@ func (m *ValidatorSet) GetTotalVotingPower() int64 {
}
type Validator struct {
Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
PubKey keys.PublicKey `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"`
VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"`
ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"`
Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
PubKey crypto.PublicKey `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"`
VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"`
ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"`
}
func (m *Validator) Reset() { *m = Validator{} }
@@ -131,11 +131,11 @@ func (m *Validator) GetAddress() []byte {
return nil
}
func (m *Validator) GetPubKey() keys.PublicKey {
func (m *Validator) GetPubKey() crypto.PublicKey {
if m != nil {
return m.PubKey
}
return keys.PublicKey{}
return crypto.PublicKey{}
}
func (m *Validator) GetVotingPower() int64 {
@@ -153,8 +153,8 @@ func (m *Validator) GetProposerPriority() int64 {
}
type SimpleValidator struct {
PubKey *keys.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"`
VotingPower int64 `protobuf:"varint,2,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"`
PubKey *crypto.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"`
VotingPower int64 `protobuf:"varint,2,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"`
}
func (m *SimpleValidator) Reset() { *m = SimpleValidator{} }
@@ -190,7 +190,7 @@ func (m *SimpleValidator) XXX_DiscardUnknown() {
var xxx_messageInfo_SimpleValidator proto.InternalMessageInfo
func (m *SimpleValidator) GetPubKey() *keys.PublicKey {
func (m *SimpleValidator) GetPubKey() *crypto.PublicKey {
if m != nil {
return m.PubKey
}
@@ -213,31 +213,30 @@ func init() {
func init() { proto.RegisterFile("tendermint/types/validator.proto", fileDescriptor_4e92274df03d3088) }
var fileDescriptor_4e92274df03d3088 = []byte{
// 371 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6a, 0xea, 0x40,
0x14, 0xc6, 0x33, 0x2a, 0x7a, 0xef, 0x28, 0x5c, 0xef, 0xd0, 0x45, 0xb0, 0x90, 0xc6, 0xac, 0x84,
0x96, 0x04, 0xda, 0x85, 0xd0, 0x6e, 0x8a, 0x5b, 0x37, 0x36, 0x82, 0x8b, 0x6e, 0x42, 0x62, 0x86,
0x74, 0x30, 0x3a, 0xc3, 0x64, 0x62, 0x99, 0xb7, 0xe8, 0xb3, 0x74, 0xd3, 0x57, 0x70, 0xe9, 0xb2,
0xab, 0x52, 0xf4, 0x45, 0x4a, 0x12, 0xf3, 0x07, 0xdb, 0xd2, 0xee, 0x26, 0xe7, 0xfb, 0xce, 0x77,
0x7e, 0x39, 0x1c, 0xa8, 0x0b, 0xbc, 0xf2, 0x31, 0x5f, 0x92, 0x95, 0xb0, 0x84, 0x64, 0x38, 0xb2,
0xd6, 0x6e, 0x48, 0x7c, 0x57, 0x50, 0x6e, 0x32, 0x4e, 0x05, 0x45, 0xdd, 0xd2, 0x61, 0xa6, 0x8e,
0xde, 0x49, 0x40, 0x03, 0x9a, 0x8a, 0x56, 0xf2, 0xca, 0x7c, 0x3d, 0xa3, 0x92, 0x34, 0xe7, 0x92,
0x09, 0x6a, 0x2d, 0xb0, 0x8c, 0xb2, 0xd4, 0xcc, 0x63, 0x3c, 0x03, 0xd8, 0x99, 0xe5, 0xf9, 0x53,
0x2c, 0xd0, 0x0d, 0x84, 0xc5, 0xbc, 0x48, 0x05, 0x7a, 0x7d, 0xd0, 0xbe, 0x3c, 0x35, 0x8f, 0x27,
0x9a, 0x45, 0x8f, 0x5d, 0xb1, 0xa3, 0x21, 0xfc, 0xc3, 0x38, 0x65, 0x34, 0xc2, 0x5c, 0xad, 0xe9,
0xe0, 0xa7, 0xd6, 0xc2, 0x8c, 0x2e, 0x20, 0x12, 0x54, 0xb8, 0xa1, 0xb3, 0xa6, 0x82, 0xac, 0x02,
0x87, 0xd1, 0x47, 0xcc, 0xd5, 0xba, 0x0e, 0x06, 0x75, 0xbb, 0x9b, 0x2a, 0xb3, 0x54, 0x98, 0x24,
0x75, 0xe3, 0x05, 0xc0, 0xbf, 0x45, 0x0a, 0x52, 0x61, 0xcb, 0xf5, 0x7d, 0x8e, 0xa3, 0x04, 0x17,
0x0c, 0x3a, 0x76, 0xfe, 0x89, 0x6e, 0x61, 0x8b, 0xc5, 0x9e, 0xb3, 0xc0, 0xf2, 0x40, 0xd3, 0xaf,
0xd2, 0x64, 0x2b, 0x31, 0x93, 0x95, 0x98, 0x93, 0xd8, 0x0b, 0xc9, 0x7c, 0x8c, 0xe5, 0xa8, 0xb1,
0x79, 0x3b, 0x53, 0xec, 0x26, 0x8b, 0xbd, 0x31, 0x96, 0xa8, 0x0f, 0x3b, 0x5f, 0x10, 0xb5, 0xd7,
0x25, 0x0c, 0x3a, 0x87, 0xff, 0xf3, 0xdf, 0x70, 0x18, 0x27, 0x94, 0x13, 0x21, 0xd5, 0x46, 0x46,
0x9e, 0x0b, 0x93, 0x43, 0xdd, 0x60, 0xf0, 0xdf, 0x94, 0x2c, 0x59, 0x88, 0x4b, 0xfc, 0xeb, 0x12,
0x12, 0xfc, 0x12, 0xf2, 0x5b, 0xbc, 0xda, 0x27, 0xbc, 0xd1, 0xdd, 0x66, 0xa7, 0x81, 0xed, 0x4e,
0x03, 0xef, 0x3b, 0x0d, 0x3c, 0xed, 0x35, 0x65, 0xbb, 0xd7, 0x94, 0xd7, 0xbd, 0xa6, 0xdc, 0x0f,
0x03, 0x22, 0x1e, 0x62, 0xcf, 0x9c, 0xd3, 0xa5, 0x55, 0xbd, 0xb9, 0xf2, 0x99, 0x5d, 0xd4, 0xf1,
0x3d, 0x7a, 0xcd, 0xb4, 0x7e, 0xf5, 0x11, 0x00, 0x00, 0xff, 0xff, 0x10, 0x63, 0x26, 0x50, 0xaa,
0x02, 0x00, 0x00,
// 361 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xc2, 0x40,
0x10, 0xc6, 0xbb, 0x40, 0x40, 0x17, 0x12, 0x71, 0xe3, 0xa1, 0x41, 0x52, 0x2b, 0x27, 0x12, 0x4d,
0x9b, 0x68, 0x0c, 0x07, 0x6e, 0x5c, 0xb9, 0x60, 0x49, 0x38, 0x78, 0x69, 0x5a, 0xba, 0xa9, 0x1b,
0x0a, 0xbb, 0xd9, 0x6e, 0x31, 0xfb, 0x16, 0x3e, 0x8b, 0x4f, 0xc1, 0x91, 0xa3, 0x27, 0x63, 0xe0,
0x45, 0x4c, 0x5b, 0xfa, 0x27, 0xa8, 0xe1, 0x36, 0x9d, 0xef, 0x9b, 0x99, 0x5f, 0x37, 0x1f, 0xd4,
0x05, 0x5e, 0x79, 0x98, 0x2f, 0xc9, 0x4a, 0x98, 0x42, 0x32, 0x1c, 0x9a, 0x6b, 0x27, 0x20, 0x9e,
0x23, 0x28, 0x37, 0x18, 0xa7, 0x82, 0xa2, 0x76, 0xe1, 0x30, 0x12, 0x47, 0xe7, 0xca, 0xa7, 0x3e,
0x4d, 0x44, 0x33, 0xae, 0x52, 0x5f, 0xa7, 0x5b, 0xda, 0x34, 0xe7, 0x92, 0x09, 0x6a, 0x2e, 0xb0,
0x0c, 0x53, 0xb5, 0xf7, 0x01, 0x60, 0x6b, 0x96, 0x6d, 0x9e, 0x62, 0x81, 0x86, 0x10, 0xe6, 0x97,
0x42, 0x15, 0xe8, 0xd5, 0x7e, 0xf3, 0xe1, 0xda, 0x38, 0xbe, 0x65, 0xe4, 0x33, 0x56, 0xc9, 0x8e,
0x06, 0xf0, 0x8c, 0x71, 0xca, 0x68, 0x88, 0xb9, 0x5a, 0xd1, 0xc1, 0xa9, 0xd1, 0xdc, 0x8c, 0xee,
0x21, 0x12, 0x54, 0x38, 0x81, 0xbd, 0xa6, 0x82, 0xac, 0x7c, 0x9b, 0xd1, 0x37, 0xcc, 0xd5, 0xaa,
0x0e, 0xfa, 0x55, 0xab, 0x9d, 0x28, 0xb3, 0x44, 0x98, 0xc4, 0xfd, 0x18, 0xfa, 0x3c, 0xdf, 0x82,
0x54, 0xd8, 0x70, 0x3c, 0x8f, 0xe3, 0x30, 0xc6, 0x05, 0xfd, 0x96, 0x95, 0x7d, 0xa2, 0x21, 0x6c,
0xb0, 0xc8, 0xb5, 0x17, 0x58, 0x1e, 0x68, 0xba, 0x65, 0x9a, 0xf4, 0x31, 0x8c, 0x49, 0xe4, 0x06,
0x64, 0x3e, 0xc6, 0x72, 0x54, 0xdb, 0x7c, 0xdd, 0x28, 0x56, 0x9d, 0x45, 0xee, 0x18, 0x4b, 0x74,
0x0b, 0x5b, 0x7f, 0xc0, 0x34, 0xd7, 0x05, 0x07, 0xba, 0x83, 0x97, 0xd9, 0x1f, 0xd8, 0x8c, 0x13,
0xca, 0x89, 0x90, 0x6a, 0x2d, 0x85, 0xce, 0x84, 0xc9, 0xa1, 0xdf, 0x5b, 0xc0, 0x8b, 0x29, 0x59,
0xb2, 0x00, 0x17, 0xe4, 0x4f, 0x05, 0x1f, 0x38, 0xcd, 0xf7, 0x2f, 0x59, 0xe5, 0x17, 0xd9, 0xe8,
0x79, 0xb3, 0xd3, 0xc0, 0x76, 0xa7, 0x81, 0xef, 0x9d, 0x06, 0xde, 0xf7, 0x9a, 0xb2, 0xdd, 0x6b,
0xca, 0xe7, 0x5e, 0x53, 0x5e, 0x06, 0x3e, 0x11, 0xaf, 0x91, 0x6b, 0xcc, 0xe9, 0xd2, 0x2c, 0x67,
0xac, 0x28, 0xd3, 0x04, 0x1d, 0xe7, 0xcf, 0xad, 0x27, 0xfd, 0xc7, 0x9f, 0x00, 0x00, 0x00, 0xff,
0xff, 0x48, 0xbf, 0x34, 0x35, 0x9a, 0x02, 0x00, 0x00,
}
func (m *ValidatorSet) Marshal() (dAtA []byte, err error) {
@@ -819,7 +818,7 @@ func (m *SimpleValidator) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF
}
if m.PubKey == nil {
m.PubKey = &keys.PublicKey{}
m.PubKey = &crypto.PublicKey{}
}
if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err

View File

@@ -4,7 +4,7 @@ package tendermint.types;
option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
import "gogoproto/gogo.proto";
import "tendermint/crypto/keys/types.proto";
import "tendermint/crypto/keys.proto";
message ValidatorSet {
repeated Validator validators = 1;
@@ -13,13 +13,13 @@ message ValidatorSet {
}
message Validator {
bytes address = 1;
tendermint.crypto.keys.PublicKey pub_key = 2 [(gogoproto.nullable) = false];
int64 voting_power = 3;
int64 proposer_priority = 4;
bytes address = 1;
tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false];
int64 voting_power = 3;
int64 proposer_priority = 4;
}
message SimpleValidator {
tendermint.crypto.keys.PublicKey pub_key = 1;
int64 voting_power = 2;
tendermint.crypto.PublicKey pub_key = 1;
int64 voting_power = 2;
}

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: tendermint/version/version.proto
// source: tendermint/version/types.proto
package version
@@ -35,7 +35,7 @@ func (m *App) Reset() { *m = App{} }
func (m *App) String() string { return proto.CompactTextString(m) }
func (*App) ProtoMessage() {}
func (*App) Descriptor() ([]byte, []int) {
return fileDescriptor_e4aa62ad65b9e120, []int{0}
return fileDescriptor_f9b42966edc5edad, []int{0}
}
func (m *App) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -90,7 +90,7 @@ func (m *Consensus) Reset() { *m = Consensus{} }
func (m *Consensus) String() string { return proto.CompactTextString(m) }
func (*Consensus) ProtoMessage() {}
func (*Consensus) Descriptor() ([]byte, []int) {
return fileDescriptor_e4aa62ad65b9e120, []int{1}
return fileDescriptor_f9b42966edc5edad, []int{1}
}
func (m *Consensus) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -138,24 +138,24 @@ func init() {
proto.RegisterType((*Consensus)(nil), "tendermint.version.Consensus")
}
func init() { proto.RegisterFile("tendermint/version/version.proto", fileDescriptor_e4aa62ad65b9e120) }
func init() { proto.RegisterFile("tendermint/version/types.proto", fileDescriptor_f9b42966edc5edad) }
var fileDescriptor_e4aa62ad65b9e120 = []byte{
// 214 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1,
0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x42, 0x08, 0x15, 0x7a, 0x50, 0x19, 0x29, 0x91, 0xf4,
0xfc, 0xf4, 0x7c, 0xb0, 0xb4, 0x3e, 0x88, 0x05, 0x51, 0xa9, 0x64, 0xcb, 0xc5, 0xec, 0x58, 0x50,
0x20, 0x24, 0xc5, 0xc5, 0x01, 0xe6, 0x27, 0xe7, 0xe7, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04,
0xc1, 0xf9, 0x20, 0xb9, 0xe2, 0xfc, 0xb4, 0x92, 0xf2, 0xc4, 0xa2, 0x54, 0x09, 0x26, 0x05, 0x46,
0x0d, 0xce, 0x20, 0x38, 0x5f, 0xc9, 0x92, 0x8b, 0xd3, 0x39, 0x3f, 0xaf, 0x38, 0x35, 0xaf, 0xb8,
0xb4, 0x58, 0x48, 0x84, 0x8b, 0x35, 0x29, 0x27, 0x3f, 0x39, 0x1b, 0x6a, 0x02, 0x84, 0x23, 0x24,
0xc0, 0xc5, 0x9c, 0x58, 0x50, 0x00, 0xd6, 0xc9, 0x12, 0x04, 0x62, 0x5a, 0xb1, 0xbc, 0x58, 0x20,
0xcf, 0xe8, 0x14, 0x7c, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31,
0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x96, 0xe9,
0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x48, 0x5e, 0x45, 0x62, 0x42, 0xbc,
0x81, 0x19, 0x0c, 0x49, 0x6c, 0x60, 0x19, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xf4,
0x35, 0x7f, 0x23, 0x01, 0x00, 0x00,
var fileDescriptor_f9b42966edc5edad = []byte{
// 218 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0xd3, 0x2f,
0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41,
0xe5, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xd2, 0xfa, 0x20, 0x16, 0x44, 0xa5, 0x92, 0x2d,
0x17, 0xb3, 0x63, 0x41, 0x81, 0x90, 0x14, 0x17, 0x07, 0x98, 0x9f, 0x9c, 0x9f, 0x23, 0xc1, 0xa8,
0xc0, 0xa8, 0xc1, 0x12, 0x04, 0xe7, 0x83, 0xe4, 0x8a, 0xf3, 0xd3, 0x4a, 0xca, 0x13, 0x8b, 0x52,
0x25, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83, 0xe0, 0x7c, 0x25, 0x4b, 0x2e, 0x4e, 0xe7, 0xfc, 0xbc,
0xe2, 0xd4, 0xbc, 0xe2, 0xd2, 0x62, 0x21, 0x11, 0x2e, 0xd6, 0xa4, 0x9c, 0xfc, 0xe4, 0x6c, 0xa8,
0x09, 0x10, 0x8e, 0x90, 0x00, 0x17, 0x73, 0x62, 0x41, 0x01, 0x58, 0x27, 0x4b, 0x10, 0x88, 0x69,
0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 0x53, 0xf0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31,
0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb,
0x31, 0x44, 0x59, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x79,
0x14, 0x89, 0x09, 0xf1, 0x06, 0x66, 0x20, 0x24, 0xb1, 0x81, 0x65, 0x8c, 0x01, 0x01, 0x00, 0x00,
0xff, 0xff, 0x42, 0x43, 0x65, 0xc7, 0x21, 0x01, 0x00, 0x00,
}
func (this *Consensus) Equal(that interface{}) bool {
@@ -208,12 +208,12 @@ func (m *App) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if len(m.Software) > 0 {
i -= len(m.Software)
copy(dAtA[i:], m.Software)
i = encodeVarintVersion(dAtA, i, uint64(len(m.Software)))
i = encodeVarintTypes(dAtA, i, uint64(len(m.Software)))
i--
dAtA[i] = 0x12
}
if m.Protocol != 0 {
i = encodeVarintVersion(dAtA, i, uint64(m.Protocol))
i = encodeVarintTypes(dAtA, i, uint64(m.Protocol))
i--
dAtA[i] = 0x8
}
@@ -241,20 +241,20 @@ func (m *Consensus) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
if m.App != 0 {
i = encodeVarintVersion(dAtA, i, uint64(m.App))
i = encodeVarintTypes(dAtA, i, uint64(m.App))
i--
dAtA[i] = 0x10
}
if m.Block != 0 {
i = encodeVarintVersion(dAtA, i, uint64(m.Block))
i = encodeVarintTypes(dAtA, i, uint64(m.Block))
i--
dAtA[i] = 0x8
}
return len(dAtA) - i, nil
}
func encodeVarintVersion(dAtA []byte, offset int, v uint64) int {
offset -= sovVersion(v)
func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
offset -= sovTypes(v)
base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -271,11 +271,11 @@ func (m *App) Size() (n int) {
var l int
_ = l
if m.Protocol != 0 {
n += 1 + sovVersion(uint64(m.Protocol))
n += 1 + sovTypes(uint64(m.Protocol))
}
l = len(m.Software)
if l > 0 {
n += 1 + l + sovVersion(uint64(l))
n += 1 + l + sovTypes(uint64(l))
}
return n
}
@@ -287,19 +287,19 @@ func (m *Consensus) Size() (n int) {
var l int
_ = l
if m.Block != 0 {
n += 1 + sovVersion(uint64(m.Block))
n += 1 + sovTypes(uint64(m.Block))
}
if m.App != 0 {
n += 1 + sovVersion(uint64(m.App))
n += 1 + sovTypes(uint64(m.App))
}
return n
}
func sovVersion(x uint64) (n int) {
func sovTypes(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
func sozVersion(x uint64) (n int) {
return sovVersion(uint64((x << 1) ^ uint64((int64(x) >> 63))))
func sozTypes(x uint64) (n int) {
return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
func (m *App) Unmarshal(dAtA []byte) error {
l := len(dAtA)
@@ -309,7 +309,7 @@ func (m *App) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowVersion
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -337,7 +337,7 @@ func (m *App) Unmarshal(dAtA []byte) error {
m.Protocol = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowVersion
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -356,7 +356,7 @@ func (m *App) Unmarshal(dAtA []byte) error {
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowVersion
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -370,11 +370,11 @@ func (m *App) Unmarshal(dAtA []byte) error {
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthVersion
return ErrInvalidLengthTypes
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthVersion
return ErrInvalidLengthTypes
}
if postIndex > l {
return io.ErrUnexpectedEOF
@@ -383,15 +383,15 @@ func (m *App) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipVersion(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthVersion
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthVersion
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -413,7 +413,7 @@ func (m *Consensus) Unmarshal(dAtA []byte) error {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowVersion
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -441,7 +441,7 @@ func (m *Consensus) Unmarshal(dAtA []byte) error {
m.Block = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowVersion
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -460,7 +460,7 @@ func (m *Consensus) Unmarshal(dAtA []byte) error {
m.App = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowVersion
return ErrIntOverflowTypes
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
@@ -474,15 +474,15 @@ func (m *Consensus) Unmarshal(dAtA []byte) error {
}
default:
iNdEx = preIndex
skippy, err := skipVersion(dAtA[iNdEx:])
skippy, err := skipTypes(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthVersion
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthVersion
return ErrInvalidLengthTypes
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
@@ -496,7 +496,7 @@ func (m *Consensus) Unmarshal(dAtA []byte) error {
}
return nil
}
func skipVersion(dAtA []byte) (n int, err error) {
func skipTypes(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
depth := 0
@@ -504,7 +504,7 @@ func skipVersion(dAtA []byte) (n int, err error) {
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowVersion
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -521,7 +521,7 @@ func skipVersion(dAtA []byte) (n int, err error) {
case 0:
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowVersion
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -537,7 +537,7 @@ func skipVersion(dAtA []byte) (n int, err error) {
var length int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return 0, ErrIntOverflowVersion
return 0, ErrIntOverflowTypes
}
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
@@ -550,14 +550,14 @@ func skipVersion(dAtA []byte) (n int, err error) {
}
}
if length < 0 {
return 0, ErrInvalidLengthVersion
return 0, ErrInvalidLengthTypes
}
iNdEx += length
case 3:
depth++
case 4:
if depth == 0 {
return 0, ErrUnexpectedEndOfGroupVersion
return 0, ErrUnexpectedEndOfGroupTypes
}
depth--
case 5:
@@ -566,7 +566,7 @@ func skipVersion(dAtA []byte) (n int, err error) {
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
if iNdEx < 0 {
return 0, ErrInvalidLengthVersion
return 0, ErrInvalidLengthTypes
}
if depth == 0 {
return iNdEx, nil
@@ -576,7 +576,7 @@ func skipVersion(dAtA []byte) (n int, err error) {
}
var (
ErrInvalidLengthVersion = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowVersion = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupVersion = fmt.Errorf("proto: unexpected end of group")
ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow")
ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
)

View File

@@ -205,27 +205,27 @@ func init() {
func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) }
var fileDescriptor_0ffff5682c662b95 = []byte{
// 320 bytes of a gzipped FileDescriptorProto
// 316 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x49, 0xcd, 0x4b,
0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0x07, 0x11, 0x25, 0x95,
0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x08, 0x05, 0x7a, 0x45, 0x05,
0xc9, 0x7a, 0x20, 0x05, 0x52, 0x8a, 0x48, 0xba, 0x12, 0x93, 0x92, 0x33, 0x21, 0x3a, 0x90, 0xf5,
0x29, 0xf1, 0x72, 0x71, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x04, 0x64, 0xe6, 0xa5, 0x2b,
0xa9, 0x70, 0x09, 0x41, 0xb9, 0x4e, 0x45, 0xf9, 0x89, 0x29, 0xc9, 0x89, 0xc5, 0x25, 0x21, 0x15,
0x42, 0x7c, 0x5c, 0x4c, 0x25, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x4c, 0x25, 0x15,
0x4a, 0x7c, 0x5c, 0x3c, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x60, 0x5d, 0x0b, 0x19,
0xb9, 0x84, 0x61, 0x02, 0xc8, 0xfa, 0x1c, 0xb9, 0x38, 0x92, 0x33, 0x52, 0x93, 0xb3, 0xe3, 0xa1,
0xba, 0xb9, 0x8d, 0xd4, 0xf4, 0x90, 0xdc, 0x09, 0x72, 0x92, 0x1e, 0xc4, 0x31, 0x30, 0xdd, 0xce,
0x20, 0xe5, 0x21, 0x15, 0x41, 0xec, 0xc9, 0x10, 0x86, 0x90, 0x3b, 0x17, 0x57, 0x4a, 0x6a, 0x4e,
0x66, 0x59, 0x6a, 0x11, 0xc8, 0x10, 0x26, 0xb0, 0x21, 0x1a, 0x04, 0x0c, 0x71, 0x81, 0x68, 0x08,
0xa9, 0x08, 0xe2, 0x4c, 0x81, 0x31, 0x8d, 0xf6, 0x32, 0x72, 0xf1, 0xc0, 0xdd, 0xe6, 0x18, 0xe0,
0x29, 0xe4, 0xcd, 0xc5, 0x02, 0x72, 0xbc, 0x90, 0x82, 0x1e, 0x96, 0xa0, 0xd3, 0x43, 0x0a, 0x14,
0x29, 0x45, 0x1c, 0x2a, 0x10, 0x21, 0x20, 0x94, 0xc0, 0xc5, 0x8d, 0xec, 0x71, 0x75, 0x7c, 0x66,
0x22, 0x29, 0x94, 0xd2, 0xc0, 0x6b, 0x34, 0x92, 0x4a, 0x27, 0x9f, 0x13, 0x8f, 0xe4, 0x18, 0x2f,
0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18,
0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf,
0xd5, 0x47, 0x8a, 0x70, 0x2c, 0x29, 0xc6, 0x3a, 0x39, 0xbf, 0x28, 0x15, 0xc4, 0x48, 0x62, 0x03,
0xc7, 0xbe, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x57, 0xba, 0xbe, 0x62, 0x58, 0x02, 0x00, 0x00,
0xc9, 0x7a, 0x20, 0x05, 0x52, 0xd2, 0x48, 0xba, 0x12, 0x93, 0x92, 0x33, 0x91, 0x75, 0x28, 0xf1,
0x72, 0x71, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x04, 0x64, 0xe6, 0xa5, 0x2b, 0xa9, 0x70,
0x09, 0x41, 0xb9, 0x4e, 0x45, 0xf9, 0x89, 0x29, 0xc9, 0x89, 0xc5, 0x25, 0x21, 0x15, 0x42, 0x7c,
0x5c, 0x4c, 0x25, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x4c, 0x25, 0x15, 0x4a, 0x7c,
0x5c, 0x3c, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x60, 0x5d, 0x53, 0x19, 0xb9, 0x84,
0x61, 0x02, 0xc8, 0xfa, 0xac, 0xb9, 0x38, 0x92, 0x33, 0x52, 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9,
0x8d, 0x14, 0xf4, 0x90, 0x5c, 0x08, 0x72, 0x8c, 0x1e, 0x4c, 0x9f, 0x33, 0x48, 0x61, 0x48, 0x45,
0x10, 0x7b, 0x32, 0x84, 0x21, 0xe4, 0xc8, 0xc5, 0x95, 0x92, 0x9a, 0x93, 0x59, 0x96, 0x5a, 0x04,
0xd2, 0xce, 0x04, 0xd6, 0xae, 0x84, 0x53, 0xbb, 0x0b, 0x44, 0x69, 0x48, 0x45, 0x10, 0x67, 0x0a,
0x8c, 0x69, 0xb4, 0x97, 0x91, 0x8b, 0x07, 0xee, 0x1e, 0xc7, 0x00, 0x4f, 0x21, 0x6f, 0x2e, 0x16,
0x90, 0x83, 0x85, 0x50, 0x9c, 0x01, 0x0b, 0x28, 0x3d, 0xa4, 0x80, 0x90, 0x52, 0xc4, 0xa1, 0x02,
0xe1, 0x6b, 0xa1, 0x04, 0x2e, 0x6e, 0x64, 0xcf, 0xaa, 0xe3, 0x33, 0x13, 0x49, 0xa1, 0x94, 0x06,
0x5e, 0xa3, 0x91, 0x54, 0x3a, 0xf9, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83,
0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43,
0x94, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x52, 0xf4, 0x62,
0x49, 0x1f, 0xd6, 0xc9, 0xf9, 0x45, 0xa9, 0x20, 0x46, 0x12, 0x1b, 0x38, 0xc6, 0x8d, 0x01, 0x01,
0x00, 0x00, 0xff, 0xff, 0xf6, 0x4b, 0x02, 0xd8, 0x46, 0x02, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

View File

@@ -17,6 +17,6 @@ done
cp -r ./tendermint/* ./proto/*
rm -rf tendermint
mv ./proto/tendermint/abci/types/types.pb.go ./abci/types
mv ./proto/tendermint/abci/types.pb.go ./abci/types
mv ./proto/tendermint/rpc/grpc/types.pb.go ./rpc/grpc