From dedf0d2350d561fffcb181c22e861914e7457619 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 22 Jun 2020 10:00:51 +0200 Subject: [PATCH] proto: folder structure adhere to buf (#5025) --- .gitignore | 2 - .vscode/settings.json | 9 + CHANGELOG_PENDING.md | 2 + UPGRADING.md | 9 + abci/cmd/abci-cli/abci-cli.go | 2 +- abci/example/kvstore/kvstore_test.go | 2 +- abci/example/kvstore/persistent_kvstore.go | 2 +- abci/types/{types.pb.go => abci.pb.go} | 2258 ++++++++--------- abci/types/messages_test.go | 2 +- blockchain/msgs.go | 2 +- blockchain/msgs_test.go | 2 +- blockchain/v0/reactor.go | 2 +- blockchain/v1/reactor.go | 2 +- blockchain/v1/reactor_test.go | 2 +- blockchain/v2/io.go | 2 +- blockchain/v2/reactor.go | 2 +- blockchain/v2/reactor_test.go | 2 +- buf.yaml | 8 +- consensus/byzantine_test.go | 2 +- consensus/common_test.go | 2 +- consensus/msgs.go | 4 +- consensus/msgs_test.go | 4 +- consensus/reactor.go | 4 +- consensus/reactor_test.go | 2 +- consensus/replay_stubs.go | 2 +- consensus/replay_test.go | 4 +- consensus/state.go | 2 +- consensus/state_test.go | 2 +- consensus/types/height_vote_set.go | 2 +- consensus/types/height_vote_set_test.go | 2 +- consensus/wal.go | 2 +- crypto/encoding/codec.go | 2 +- crypto/merkle/proof.go | 2 +- crypto/merkle/proof_op.go | 2 +- crypto/merkle/proof_test.go | 2 +- crypto/merkle/proof_value.go | 2 +- docs/architecture/adr-055-protobuf-design.md | 5 +- evidence/pool.go | 2 +- evidence/pool_test.go | 2 +- evidence/reactor.go | 4 +- libs/bits/bit_array.go | 2 +- light/helpers_test.go | 2 +- light/store/db/db.go | 2 +- p2p/conn/connection.go | 2 +- p2p/conn/connection_test.go | 4 +- p2p/conn/evil_secret_connection_test.go | 2 +- p2p/conn/secret_connection.go | 2 +- p2p/netaddress.go | 2 +- p2p/node_info.go | 2 +- p2p/pex/pex_reactor.go | 2 +- p2p/pex/pex_reactor_test.go | 2 +- p2p/transport.go | 2 +- p2p/transport_test.go | 2 +- privval/file.go | 2 +- privval/file_test.go | 2 +- privval/messages.go | 2 +- privval/retry_signer_client.go | 2 +- privval/signer_client.go | 4 +- privval/signer_client_test.go | 4 +- privval/signer_endpoint.go | 2 +- privval/signer_listener_endpoint.go | 2 +- privval/signer_requestHandler.go | 2 +- privval/signer_server.go | 2 +- .../abci/abci.proto} | 12 +- proto/{ => tendermint}/blockchain/msgs.pb.go | 70 +- proto/{ => tendermint}/blockchain/msgs.proto | 4 +- proto/{ => tendermint}/consensus/msgs.pb.go | 142 +- proto/{ => tendermint}/consensus/msgs.proto | 8 +- .../{ => tendermint}/consensus/walmsgs.pb.go | 93 +- .../{ => tendermint}/consensus/walmsgs.proto | 8 +- .../{ => tendermint}/crypto/keys/types.pb.go | 43 +- .../{ => tendermint}/crypto/keys/types.proto | 4 +- .../crypto/merkle/types.pb.go | 67 +- .../crypto/merkle/types.proto | 4 +- proto/{ => tendermint}/evidence/msgs.pb.go | 46 +- proto/{ => tendermint}/evidence/msgs.proto | 6 +- proto/{ => tendermint}/libs/bits/types.pb.go | 32 +- proto/{ => tendermint}/libs/bits/types.proto | 2 +- proto/{ => tendermint}/p2p/conn_msgs.pb.go | 74 +- proto/{ => tendermint}/p2p/conn_msgs.proto | 6 +- proto/{ => tendermint}/p2p/pex_msgs.pb.go | 51 +- proto/{ => tendermint}/p2p/pex_msgs.proto | 6 +- proto/{ => tendermint}/p2p/types.pb.go | 78 +- proto/{ => tendermint}/p2p/types.proto | 4 +- proto/{ => tendermint}/privval/msgs.pb.go | 113 +- proto/{ => tendermint}/privval/msgs.proto | 8 +- proto/{ => tendermint}/privval/types.pb.go | 24 +- proto/{ => tendermint}/privval/types.proto | 2 +- .../{rpc => tendermint/rpc/grpc}/types.proto | 6 +- proto/{ => tendermint}/state/types.pb.go | 120 +- proto/{ => tendermint}/state/types.proto | 20 +- proto/{ => tendermint}/statesync/types.pb.go | 66 +- proto/{ => tendermint}/statesync/types.proto | 2 +- proto/{ => tendermint}/store/types.pb.go | 26 +- proto/{ => tendermint}/store/types.proto | 2 +- proto/{ => tendermint}/types/block.pb.go | 44 +- proto/{ => tendermint}/types/block.proto | 8 +- proto/{ => tendermint}/types/canonical.pb.go | 78 +- proto/{ => tendermint}/types/canonical.proto | 6 +- proto/{ => tendermint}/types/events.pb.go | 24 +- proto/{ => tendermint}/types/events.proto | 2 +- proto/{ => tendermint}/types/evidence.pb.go | 150 +- proto/{ => tendermint}/types/evidence.proto | 8 +- proto/{ => tendermint}/types/params.pb.go | 87 +- proto/{ => tendermint}/types/params.proto | 4 +- proto/{ => tendermint}/types/types.pb.go | 210 +- proto/{ => tendermint}/types/types.proto | 10 +- proto/{ => tendermint}/types/validator.pb.go | 66 +- proto/{ => tendermint}/types/validator.proto | 6 +- proto/{ => tendermint}/version/version.pb.go | 40 +- proto/{ => tendermint}/version/version.proto | 4 +- rpc/client/evidence_test.go | 2 +- rpc/core/blocks_test.go | 2 +- rpc/core/types/responses.go | 2 +- rpc/grpc/types.pb.go | 61 +- scripts/protocgen.sh | 12 +- state/execution.go | 4 +- state/execution_test.go | 2 +- state/export_test.go | 4 +- state/helpers_test.go | 4 +- state/state.go | 6 +- state/state_test.go | 4 +- state/store.go | 4 +- state/store_test.go | 4 +- state/validation_test.go | 6 +- statesync/messages.go | 2 +- statesync/messages_test.go | 4 +- statesync/reactor.go | 2 +- statesync/reactor_test.go | 2 +- statesync/stateprovider.go | 2 +- statesync/syncer.go | 2 +- statesync/syncer_test.go | 6 +- store/store.go | 4 +- store/store_test.go | 2 +- .../internal/test_harness.go | 2 +- types/block.go | 4 +- types/block_meta.go | 2 +- types/block_test.go | 4 +- types/canonical.go | 2 +- types/canonical_test.go | 2 +- types/evidence.go | 2 +- types/evidence_test.go | 2 +- types/genesis.go | 2 +- types/params.go | 2 +- types/params_test.go | 2 +- types/part_set.go | 2 +- types/priv_validator.go | 2 +- types/proposal.go | 2 +- types/proposal_test.go | 2 +- types/protobuf.go | 2 +- types/signed_msg_type.go | 2 +- types/test_util.go | 2 +- types/tx.go | 2 +- types/tx_test.go | 2 +- types/validator.go | 2 +- types/validator_set.go | 2 +- types/validator_set_test.go | 2 +- types/vote.go | 2 +- types/vote_set.go | 2 +- types/vote_set_test.go | 2 +- types/vote_test.go | 2 +- 161 files changed, 2268 insertions(+), 2250 deletions(-) create mode 100644 .vscode/settings.json rename abci/types/{types.pb.go => abci.pb.go} (84%) rename proto/{abci/types.proto => tendermint/abci/abci.proto} (98%) rename proto/{ => tendermint}/blockchain/msgs.pb.go (92%) rename proto/{ => tendermint}/blockchain/msgs.proto (88%) rename proto/{ => tendermint}/consensus/msgs.pb.go (92%) rename proto/{ => tendermint}/consensus/msgs.proto (94%) rename proto/{ => tendermint}/consensus/walmsgs.pb.go (89%) rename proto/{ => tendermint}/consensus/walmsgs.proto (86%) rename proto/{ => tendermint}/crypto/keys/types.pb.go (90%) rename proto/{ => tendermint}/crypto/keys/types.proto (79%) rename proto/{ => tendermint}/crypto/merkle/types.pb.go (91%) rename proto/{ => tendermint}/crypto/merkle/types.proto (86%) rename proto/{ => tendermint}/evidence/msgs.pb.go (86%) rename proto/{ => tendermint}/evidence/msgs.proto (65%) rename proto/{ => tendermint}/libs/bits/types.pb.go (87%) rename proto/{ => tendermint}/libs/bits/types.proto (61%) rename proto/{ => tendermint}/p2p/conn_msgs.pb.go (90%) rename proto/{ => tendermint}/p2p/conn_msgs.proto (77%) rename proto/{ => tendermint}/p2p/pex_msgs.pb.go (89%) rename proto/{ => tendermint}/p2p/pex_msgs.proto (63%) rename proto/{ => tendermint}/p2p/types.pb.go (90%) rename proto/{ => tendermint}/p2p/types.proto (89%) rename proto/{ => tendermint}/privval/msgs.pb.go (92%) rename proto/{ => tendermint}/privval/msgs.proto (89%) rename proto/{ => tendermint}/privval/types.pb.go (74%) rename proto/{ => tendermint}/privval/types.proto (76%) rename proto/{rpc => tendermint/rpc/grpc}/types.proto (79%) rename proto/{ => tendermint}/state/types.pb.go (89%) rename proto/{ => tendermint}/state/types.proto (83%) rename proto/{ => tendermint}/statesync/types.pb.go (92%) rename proto/{ => tendermint}/statesync/types.proto (89%) rename proto/{ => tendermint}/store/types.pb.go (89%) rename proto/{ => tendermint}/store/types.proto (59%) rename proto/{ => tendermint}/types/block.pb.go (84%) rename proto/{ => tendermint}/types/block.proto (65%) rename proto/{ => tendermint}/types/canonical.pb.go (90%) rename proto/{ => tendermint}/types/canonical.proto (90%) rename proto/{ => tendermint}/types/events.pb.go (91%) rename proto/{ => tendermint}/types/events.proto (64%) rename proto/{ => tendermint}/types/evidence.pb.go (92%) rename proto/{ => tendermint}/types/evidence.proto (92%) rename proto/{ => tendermint}/types/params.pb.go (90%) rename proto/{ => tendermint}/types/params.proto (95%) rename proto/{ => tendermint}/types/types.pb.go (91%) rename proto/{ => tendermint}/types/types.proto (95%) rename proto/{ => tendermint}/types/validator.pb.go (88%) rename proto/{ => tendermint}/types/validator.proto (80%) rename proto/{ => tendermint}/version/version.pb.go (88%) rename proto/{ => tendermint}/version/version.proto (82%) diff --git a/.gitignore b/.gitignore index dfca4da95..5d2d31aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,4 @@ terraform.tfstate terraform.tfstate.backup terraform.tfstate.d -.vscode - profile\.out diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..d1bb05dc9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,9 @@ +{ + "protoc": { + "options": [ + "--proto_path=${workspaceRoot}/proto", + "--proto_path=${workspaceRoot}/third_party/proto" + ] + }, + "clang-format.style": "{BasedOnStyle: Google, IndentWidth: 2, ColumnLimit: 0, AlignConsecutiveAssignments: true, AlignConsecutiveDeclarations: true, SpacesInSquareBrackets: true}", +} diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 0d62b6e91..ce5f8f393 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -52,6 +52,8 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi - [types] \#4852 Vote & Proposal `SignBytes` is now func `VoteSignBytes` & `ProposalSignBytes` - [privval] \#4985 `privval` reactor migration to Protobuf encoding - [evidence] \#4949 `evidence` reactor migration to Protobuf encoding + - [proto] \#5025 All proto files have been moved to `/proto` directory. + - Using the recommended the file layout from buf, [see here for more info](https://buf.build/docs/lint-checkers#file_layout) - [types] \#5029 Rename all values from `PartsHeader` to `PartSetHeader` to have consistency - Apps diff --git a/UPGRADING.md b/UPGRADING.md index 84872e151..a60c7ef02 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -31,6 +31,15 @@ amino to proto3 encoding and breaking changes to the header. [Cosmos-SDK](https://github.com/cosmos/cosmos-sdk). (https://github.com/cosmos/cosmos-sdk/blob/master/crypto/types/multisig/multisignature.go) +### Protobuf + +With this release we are happy to announce the full protobuf migration of the Tendermint repo. This consists of changes that you may need to be aware of: + +- All proto files have been moved under one directory, `/proto`. This is in line with the recommended file layout by [buf](https://buf.build), you can read more about it [here](https://buf.build/docs/lint-checkers#file_layout) +- We use the generated protobuf types for only on disk and over the wire serialization. This means that these changes should not effect you as user of Tendermint. +- A few notable changes in the abci: + - In `ValidatorUpdates` the public key type has been migrated to a protobuf `oneof` type. Since Tendermint only supports ed25519 validator keys this is the only available key in the oneof. + ## v0.33.4 ### Go API diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index 752470977..c29ea25b5 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -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/crypto/merkle" + "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" ) // client is a global variable so it can be reused by the console diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go index bc6303479..2257a2eb2 100644 --- a/abci/example/kvstore/kvstore_test.go +++ b/abci/example/kvstore/kvstore_test.go @@ -15,7 +15,7 @@ import ( "github.com/tendermint/tendermint/abci/example/code" abciserver "github.com/tendermint/tendermint/abci/server" "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index b2e0da99b..0f79a067d 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -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/crypto/keys" + pc "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" tmtypes "github.com/tendermint/tendermint/types" ) diff --git a/abci/types/types.pb.go b/abci/types/abci.pb.go similarity index 84% rename from abci/types/types.pb.go rename to abci/types/abci.pb.go index aea2ad00a..2613a7b8f 100644 --- a/abci/types/types.pb.go +++ b/abci/types/abci.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/abci/types.proto +// source: tendermint/abci/abci.proto package types @@ -10,9 +10,9 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - keys "github.com/tendermint/tendermint/proto/crypto/keys" - merkle "github.com/tendermint/tendermint/proto/crypto/merkle" - types1 "github.com/tendermint/tendermint/proto/types" + keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" + merkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" + types1 "github.com/tendermint/tendermint/proto/tendermint/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -56,7 +56,7 @@ func (x CheckTxType) String() string { } func (CheckTxType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{0} + return fileDescriptor_51a5414a4a9be4c5, []int{0} } type ResponseOfferSnapshot_Result int32 @@ -90,7 +90,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{30, 0} + return fileDescriptor_51a5414a4a9be4c5, []int{30, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -124,7 +124,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{32, 0} + return fileDescriptor_51a5414a4a9be4c5, []int{32, 0} } type Request struct { @@ -151,7 +151,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{0} + return fileDescriptor_51a5414a4a9be4c5, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -389,7 +389,7 @@ func (m *RequestEcho) Reset() { *m = RequestEcho{} } func (m *RequestEcho) String() string { return proto.CompactTextString(m) } func (*RequestEcho) ProtoMessage() {} func (*RequestEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{1} + return fileDescriptor_51a5414a4a9be4c5, []int{1} } func (m *RequestEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -432,7 +432,7 @@ func (m *RequestFlush) Reset() { *m = RequestFlush{} } func (m *RequestFlush) String() string { return proto.CompactTextString(m) } func (*RequestFlush) ProtoMessage() {} func (*RequestFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{2} + return fileDescriptor_51a5414a4a9be4c5, []int{2} } func (m *RequestFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -471,7 +471,7 @@ func (m *RequestInfo) Reset() { *m = RequestInfo{} } func (m *RequestInfo) String() string { return proto.CompactTextString(m) } func (*RequestInfo) ProtoMessage() {} func (*RequestInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{3} + return fileDescriptor_51a5414a4a9be4c5, []int{3} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -531,7 +531,7 @@ func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } func (*RequestSetOption) ProtoMessage() {} func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{4} + return fileDescriptor_51a5414a4a9be4c5, []int{4} } func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -586,7 +586,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{5} + return fileDescriptor_51a5414a4a9be4c5, []int{5} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -661,7 +661,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{6} + return fileDescriptor_51a5414a4a9be4c5, []int{6} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -729,7 +729,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{7} + return fileDescriptor_51a5414a4a9be4c5, []int{7} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -788,14 +788,14 @@ func (m *RequestBeginBlock) GetByzantineValidators() []Evidence { type RequestCheckTx struct { Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` - Type CheckTxType `protobuf:"varint,2,opt,name=type,proto3,enum=tendermint.abci.types.CheckTxType" json:"type,omitempty"` + Type CheckTxType `protobuf:"varint,2,opt,name=type,proto3,enum=tendermint.abci.CheckTxType" json:"type,omitempty"` } func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{8} + return fileDescriptor_51a5414a4a9be4c5, []int{8} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -846,7 +846,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{9} + return fileDescriptor_51a5414a4a9be4c5, []int{9} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -890,7 +890,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{10} + return fileDescriptor_51a5414a4a9be4c5, []int{10} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -933,7 +933,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{11} + return fileDescriptor_51a5414a4a9be4c5, []int{11} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -970,7 +970,7 @@ func (m *RequestListSnapshots) Reset() { *m = RequestListSnapshots{} } func (m *RequestListSnapshots) String() string { return proto.CompactTextString(m) } func (*RequestListSnapshots) ProtoMessage() {} func (*RequestListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{12} + return fileDescriptor_51a5414a4a9be4c5, []int{12} } func (m *RequestListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1009,7 +1009,7 @@ func (m *RequestOfferSnapshot) Reset() { *m = RequestOfferSnapshot{} } func (m *RequestOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*RequestOfferSnapshot) ProtoMessage() {} func (*RequestOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{13} + return fileDescriptor_51a5414a4a9be4c5, []int{13} } func (m *RequestOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1063,7 +1063,7 @@ func (m *RequestLoadSnapshotChunk) Reset() { *m = RequestLoadSnapshotChu func (m *RequestLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestLoadSnapshotChunk) ProtoMessage() {} func (*RequestLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{14} + return fileDescriptor_51a5414a4a9be4c5, []int{14} } func (m *RequestLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1124,7 +1124,7 @@ func (m *RequestApplySnapshotChunk) Reset() { *m = RequestApplySnapshotC func (m *RequestApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestApplySnapshotChunk) ProtoMessage() {} func (*RequestApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{15} + return fileDescriptor_51a5414a4a9be4c5, []int{15} } func (m *RequestApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1199,7 +1199,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{16} + return fileDescriptor_51a5414a4a9be4c5, []int{16} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1450,7 +1450,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{17} + return fileDescriptor_51a5414a4a9be4c5, []int{17} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1494,7 +1494,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{18} + return fileDescriptor_51a5414a4a9be4c5, []int{18} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1537,7 +1537,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{19} + return fileDescriptor_51a5414a4a9be4c5, []int{19} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1578,7 +1578,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{20} + return fileDescriptor_51a5414a4a9be4c5, []int{20} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1654,7 +1654,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{21} + return fileDescriptor_51a5414a4a9be4c5, []int{21} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1713,7 +1713,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{22} + return fileDescriptor_51a5414a4a9be4c5, []int{22} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1773,7 +1773,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{23} + return fileDescriptor_51a5414a4a9be4c5, []int{23} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1873,7 +1873,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{24} + return fileDescriptor_51a5414a4a9be4c5, []int{24} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1924,7 +1924,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{25} + return fileDescriptor_51a5414a4a9be4c5, []int{25} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2024,7 +2024,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{26} + return fileDescriptor_51a5414a4a9be4c5, []int{26} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2119,7 +2119,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{27} + return fileDescriptor_51a5414a4a9be4c5, []int{27} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2179,7 +2179,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{28} + return fileDescriptor_51a5414a4a9be4c5, []int{28} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2230,7 +2230,7 @@ func (m *ResponseListSnapshots) Reset() { *m = ResponseListSnapshots{} } func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) } func (*ResponseListSnapshots) ProtoMessage() {} func (*ResponseListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{29} + return fileDescriptor_51a5414a4a9be4c5, []int{29} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2267,14 +2267,14 @@ func (m *ResponseListSnapshots) GetSnapshots() []*Snapshot { } type ResponseOfferSnapshot struct { - Result ResponseOfferSnapshot_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.types.ResponseOfferSnapshot_Result" json:"result,omitempty"` + Result ResponseOfferSnapshot_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseOfferSnapshot_Result" json:"result,omitempty"` } func (m *ResponseOfferSnapshot) Reset() { *m = ResponseOfferSnapshot{} } func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*ResponseOfferSnapshot) ProtoMessage() {} func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{30} + return fileDescriptor_51a5414a4a9be4c5, []int{30} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2318,7 +2318,7 @@ func (m *ResponseLoadSnapshotChunk) Reset() { *m = ResponseLoadSnapshotC func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseLoadSnapshotChunk) ProtoMessage() {} func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{31} + return fileDescriptor_51a5414a4a9be4c5, []int{31} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2355,7 +2355,7 @@ func (m *ResponseLoadSnapshotChunk) GetChunk() []byte { } type ResponseApplySnapshotChunk struct { - Result ResponseApplySnapshotChunk_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.types.ResponseApplySnapshotChunk_Result" json:"result,omitempty"` + Result ResponseApplySnapshotChunk_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseApplySnapshotChunk_Result" json:"result,omitempty"` RefetchChunks []uint32 `protobuf:"varint,2,rep,packed,name=refetch_chunks,json=refetchChunks,proto3" json:"refetch_chunks,omitempty"` RejectSenders []string `protobuf:"bytes,3,rep,name=reject_senders,json=rejectSenders,proto3" json:"reject_senders,omitempty"` } @@ -2364,7 +2364,7 @@ func (m *ResponseApplySnapshotChunk) Reset() { *m = ResponseApplySnapsho func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseApplySnapshotChunk) ProtoMessage() {} func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{32} + return fileDescriptor_51a5414a4a9be4c5, []int{32} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2426,7 +2426,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{33} + return fileDescriptor_51a5414a4a9be4c5, []int{33} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2488,7 +2488,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{34} + return fileDescriptor_51a5414a4a9be4c5, []int{34} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2540,7 +2540,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{35} + return fileDescriptor_51a5414a4a9be4c5, []int{35} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2594,7 +2594,7 @@ func (m *EventAttribute) Reset() { *m = EventAttribute{} } func (m *EventAttribute) String() string { return proto.CompactTextString(m) } func (*EventAttribute) ProtoMessage() {} func (*EventAttribute) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{36} + return fileDescriptor_51a5414a4a9be4c5, []int{36} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2653,7 +2653,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{37} + return fileDescriptor_51a5414a4a9be4c5, []int{37} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2710,7 +2710,7 @@ func (m *TxResult) Reset() { *m = TxResult{} } func (m *TxResult) String() string { return proto.CompactTextString(m) } func (*TxResult) ProtoMessage() {} func (*TxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{38} + return fileDescriptor_51a5414a4a9be4c5, []int{38} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2778,7 +2778,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{39} + return fileDescriptor_51a5414a4a9be4c5, []int{39} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2831,7 +2831,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{40} + return fileDescriptor_51a5414a4a9be4c5, []int{40} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2884,7 +2884,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{41} + return fileDescriptor_51a5414a4a9be4c5, []int{41} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2939,7 +2939,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{42} + return fileDescriptor_51a5414a4a9be4c5, []int{42} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3015,7 +3015,7 @@ func (m *Snapshot) Reset() { *m = Snapshot{} } func (m *Snapshot) String() string { return proto.CompactTextString(m) } func (*Snapshot) ProtoMessage() {} func (*Snapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_5056eb770c93415b, []int{43} + return fileDescriptor_51a5414a4a9be4c5, []int{43} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3080,225 +3080,223 @@ func (m *Snapshot) GetMetadata() []byte { } func init() { - proto.RegisterEnum("tendermint.abci.types.CheckTxType", CheckTxType_name, CheckTxType_value) - proto.RegisterEnum("tendermint.abci.types.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) - proto.RegisterEnum("tendermint.abci.types.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) - proto.RegisterType((*Request)(nil), "tendermint.abci.types.Request") - proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.types.RequestEcho") - proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.types.RequestFlush") - proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.types.RequestInfo") - proto.RegisterType((*RequestSetOption)(nil), "tendermint.abci.types.RequestSetOption") - proto.RegisterType((*RequestInitChain)(nil), "tendermint.abci.types.RequestInitChain") - proto.RegisterType((*RequestQuery)(nil), "tendermint.abci.types.RequestQuery") - proto.RegisterType((*RequestBeginBlock)(nil), "tendermint.abci.types.RequestBeginBlock") - proto.RegisterType((*RequestCheckTx)(nil), "tendermint.abci.types.RequestCheckTx") - proto.RegisterType((*RequestDeliverTx)(nil), "tendermint.abci.types.RequestDeliverTx") - proto.RegisterType((*RequestEndBlock)(nil), "tendermint.abci.types.RequestEndBlock") - proto.RegisterType((*RequestCommit)(nil), "tendermint.abci.types.RequestCommit") - proto.RegisterType((*RequestListSnapshots)(nil), "tendermint.abci.types.RequestListSnapshots") - proto.RegisterType((*RequestOfferSnapshot)(nil), "tendermint.abci.types.RequestOfferSnapshot") - proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.types.RequestLoadSnapshotChunk") - proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.types.RequestApplySnapshotChunk") - proto.RegisterType((*Response)(nil), "tendermint.abci.types.Response") - proto.RegisterType((*ResponseException)(nil), "tendermint.abci.types.ResponseException") - proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.types.ResponseEcho") - proto.RegisterType((*ResponseFlush)(nil), "tendermint.abci.types.ResponseFlush") - proto.RegisterType((*ResponseInfo)(nil), "tendermint.abci.types.ResponseInfo") - proto.RegisterType((*ResponseSetOption)(nil), "tendermint.abci.types.ResponseSetOption") - proto.RegisterType((*ResponseInitChain)(nil), "tendermint.abci.types.ResponseInitChain") - proto.RegisterType((*ResponseQuery)(nil), "tendermint.abci.types.ResponseQuery") - proto.RegisterType((*ResponseBeginBlock)(nil), "tendermint.abci.types.ResponseBeginBlock") - proto.RegisterType((*ResponseCheckTx)(nil), "tendermint.abci.types.ResponseCheckTx") - proto.RegisterType((*ResponseDeliverTx)(nil), "tendermint.abci.types.ResponseDeliverTx") - proto.RegisterType((*ResponseEndBlock)(nil), "tendermint.abci.types.ResponseEndBlock") - proto.RegisterType((*ResponseCommit)(nil), "tendermint.abci.types.ResponseCommit") - proto.RegisterType((*ResponseListSnapshots)(nil), "tendermint.abci.types.ResponseListSnapshots") - proto.RegisterType((*ResponseOfferSnapshot)(nil), "tendermint.abci.types.ResponseOfferSnapshot") - proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.types.ResponseLoadSnapshotChunk") - proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.types.ResponseApplySnapshotChunk") - proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.types.ConsensusParams") - proto.RegisterType((*BlockParams)(nil), "tendermint.abci.types.BlockParams") - proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.types.LastCommitInfo") - proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.types.EventAttribute") - proto.RegisterType((*Event)(nil), "tendermint.abci.types.Event") - proto.RegisterType((*TxResult)(nil), "tendermint.abci.types.TxResult") - proto.RegisterType((*Validator)(nil), "tendermint.abci.types.Validator") - proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.types.ValidatorUpdate") - proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.types.VoteInfo") - proto.RegisterType((*Evidence)(nil), "tendermint.abci.types.Evidence") - proto.RegisterType((*Snapshot)(nil), "tendermint.abci.types.Snapshot") -} - -func init() { proto.RegisterFile("proto/abci/types.proto", fileDescriptor_5056eb770c93415b) } - -var fileDescriptor_5056eb770c93415b = []byte{ - // 2650 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x1b, 0xc7, - 0x11, 0xc6, 0x02, 0x20, 0x1e, 0x4d, 0x02, 0x04, 0x47, 0xb2, 0x0c, 0x23, 0x36, 0xa9, 0xac, 0x2c, - 0x59, 0x7e, 0x04, 0xb4, 0xe9, 0x2a, 0x97, 0x1d, 0x29, 0x71, 0x08, 0x8a, 0x0a, 0x18, 0xc9, 0x22, - 0xb5, 0x24, 0x15, 0x39, 0xa9, 0xf2, 0x66, 0xb0, 0x3b, 0x04, 0xd6, 0x04, 0x76, 0xd7, 0xbb, 0x03, - 0x8a, 0x48, 0xe5, 0x90, 0xca, 0x25, 0x95, 0x9b, 0xf2, 0x03, 0xf2, 0x1f, 0x72, 0x48, 0x95, 0xf3, - 0x07, 0x52, 0xe5, 0xca, 0xc9, 0xc7, 0x9c, 0x9c, 0x94, 0x94, 0x53, 0xf2, 0x1f, 0x52, 0xa9, 0x79, - 0xec, 0x0b, 0xc4, 0x63, 0xe1, 0xe8, 0x96, 0xdb, 0x4c, 0x6f, 0x77, 0xcf, 0x4c, 0xcf, 0x4c, 0xf7, - 0xd7, 0x3d, 0x0b, 0x57, 0x5c, 0xcf, 0xa1, 0xce, 0x26, 0xee, 0x18, 0xd6, 0x26, 0x1d, 0xb9, 0xc4, - 0x6f, 0x72, 0x02, 0x7a, 0x89, 0x12, 0xdb, 0x24, 0xde, 0xc0, 0xb2, 0x69, 0x93, 0x7d, 0x6c, 0xf2, - 0x8f, 0x8d, 0x0d, 0xc1, 0x6e, 0x78, 0x23, 0x97, 0x3a, 0x9b, 0x03, 0xe2, 0x9d, 0xf6, 0x49, 0x5c, - 0xae, 0xf1, 0xb2, 0x60, 0xe0, 0xa4, 0xc4, 0x87, 0xd7, 0x12, 0x92, 0xa7, 0x64, 0x94, 0xfc, 0x5c, - 0x8f, 0xcb, 0xb9, 0xd8, 0xc3, 0x83, 0xe0, 0xcb, 0x46, 0xd7, 0x71, 0xba, 0x7d, 0xb2, 0xc9, 0x7b, - 0x9d, 0xe1, 0xc9, 0x26, 0xb5, 0x06, 0xc4, 0xa7, 0x78, 0xe0, 0x4a, 0x86, 0x1b, 0xb4, 0x67, 0x79, - 0xa6, 0xee, 0x62, 0x8f, 0x8e, 0x04, 0xd7, 0x66, 0xd7, 0xe9, 0x3a, 0x51, 0x4b, 0xf0, 0xa9, 0xff, - 0x2e, 0x41, 0x51, 0x23, 0x5f, 0x0c, 0x89, 0x4f, 0xd1, 0x87, 0x90, 0x27, 0x46, 0xcf, 0xa9, 0x67, - 0xaf, 0x2a, 0x37, 0x97, 0xb7, 0xd4, 0xe6, 0xc4, 0xd5, 0x36, 0x25, 0xf7, 0xae, 0xd1, 0x73, 0xda, - 0x19, 0x8d, 0x4b, 0xa0, 0x5b, 0xb0, 0x74, 0xd2, 0x1f, 0xfa, 0xbd, 0x7a, 0x8e, 0x8b, 0x5e, 0x9b, - 0x2d, 0x7a, 0x97, 0xb1, 0xb6, 0x33, 0x9a, 0x90, 0x61, 0xc3, 0x5a, 0xf6, 0x89, 0x53, 0xcf, 0xa7, - 0x19, 0x76, 0xcf, 0x3e, 0xe1, 0xc3, 0x32, 0x09, 0xd4, 0x06, 0xf0, 0x09, 0xd5, 0x1d, 0x97, 0x5a, - 0x8e, 0x5d, 0x5f, 0xe2, 0xf2, 0x6f, 0xcc, 0x96, 0x3f, 0x24, 0x74, 0x9f, 0xb3, 0xb7, 0x33, 0x5a, - 0xd9, 0x0f, 0x3a, 0x4c, 0x93, 0x65, 0x5b, 0x54, 0x37, 0x7a, 0xd8, 0xb2, 0xeb, 0x85, 0x34, 0x9a, - 0xf6, 0x6c, 0x8b, 0xee, 0x30, 0x76, 0xa6, 0xc9, 0x0a, 0x3a, 0xcc, 0x14, 0x5f, 0x0c, 0x89, 0x37, - 0xaa, 0x17, 0xd3, 0x98, 0xe2, 0x21, 0x63, 0x65, 0xa6, 0xe0, 0x32, 0xe8, 0x1e, 0x2c, 0x77, 0x48, - 0xd7, 0xb2, 0xf5, 0x4e, 0xdf, 0x31, 0x4e, 0xeb, 0x25, 0xae, 0xe2, 0xe6, 0x6c, 0x15, 0x2d, 0x26, - 0xd0, 0x62, 0xfc, 0xed, 0x8c, 0x06, 0x9d, 0xb0, 0x87, 0x5a, 0x50, 0x32, 0x7a, 0xc4, 0x38, 0xd5, - 0xe9, 0x79, 0xbd, 0xcc, 0x35, 0x5d, 0x9f, 0xad, 0x69, 0x87, 0x71, 0x1f, 0x9d, 0xb7, 0x33, 0x5a, - 0xd1, 0x10, 0x4d, 0x66, 0x17, 0x93, 0xf4, 0xad, 0x33, 0xe2, 0x31, 0x2d, 0x97, 0xd2, 0xd8, 0xe5, - 0x8e, 0xe0, 0xe7, 0x7a, 0xca, 0x66, 0xd0, 0x41, 0xbb, 0x50, 0x26, 0xb6, 0x29, 0x17, 0xb6, 0xcc, - 0x15, 0xdd, 0x98, 0x73, 0xc2, 0x6c, 0x33, 0x58, 0x56, 0x89, 0xc8, 0x36, 0xfa, 0x21, 0x14, 0x0c, - 0x67, 0x30, 0xb0, 0x68, 0x7d, 0x85, 0xeb, 0x78, 0x7d, 0xce, 0x92, 0x38, 0x6f, 0x3b, 0xa3, 0x49, - 0x29, 0x74, 0x04, 0xd5, 0xbe, 0xe5, 0x53, 0xdd, 0xb7, 0xb1, 0xeb, 0xf7, 0x1c, 0xea, 0xd7, 0x2b, - 0x5c, 0xcf, 0xdb, 0xb3, 0xf5, 0xdc, 0xb7, 0x7c, 0x7a, 0x18, 0x88, 0xb4, 0x33, 0x5a, 0xa5, 0x1f, - 0x27, 0x30, 0xad, 0xce, 0xc9, 0x09, 0xf1, 0x42, 0xb5, 0xf5, 0x6a, 0x1a, 0xad, 0xfb, 0x4c, 0x26, - 0xd0, 0xc2, 0xb4, 0x3a, 0x71, 0x02, 0xc2, 0x70, 0xa9, 0xef, 0x60, 0x33, 0x54, 0xaa, 0x1b, 0xbd, - 0xa1, 0x7d, 0x5a, 0x5f, 0xe5, 0xaa, 0x37, 0xe7, 0x4c, 0xd8, 0xc1, 0x66, 0xa0, 0x68, 0x87, 0x89, - 0xb5, 0x33, 0xda, 0x5a, 0x7f, 0x9c, 0x88, 0x4c, 0xb8, 0x8c, 0x5d, 0xb7, 0x3f, 0x1a, 0x1f, 0xa3, - 0xc6, 0xc7, 0x78, 0x77, 0xf6, 0x18, 0xdb, 0x4c, 0x72, 0x7c, 0x10, 0x84, 0x2f, 0x50, 0x5b, 0x45, - 0x58, 0x3a, 0xc3, 0xfd, 0x21, 0x51, 0xdf, 0x80, 0xe5, 0x98, 0xfb, 0x40, 0x75, 0x28, 0x0e, 0x88, - 0xef, 0xe3, 0x2e, 0xa9, 0x2b, 0x57, 0x95, 0x9b, 0x65, 0x2d, 0xe8, 0xaa, 0x55, 0x58, 0x89, 0x3b, - 0x0b, 0x75, 0x10, 0x0a, 0x32, 0x07, 0xc0, 0x04, 0xcf, 0x88, 0xe7, 0xb3, 0x5b, 0x2f, 0x05, 0x65, - 0x17, 0x5d, 0x83, 0x0a, 0x3f, 0x62, 0x7a, 0xf0, 0x9d, 0x39, 0xb3, 0xbc, 0xb6, 0xc2, 0x89, 0x8f, - 0x24, 0xd3, 0x06, 0x2c, 0xbb, 0x5b, 0x6e, 0xc8, 0x92, 0xe3, 0x2c, 0xe0, 0x6e, 0xb9, 0x92, 0x41, - 0xfd, 0x3e, 0xd4, 0xc6, 0xfd, 0x05, 0xaa, 0x41, 0xee, 0x94, 0x8c, 0xe4, 0x78, 0xac, 0x89, 0x2e, - 0xcb, 0x65, 0xf1, 0x31, 0xca, 0x9a, 0x5c, 0xe3, 0x1f, 0xb3, 0xa1, 0x70, 0xe8, 0x22, 0x98, 0x8f, - 0x63, 0x1e, 0x9a, 0x4b, 0x2f, 0x6f, 0x35, 0x9a, 0xc2, 0x7d, 0x37, 0x03, 0xf7, 0xdd, 0x3c, 0x0a, - 0xdc, 0x77, 0xab, 0xf4, 0xd5, 0x37, 0x1b, 0x99, 0xa7, 0x7f, 0xdf, 0x50, 0x34, 0x2e, 0x81, 0x5e, - 0x61, 0xb7, 0x18, 0x5b, 0xb6, 0x6e, 0x99, 0x72, 0x9c, 0x22, 0xef, 0xef, 0x99, 0xe8, 0x21, 0xd4, - 0x0c, 0xc7, 0xf6, 0x89, 0xed, 0x0f, 0x7d, 0x5d, 0x84, 0x07, 0xe9, 0x80, 0xa7, 0xdd, 0xac, 0x9d, - 0x80, 0xfd, 0x80, 0x73, 0x6b, 0xab, 0x46, 0x92, 0x80, 0xee, 0x03, 0x9c, 0xe1, 0xbe, 0x65, 0x62, - 0xea, 0x78, 0x7e, 0x3d, 0x7f, 0x35, 0x37, 0x43, 0xd9, 0xa3, 0x80, 0xf1, 0xd8, 0x35, 0x31, 0x25, - 0xad, 0x3c, 0x9b, 0xb9, 0x16, 0x93, 0x47, 0x37, 0x60, 0x15, 0xbb, 0xae, 0xee, 0x53, 0x4c, 0x89, - 0xde, 0x19, 0x51, 0xe2, 0x73, 0x27, 0xbd, 0xa2, 0x55, 0xb0, 0xeb, 0x1e, 0x32, 0x6a, 0x8b, 0x11, - 0x55, 0x33, 0xdc, 0x6d, 0xee, 0x0f, 0x11, 0x82, 0xbc, 0x89, 0x29, 0xe6, 0xd6, 0x5a, 0xd1, 0x78, - 0x9b, 0xd1, 0x5c, 0x4c, 0x7b, 0xd2, 0x06, 0xbc, 0x8d, 0xae, 0x40, 0xa1, 0x47, 0xac, 0x6e, 0x8f, - 0xf2, 0x65, 0xe7, 0x34, 0xd9, 0x63, 0x1b, 0xe3, 0x7a, 0xce, 0x19, 0xe1, 0x21, 0xa5, 0xa4, 0x89, - 0x8e, 0xfa, 0x34, 0x0b, 0x6b, 0x17, 0x7c, 0x26, 0xd3, 0xdb, 0xc3, 0x7e, 0x2f, 0x18, 0x8b, 0xb5, - 0xd1, 0x07, 0x4c, 0x2f, 0x36, 0x89, 0x27, 0x43, 0x61, 0x3d, 0x6e, 0x01, 0xb1, 0xf8, 0x36, 0xff, - 0x2e, 0xd7, 0x2c, 0xb9, 0xd1, 0x31, 0xd4, 0xfa, 0xd8, 0xa7, 0xba, 0xf0, 0x35, 0x3a, 0x8f, 0x6a, - 0xb9, 0x99, 0x9e, 0xf7, 0x3e, 0x0e, 0x7c, 0x14, 0x3b, 0xd7, 0x52, 0x5d, 0xb5, 0x9f, 0xa0, 0xa2, - 0xc7, 0x70, 0xb9, 0x33, 0xfa, 0x25, 0xb6, 0xa9, 0x65, 0x13, 0xfd, 0xc2, 0xf6, 0x6c, 0x4c, 0x51, - 0xbd, 0x7b, 0x66, 0x99, 0xc4, 0x36, 0x82, 0x7d, 0xb9, 0x14, 0xaa, 0x08, 0xf7, 0xcd, 0x57, 0x1f, - 0x43, 0x35, 0xe9, 0xfb, 0x51, 0x15, 0xb2, 0xf4, 0x5c, 0x1a, 0x23, 0x4b, 0xcf, 0xd1, 0x07, 0x90, - 0x67, 0xea, 0xb8, 0x21, 0xaa, 0x53, 0x83, 0xb3, 0x94, 0x3e, 0x1a, 0xb9, 0x44, 0xe3, 0xfc, 0xaa, - 0x1a, 0x5e, 0x82, 0x30, 0x1e, 0x8c, 0xeb, 0x56, 0xdf, 0x84, 0xd5, 0x31, 0x57, 0x1f, 0xdb, 0x51, - 0x25, 0xbe, 0xa3, 0xea, 0x2a, 0x54, 0x12, 0x1e, 0x5d, 0xbd, 0x02, 0x97, 0x27, 0xb9, 0x66, 0xd5, - 0x0e, 0xe9, 0x09, 0xe7, 0x8a, 0x6e, 0x41, 0x29, 0xf4, 0xcd, 0xe2, 0x12, 0x4e, 0xb3, 0x5b, 0x20, - 0xa2, 0x85, 0x02, 0xec, 0x0e, 0xb2, 0x73, 0xcc, 0xcf, 0x49, 0x96, 0x4f, 0xbf, 0x88, 0x5d, 0xb7, - 0x8d, 0xfd, 0x9e, 0xfa, 0x0b, 0xa8, 0x4f, 0xf3, 0xb8, 0x63, 0x8b, 0xc9, 0x87, 0xc7, 0xf3, 0x0a, - 0x14, 0x4e, 0x1c, 0x6f, 0x80, 0x29, 0x57, 0x56, 0xd1, 0x64, 0x8f, 0x1d, 0x5b, 0xe1, 0x7d, 0x73, - 0x9c, 0x2c, 0x3a, 0xaa, 0x0e, 0xaf, 0x4c, 0xf5, 0xb7, 0x4c, 0xc4, 0xb2, 0x4d, 0x22, 0xac, 0x5a, - 0xd1, 0x44, 0x27, 0x52, 0x24, 0x26, 0x2b, 0x3a, 0x6c, 0x58, 0x9f, 0xaf, 0x98, 0xeb, 0x2f, 0x6b, - 0xb2, 0xa7, 0xfe, 0xa5, 0x0c, 0x25, 0x8d, 0xf8, 0x2e, 0x73, 0x05, 0xa8, 0x0d, 0x65, 0x72, 0x6e, - 0x10, 0x81, 0xa8, 0x94, 0x39, 0xf8, 0x43, 0xc8, 0xec, 0x06, 0xfc, 0x2c, 0xe0, 0x87, 0xc2, 0xe8, - 0xa3, 0x04, 0x9a, 0xbc, 0x36, 0x4f, 0x49, 0x1c, 0x4e, 0xde, 0x4e, 0xc2, 0xc9, 0xd7, 0xe7, 0xc8, - 0x8e, 0xe1, 0xc9, 0x8f, 0x12, 0x78, 0x72, 0xde, 0xc0, 0x09, 0x40, 0xb9, 0x37, 0x01, 0x50, 0xce, - 0x5b, 0xfe, 0x14, 0x44, 0xb9, 0x37, 0x01, 0x51, 0xde, 0x9c, 0x3b, 0x97, 0x89, 0x90, 0xf2, 0x76, - 0x12, 0x52, 0xce, 0x33, 0xc7, 0x18, 0xa6, 0xbc, 0x3f, 0x09, 0x53, 0xbe, 0x39, 0x47, 0xc7, 0x54, - 0x50, 0xb9, 0x73, 0x01, 0x54, 0xde, 0x98, 0xa3, 0x6a, 0x02, 0xaa, 0xdc, 0x4b, 0xa0, 0x4a, 0x48, - 0x65, 0x9b, 0x29, 0xb0, 0xf2, 0xee, 0x45, 0x58, 0xf9, 0xc6, 0xbc, 0xa3, 0x36, 0x09, 0x57, 0x7e, - 0x3c, 0x86, 0x2b, 0xaf, 0xcf, 0x5b, 0xd5, 0x38, 0xb0, 0x3c, 0x9e, 0x02, 0x2c, 0xdf, 0x99, 0xa3, - 0x68, 0x0e, 0xb2, 0x3c, 0x9e, 0x82, 0x2c, 0xe7, 0xa9, 0x9d, 0x03, 0x2d, 0x3b, 0xb3, 0xa0, 0xe5, - 0xbb, 0xf3, 0xa6, 0x9c, 0x0e, 0x5b, 0x92, 0x99, 0xd8, 0xf2, 0xbd, 0x39, 0x83, 0x2c, 0x0e, 0x2e, - 0xdf, 0x64, 0xe1, 0x7d, 0xcc, 0x25, 0x31, 0x57, 0x48, 0x3c, 0xcf, 0xf1, 0x24, 0x6e, 0x13, 0x1d, - 0xf5, 0x26, 0x03, 0x1c, 0x91, 0xe3, 0x99, 0x01, 0x44, 0x79, 0xe0, 0x89, 0xb9, 0x19, 0xf5, 0xcf, - 0x4a, 0x24, 0xcb, 0xa3, 0x73, 0x1c, 0xac, 0x94, 0x25, 0x58, 0x89, 0xe1, 0xd3, 0x6c, 0x12, 0x9f, - 0x6e, 0xc0, 0x32, 0x0b, 0x25, 0x63, 0xd0, 0x13, 0xbb, 0x01, 0xf4, 0x44, 0x6f, 0xc1, 0x1a, 0xc7, - 0x10, 0x02, 0xc5, 0xca, 0xf8, 0x91, 0xe7, 0xc1, 0x70, 0x95, 0x7d, 0x10, 0x47, 0x57, 0x04, 0x92, - 0xef, 0xc1, 0xa5, 0x18, 0x6f, 0x18, 0xa2, 0x04, 0xc6, 0xaa, 0x85, 0xdc, 0xdb, 0x32, 0x56, 0x7d, - 0x12, 0x19, 0x28, 0x82, 0xb5, 0x08, 0xf2, 0x86, 0x63, 0x12, 0x19, 0x40, 0x78, 0x9b, 0x41, 0xdd, - 0xbe, 0xd3, 0x95, 0x61, 0x82, 0x35, 0x19, 0x57, 0xe8, 0x53, 0xcb, 0xc2, 0x59, 0xaa, 0x7f, 0x52, - 0x22, 0x7d, 0x11, 0xd2, 0x9d, 0x04, 0x4a, 0x95, 0x17, 0x09, 0x4a, 0xb3, 0xff, 0x1b, 0x28, 0x55, - 0xff, 0xa3, 0x44, 0x5b, 0x1a, 0xc2, 0xcd, 0x6f, 0x67, 0x82, 0x28, 0xfc, 0x2e, 0xf1, 0x0d, 0x92, - 0xe1, 0x57, 0x66, 0x0a, 0x05, 0xbe, 0x0d, 0xc9, 0x4c, 0xa1, 0x28, 0x02, 0x32, 0xef, 0xa0, 0x8f, - 0xa1, 0xec, 0x7a, 0x8e, 0x73, 0xa2, 0x3b, 0xae, 0x2f, 0xfd, 0x72, 0x02, 0x60, 0x89, 0xb2, 0x50, - 0x53, 0x14, 0x94, 0x9a, 0x07, 0x8c, 0x75, 0xdf, 0xf5, 0xb5, 0x92, 0x2b, 0x5b, 0x31, 0x80, 0x51, - 0x4e, 0xe0, 0xdf, 0x57, 0xa1, 0xcc, 0x16, 0xe1, 0xbb, 0xd8, 0x20, 0xdc, 0xbd, 0x96, 0xb5, 0x88, - 0xa0, 0x9a, 0x80, 0x2e, 0xba, 0x79, 0xf4, 0x00, 0x0a, 0xe4, 0x8c, 0xd8, 0x94, 0xed, 0x16, 0x33, - 0xf0, 0xab, 0x53, 0x61, 0x25, 0xb1, 0x69, 0xab, 0xce, 0xcc, 0xfa, 0xaf, 0x6f, 0x36, 0x6a, 0x42, - 0xe6, 0x1d, 0x67, 0x60, 0x51, 0x32, 0x70, 0xe9, 0x48, 0x93, 0x5a, 0xd4, 0xdf, 0x66, 0x19, 0xba, - 0x4b, 0x84, 0x80, 0x89, 0x86, 0x0e, 0xae, 0x4f, 0x36, 0x86, 0xf5, 0xd3, 0x19, 0xff, 0x35, 0x80, - 0x2e, 0xf6, 0xf5, 0x27, 0xd8, 0xa6, 0xc4, 0x94, 0x3b, 0x50, 0xee, 0x62, 0xff, 0xa7, 0x9c, 0xc0, - 0x40, 0x1b, 0xfb, 0x3c, 0xf4, 0x89, 0xc9, 0xb7, 0x22, 0xa7, 0x15, 0xbb, 0xd8, 0x3f, 0xf6, 0x89, - 0x19, 0x5b, 0x6b, 0xf1, 0x45, 0xac, 0x35, 0x69, 0xef, 0xd2, 0xb8, 0xbd, 0x7f, 0x97, 0x8d, 0xee, - 0x49, 0x04, 0x86, 0xff, 0x3f, 0x6d, 0xf1, 0x07, 0x9e, 0x1c, 0x27, 0xe3, 0x30, 0xfa, 0x14, 0xd6, - 0xc2, 0xfb, 0xa9, 0x0f, 0xf9, 0xbd, 0x0d, 0x4e, 0xe1, 0x62, 0xd7, 0xbc, 0x76, 0x96, 0x24, 0xfb, - 0xe8, 0x33, 0x78, 0x79, 0xcc, 0x1b, 0x85, 0x03, 0x64, 0x17, 0x72, 0x4a, 0x2f, 0x25, 0x9d, 0x52, - 0xa0, 0x3f, 0xb2, 0x5e, 0xee, 0x85, 0xdc, 0x9a, 0x3d, 0x96, 0x90, 0xc5, 0x11, 0xc6, 0xc4, 0x33, - 0x71, 0x0d, 0x2a, 0x1e, 0xa1, 0xd8, 0xb2, 0xf5, 0x44, 0xfa, 0xbb, 0x22, 0x88, 0x22, 0x38, 0xa8, - 0x8f, 0xe0, 0xa5, 0x89, 0x18, 0x03, 0xfd, 0x00, 0xca, 0x11, 0x48, 0x51, 0x66, 0xe6, 0x90, 0x61, - 0x2e, 0x14, 0x49, 0xa8, 0x5f, 0x2a, 0x91, 0xe2, 0x64, 0x8e, 0x75, 0x0f, 0x0a, 0x1e, 0xf1, 0x87, - 0x7d, 0x91, 0xef, 0x54, 0xb7, 0xde, 0x5f, 0x04, 0xa3, 0x30, 0xea, 0xb0, 0x4f, 0x35, 0xa9, 0x42, - 0x7d, 0x08, 0x05, 0x41, 0x41, 0x00, 0x85, 0xed, 0x9d, 0x9d, 0xdd, 0x83, 0xa3, 0x5a, 0x06, 0x95, - 0x61, 0x69, 0xbb, 0xb5, 0xaf, 0x1d, 0xd5, 0x14, 0x46, 0xd6, 0x76, 0x7f, 0xb2, 0xbb, 0x73, 0x54, - 0xcb, 0xa2, 0x35, 0xa8, 0x88, 0xb6, 0x7e, 0x77, 0x5f, 0xfb, 0x64, 0xfb, 0xa8, 0x96, 0x8b, 0x91, - 0x0e, 0x77, 0x1f, 0xdc, 0xd9, 0xd5, 0x6a, 0x79, 0xf5, 0x3d, 0x96, 0x49, 0x4d, 0x81, 0x30, 0x51, - 0xce, 0xa4, 0xc4, 0x72, 0x26, 0xf5, 0xf7, 0x59, 0x68, 0x4c, 0x47, 0x24, 0xe8, 0x60, 0x6c, 0xc5, - 0x1f, 0x2e, 0x0c, 0x6a, 0xc6, 0x96, 0x8d, 0xae, 0x43, 0xd5, 0x23, 0x27, 0x84, 0x1a, 0x3d, 0x81, - 0x96, 0x44, 0xbc, 0xab, 0x68, 0x15, 0x49, 0xe5, 0x42, 0xbe, 0x60, 0xfb, 0x9c, 0x18, 0x54, 0x17, - 0x49, 0x9c, 0x38, 0x7f, 0x65, 0xc6, 0xc6, 0xa8, 0x87, 0x82, 0xa8, 0x1e, 0xce, 0x33, 0x62, 0x19, - 0x96, 0xb4, 0xdd, 0x23, 0xed, 0xd3, 0x5a, 0x16, 0x21, 0xa8, 0xf2, 0xa6, 0x7e, 0xf8, 0x60, 0xfb, - 0xe0, 0xb0, 0xbd, 0xcf, 0x8c, 0x78, 0x09, 0x56, 0x03, 0x23, 0x06, 0xc4, 0xbc, 0xfa, 0x57, 0x05, - 0x56, 0xc7, 0xae, 0x07, 0xfa, 0x10, 0x96, 0x04, 0x04, 0x57, 0x66, 0x16, 0xf1, 0xf9, 0x7d, 0x97, - 0x37, 0x4a, 0x08, 0xa0, 0xdb, 0x50, 0x22, 0xb2, 0x52, 0x21, 0xaf, 0xe4, 0xd5, 0x8b, 0xd5, 0x96, - 0xa0, 0x96, 0x21, 0x45, 0x43, 0x09, 0x16, 0x42, 0xc3, 0x3b, 0x2f, 0xb3, 0xc5, 0xef, 0x5e, 0x14, - 0x0f, 0xbd, 0x85, 0x94, 0x8f, 0x64, 0xd4, 0x1d, 0x58, 0x8e, 0x4d, 0x0a, 0x7d, 0x07, 0xca, 0x03, - 0x7c, 0x2e, 0x6b, 0x55, 0xa2, 0x04, 0x51, 0x1a, 0xe0, 0x73, 0x5e, 0xa6, 0x42, 0x2f, 0x43, 0x91, - 0x7d, 0xec, 0x62, 0xe1, 0x3c, 0x72, 0x5a, 0x61, 0x80, 0xcf, 0x7f, 0x8c, 0x7d, 0xd5, 0x80, 0x6a, - 0xb2, 0x90, 0xc3, 0x4e, 0x93, 0xe7, 0x0c, 0x6d, 0x93, 0xeb, 0x58, 0xd2, 0x44, 0x07, 0xdd, 0x82, - 0xa5, 0x33, 0x47, 0xf8, 0x9e, 0x59, 0xb7, 0xee, 0x91, 0x43, 0x49, 0xac, 0x1c, 0x24, 0x64, 0xd4, - 0x07, 0x50, 0xe5, 0x5e, 0x64, 0x9b, 0x52, 0xcf, 0xea, 0x0c, 0x29, 0x89, 0x57, 0x24, 0x57, 0x26, - 0x54, 0x24, 0x43, 0x9c, 0x11, 0xa2, 0x94, 0x9c, 0x28, 0x87, 0xf1, 0x8e, 0xfa, 0x6b, 0x05, 0x96, - 0xb8, 0x42, 0xe6, 0x62, 0x78, 0x8d, 0x47, 0x22, 0x58, 0xd6, 0x46, 0x06, 0x00, 0x0e, 0x06, 0x0a, - 0xe6, 0x7b, 0x7d, 0x96, 0x73, 0x0b, 0xa7, 0xd5, 0x7a, 0x55, 0x7a, 0xb9, 0xcb, 0x91, 0x82, 0x98, - 0xa7, 0x8b, 0xa9, 0x55, 0x9f, 0x2a, 0x50, 0x3a, 0x3a, 0x97, 0x27, 0x74, 0x4a, 0xe9, 0x87, 0xcd, - 0x7e, 0x8f, 0xcf, 0x5e, 0x14, 0x4b, 0x44, 0x47, 0xd6, 0x92, 0x72, 0x61, 0x9d, 0xea, 0x6e, 0x78, - 0x13, 0xf3, 0x8b, 0xa5, 0x93, 0x41, 0x09, 0x4f, 0xba, 0x9d, 0x5b, 0x50, 0x0e, 0x4f, 0x0b, 0x83, - 0xf1, 0xd8, 0x34, 0x3d, 0xe2, 0xfb, 0xd2, 0xc8, 0x41, 0x97, 0x57, 0x18, 0x9d, 0x27, 0xb2, 0x94, - 0x92, 0xd3, 0x44, 0x47, 0xb5, 0x60, 0x75, 0x2c, 0x30, 0xa1, 0x1f, 0x41, 0xd1, 0x1d, 0x76, 0xf4, - 0x60, 0x9f, 0xc6, 0x8e, 0xa7, 0x44, 0x78, 0xa7, 0x64, 0xe4, 0x37, 0x0f, 0x86, 0x9d, 0xbe, 0x65, - 0xdc, 0x23, 0xa3, 0x60, 0x46, 0xee, 0xb0, 0x73, 0x4f, 0xec, 0xa9, 0x18, 0x2a, 0x1b, 0x1f, 0xea, - 0x57, 0x50, 0x0a, 0x8e, 0x09, 0xba, 0x13, 0xbf, 0x04, 0xca, 0xc5, 0x3b, 0x34, 0x29, 0x6e, 0xca, - 0x41, 0x22, 0x41, 0x96, 0x78, 0xf8, 0x56, 0xd7, 0x26, 0xa6, 0x1e, 0xe5, 0x14, 0x7c, 0xcc, 0x92, - 0xb6, 0x2a, 0x3e, 0xdc, 0x0f, 0x12, 0x0a, 0xf5, 0x9f, 0x0a, 0x94, 0x82, 0x3b, 0x39, 0xf1, 0xf8, - 0x24, 0xa6, 0x94, 0xfd, 0xb6, 0x53, 0x9a, 0x56, 0xdf, 0x0d, 0xaa, 0xe9, 0xf9, 0x85, 0xab, 0xe9, - 0xef, 0x00, 0xa2, 0x0e, 0xc5, 0x7d, 0xfd, 0xcc, 0xa1, 0x96, 0xdd, 0xd5, 0x85, 0x65, 0x05, 0x5e, - 0xaa, 0xf1, 0x2f, 0x8f, 0xf8, 0x87, 0x03, 0x6e, 0xe4, 0xdf, 0x28, 0x50, 0x0a, 0xa3, 0xdb, 0xa2, - 0xd5, 0xbc, 0x2b, 0x50, 0x90, 0x1e, 0x5c, 0x94, 0xf3, 0x64, 0x2f, 0x2c, 0x38, 0xe7, 0x63, 0x05, - 0xe7, 0x06, 0x94, 0x06, 0x84, 0x62, 0x1e, 0xe8, 0x45, 0xf6, 0x16, 0xf6, 0xdf, 0xba, 0x06, 0xcb, - 0xb1, 0xf2, 0x2a, 0x2a, 0x42, 0xee, 0x01, 0x79, 0x52, 0xcb, 0xa0, 0x65, 0x28, 0x6a, 0x84, 0x57, - 0x54, 0x6a, 0xca, 0xd6, 0x97, 0xcb, 0xb0, 0xba, 0xdd, 0xda, 0xd9, 0x63, 0x01, 0xc6, 0x32, 0x30, - 0xcf, 0xec, 0xf6, 0x21, 0xcf, 0x93, 0xdb, 0x14, 0x0f, 0xb9, 0x8d, 0x34, 0xe5, 0x39, 0xa4, 0xc1, - 0x12, 0xcf, 0x81, 0x51, 0x9a, 0xf7, 0xdd, 0x46, 0xaa, 0xaa, 0x1d, 0x9b, 0x24, 0x3f, 0xc3, 0x29, - 0x9e, 0x7d, 0x1b, 0x69, 0x4a, 0x79, 0xe8, 0x33, 0x28, 0x47, 0xc9, 0x6d, 0xda, 0xc7, 0xe0, 0x46, - 0xea, 0x22, 0x1f, 0xd3, 0x1f, 0x81, 0xf8, 0xb4, 0x4f, 0xa1, 0x8d, 0xd4, 0xee, 0x08, 0x3d, 0x86, - 0x62, 0x90, 0x2e, 0xa5, 0x7b, 0xae, 0x6d, 0xa4, 0x2c, 0xc0, 0xb1, 0xed, 0x13, 0xf9, 0x6e, 0x9a, - 0x37, 0xe9, 0x46, 0xaa, 0x2a, 0x23, 0x3a, 0x86, 0x82, 0xc4, 0xa9, 0xa9, 0x1e, 0x62, 0x1b, 0xe9, - 0xca, 0x6a, 0xcc, 0xc8, 0x51, 0x45, 0x21, 0xed, 0x3b, 0x7c, 0x23, 0x75, 0x79, 0x15, 0x61, 0x80, - 0x58, 0xea, 0x9b, 0xfa, 0x81, 0xbd, 0x91, 0xbe, 0x6c, 0x8a, 0x7e, 0x0e, 0xa5, 0x30, 0xc1, 0x49, - 0xf9, 0xd0, 0xdd, 0x48, 0x5b, 0xb9, 0x44, 0x9f, 0x43, 0x25, 0x89, 0xe9, 0x17, 0x79, 0xbe, 0x6e, - 0x2c, 0x54, 0x92, 0x64, 0x63, 0x25, 0x61, 0xfe, 0x22, 0x8f, 0xda, 0x8d, 0x85, 0xea, 0x94, 0xe8, - 0x0c, 0xd6, 0x2e, 0x22, 0xf3, 0x45, 0x5f, 0xba, 0x1b, 0x0b, 0xd7, 0x2f, 0xd1, 0x08, 0xd0, 0x04, - 0x74, 0xbf, 0xf0, 0xf3, 0x77, 0x63, 0xf1, 0xa2, 0x66, 0x6b, 0xf7, 0xab, 0x67, 0xeb, 0xca, 0xd7, - 0xcf, 0xd6, 0x95, 0x7f, 0x3c, 0x5b, 0x57, 0x9e, 0x3e, 0x5f, 0xcf, 0x7c, 0xfd, 0x7c, 0x3d, 0xf3, - 0xb7, 0xe7, 0xeb, 0x99, 0x9f, 0xbd, 0xdd, 0xb5, 0x68, 0x6f, 0xd8, 0x69, 0x1a, 0xce, 0x60, 0x33, - 0x52, 0x1b, 0x6f, 0x46, 0x3f, 0x28, 0x75, 0x0a, 0x3c, 0xf8, 0xbd, 0xff, 0xdf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x41, 0x23, 0x27, 0x2d, 0xbb, 0x24, 0x00, 0x00, + proto.RegisterEnum("tendermint.abci.CheckTxType", CheckTxType_name, CheckTxType_value) + proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterType((*Request)(nil), "tendermint.abci.Request") + proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") + proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") + proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.RequestInfo") + proto.RegisterType((*RequestSetOption)(nil), "tendermint.abci.RequestSetOption") + proto.RegisterType((*RequestInitChain)(nil), "tendermint.abci.RequestInitChain") + proto.RegisterType((*RequestQuery)(nil), "tendermint.abci.RequestQuery") + proto.RegisterType((*RequestBeginBlock)(nil), "tendermint.abci.RequestBeginBlock") + proto.RegisterType((*RequestCheckTx)(nil), "tendermint.abci.RequestCheckTx") + proto.RegisterType((*RequestDeliverTx)(nil), "tendermint.abci.RequestDeliverTx") + proto.RegisterType((*RequestEndBlock)(nil), "tendermint.abci.RequestEndBlock") + proto.RegisterType((*RequestCommit)(nil), "tendermint.abci.RequestCommit") + proto.RegisterType((*RequestListSnapshots)(nil), "tendermint.abci.RequestListSnapshots") + proto.RegisterType((*RequestOfferSnapshot)(nil), "tendermint.abci.RequestOfferSnapshot") + proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.RequestLoadSnapshotChunk") + proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.RequestApplySnapshotChunk") + proto.RegisterType((*Response)(nil), "tendermint.abci.Response") + proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") + proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") + proto.RegisterType((*ResponseFlush)(nil), "tendermint.abci.ResponseFlush") + proto.RegisterType((*ResponseInfo)(nil), "tendermint.abci.ResponseInfo") + proto.RegisterType((*ResponseSetOption)(nil), "tendermint.abci.ResponseSetOption") + proto.RegisterType((*ResponseInitChain)(nil), "tendermint.abci.ResponseInitChain") + proto.RegisterType((*ResponseQuery)(nil), "tendermint.abci.ResponseQuery") + proto.RegisterType((*ResponseBeginBlock)(nil), "tendermint.abci.ResponseBeginBlock") + proto.RegisterType((*ResponseCheckTx)(nil), "tendermint.abci.ResponseCheckTx") + proto.RegisterType((*ResponseDeliverTx)(nil), "tendermint.abci.ResponseDeliverTx") + proto.RegisterType((*ResponseEndBlock)(nil), "tendermint.abci.ResponseEndBlock") + proto.RegisterType((*ResponseCommit)(nil), "tendermint.abci.ResponseCommit") + proto.RegisterType((*ResponseListSnapshots)(nil), "tendermint.abci.ResponseListSnapshots") + proto.RegisterType((*ResponseOfferSnapshot)(nil), "tendermint.abci.ResponseOfferSnapshot") + proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.ResponseLoadSnapshotChunk") + proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") + proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") + proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") + proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") + proto.RegisterType((*Event)(nil), "tendermint.abci.Event") + proto.RegisterType((*TxResult)(nil), "tendermint.abci.TxResult") + proto.RegisterType((*Validator)(nil), "tendermint.abci.Validator") + proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.ValidatorUpdate") + proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.VoteInfo") + proto.RegisterType((*Evidence)(nil), "tendermint.abci.Evidence") + proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") +} + +func init() { proto.RegisterFile("tendermint/abci/abci.proto", fileDescriptor_51a5414a4a9be4c5) } + +var fileDescriptor_51a5414a4a9be4c5 = []byte{ + // 2622 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x97, 0x1b, 0x47, + 0x15, 0x56, 0x4b, 0x1a, 0x3d, 0xee, 0x8c, 0x1e, 0x53, 0x9e, 0x38, 0x8a, 0xb0, 0x67, 0x9c, 0x36, + 0x09, 0xb1, 0x93, 0xcc, 0xc0, 0xf8, 0xd8, 0x04, 0x08, 0xe0, 0x91, 0x22, 0xa3, 0x89, 0x1d, 0xcf, + 0xa4, 0x67, 0x6c, 0x9e, 0x71, 0x53, 0x52, 0xd7, 0x48, 0x9d, 0x91, 0xba, 0x3b, 0xdd, 0xa5, 0xf1, + 0x28, 0x3b, 0x08, 0x2b, 0xd8, 0x84, 0xff, 0xc0, 0x82, 0x2d, 0x3b, 0x7e, 0x00, 0x8b, 0x2c, 0xb3, + 0x64, 0x65, 0x38, 0xf6, 0x61, 0xc3, 0x8f, 0xe0, 0x70, 0xea, 0xd1, 0x2f, 0x49, 0x2d, 0x69, 0x12, + 0x76, 0x6c, 0x74, 0xaa, 0xaa, 0xef, 0xbd, 0x55, 0xb7, 0x1e, 0x5f, 0x7d, 0xf7, 0x96, 0xa0, 0x4e, + 0x89, 0x65, 0x10, 0x77, 0x68, 0x5a, 0x74, 0x07, 0x77, 0xba, 0x26, 0xff, 0xd9, 0x76, 0x5c, 0x9b, + 0xda, 0xa8, 0x12, 0x7e, 0xdb, 0x66, 0xcd, 0xf5, 0x6f, 0x46, 0x84, 0xbb, 0xee, 0xd8, 0xa1, 0xf6, + 0xce, 0x90, 0xb8, 0xa7, 0x03, 0xb2, 0x43, 0xc7, 0x0e, 0xf1, 0x84, 0x5a, 0xfd, 0x4a, 0x44, 0x8a, + 0xb7, 0xc7, 0xbe, 0xaa, 0xd3, 0x36, 0x4e, 0xc9, 0x38, 0x2e, 0x73, 0x75, 0xca, 0x82, 0x83, 0x5d, + 0x3c, 0xf4, 0x3f, 0x6f, 0xf5, 0x6c, 0xbb, 0x37, 0x20, 0x3b, 0xbc, 0xd6, 0x19, 0x9d, 0xec, 0x50, + 0x73, 0x48, 0x3c, 0x8a, 0x87, 0x8e, 0x14, 0xd8, 0xe8, 0xd9, 0x3d, 0x9b, 0x17, 0x77, 0x58, 0x49, + 0xb4, 0xaa, 0x7f, 0x2c, 0x40, 0x5e, 0x23, 0x9f, 0x8c, 0x88, 0x47, 0xd1, 0x2e, 0x64, 0x49, 0xb7, + 0x6f, 0xd7, 0xd2, 0xd7, 0x94, 0x37, 0x56, 0x77, 0xaf, 0x6c, 0x4f, 0x78, 0xba, 0x2d, 0xe5, 0x5a, + 0xdd, 0xbe, 0xdd, 0x4e, 0x69, 0x5c, 0x16, 0xdd, 0x86, 0x95, 0x93, 0xc1, 0xc8, 0xeb, 0xd7, 0x32, + 0x5c, 0xe9, 0x6a, 0x92, 0xd2, 0x3d, 0x26, 0xd4, 0x4e, 0x69, 0x42, 0x9a, 0x75, 0x65, 0x5a, 0x27, + 0x76, 0x2d, 0x3b, 0xbf, 0xab, 0x7d, 0xeb, 0x84, 0x77, 0xc5, 0x64, 0x51, 0x03, 0xc0, 0x23, 0x54, + 0xb7, 0x1d, 0x6a, 0xda, 0x56, 0x6d, 0x85, 0x6b, 0xbe, 0x9a, 0xa4, 0x79, 0x44, 0xe8, 0x01, 0x17, + 0x6c, 0xa7, 0xb4, 0xa2, 0xe7, 0x57, 0x98, 0x0d, 0xd3, 0x32, 0xa9, 0xde, 0xed, 0x63, 0xd3, 0xaa, + 0xe5, 0xe6, 0xdb, 0xd8, 0xb7, 0x4c, 0xda, 0x64, 0x82, 0xcc, 0x86, 0xe9, 0x57, 0x98, 0xcb, 0x9f, + 0x8c, 0x88, 0x3b, 0xae, 0xe5, 0xe7, 0xbb, 0xfc, 0x21, 0x13, 0x62, 0x2e, 0x73, 0x69, 0xd4, 0x82, + 0xd5, 0x0e, 0xe9, 0x99, 0x96, 0xde, 0x19, 0xd8, 0xdd, 0xd3, 0x5a, 0x81, 0x2b, 0xab, 0x49, 0xca, + 0x0d, 0x26, 0xda, 0x60, 0x92, 0xed, 0x94, 0x06, 0x9d, 0xa0, 0x86, 0xde, 0x85, 0x42, 0xb7, 0x4f, + 0xba, 0xa7, 0x3a, 0x3d, 0xaf, 0x15, 0xb9, 0x8d, 0xad, 0x24, 0x1b, 0x4d, 0x26, 0x77, 0x7c, 0xde, + 0x4e, 0x69, 0xf9, 0xae, 0x28, 0x32, 0xff, 0x0d, 0x32, 0x30, 0xcf, 0x88, 0xcb, 0xf4, 0x2f, 0xcd, + 0xf7, 0xff, 0x3d, 0x21, 0xc9, 0x2d, 0x14, 0x0d, 0xbf, 0x82, 0x7e, 0x0c, 0x45, 0x62, 0x19, 0xd2, + 0x8d, 0x55, 0x6e, 0xe2, 0x5a, 0xe2, 0x5e, 0xb1, 0x0c, 0xdf, 0x89, 0x02, 0x91, 0x65, 0xf4, 0x0e, + 0xe4, 0xba, 0xf6, 0x70, 0x68, 0xd2, 0xda, 0x1a, 0xd7, 0xde, 0x4c, 0x74, 0x80, 0x4b, 0xb5, 0x53, + 0x9a, 0x94, 0x47, 0x0f, 0xa1, 0x3c, 0x30, 0x3d, 0xaa, 0x7b, 0x16, 0x76, 0xbc, 0xbe, 0x4d, 0xbd, + 0x5a, 0x89, 0x5b, 0x78, 0x2d, 0xc9, 0xc2, 0x03, 0xd3, 0xa3, 0x47, 0xbe, 0x70, 0x3b, 0xa5, 0x95, + 0x06, 0xd1, 0x06, 0x66, 0xcf, 0x3e, 0x39, 0x21, 0x6e, 0x60, 0xb0, 0x56, 0x9e, 0x6f, 0xef, 0x80, + 0x49, 0xfb, 0xfa, 0xcc, 0x9e, 0x1d, 0x6d, 0x40, 0xbf, 0x84, 0x4b, 0x03, 0x1b, 0x1b, 0x81, 0x39, + 0xbd, 0xdb, 0x1f, 0x59, 0xa7, 0xb5, 0x0a, 0x37, 0x7a, 0x23, 0x71, 0x90, 0x36, 0x36, 0x7c, 0x13, + 0x4d, 0xa6, 0xd0, 0x4e, 0x69, 0xeb, 0x83, 0xc9, 0x46, 0xf4, 0x04, 0x36, 0xb0, 0xe3, 0x0c, 0xc6, + 0x93, 0xd6, 0xab, 0xdc, 0xfa, 0xcd, 0x24, 0xeb, 0x7b, 0x4c, 0x67, 0xd2, 0x3c, 0xc2, 0x53, 0xad, + 0x8d, 0x3c, 0xac, 0x9c, 0xe1, 0xc1, 0x88, 0xa8, 0xdf, 0x82, 0xd5, 0xc8, 0x51, 0x47, 0x35, 0xc8, + 0x0f, 0x89, 0xe7, 0xe1, 0x1e, 0xa9, 0x29, 0xd7, 0x94, 0x37, 0x8a, 0x9a, 0x5f, 0x55, 0xcb, 0xb0, + 0x16, 0x3d, 0xde, 0xea, 0x30, 0x50, 0x64, 0x07, 0x97, 0x29, 0x9e, 0x11, 0xd7, 0x63, 0xa7, 0x55, + 0x2a, 0xca, 0x2a, 0xba, 0x0e, 0x25, 0xbe, 0x7d, 0x74, 0xff, 0x3b, 0x83, 0x9c, 0xac, 0xb6, 0xc6, + 0x1b, 0x1f, 0x4b, 0xa1, 0x2d, 0x58, 0x75, 0x76, 0x9d, 0x40, 0x24, 0xc3, 0x45, 0xc0, 0xd9, 0x75, + 0xa4, 0x80, 0xfa, 0x7d, 0xa8, 0x4e, 0x9e, 0x76, 0x54, 0x85, 0xcc, 0x29, 0x19, 0xcb, 0xfe, 0x58, + 0x11, 0x6d, 0x48, 0xb7, 0x78, 0x1f, 0x45, 0x4d, 0xfa, 0xf8, 0xa7, 0x74, 0xa0, 0x1c, 0x1c, 0x73, + 0xf4, 0x0e, 0x64, 0x19, 0x6a, 0x72, 0xed, 0xd5, 0xdd, 0xfa, 0xb6, 0x80, 0xd4, 0x6d, 0x1f, 0x52, + 0xb7, 0x8f, 0x7d, 0x48, 0x6d, 0x14, 0xbe, 0x78, 0xb6, 0x95, 0xfa, 0xfc, 0x1f, 0x5b, 0x8a, 0xc6, + 0x35, 0xd0, 0x2b, 0xec, 0x54, 0x62, 0xd3, 0xd2, 0x4d, 0x43, 0xf6, 0x93, 0xe7, 0xf5, 0x7d, 0x03, + 0xdd, 0x87, 0x6a, 0xd7, 0xb6, 0x3c, 0x62, 0x79, 0x23, 0x4f, 0x17, 0x90, 0x2d, 0xc1, 0x72, 0xfa, + 0xd4, 0x34, 0x7d, 0xc1, 0x43, 0x2e, 0xa7, 0x55, 0xba, 0xf1, 0x06, 0x74, 0x0f, 0xe0, 0x0c, 0x0f, + 0x4c, 0x03, 0x53, 0xdb, 0xf5, 0x6a, 0xd9, 0x6b, 0x99, 0x99, 0x66, 0x1e, 0xfb, 0x22, 0x8f, 0x1c, + 0x03, 0x53, 0xd2, 0xc8, 0xb2, 0xd1, 0x6a, 0x11, 0x4d, 0xf4, 0x3a, 0x54, 0xb0, 0xe3, 0xe8, 0x1e, + 0xc5, 0x94, 0xe8, 0x9d, 0x31, 0x25, 0x1e, 0x07, 0xd4, 0x35, 0xad, 0x84, 0x1d, 0xe7, 0x88, 0xb5, + 0x36, 0x58, 0xa3, 0x6a, 0x04, 0x2b, 0xcc, 0xd1, 0x0c, 0x21, 0xc8, 0x1a, 0x98, 0x62, 0x3e, 0x43, + 0x6b, 0x1a, 0x2f, 0xb3, 0x36, 0x07, 0xd3, 0xbe, 0xf4, 0x9b, 0x97, 0xd1, 0x65, 0xc8, 0xf5, 0x89, + 0xd9, 0xeb, 0x53, 0xee, 0x6a, 0x46, 0x93, 0x35, 0xb6, 0x18, 0x8e, 0x6b, 0x9f, 0x11, 0x0e, 0xfc, + 0x05, 0x4d, 0x54, 0xd4, 0xdf, 0xa5, 0x61, 0x7d, 0x0a, 0xf7, 0x98, 0xdd, 0x3e, 0xf6, 0xfa, 0x7e, + 0x5f, 0xac, 0x8c, 0xee, 0x30, 0xbb, 0xd8, 0x20, 0xae, 0xbc, 0xa4, 0x6a, 0x51, 0xdf, 0xc5, 0x6d, + 0xd9, 0xe6, 0xdf, 0xa5, 0xcf, 0x52, 0x1a, 0x1d, 0x40, 0x75, 0x80, 0x3d, 0xaa, 0x0b, 0x1c, 0xd1, + 0xf9, 0xdd, 0x93, 0x49, 0x40, 0xcf, 0x07, 0xd8, 0x47, 0x1e, 0xb6, 0x8b, 0xa5, 0xa1, 0xf2, 0x20, + 0xd6, 0x8a, 0x34, 0xd8, 0xe8, 0x8c, 0x3f, 0xc5, 0x16, 0x35, 0x2d, 0xa2, 0x4f, 0x2d, 0xc9, 0x2b, + 0x53, 0x46, 0x5b, 0x67, 0xa6, 0x41, 0xac, 0xae, 0xbf, 0x16, 0x97, 0x02, 0xe5, 0x60, 0xad, 0x3c, + 0x55, 0x83, 0x72, 0x1c, 0xb9, 0x51, 0x19, 0xd2, 0xf4, 0x5c, 0x4e, 0x40, 0x9a, 0x9e, 0xa3, 0x6f, + 0x43, 0x96, 0x39, 0xc9, 0x9d, 0x2f, 0xcf, 0xb8, 0x36, 0xa5, 0xde, 0xf1, 0xd8, 0x21, 0x1a, 0x97, + 0x54, 0xd5, 0x60, 0x9b, 0x07, 0x68, 0x3e, 0x69, 0x55, 0xbd, 0x01, 0x95, 0x09, 0xb8, 0x8e, 0xac, + 0x9f, 0x12, 0x5d, 0x3f, 0xb5, 0x02, 0xa5, 0x18, 0x36, 0xab, 0x97, 0x61, 0x63, 0x16, 0xd4, 0xaa, + 0xfd, 0xa0, 0x3d, 0x06, 0x99, 0xe8, 0x36, 0x14, 0x02, 0xac, 0x15, 0xc7, 0x6c, 0x7a, 0xae, 0x7c, + 0x61, 0x2d, 0x10, 0x65, 0xe7, 0x8b, 0xed, 0x57, 0xbe, 0x1f, 0xd2, 0x7c, 0xe0, 0x79, 0xec, 0x38, + 0x6d, 0xec, 0xf5, 0xd5, 0x5f, 0x43, 0x2d, 0x09, 0x47, 0x27, 0xdc, 0xc8, 0x06, 0xdb, 0xf0, 0x32, + 0xe4, 0x4e, 0x6c, 0x77, 0x88, 0x29, 0x37, 0x56, 0xd2, 0x64, 0x8d, 0x6d, 0x4f, 0x81, 0xa9, 0x19, + 0xde, 0x2c, 0x2a, 0xaa, 0x0e, 0xaf, 0x24, 0x62, 0x29, 0x53, 0x31, 0x2d, 0x83, 0x88, 0xf9, 0x2c, + 0x69, 0xa2, 0x12, 0x1a, 0x12, 0x83, 0x15, 0x15, 0xd6, 0xad, 0xc7, 0x7d, 0xe5, 0xf6, 0x8b, 0x9a, + 0xac, 0xa9, 0xff, 0x2a, 0x40, 0x41, 0x23, 0x9e, 0xc3, 0x0e, 0x3b, 0x6a, 0x40, 0x91, 0x9c, 0x77, + 0x89, 0x60, 0x39, 0x4a, 0x22, 0x4b, 0x10, 0xd2, 0x2d, 0x5f, 0x92, 0x5d, 0xd1, 0x81, 0x1a, 0xba, + 0x15, 0x63, 0x72, 0x57, 0x93, 0xd5, 0xa3, 0x54, 0xee, 0x4e, 0x9c, 0xca, 0x6d, 0x26, 0x6a, 0x4d, + 0x70, 0xb9, 0x5b, 0x31, 0x2e, 0x97, 0xdc, 0x59, 0x8c, 0xcc, 0x35, 0x67, 0x90, 0xb9, 0x64, 0x37, + 0x13, 0xd8, 0x5c, 0x73, 0x06, 0x9b, 0x53, 0xe7, 0xf4, 0x3f, 0x93, 0xce, 0xdd, 0x89, 0xd3, 0xb9, + 0x64, 0xb7, 0x27, 0xf8, 0xdc, 0xbd, 0x59, 0x7c, 0xee, 0x7a, 0xa2, 0x76, 0x22, 0xa1, 0xfb, 0xe1, + 0x14, 0xa1, 0xbb, 0x96, 0x68, 0x64, 0x06, 0xa3, 0x6b, 0xc6, 0x18, 0x1d, 0x2c, 0x98, 0x83, 0x04, + 0x4a, 0x77, 0x77, 0x9a, 0xd2, 0xbd, 0x9a, 0xbc, 0x69, 0x66, 0x71, 0xba, 0xef, 0x4d, 0x70, 0xba, + 0xad, 0x64, 0x1f, 0x26, 0x49, 0xdd, 0x41, 0x02, 0xa9, 0x7b, 0x3d, 0xd1, 0xc4, 0x02, 0x56, 0x77, + 0x90, 0xc0, 0xea, 0x92, 0x0d, 0x2e, 0xa0, 0x75, 0xbf, 0x9a, 0x47, 0xeb, 0x6e, 0x26, 0x0f, 0x73, + 0x39, 0x5e, 0xa7, 0xcf, 0xe5, 0x75, 0x6f, 0x26, 0x9a, 0xbf, 0x38, 0xb1, 0xbb, 0xc1, 0xae, 0xd9, + 0x09, 0xe0, 0x60, 0x50, 0x45, 0x5c, 0xd7, 0x76, 0x25, 0x67, 0x12, 0x15, 0xf5, 0x0d, 0x76, 0xf1, + 0x87, 0x20, 0x31, 0x87, 0x04, 0xf2, 0x2b, 0x21, 0x02, 0x0c, 0xea, 0x5f, 0x95, 0x50, 0x97, 0xdf, + 0x95, 0x51, 0xd2, 0x50, 0x94, 0xa4, 0x21, 0xc2, 0x0d, 0xd3, 0x71, 0x6e, 0xb8, 0x05, 0xab, 0x0c, + 0xea, 0x27, 0x68, 0x1f, 0x76, 0x7c, 0xda, 0x87, 0x6e, 0xc2, 0x3a, 0xbf, 0xcb, 0x05, 0x83, 0x94, + 0xf8, 0x9e, 0xe5, 0xd7, 0x54, 0x85, 0x7d, 0x10, 0x9b, 0x53, 0x00, 0xfd, 0xdb, 0x70, 0x29, 0x22, + 0x1b, 0x5c, 0x21, 0x82, 0xeb, 0x54, 0x03, 0xe9, 0x3d, 0x79, 0x97, 0x7c, 0x10, 0x4e, 0x50, 0x48, + 0x29, 0x11, 0x64, 0xbb, 0xb6, 0x41, 0x24, 0xc0, 0xf3, 0x32, 0xa3, 0x99, 0x03, 0xbb, 0x27, 0x61, + 0x9c, 0x15, 0x99, 0x54, 0x80, 0x82, 0x45, 0x01, 0x72, 0xea, 0x9f, 0x95, 0xd0, 0x5e, 0xc8, 0x32, + 0x67, 0x11, 0x42, 0xe5, 0x7f, 0x43, 0x08, 0xd3, 0x5f, 0x95, 0x10, 0xaa, 0xff, 0x51, 0xc2, 0x65, + 0x0c, 0xa8, 0xde, 0x57, 0x73, 0x3b, 0xbc, 0x12, 0x57, 0xf8, 0xa2, 0xc8, 0x2b, 0x51, 0x32, 0xf3, + 0x1c, 0x9f, 0xfa, 0x38, 0x33, 0xcf, 0x8b, 0x4b, 0x92, 0x57, 0x58, 0x78, 0xe9, 0xb8, 0xb6, 0x7d, + 0xa2, 0xdb, 0x8e, 0x37, 0x2b, 0x4a, 0x16, 0xf9, 0x91, 0x6d, 0x91, 0x63, 0xd9, 0x3e, 0x64, 0xa2, + 0x07, 0x8e, 0xa7, 0x15, 0x1c, 0x59, 0x8a, 0x5c, 0xfa, 0xc5, 0x18, 0xf7, 0xbc, 0x02, 0x45, 0xe6, + 0x84, 0xe7, 0xe0, 0x2e, 0xe1, 0x40, 0x59, 0xd4, 0xc2, 0x06, 0xf5, 0x09, 0xa0, 0x69, 0xa8, 0x46, + 0x6d, 0xc8, 0x91, 0x33, 0x62, 0x51, 0xb6, 0x42, 0x6c, 0x6a, 0x2f, 0xcf, 0x20, 0x76, 0xc4, 0xa2, + 0x8d, 0x1a, 0x9b, 0xd0, 0x7f, 0x3f, 0xdb, 0xaa, 0x0a, 0xe9, 0xb7, 0xec, 0xa1, 0x49, 0xc9, 0xd0, + 0xa1, 0x63, 0x4d, 0xea, 0xab, 0xbf, 0x49, 0x33, 0x96, 0x15, 0x83, 0xf1, 0x99, 0x53, 0xec, 0x1f, + 0x96, 0x74, 0x84, 0x61, 0x2f, 0x37, 0xed, 0x57, 0x01, 0x7a, 0xd8, 0xd3, 0x9f, 0x62, 0x8b, 0x12, + 0x43, 0xce, 0x7d, 0xb1, 0x87, 0xbd, 0x9f, 0xf2, 0x06, 0x46, 0xa1, 0xd8, 0xe7, 0x91, 0x47, 0x0c, + 0xbe, 0x08, 0x19, 0x2d, 0xdf, 0xc3, 0xde, 0x23, 0x8f, 0x18, 0x11, 0x2f, 0xf3, 0x5f, 0xcf, 0xcb, + 0xf8, 0x1c, 0x17, 0x26, 0xe7, 0xf8, 0xb3, 0x74, 0x78, 0x1e, 0x42, 0x3a, 0xfa, 0xff, 0x36, 0x0b, + 0x7f, 0xe0, 0xa1, 0x67, 0xfc, 0x2e, 0x45, 0x47, 0xb0, 0x1e, 0x9c, 0x46, 0x7d, 0xc4, 0x4f, 0xa9, + 0xbf, 0xe7, 0x96, 0x3d, 0xce, 0xd5, 0xb3, 0x78, 0xb3, 0x87, 0x7e, 0x06, 0x2f, 0x4f, 0x20, 0x4d, + 0x60, 0x3a, 0xbd, 0x24, 0xe0, 0xbc, 0x14, 0x07, 0x1c, 0xdf, 0x72, 0x38, 0x57, 0x99, 0xaf, 0x79, + 0x2e, 0xf6, 0x59, 0xd0, 0x13, 0x65, 0x06, 0x33, 0xd7, 0xfe, 0x3a, 0x94, 0x5c, 0x42, 0x59, 0x80, + 0x1d, 0x0b, 0x2b, 0xd7, 0x44, 0xa3, 0x00, 0x7b, 0xf5, 0x10, 0x5e, 0x9a, 0xc9, 0x10, 0xd0, 0x77, + 0xa1, 0x18, 0x92, 0x0b, 0x25, 0x21, 0x42, 0x0b, 0xa2, 0x8e, 0x50, 0x56, 0xfd, 0x8b, 0x12, 0x9a, + 0x8c, 0xc7, 0x31, 0x2d, 0xc8, 0xb9, 0xc4, 0x1b, 0x0d, 0x44, 0x64, 0x51, 0xde, 0x7d, 0x7b, 0x39, + 0x6e, 0xc1, 0x5a, 0x47, 0x03, 0xaa, 0x49, 0x65, 0xf5, 0x43, 0xc8, 0x89, 0x16, 0x04, 0x90, 0xdb, + 0x6b, 0x36, 0x5b, 0x87, 0xc7, 0xd5, 0x14, 0x2a, 0xc2, 0xca, 0x5e, 0xe3, 0x40, 0x3b, 0xae, 0x2a, + 0xac, 0x59, 0x6b, 0xbd, 0xdf, 0x6a, 0x1e, 0x57, 0xd3, 0x68, 0x1d, 0x4a, 0xa2, 0xac, 0xdf, 0x3b, + 0xd0, 0x3e, 0xd8, 0x3b, 0xae, 0x66, 0x22, 0x4d, 0x47, 0xad, 0x87, 0xef, 0xb5, 0xb4, 0x6a, 0x56, + 0xfd, 0x0e, 0x8b, 0x56, 0x12, 0x08, 0x48, 0x18, 0x97, 0x28, 0x91, 0xb8, 0x84, 0xed, 0xc8, 0x7a, + 0x32, 0xab, 0x40, 0xef, 0x4f, 0xf8, 0xba, 0x7b, 0x01, 0x4a, 0x32, 0xe1, 0x30, 0x7a, 0x0d, 0xca, + 0x2e, 0x39, 0x21, 0xb4, 0xdb, 0x17, 0x2c, 0x47, 0xdc, 0x59, 0x25, 0xad, 0x24, 0x5b, 0xb9, 0x92, + 0x27, 0xc4, 0x3e, 0x26, 0x5d, 0xaa, 0x8b, 0x10, 0x49, 0xec, 0xb3, 0x22, 0x13, 0x63, 0xad, 0x47, + 0xa2, 0x51, 0x3d, 0x5a, 0x34, 0x7d, 0x45, 0x58, 0xd1, 0x5a, 0xc7, 0xda, 0xcf, 0xab, 0x69, 0x84, + 0xa0, 0xcc, 0x8b, 0xfa, 0xd1, 0xc3, 0xbd, 0xc3, 0xa3, 0xf6, 0x01, 0x9b, 0xbe, 0x4b, 0x50, 0xf1, + 0xa7, 0xcf, 0x6f, 0xcc, 0xaa, 0x7f, 0x53, 0xa0, 0x32, 0x71, 0x0c, 0xd0, 0x2e, 0xac, 0x08, 0x72, + 0xac, 0x24, 0x24, 0xac, 0xf9, 0x29, 0x96, 0x67, 0x46, 0x88, 0xa2, 0x77, 0xa1, 0x40, 0x64, 0xd4, + 0x3f, 0xeb, 0xb8, 0x89, 0x6c, 0x85, 0x9f, 0x17, 0x90, 0xaa, 0x81, 0x06, 0xbb, 0x06, 0x83, 0xf3, + 0x2c, 0x23, 0xb2, 0x57, 0xa7, 0xd5, 0x03, 0x24, 0x90, 0xfa, 0xa1, 0x8e, 0xda, 0x84, 0xd5, 0xc8, + 0xa0, 0xd0, 0x37, 0xa0, 0x38, 0xc4, 0xe7, 0x32, 0xd7, 0x23, 0x82, 0xfa, 0xc2, 0x10, 0x9f, 0xf3, + 0x34, 0x0f, 0x7a, 0x19, 0xf2, 0xec, 0x63, 0x0f, 0x0b, 0x60, 0xc8, 0x68, 0xb9, 0x21, 0x3e, 0xff, + 0x09, 0xf6, 0xd4, 0x8f, 0xa0, 0x1c, 0x4f, 0x87, 0xb0, 0x1d, 0xe4, 0xda, 0x23, 0xcb, 0xe0, 0x36, + 0x56, 0x34, 0x51, 0x41, 0xb7, 0x61, 0xe5, 0xcc, 0x16, 0xb8, 0x32, 0xfb, 0x74, 0x3d, 0xb6, 0x29, + 0x89, 0xa4, 0x53, 0x84, 0xb4, 0xfa, 0x10, 0xca, 0x1c, 0x27, 0xf6, 0x28, 0x75, 0xcd, 0xce, 0x88, + 0x92, 0x68, 0xfe, 0x6e, 0x6d, 0x46, 0xfe, 0x2e, 0x60, 0x09, 0x01, 0xc7, 0xc8, 0x88, 0x44, 0x12, + 0xaf, 0xa8, 0x9f, 0xc2, 0x0a, 0xb7, 0xc7, 0x30, 0x84, 0x27, 0x4a, 0x24, 0xe5, 0x64, 0x65, 0xf4, + 0x11, 0x00, 0xf6, 0xfb, 0xf1, 0x07, 0xba, 0x35, 0x1b, 0xb7, 0x82, 0xf1, 0x34, 0xae, 0x48, 0x00, + 0xdb, 0x08, 0x55, 0x23, 0x20, 0x16, 0x31, 0xa8, 0xfe, 0x5e, 0x81, 0xc2, 0xf1, 0xb9, 0xdc, 0x8e, + 0x09, 0xf9, 0x13, 0x36, 0xec, 0x7d, 0x3e, 0x6c, 0x91, 0x77, 0x10, 0x15, 0x99, 0x90, 0xc9, 0x04, + 0x69, 0x9e, 0xbb, 0xc1, 0x81, 0xcb, 0x2e, 0x1b, 0xcf, 0xf9, 0xf9, 0x2e, 0x89, 0x2b, 0x3f, 0x80, + 0x62, 0xb0, 0x35, 0x18, 0xd7, 0xc6, 0x86, 0xe1, 0x12, 0xcf, 0x93, 0xf3, 0xea, 0x57, 0x79, 0x3a, + 0xce, 0x7e, 0x2a, 0xf3, 0x11, 0x19, 0x4d, 0x54, 0x54, 0x13, 0x2a, 0x13, 0x37, 0x0c, 0xba, 0x0b, + 0x79, 0x67, 0xd4, 0xd1, 0xfd, 0xa5, 0x99, 0xd8, 0x8b, 0x92, 0x92, 0x9d, 0x92, 0xb1, 0xb7, 0x7d, + 0x38, 0xea, 0x0c, 0xcc, 0xee, 0x7d, 0x32, 0xf6, 0x47, 0xe4, 0x8c, 0x3a, 0xf7, 0xc5, 0x32, 0x8a, + 0xae, 0xd2, 0xd1, 0xae, 0xce, 0xa0, 0xe0, 0xef, 0x0c, 0xf4, 0xa3, 0xe8, 0x8e, 0xf7, 0x53, 0xb0, + 0x89, 0x57, 0x9f, 0x34, 0x1f, 0xaa, 0xb0, 0xb8, 0xc0, 0x33, 0x7b, 0x16, 0x31, 0xf4, 0x90, 0xf2, + 0xf3, 0xde, 0x0a, 0x5a, 0x45, 0x7c, 0x78, 0xe0, 0xf3, 0x7d, 0xf5, 0x99, 0x02, 0x05, 0xff, 0xe8, + 0xcd, 0xdc, 0x2c, 0xb1, 0xc1, 0xa4, 0x2f, 0x3e, 0x98, 0xa4, 0x04, 0xa8, 0x9f, 0x62, 0xce, 0x5e, + 0x38, 0xc5, 0xfc, 0x16, 0x20, 0x6a, 0x53, 0x3c, 0xd0, 0xcf, 0x6c, 0x6a, 0x5a, 0x3d, 0x5d, 0xcc, + 0xa6, 0x20, 0x38, 0x55, 0xfe, 0xe5, 0x31, 0xff, 0x70, 0xc8, 0x27, 0xf6, 0xb7, 0x0a, 0x14, 0x82, + 0xcb, 0xea, 0xa2, 0x69, 0xb0, 0xcb, 0x90, 0x93, 0xe0, 0x2c, 0xf2, 0x60, 0xb2, 0x16, 0x64, 0x64, + 0xb3, 0x91, 0x8c, 0x6c, 0x1d, 0x0a, 0x43, 0x42, 0x31, 0xbf, 0xb1, 0x45, 0x58, 0x15, 0xd4, 0x6f, + 0x5e, 0x87, 0xd5, 0x48, 0x46, 0x12, 0xe5, 0x21, 0xf3, 0x90, 0x3c, 0xad, 0xa6, 0xd0, 0x2a, 0xe4, + 0x35, 0xc2, 0x13, 0x18, 0x55, 0x65, 0xf7, 0x33, 0x80, 0xca, 0x5e, 0xa3, 0xb9, 0xcf, 0xee, 0x0e, + 0xb3, 0x8b, 0x65, 0x62, 0x27, 0xcb, 0xa3, 0xce, 0xb9, 0x6f, 0x90, 0xf5, 0xf9, 0x79, 0x2d, 0x74, + 0x0f, 0x56, 0x78, 0x40, 0x8a, 0xe6, 0x3f, 0x4a, 0xd6, 0x17, 0x24, 0xba, 0xd8, 0x60, 0xf8, 0xfe, + 0x9c, 0xfb, 0x4a, 0x59, 0x9f, 0x9f, 0xf7, 0x42, 0x1a, 0x14, 0xc3, 0x88, 0x72, 0xf1, 0xab, 0x65, + 0x7d, 0x89, 0x5c, 0x18, 0xb3, 0x19, 0xb2, 0xe8, 0xc5, 0xaf, 0x78, 0xf5, 0x25, 0x60, 0x04, 0x3d, + 0x80, 0xbc, 0x1f, 0x9d, 0x2c, 0x7a, 0x57, 0xac, 0x2f, 0xcc, 0x53, 0xb1, 0x25, 0x10, 0xc1, 0xe4, + 0xfc, 0x47, 0xd2, 0xfa, 0x82, 0xa4, 0x1b, 0xda, 0x87, 0x9c, 0x24, 0x87, 0x0b, 0xde, 0x0a, 0xeb, + 0x8b, 0xf2, 0x4e, 0x6c, 0xd2, 0xc2, 0x50, 0x7c, 0xf1, 0xd3, 0x6f, 0x7d, 0x89, 0x7c, 0x22, 0x7a, + 0x04, 0x10, 0x89, 0x19, 0x97, 0x78, 0xd3, 0xad, 0x2f, 0x93, 0x27, 0x44, 0x07, 0x50, 0x08, 0xe2, + 0x83, 0x85, 0x2f, 0xac, 0xf5, 0xc5, 0x09, 0x3b, 0xf4, 0x04, 0x4a, 0x71, 0x62, 0xbc, 0xdc, 0xbb, + 0x69, 0x7d, 0xc9, 0x4c, 0x1c, 0xb3, 0x1f, 0x67, 0xc9, 0xcb, 0xbd, 0xa3, 0xd6, 0x97, 0x4c, 0xcc, + 0xa1, 0x8f, 0x61, 0x7d, 0x9a, 0xd2, 0x2e, 0xff, 0xac, 0x5a, 0xbf, 0x40, 0xaa, 0x0e, 0x0d, 0x01, + 0xcd, 0xa0, 0xc2, 0x17, 0x78, 0x65, 0xad, 0x5f, 0x24, 0x73, 0xd7, 0x68, 0x7d, 0xf1, 0x7c, 0x53, + 0xf9, 0xf2, 0xf9, 0xa6, 0xf2, 0xcf, 0xe7, 0x9b, 0xca, 0xe7, 0x2f, 0x36, 0x53, 0x5f, 0xbe, 0xd8, + 0x4c, 0xfd, 0xfd, 0xc5, 0x66, 0xea, 0x17, 0x6f, 0xf6, 0x4c, 0xda, 0x1f, 0x75, 0xb6, 0xbb, 0xf6, + 0x70, 0x27, 0xfa, 0x17, 0x90, 0x89, 0xbf, 0xa8, 0x70, 0x3e, 0xd8, 0xc9, 0xf1, 0x8b, 0xe4, 0xd6, + 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x58, 0x74, 0x9d, 0xd7, 0xc2, 0x22, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3340,7 +3338,7 @@ func NewABCIApplicationClient(cc *grpc.ClientConn) ABCIApplicationClient { func (c *aBCIApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) { out := new(ResponseEcho) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Echo", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Echo", in, out, opts...) if err != nil { return nil, err } @@ -3349,7 +3347,7 @@ func (c *aBCIApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts func (c *aBCIApplicationClient) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) { out := new(ResponseFlush) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Flush", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Flush", in, out, opts...) if err != nil { return nil, err } @@ -3358,7 +3356,7 @@ func (c *aBCIApplicationClient) Flush(ctx context.Context, in *RequestFlush, opt func (c *aBCIApplicationClient) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) { out := new(ResponseInfo) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Info", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Info", in, out, opts...) if err != nil { return nil, err } @@ -3367,7 +3365,7 @@ func (c *aBCIApplicationClient) Info(ctx context.Context, in *RequestInfo, opts func (c *aBCIApplicationClient) SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) { out := new(ResponseSetOption) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/SetOption", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/SetOption", in, out, opts...) if err != nil { return nil, err } @@ -3376,7 +3374,7 @@ func (c *aBCIApplicationClient) SetOption(ctx context.Context, in *RequestSetOpt func (c *aBCIApplicationClient) DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) { out := new(ResponseDeliverTx) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/DeliverTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/DeliverTx", in, out, opts...) if err != nil { return nil, err } @@ -3385,7 +3383,7 @@ func (c *aBCIApplicationClient) DeliverTx(ctx context.Context, in *RequestDelive func (c *aBCIApplicationClient) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...grpc.CallOption) (*ResponseCheckTx, error) { out := new(ResponseCheckTx) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/CheckTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/CheckTx", in, out, opts...) if err != nil { return nil, err } @@ -3394,7 +3392,7 @@ func (c *aBCIApplicationClient) CheckTx(ctx context.Context, in *RequestCheckTx, func (c *aBCIApplicationClient) Query(ctx context.Context, in *RequestQuery, opts ...grpc.CallOption) (*ResponseQuery, error) { out := new(ResponseQuery) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Query", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Query", in, out, opts...) if err != nil { return nil, err } @@ -3403,7 +3401,7 @@ func (c *aBCIApplicationClient) Query(ctx context.Context, in *RequestQuery, opt func (c *aBCIApplicationClient) Commit(ctx context.Context, in *RequestCommit, opts ...grpc.CallOption) (*ResponseCommit, error) { out := new(ResponseCommit) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Commit", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Commit", in, out, opts...) if err != nil { return nil, err } @@ -3412,7 +3410,7 @@ func (c *aBCIApplicationClient) Commit(ctx context.Context, in *RequestCommit, o func (c *aBCIApplicationClient) InitChain(ctx context.Context, in *RequestInitChain, opts ...grpc.CallOption) (*ResponseInitChain, error) { out := new(ResponseInitChain) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/InitChain", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/InitChain", in, out, opts...) if err != nil { return nil, err } @@ -3421,7 +3419,7 @@ func (c *aBCIApplicationClient) InitChain(ctx context.Context, in *RequestInitCh func (c *aBCIApplicationClient) BeginBlock(ctx context.Context, in *RequestBeginBlock, opts ...grpc.CallOption) (*ResponseBeginBlock, error) { out := new(ResponseBeginBlock) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/BeginBlock", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/BeginBlock", in, out, opts...) if err != nil { return nil, err } @@ -3430,7 +3428,7 @@ func (c *aBCIApplicationClient) BeginBlock(ctx context.Context, in *RequestBegin func (c *aBCIApplicationClient) EndBlock(ctx context.Context, in *RequestEndBlock, opts ...grpc.CallOption) (*ResponseEndBlock, error) { out := new(ResponseEndBlock) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/EndBlock", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/EndBlock", in, out, opts...) if err != nil { return nil, err } @@ -3439,7 +3437,7 @@ func (c *aBCIApplicationClient) EndBlock(ctx context.Context, in *RequestEndBloc func (c *aBCIApplicationClient) ListSnapshots(ctx context.Context, in *RequestListSnapshots, opts ...grpc.CallOption) (*ResponseListSnapshots, error) { out := new(ResponseListSnapshots) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/ListSnapshots", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ListSnapshots", in, out, opts...) if err != nil { return nil, err } @@ -3448,7 +3446,7 @@ func (c *aBCIApplicationClient) ListSnapshots(ctx context.Context, in *RequestLi func (c *aBCIApplicationClient) OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) { out := new(ResponseOfferSnapshot) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/OfferSnapshot", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/OfferSnapshot", in, out, opts...) if err != nil { return nil, err } @@ -3457,7 +3455,7 @@ func (c *aBCIApplicationClient) OfferSnapshot(ctx context.Context, in *RequestOf func (c *aBCIApplicationClient) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) { out := new(ResponseLoadSnapshotChunk) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/LoadSnapshotChunk", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/LoadSnapshotChunk", in, out, opts...) if err != nil { return nil, err } @@ -3466,7 +3464,7 @@ func (c *aBCIApplicationClient) LoadSnapshotChunk(ctx context.Context, in *Reque func (c *aBCIApplicationClient) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) { out := new(ResponseApplySnapshotChunk) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/ApplySnapshotChunk", in, out, opts...) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ApplySnapshotChunk", in, out, opts...) if err != nil { return nil, err } @@ -3556,7 +3554,7 @@ func _ABCIApplication_Echo_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/Echo", + FullMethod: "/tendermint.abci.ABCIApplication/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Echo(ctx, req.(*RequestEcho)) @@ -3574,7 +3572,7 @@ func _ABCIApplication_Flush_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/Flush", + FullMethod: "/tendermint.abci.ABCIApplication/Flush", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Flush(ctx, req.(*RequestFlush)) @@ -3592,7 +3590,7 @@ func _ABCIApplication_Info_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/Info", + FullMethod: "/tendermint.abci.ABCIApplication/Info", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Info(ctx, req.(*RequestInfo)) @@ -3610,7 +3608,7 @@ func _ABCIApplication_SetOption_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/SetOption", + FullMethod: "/tendermint.abci.ABCIApplication/SetOption", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).SetOption(ctx, req.(*RequestSetOption)) @@ -3628,7 +3626,7 @@ func _ABCIApplication_DeliverTx_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/DeliverTx", + FullMethod: "/tendermint.abci.ABCIApplication/DeliverTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).DeliverTx(ctx, req.(*RequestDeliverTx)) @@ -3646,7 +3644,7 @@ func _ABCIApplication_CheckTx_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/CheckTx", + FullMethod: "/tendermint.abci.ABCIApplication/CheckTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).CheckTx(ctx, req.(*RequestCheckTx)) @@ -3664,7 +3662,7 @@ func _ABCIApplication_Query_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/Query", + FullMethod: "/tendermint.abci.ABCIApplication/Query", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Query(ctx, req.(*RequestQuery)) @@ -3682,7 +3680,7 @@ func _ABCIApplication_Commit_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/Commit", + FullMethod: "/tendermint.abci.ABCIApplication/Commit", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Commit(ctx, req.(*RequestCommit)) @@ -3700,7 +3698,7 @@ func _ABCIApplication_InitChain_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/InitChain", + FullMethod: "/tendermint.abci.ABCIApplication/InitChain", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).InitChain(ctx, req.(*RequestInitChain)) @@ -3718,7 +3716,7 @@ func _ABCIApplication_BeginBlock_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/BeginBlock", + FullMethod: "/tendermint.abci.ABCIApplication/BeginBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).BeginBlock(ctx, req.(*RequestBeginBlock)) @@ -3736,7 +3734,7 @@ func _ABCIApplication_EndBlock_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/EndBlock", + FullMethod: "/tendermint.abci.ABCIApplication/EndBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).EndBlock(ctx, req.(*RequestEndBlock)) @@ -3754,7 +3752,7 @@ func _ABCIApplication_ListSnapshots_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/ListSnapshots", + FullMethod: "/tendermint.abci.ABCIApplication/ListSnapshots", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).ListSnapshots(ctx, req.(*RequestListSnapshots)) @@ -3772,7 +3770,7 @@ func _ABCIApplication_OfferSnapshot_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/OfferSnapshot", + FullMethod: "/tendermint.abci.ABCIApplication/OfferSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).OfferSnapshot(ctx, req.(*RequestOfferSnapshot)) @@ -3790,7 +3788,7 @@ func _ABCIApplication_LoadSnapshotChunk_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/LoadSnapshotChunk", + FullMethod: "/tendermint.abci.ABCIApplication/LoadSnapshotChunk", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).LoadSnapshotChunk(ctx, req.(*RequestLoadSnapshotChunk)) @@ -3808,7 +3806,7 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/ApplySnapshotChunk", + FullMethod: "/tendermint.abci.ABCIApplication/ApplySnapshotChunk", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).ApplySnapshotChunk(ctx, req.(*RequestApplySnapshotChunk)) @@ -3817,7 +3815,7 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co } var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.abci.types.ABCIApplication", + ServiceName: "tendermint.abci.ABCIApplication", HandlerType: (*ABCIApplicationServer)(nil), Methods: []grpc.MethodDesc{ { @@ -3882,7 +3880,7 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "proto/abci/types.proto", + Metadata: "tendermint/abci/abci.proto", } func (m *Request) Marshal() (dAtA []byte, err error) { @@ -3931,7 +3929,7 @@ func (m *Request_Echo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -3952,7 +3950,7 @@ func (m *Request_Flush) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -3973,7 +3971,7 @@ func (m *Request_Info) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x22 @@ -3994,7 +3992,7 @@ func (m *Request_SetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x2a @@ -4015,7 +4013,7 @@ func (m *Request_InitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x32 @@ -4036,7 +4034,7 @@ func (m *Request_Query) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x3a @@ -4057,7 +4055,7 @@ func (m *Request_BeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x42 @@ -4078,7 +4076,7 @@ func (m *Request_CheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x4a @@ -4099,7 +4097,7 @@ func (m *Request_EndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x5a @@ -4120,7 +4118,7 @@ func (m *Request_Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x62 @@ -4141,7 +4139,7 @@ func (m *Request_ListSnapshots) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x6a @@ -4162,7 +4160,7 @@ func (m *Request_OfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x72 @@ -4183,7 +4181,7 @@ func (m *Request_LoadSnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x7a @@ -4204,7 +4202,7 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1 @@ -4227,7 +4225,7 @@ func (m *Request_DeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1 @@ -4259,7 +4257,7 @@ func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Message) > 0 { i -= len(m.Message) copy(dAtA[i:], m.Message) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Message))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Message))) i-- dAtA[i] = 0xa } @@ -4310,19 +4308,19 @@ func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.P2PVersion != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.P2PVersion)) + i = encodeVarintAbci(dAtA, i, uint64(m.P2PVersion)) i-- dAtA[i] = 0x18 } if m.BlockVersion != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.BlockVersion)) + i = encodeVarintAbci(dAtA, i, uint64(m.BlockVersion)) i-- dAtA[i] = 0x10 } if len(m.Version) > 0 { i -= len(m.Version) copy(dAtA[i:], m.Version) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Version))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Version))) i-- dAtA[i] = 0xa } @@ -4352,14 +4350,14 @@ func (m *RequestSetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Value) > 0 { i -= len(m.Value) copy(dAtA[i:], m.Value) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Value))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Value))) 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 = encodeVarintAbci(dAtA, i, uint64(len(m.Key))) i-- dAtA[i] = 0xa } @@ -4389,7 +4387,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.AppStateBytes) > 0 { i -= len(m.AppStateBytes) copy(dAtA[i:], m.AppStateBytes) - i = encodeVarintTypes(dAtA, i, uint64(len(m.AppStateBytes))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.AppStateBytes))) i-- dAtA[i] = 0x2a } @@ -4401,7 +4399,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x22 @@ -4414,7 +4412,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -4422,7 +4420,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.ChainId) > 0 { i -= len(m.ChainId) copy(dAtA[i:], m.ChainId) - i = encodeVarintTypes(dAtA, i, uint64(len(m.ChainId))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.ChainId))) i-- dAtA[i] = 0x12 } @@ -4431,7 +4429,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err17 } i -= n17 - i = encodeVarintTypes(dAtA, i, uint64(n17)) + i = encodeVarintAbci(dAtA, i, uint64(n17)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -4468,21 +4466,21 @@ func (m *RequestQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x20 } if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x18 } if len(m.Path) > 0 { i -= len(m.Path) copy(dAtA[i:], m.Path) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Path))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Path))) i-- dAtA[i] = 0x12 } if len(m.Data) > 0 { i -= len(m.Data) copy(dAtA[i:], m.Data) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Data))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Data))) i-- dAtA[i] = 0xa } @@ -4517,7 +4515,7 @@ func (m *RequestBeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x22 @@ -4529,7 +4527,7 @@ func (m *RequestBeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -4539,14 +4537,14 @@ func (m *RequestBeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 if len(m.Hash) > 0 { i -= len(m.Hash) copy(dAtA[i:], m.Hash) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Hash))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Hash))) i-- dAtA[i] = 0xa } @@ -4574,14 +4572,14 @@ func (m *RequestCheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.Type != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Type)) + i = encodeVarintAbci(dAtA, i, uint64(m.Type)) i-- dAtA[i] = 0x10 } if len(m.Tx) > 0 { i -= len(m.Tx) copy(dAtA[i:], m.Tx) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Tx))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Tx))) i-- dAtA[i] = 0xa } @@ -4611,7 +4609,7 @@ func (m *RequestDeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Tx) > 0 { i -= len(m.Tx) copy(dAtA[i:], m.Tx) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Tx))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Tx))) i-- dAtA[i] = 0xa } @@ -4639,7 +4637,7 @@ func (m *RequestEndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 } @@ -4715,7 +4713,7 @@ func (m *RequestOfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.AppHash) > 0 { i -= len(m.AppHash) copy(dAtA[i:], m.AppHash) - i = encodeVarintTypes(dAtA, i, uint64(len(m.AppHash))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.AppHash))) i-- dAtA[i] = 0x12 } @@ -4726,7 +4724,7 @@ func (m *RequestOfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -4755,17 +4753,17 @@ func (m *RequestLoadSnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, error var l int _ = l if m.Chunk != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Chunk)) + i = encodeVarintAbci(dAtA, i, uint64(m.Chunk)) i-- dAtA[i] = 0x18 } if m.Format != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Format)) + i = encodeVarintAbci(dAtA, i, uint64(m.Format)) i-- dAtA[i] = 0x10 } if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 } @@ -4795,19 +4793,19 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro if len(m.Sender) > 0 { i -= len(m.Sender) copy(dAtA[i:], m.Sender) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Sender))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Sender))) i-- dAtA[i] = 0x1a } if len(m.Chunk) > 0 { i -= len(m.Chunk) copy(dAtA[i:], m.Chunk) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Chunk))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Chunk))) i-- dAtA[i] = 0x12 } if m.Index != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Index)) + i = encodeVarintAbci(dAtA, i, uint64(m.Index)) i-- dAtA[i] = 0x8 } @@ -4860,7 +4858,7 @@ func (m *Response_Exception) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -4881,7 +4879,7 @@ func (m *Response_Echo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -4902,7 +4900,7 @@ func (m *Response_Flush) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -4923,7 +4921,7 @@ func (m *Response_Info) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x22 @@ -4944,7 +4942,7 @@ func (m *Response_SetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x2a @@ -4965,7 +4963,7 @@ func (m *Response_InitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x32 @@ -4986,7 +4984,7 @@ func (m *Response_Query) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x3a @@ -5007,7 +5005,7 @@ func (m *Response_BeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x42 @@ -5028,7 +5026,7 @@ func (m *Response_CheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x4a @@ -5049,7 +5047,7 @@ func (m *Response_DeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x52 @@ -5070,7 +5068,7 @@ func (m *Response_EndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x5a @@ -5091,7 +5089,7 @@ func (m *Response_Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x62 @@ -5112,7 +5110,7 @@ func (m *Response_ListSnapshots) MarshalToSizedBuffer(dAtA []byte) (int, error) return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x6a @@ -5133,7 +5131,7 @@ func (m *Response_OfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x72 @@ -5154,7 +5152,7 @@ func (m *Response_LoadSnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x7a @@ -5175,7 +5173,7 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1 @@ -5207,7 +5205,7 @@ func (m *ResponseException) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Error) > 0 { i -= len(m.Error) copy(dAtA[i:], m.Error) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Error))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Error))) i-- dAtA[i] = 0xa } @@ -5237,7 +5235,7 @@ func (m *ResponseEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Message) > 0 { i -= len(m.Message) copy(dAtA[i:], m.Message) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Message))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Message))) i-- dAtA[i] = 0xa } @@ -5290,31 +5288,31 @@ func (m *ResponseInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.LastBlockAppHash) > 0 { i -= len(m.LastBlockAppHash) copy(dAtA[i:], m.LastBlockAppHash) - i = encodeVarintTypes(dAtA, i, uint64(len(m.LastBlockAppHash))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.LastBlockAppHash))) i-- dAtA[i] = 0x2a } if m.LastBlockHeight != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.LastBlockHeight)) + i = encodeVarintAbci(dAtA, i, uint64(m.LastBlockHeight)) i-- dAtA[i] = 0x20 } if m.AppVersion != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.AppVersion)) + i = encodeVarintAbci(dAtA, i, uint64(m.AppVersion)) i-- dAtA[i] = 0x18 } if len(m.Version) > 0 { i -= len(m.Version) copy(dAtA[i:], m.Version) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Version))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Version))) i-- dAtA[i] = 0x12 } if len(m.Data) > 0 { i -= len(m.Data) copy(dAtA[i:], m.Data) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Data))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Data))) i-- dAtA[i] = 0xa } @@ -5344,19 +5342,19 @@ func (m *ResponseSetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Info))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Info))) i-- dAtA[i] = 0x22 } if len(m.Log) > 0 { i -= len(m.Log) copy(dAtA[i:], m.Log) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Log))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Log))) i-- dAtA[i] = 0x1a } if m.Code != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + i = encodeVarintAbci(dAtA, i, uint64(m.Code)) i-- dAtA[i] = 0x8 } @@ -5391,7 +5389,7 @@ func (m *ResponseInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -5404,7 +5402,7 @@ func (m *ResponseInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -5435,12 +5433,12 @@ func (m *ResponseQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Codespace) > 0 { i -= len(m.Codespace) copy(dAtA[i:], m.Codespace) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Codespace))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Codespace))) i-- dAtA[i] = 0x52 } if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x48 } @@ -5451,7 +5449,7 @@ func (m *ResponseQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x42 @@ -5459,38 +5457,38 @@ func (m *ResponseQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Value) > 0 { i -= len(m.Value) copy(dAtA[i:], m.Value) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Value))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Value))) i-- dAtA[i] = 0x3a } if len(m.Key) > 0 { i -= len(m.Key) copy(dAtA[i:], m.Key) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Key))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Key))) i-- dAtA[i] = 0x32 } if m.Index != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Index)) + i = encodeVarintAbci(dAtA, i, uint64(m.Index)) i-- dAtA[i] = 0x28 } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Info))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Info))) i-- dAtA[i] = 0x22 } if len(m.Log) > 0 { i -= len(m.Log) copy(dAtA[i:], m.Log) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Log))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Log))) i-- dAtA[i] = 0x1a } if m.Code != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + i = encodeVarintAbci(dAtA, i, uint64(m.Code)) i-- dAtA[i] = 0x8 } @@ -5525,7 +5523,7 @@ func (m *ResponseBeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -5557,7 +5555,7 @@ func (m *ResponseCheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Codespace) > 0 { i -= len(m.Codespace) copy(dAtA[i:], m.Codespace) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Codespace))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Codespace))) i-- dAtA[i] = 0x42 } @@ -5569,45 +5567,45 @@ func (m *ResponseCheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x3a } } if m.GasUsed != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.GasUsed)) + i = encodeVarintAbci(dAtA, i, uint64(m.GasUsed)) i-- dAtA[i] = 0x30 } if m.GasWanted != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.GasWanted)) + i = encodeVarintAbci(dAtA, i, uint64(m.GasWanted)) i-- dAtA[i] = 0x28 } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Info))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Info))) i-- dAtA[i] = 0x22 } if len(m.Log) > 0 { i -= len(m.Log) copy(dAtA[i:], m.Log) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Log))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Log))) i-- dAtA[i] = 0x1a } if len(m.Data) > 0 { i -= len(m.Data) copy(dAtA[i:], m.Data) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Data))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Data))) i-- dAtA[i] = 0x12 } if m.Code != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + i = encodeVarintAbci(dAtA, i, uint64(m.Code)) i-- dAtA[i] = 0x8 } @@ -5637,7 +5635,7 @@ func (m *ResponseDeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Codespace) > 0 { i -= len(m.Codespace) copy(dAtA[i:], m.Codespace) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Codespace))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Codespace))) i-- dAtA[i] = 0x42 } @@ -5649,45 +5647,45 @@ func (m *ResponseDeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x3a } } if m.GasUsed != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.GasUsed)) + i = encodeVarintAbci(dAtA, i, uint64(m.GasUsed)) i-- dAtA[i] = 0x30 } if m.GasWanted != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.GasWanted)) + i = encodeVarintAbci(dAtA, i, uint64(m.GasWanted)) i-- dAtA[i] = 0x28 } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Info))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Info))) i-- dAtA[i] = 0x22 } if len(m.Log) > 0 { i -= len(m.Log) copy(dAtA[i:], m.Log) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Log))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Log))) i-- dAtA[i] = 0x1a } if len(m.Data) > 0 { i -= len(m.Data) copy(dAtA[i:], m.Data) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Data))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Data))) i-- dAtA[i] = 0x12 } if m.Code != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + i = encodeVarintAbci(dAtA, i, uint64(m.Code)) i-- dAtA[i] = 0x8 } @@ -5722,7 +5720,7 @@ func (m *ResponseEndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -5735,7 +5733,7 @@ func (m *ResponseEndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -5748,7 +5746,7 @@ func (m *ResponseEndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -5778,14 +5776,14 @@ func (m *ResponseCommit) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.RetainHeight != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.RetainHeight)) + i = encodeVarintAbci(dAtA, i, uint64(m.RetainHeight)) i-- dAtA[i] = 0x18 } if len(m.Data) > 0 { i -= len(m.Data) copy(dAtA[i:], m.Data) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Data))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Data))) i-- dAtA[i] = 0x12 } @@ -5820,7 +5818,7 @@ func (m *ResponseListSnapshots) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -5850,7 +5848,7 @@ func (m *ResponseOfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.Result != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i = encodeVarintAbci(dAtA, i, uint64(m.Result)) i-- dAtA[i] = 0x8 } @@ -5880,7 +5878,7 @@ func (m *ResponseLoadSnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro if len(m.Chunk) > 0 { i -= len(m.Chunk) copy(dAtA[i:], m.Chunk) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Chunk))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Chunk))) i-- dAtA[i] = 0xa } @@ -5911,7 +5909,7 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err for iNdEx := len(m.RejectSenders) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.RejectSenders[iNdEx]) copy(dAtA[i:], m.RejectSenders[iNdEx]) - i = encodeVarintTypes(dAtA, i, uint64(len(m.RejectSenders[iNdEx]))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.RejectSenders[iNdEx]))) i-- dAtA[i] = 0x1a } @@ -5930,12 +5928,12 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } i -= j40 copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintTypes(dAtA, i, uint64(j40)) + i = encodeVarintAbci(dAtA, i, uint64(j40)) i-- dAtA[i] = 0x12 } if m.Result != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i = encodeVarintAbci(dAtA, i, uint64(m.Result)) i-- dAtA[i] = 0x8 } @@ -5969,7 +5967,7 @@ func (m *ConsensusParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x1a @@ -5981,7 +5979,7 @@ func (m *ConsensusParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -5993,7 +5991,7 @@ func (m *ConsensusParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -6022,12 +6020,12 @@ func (m *BlockParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.MaxGas != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.MaxGas)) + i = encodeVarintAbci(dAtA, i, uint64(m.MaxGas)) i-- dAtA[i] = 0x10 } if m.MaxBytes != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.MaxBytes)) + i = encodeVarintAbci(dAtA, i, uint64(m.MaxBytes)) i-- dAtA[i] = 0x8 } @@ -6062,14 +6060,14 @@ func (m *LastCommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 } } if m.Round != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Round)) + i = encodeVarintAbci(dAtA, i, uint64(m.Round)) i-- dAtA[i] = 0x8 } @@ -6109,14 +6107,14 @@ func (m *EventAttribute) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Value) > 0 { i -= len(m.Value) copy(dAtA[i:], m.Value) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Value))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Value))) 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 = encodeVarintAbci(dAtA, i, uint64(len(m.Key))) i-- dAtA[i] = 0xa } @@ -6151,7 +6149,7 @@ func (m *Event) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -6160,7 +6158,7 @@ func (m *Event) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Type) > 0 { i -= len(m.Type) copy(dAtA[i:], m.Type) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Type))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Type))) i-- dAtA[i] = 0xa } @@ -6193,24 +6191,24 @@ func (m *TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x22 if len(m.Tx) > 0 { i -= len(m.Tx) copy(dAtA[i:], m.Tx) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Tx))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Tx))) i-- dAtA[i] = 0x1a } if m.Index != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Index)) + i = encodeVarintAbci(dAtA, i, uint64(m.Index)) i-- dAtA[i] = 0x10 } if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 } @@ -6238,14 +6236,14 @@ func (m *Validator) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.Power != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Power)) + i = encodeVarintAbci(dAtA, i, uint64(m.Power)) i-- dAtA[i] = 0x18 } if len(m.Address) > 0 { i -= len(m.Address) copy(dAtA[i:], m.Address) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Address))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } @@ -6273,7 +6271,7 @@ func (m *ValidatorUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.Power != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Power)) + i = encodeVarintAbci(dAtA, i, uint64(m.Power)) i-- dAtA[i] = 0x10 } @@ -6283,7 +6281,7 @@ func (m *ValidatorUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -6326,7 +6324,7 @@ func (m *VoteInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -6354,7 +6352,7 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.TotalVotingPower != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.TotalVotingPower)) + i = encodeVarintAbci(dAtA, i, uint64(m.TotalVotingPower)) i-- dAtA[i] = 0x28 } @@ -6363,11 +6361,11 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err48 } i -= n48 - i = encodeVarintTypes(dAtA, i, uint64(n48)) + i = encodeVarintAbci(dAtA, i, uint64(n48)) i-- dAtA[i] = 0x22 if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x18 } @@ -6377,14 +6375,14 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i = encodeVarintAbci(dAtA, i, uint64(size)) } 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 = encodeVarintAbci(dAtA, i, uint64(len(m.Type))) i-- dAtA[i] = 0xa } @@ -6414,37 +6412,37 @@ func (m *Snapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Metadata) > 0 { i -= len(m.Metadata) copy(dAtA[i:], m.Metadata) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Metadata))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Metadata))) i-- dAtA[i] = 0x2a } if len(m.Hash) > 0 { i -= len(m.Hash) copy(dAtA[i:], m.Hash) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Hash))) + i = encodeVarintAbci(dAtA, i, uint64(len(m.Hash))) i-- dAtA[i] = 0x22 } if m.Chunks != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Chunks)) + i = encodeVarintAbci(dAtA, i, uint64(m.Chunks)) i-- dAtA[i] = 0x18 } if m.Format != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Format)) + i = encodeVarintAbci(dAtA, i, uint64(m.Format)) i-- dAtA[i] = 0x10 } if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintAbci(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { - offset -= sovTypes(v) +func encodeVarintAbci(dAtA []byte, offset int, v uint64) int { + offset -= sovAbci(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -6474,7 +6472,7 @@ func (m *Request_Echo) Size() (n int) { _ = l if m.Echo != nil { l = m.Echo.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6486,7 +6484,7 @@ func (m *Request_Flush) Size() (n int) { _ = l if m.Flush != nil { l = m.Flush.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6498,7 +6496,7 @@ func (m *Request_Info) Size() (n int) { _ = l if m.Info != nil { l = m.Info.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6510,7 +6508,7 @@ func (m *Request_SetOption) Size() (n int) { _ = l if m.SetOption != nil { l = m.SetOption.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6522,7 +6520,7 @@ func (m *Request_InitChain) Size() (n int) { _ = l if m.InitChain != nil { l = m.InitChain.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6534,7 +6532,7 @@ func (m *Request_Query) Size() (n int) { _ = l if m.Query != nil { l = m.Query.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6546,7 +6544,7 @@ func (m *Request_BeginBlock) Size() (n int) { _ = l if m.BeginBlock != nil { l = m.BeginBlock.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6558,7 +6556,7 @@ func (m *Request_CheckTx) Size() (n int) { _ = l if m.CheckTx != nil { l = m.CheckTx.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6570,7 +6568,7 @@ func (m *Request_EndBlock) Size() (n int) { _ = l if m.EndBlock != nil { l = m.EndBlock.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6582,7 +6580,7 @@ func (m *Request_Commit) Size() (n int) { _ = l if m.Commit != nil { l = m.Commit.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6594,7 +6592,7 @@ func (m *Request_ListSnapshots) Size() (n int) { _ = l if m.ListSnapshots != nil { l = m.ListSnapshots.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6606,7 +6604,7 @@ func (m *Request_OfferSnapshot) Size() (n int) { _ = l if m.OfferSnapshot != nil { l = m.OfferSnapshot.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6618,7 +6616,7 @@ func (m *Request_LoadSnapshotChunk) Size() (n int) { _ = l if m.LoadSnapshotChunk != nil { l = m.LoadSnapshotChunk.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6630,7 +6628,7 @@ func (m *Request_ApplySnapshotChunk) Size() (n int) { _ = l if m.ApplySnapshotChunk != nil { l = m.ApplySnapshotChunk.Size() - n += 2 + l + sovTypes(uint64(l)) + n += 2 + l + sovAbci(uint64(l)) } return n } @@ -6642,7 +6640,7 @@ func (m *Request_DeliverTx) Size() (n int) { _ = l if m.DeliverTx != nil { l = m.DeliverTx.Size() - n += 2 + l + sovTypes(uint64(l)) + n += 2 + l + sovAbci(uint64(l)) } return n } @@ -6654,7 +6652,7 @@ func (m *RequestEcho) Size() (n int) { _ = l l = len(m.Message) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6676,13 +6674,13 @@ func (m *RequestInfo) Size() (n int) { _ = l l = len(m.Version) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.BlockVersion != 0 { - n += 1 + sovTypes(uint64(m.BlockVersion)) + n += 1 + sovAbci(uint64(m.BlockVersion)) } if m.P2PVersion != 0 { - n += 1 + sovTypes(uint64(m.P2PVersion)) + n += 1 + sovAbci(uint64(m.P2PVersion)) } return n } @@ -6695,11 +6693,11 @@ func (m *RequestSetOption) Size() (n int) { _ = l l = len(m.Key) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Value) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6711,24 +6709,24 @@ func (m *RequestInitChain) Size() (n int) { var l int _ = l l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) l = len(m.ChainId) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.ConsensusParams != nil { l = m.ConsensusParams.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if len(m.Validators) > 0 { for _, e := range m.Validators { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } l = len(m.AppStateBytes) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6741,14 +6739,14 @@ func (m *RequestQuery) Size() (n int) { _ = l l = len(m.Data) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Path) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } if m.Prove { n += 2 @@ -6764,16 +6762,16 @@ func (m *RequestBeginBlock) Size() (n int) { _ = l l = len(m.Hash) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = m.Header.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) l = m.LastCommitInfo.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) if len(m.ByzantineValidators) > 0 { for _, e := range m.ByzantineValidators { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -6787,10 +6785,10 @@ func (m *RequestCheckTx) Size() (n int) { _ = l l = len(m.Tx) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Type != 0 { - n += 1 + sovTypes(uint64(m.Type)) + n += 1 + sovAbci(uint64(m.Type)) } return n } @@ -6803,7 +6801,7 @@ func (m *RequestDeliverTx) Size() (n int) { _ = l l = len(m.Tx) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6815,7 +6813,7 @@ func (m *RequestEndBlock) Size() (n int) { var l int _ = l if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } return n } @@ -6846,11 +6844,11 @@ func (m *RequestOfferSnapshot) Size() (n int) { _ = l if m.Snapshot != nil { l = m.Snapshot.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.AppHash) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6862,13 +6860,13 @@ func (m *RequestLoadSnapshotChunk) Size() (n int) { var l int _ = l if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } if m.Format != 0 { - n += 1 + sovTypes(uint64(m.Format)) + n += 1 + sovAbci(uint64(m.Format)) } if m.Chunk != 0 { - n += 1 + sovTypes(uint64(m.Chunk)) + n += 1 + sovAbci(uint64(m.Chunk)) } return n } @@ -6880,15 +6878,15 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { var l int _ = l if m.Index != 0 { - n += 1 + sovTypes(uint64(m.Index)) + n += 1 + sovAbci(uint64(m.Index)) } l = len(m.Chunk) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Sender) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6913,7 +6911,7 @@ func (m *Response_Exception) Size() (n int) { _ = l if m.Exception != nil { l = m.Exception.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6925,7 +6923,7 @@ func (m *Response_Echo) Size() (n int) { _ = l if m.Echo != nil { l = m.Echo.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6937,7 +6935,7 @@ func (m *Response_Flush) Size() (n int) { _ = l if m.Flush != nil { l = m.Flush.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6949,7 +6947,7 @@ func (m *Response_Info) Size() (n int) { _ = l if m.Info != nil { l = m.Info.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6961,7 +6959,7 @@ func (m *Response_SetOption) Size() (n int) { _ = l if m.SetOption != nil { l = m.SetOption.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6973,7 +6971,7 @@ func (m *Response_InitChain) Size() (n int) { _ = l if m.InitChain != nil { l = m.InitChain.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6985,7 +6983,7 @@ func (m *Response_Query) Size() (n int) { _ = l if m.Query != nil { l = m.Query.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -6997,7 +6995,7 @@ func (m *Response_BeginBlock) Size() (n int) { _ = l if m.BeginBlock != nil { l = m.BeginBlock.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7009,7 +7007,7 @@ func (m *Response_CheckTx) Size() (n int) { _ = l if m.CheckTx != nil { l = m.CheckTx.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7021,7 +7019,7 @@ func (m *Response_DeliverTx) Size() (n int) { _ = l if m.DeliverTx != nil { l = m.DeliverTx.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7033,7 +7031,7 @@ func (m *Response_EndBlock) Size() (n int) { _ = l if m.EndBlock != nil { l = m.EndBlock.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7045,7 +7043,7 @@ func (m *Response_Commit) Size() (n int) { _ = l if m.Commit != nil { l = m.Commit.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7057,7 +7055,7 @@ func (m *Response_ListSnapshots) Size() (n int) { _ = l if m.ListSnapshots != nil { l = m.ListSnapshots.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7069,7 +7067,7 @@ func (m *Response_OfferSnapshot) Size() (n int) { _ = l if m.OfferSnapshot != nil { l = m.OfferSnapshot.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7081,7 +7079,7 @@ func (m *Response_LoadSnapshotChunk) Size() (n int) { _ = l if m.LoadSnapshotChunk != nil { l = m.LoadSnapshotChunk.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7093,7 +7091,7 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { _ = l if m.ApplySnapshotChunk != nil { l = m.ApplySnapshotChunk.Size() - n += 2 + l + sovTypes(uint64(l)) + n += 2 + l + sovAbci(uint64(l)) } return n } @@ -7105,7 +7103,7 @@ func (m *ResponseException) Size() (n int) { _ = l l = len(m.Error) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7118,7 +7116,7 @@ func (m *ResponseEcho) Size() (n int) { _ = l l = len(m.Message) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7140,21 +7138,21 @@ func (m *ResponseInfo) Size() (n int) { _ = l l = len(m.Data) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Version) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.AppVersion != 0 { - n += 1 + sovTypes(uint64(m.AppVersion)) + n += 1 + sovAbci(uint64(m.AppVersion)) } if m.LastBlockHeight != 0 { - n += 1 + sovTypes(uint64(m.LastBlockHeight)) + n += 1 + sovAbci(uint64(m.LastBlockHeight)) } l = len(m.LastBlockAppHash) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7166,15 +7164,15 @@ func (m *ResponseSetOption) Size() (n int) { var l int _ = l if m.Code != 0 { - n += 1 + sovTypes(uint64(m.Code)) + n += 1 + sovAbci(uint64(m.Code)) } l = len(m.Log) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Info) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7187,12 +7185,12 @@ func (m *ResponseInitChain) Size() (n int) { _ = l if m.ConsensusParams != nil { l = m.ConsensusParams.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if len(m.Validators) > 0 { for _, e := range m.Validators { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7205,37 +7203,37 @@ func (m *ResponseQuery) Size() (n int) { var l int _ = l if m.Code != 0 { - n += 1 + sovTypes(uint64(m.Code)) + n += 1 + sovAbci(uint64(m.Code)) } l = len(m.Log) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Info) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Index != 0 { - n += 1 + sovTypes(uint64(m.Index)) + n += 1 + sovAbci(uint64(m.Index)) } l = len(m.Key) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Value) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.ProofOps != nil { l = m.ProofOps.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } l = len(m.Codespace) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7249,7 +7247,7 @@ func (m *ResponseBeginBlock) Size() (n int) { if len(m.Events) > 0 { for _, e := range m.Events { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7262,35 +7260,35 @@ func (m *ResponseCheckTx) Size() (n int) { var l int _ = l if m.Code != 0 { - n += 1 + sovTypes(uint64(m.Code)) + n += 1 + sovAbci(uint64(m.Code)) } l = len(m.Data) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Log) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Info) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.GasWanted != 0 { - n += 1 + sovTypes(uint64(m.GasWanted)) + n += 1 + sovAbci(uint64(m.GasWanted)) } if m.GasUsed != 0 { - n += 1 + sovTypes(uint64(m.GasUsed)) + n += 1 + sovAbci(uint64(m.GasUsed)) } if len(m.Events) > 0 { for _, e := range m.Events { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } l = len(m.Codespace) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7302,35 +7300,35 @@ func (m *ResponseDeliverTx) Size() (n int) { var l int _ = l if m.Code != 0 { - n += 1 + sovTypes(uint64(m.Code)) + n += 1 + sovAbci(uint64(m.Code)) } l = len(m.Data) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Log) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Info) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.GasWanted != 0 { - n += 1 + sovTypes(uint64(m.GasWanted)) + n += 1 + sovAbci(uint64(m.GasWanted)) } if m.GasUsed != 0 { - n += 1 + sovTypes(uint64(m.GasUsed)) + n += 1 + sovAbci(uint64(m.GasUsed)) } if len(m.Events) > 0 { for _, e := range m.Events { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } l = len(m.Codespace) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7344,17 +7342,17 @@ func (m *ResponseEndBlock) Size() (n int) { if len(m.ValidatorUpdates) > 0 { for _, e := range m.ValidatorUpdates { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } if m.ConsensusParamUpdates != nil { l = m.ConsensusParamUpdates.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if len(m.Events) > 0 { for _, e := range m.Events { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7368,10 +7366,10 @@ func (m *ResponseCommit) Size() (n int) { _ = l l = len(m.Data) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.RetainHeight != 0 { - n += 1 + sovTypes(uint64(m.RetainHeight)) + n += 1 + sovAbci(uint64(m.RetainHeight)) } return n } @@ -7385,7 +7383,7 @@ func (m *ResponseListSnapshots) Size() (n int) { if len(m.Snapshots) > 0 { for _, e := range m.Snapshots { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7398,7 +7396,7 @@ func (m *ResponseOfferSnapshot) Size() (n int) { var l int _ = l if m.Result != 0 { - n += 1 + sovTypes(uint64(m.Result)) + n += 1 + sovAbci(uint64(m.Result)) } return n } @@ -7411,7 +7409,7 @@ func (m *ResponseLoadSnapshotChunk) Size() (n int) { _ = l l = len(m.Chunk) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7423,19 +7421,19 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { var l int _ = l if m.Result != 0 { - n += 1 + sovTypes(uint64(m.Result)) + n += 1 + sovAbci(uint64(m.Result)) } if len(m.RefetchChunks) > 0 { l = 0 for _, e := range m.RefetchChunks { - l += sovTypes(uint64(e)) + l += sovAbci(uint64(e)) } - n += 1 + sovTypes(uint64(l)) + l + n += 1 + sovAbci(uint64(l)) + l } if len(m.RejectSenders) > 0 { for _, s := range m.RejectSenders { l = len(s) - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7449,15 +7447,15 @@ func (m *ConsensusParams) Size() (n int) { _ = l if m.Block != nil { l = m.Block.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Evidence != nil { l = m.Evidence.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Validator != nil { l = m.Validator.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } @@ -7469,10 +7467,10 @@ func (m *BlockParams) Size() (n int) { var l int _ = l if m.MaxBytes != 0 { - n += 1 + sovTypes(uint64(m.MaxBytes)) + n += 1 + sovAbci(uint64(m.MaxBytes)) } if m.MaxGas != 0 { - n += 1 + sovTypes(uint64(m.MaxGas)) + n += 1 + sovAbci(uint64(m.MaxGas)) } return n } @@ -7484,12 +7482,12 @@ func (m *LastCommitInfo) Size() (n int) { var l int _ = l if m.Round != 0 { - n += 1 + sovTypes(uint64(m.Round)) + n += 1 + sovAbci(uint64(m.Round)) } if len(m.Votes) > 0 { for _, e := range m.Votes { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7503,11 +7501,11 @@ func (m *EventAttribute) Size() (n int) { _ = l l = len(m.Key) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Value) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Index { n += 2 @@ -7523,12 +7521,12 @@ func (m *Event) Size() (n int) { _ = l l = len(m.Type) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if len(m.Attributes) > 0 { for _, e := range m.Attributes { l = e.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } } return n @@ -7541,17 +7539,17 @@ func (m *TxResult) Size() (n int) { var l int _ = l if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } if m.Index != 0 { - n += 1 + sovTypes(uint64(m.Index)) + n += 1 + sovAbci(uint64(m.Index)) } l = len(m.Tx) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = m.Result.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) return n } @@ -7563,10 +7561,10 @@ func (m *Validator) Size() (n int) { _ = l l = len(m.Address) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } if m.Power != 0 { - n += 1 + sovTypes(uint64(m.Power)) + n += 1 + sovAbci(uint64(m.Power)) } return n } @@ -7578,9 +7576,9 @@ func (m *ValidatorUpdate) Size() (n int) { var l int _ = l l = m.PubKey.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) if m.Power != 0 { - n += 1 + sovTypes(uint64(m.Power)) + n += 1 + sovAbci(uint64(m.Power)) } return n } @@ -7592,7 +7590,7 @@ func (m *VoteInfo) Size() (n int) { var l int _ = l l = m.Validator.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) if m.SignedLastBlock { n += 2 } @@ -7607,17 +7605,17 @@ func (m *Evidence) Size() (n int) { _ = l l = len(m.Type) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = m.Validator.Size() - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) if m.TotalVotingPower != 0 { - n += 1 + sovTypes(uint64(m.TotalVotingPower)) + n += 1 + sovAbci(uint64(m.TotalVotingPower)) } return n } @@ -7629,30 +7627,30 @@ func (m *Snapshot) Size() (n int) { var l int _ = l if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sovAbci(uint64(m.Height)) } if m.Format != 0 { - n += 1 + sovTypes(uint64(m.Format)) + n += 1 + sovAbci(uint64(m.Format)) } if m.Chunks != 0 { - n += 1 + sovTypes(uint64(m.Chunks)) + n += 1 + sovAbci(uint64(m.Chunks)) } l = len(m.Hash) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } l = len(m.Metadata) if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + n += 1 + l + sovAbci(uint64(l)) } return n } -func sovTypes(x uint64) (n int) { +func sovAbci(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 sozAbci(x uint64) (n int) { + return sovAbci(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *Request) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -7662,7 +7660,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7690,7 +7688,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7703,11 +7701,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7725,7 +7723,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7738,11 +7736,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7760,7 +7758,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7773,11 +7771,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7795,7 +7793,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7808,11 +7806,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7830,7 +7828,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7843,11 +7841,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7865,7 +7863,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7878,11 +7876,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7900,7 +7898,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7913,11 +7911,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7935,7 +7933,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7948,11 +7946,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -7970,7 +7968,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -7983,11 +7981,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8005,7 +8003,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8018,11 +8016,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8040,7 +8038,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8053,11 +8051,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8075,7 +8073,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8088,11 +8086,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8110,7 +8108,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8123,11 +8121,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8145,7 +8143,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8158,11 +8156,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8180,7 +8178,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8193,11 +8191,11 @@ func (m *Request) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8210,15 +8208,15 @@ func (m *Request) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8240,7 +8238,7 @@ func (m *RequestEcho) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8268,7 +8266,7 @@ func (m *RequestEcho) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8282,11 +8280,11 @@ func (m *RequestEcho) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8295,15 +8293,15 @@ func (m *RequestEcho) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8325,7 +8323,7 @@ func (m *RequestFlush) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8348,15 +8346,15 @@ func (m *RequestFlush) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8378,7 +8376,7 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8406,7 +8404,7 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8420,11 +8418,11 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8438,7 +8436,7 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { m.BlockVersion = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8457,7 +8455,7 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { m.P2PVersion = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8471,15 +8469,15 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8501,7 +8499,7 @@ func (m *RequestSetOption) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8529,7 +8527,7 @@ func (m *RequestSetOption) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8543,11 +8541,11 @@ func (m *RequestSetOption) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8561,7 +8559,7 @@ func (m *RequestSetOption) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8575,11 +8573,11 @@ func (m *RequestSetOption) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8588,15 +8586,15 @@ func (m *RequestSetOption) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8618,7 +8616,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8646,7 +8644,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8659,11 +8657,11 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8679,7 +8677,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8693,11 +8691,11 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8711,7 +8709,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8724,11 +8722,11 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8747,7 +8745,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8760,11 +8758,11 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8781,7 +8779,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8794,11 +8792,11 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8810,15 +8808,15 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8840,7 +8838,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8868,7 +8866,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8881,11 +8879,11 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8902,7 +8900,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8916,11 +8914,11 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -8934,7 +8932,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8953,7 +8951,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -8968,15 +8966,15 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { m.Prove = bool(v != 0) default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -8998,7 +8996,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9026,7 +9024,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9039,11 +9037,11 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9060,7 +9058,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9073,11 +9071,11 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9093,7 +9091,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9106,11 +9104,11 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9126,7 +9124,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9139,11 +9137,11 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9155,15 +9153,15 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9185,7 +9183,7 @@ func (m *RequestCheckTx) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9213,7 +9211,7 @@ func (m *RequestCheckTx) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9226,11 +9224,11 @@ func (m *RequestCheckTx) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9247,7 +9245,7 @@ func (m *RequestCheckTx) Unmarshal(dAtA []byte) error { m.Type = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9261,15 +9259,15 @@ func (m *RequestCheckTx) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9291,7 +9289,7 @@ func (m *RequestDeliverTx) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9319,7 +9317,7 @@ func (m *RequestDeliverTx) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9332,11 +9330,11 @@ func (m *RequestDeliverTx) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9348,15 +9346,15 @@ func (m *RequestDeliverTx) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9378,7 +9376,7 @@ func (m *RequestEndBlock) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9406,7 +9404,7 @@ func (m *RequestEndBlock) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9420,15 +9418,15 @@ func (m *RequestEndBlock) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9450,7 +9448,7 @@ func (m *RequestCommit) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9473,15 +9471,15 @@ func (m *RequestCommit) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9503,7 +9501,7 @@ func (m *RequestListSnapshots) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9526,15 +9524,15 @@ func (m *RequestListSnapshots) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9556,7 +9554,7 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9584,7 +9582,7 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9597,11 +9595,11 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9620,7 +9618,7 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9633,11 +9631,11 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9649,15 +9647,15 @@ func (m *RequestOfferSnapshot) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9679,7 +9677,7 @@ func (m *RequestLoadSnapshotChunk) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9707,7 +9705,7 @@ func (m *RequestLoadSnapshotChunk) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9726,7 +9724,7 @@ func (m *RequestLoadSnapshotChunk) Unmarshal(dAtA []byte) error { m.Format = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9745,7 +9743,7 @@ func (m *RequestLoadSnapshotChunk) Unmarshal(dAtA []byte) error { m.Chunk = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9759,15 +9757,15 @@ func (m *RequestLoadSnapshotChunk) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9789,7 +9787,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9817,7 +9815,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { m.Index = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9836,7 +9834,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9849,11 +9847,11 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9870,7 +9868,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9884,11 +9882,11 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9897,15 +9895,15 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -9927,7 +9925,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9955,7 +9953,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -9968,11 +9966,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -9990,7 +9988,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10003,11 +10001,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10025,7 +10023,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10038,11 +10036,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10060,7 +10058,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10073,11 +10071,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10095,7 +10093,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10108,11 +10106,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10130,7 +10128,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10143,11 +10141,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10165,7 +10163,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10178,11 +10176,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10200,7 +10198,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10213,11 +10211,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10235,7 +10233,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10248,11 +10246,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10270,7 +10268,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10283,11 +10281,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10305,7 +10303,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10318,11 +10316,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10340,7 +10338,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10353,11 +10351,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10375,7 +10373,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10388,11 +10386,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10410,7 +10408,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10423,11 +10421,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10445,7 +10443,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10458,11 +10456,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10480,7 +10478,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10493,11 +10491,11 @@ func (m *Response) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10510,15 +10508,15 @@ func (m *Response) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -10540,7 +10538,7 @@ func (m *ResponseException) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10568,7 +10566,7 @@ func (m *ResponseException) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10582,11 +10580,11 @@ func (m *ResponseException) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10595,15 +10593,15 @@ func (m *ResponseException) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -10625,7 +10623,7 @@ func (m *ResponseEcho) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10653,7 +10651,7 @@ func (m *ResponseEcho) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10667,11 +10665,11 @@ func (m *ResponseEcho) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10680,15 +10678,15 @@ func (m *ResponseEcho) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -10710,7 +10708,7 @@ func (m *ResponseFlush) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10733,15 +10731,15 @@ func (m *ResponseFlush) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -10763,7 +10761,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10791,7 +10789,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10805,11 +10803,11 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10823,7 +10821,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10837,11 +10835,11 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10855,7 +10853,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { m.AppVersion = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10874,7 +10872,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { m.LastBlockHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10893,7 +10891,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10906,11 +10904,11 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -10922,15 +10920,15 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -10952,7 +10950,7 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10980,7 +10978,7 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { m.Code = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -10999,7 +10997,7 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11013,11 +11011,11 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11031,7 +11029,7 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11045,11 +11043,11 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11058,15 +11056,15 @@ func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -11088,7 +11086,7 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11116,7 +11114,7 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11129,11 +11127,11 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11152,7 +11150,7 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11165,11 +11163,11 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11181,15 +11179,15 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -11211,7 +11209,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11239,7 +11237,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { m.Code = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11258,7 +11256,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11272,11 +11270,11 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11290,7 +11288,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11304,11 +11302,11 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11322,7 +11320,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { m.Index = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11341,7 +11339,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11354,11 +11352,11 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11375,7 +11373,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11388,11 +11386,11 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11409,7 +11407,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11422,11 +11420,11 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11445,7 +11443,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11464,7 +11462,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11478,11 +11476,11 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11491,15 +11489,15 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -11521,7 +11519,7 @@ func (m *ResponseBeginBlock) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11549,7 +11547,7 @@ func (m *ResponseBeginBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11562,11 +11560,11 @@ func (m *ResponseBeginBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11578,15 +11576,15 @@ func (m *ResponseBeginBlock) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -11608,7 +11606,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11636,7 +11634,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { m.Code = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11655,7 +11653,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11668,11 +11666,11 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11689,7 +11687,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11703,11 +11701,11 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11721,7 +11719,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11735,11 +11733,11 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11753,7 +11751,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { m.GasWanted = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11772,7 +11770,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { m.GasUsed = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11791,7 +11789,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11804,11 +11802,11 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11825,7 +11823,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11839,11 +11837,11 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11852,15 +11850,15 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -11882,7 +11880,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11910,7 +11908,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { m.Code = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11929,7 +11927,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11942,11 +11940,11 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11963,7 +11961,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -11977,11 +11975,11 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -11995,7 +11993,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12009,11 +12007,11 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12027,7 +12025,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { m.GasWanted = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12046,7 +12044,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { m.GasUsed = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12065,7 +12063,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12078,11 +12076,11 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12099,7 +12097,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12113,11 +12111,11 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12126,15 +12124,15 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12156,7 +12154,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12184,7 +12182,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12197,11 +12195,11 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12218,7 +12216,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12231,11 +12229,11 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12254,7 +12252,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12267,11 +12265,11 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12283,15 +12281,15 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12313,7 +12311,7 @@ func (m *ResponseCommit) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12341,7 +12339,7 @@ func (m *ResponseCommit) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12354,11 +12352,11 @@ func (m *ResponseCommit) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12375,7 +12373,7 @@ func (m *ResponseCommit) Unmarshal(dAtA []byte) error { m.RetainHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12389,15 +12387,15 @@ func (m *ResponseCommit) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12419,7 +12417,7 @@ func (m *ResponseListSnapshots) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12447,7 +12445,7 @@ func (m *ResponseListSnapshots) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12460,11 +12458,11 @@ func (m *ResponseListSnapshots) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12476,15 +12474,15 @@ func (m *ResponseListSnapshots) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12506,7 +12504,7 @@ func (m *ResponseOfferSnapshot) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12534,7 +12532,7 @@ func (m *ResponseOfferSnapshot) Unmarshal(dAtA []byte) error { m.Result = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12548,15 +12546,15 @@ func (m *ResponseOfferSnapshot) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12578,7 +12576,7 @@ func (m *ResponseLoadSnapshotChunk) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12606,7 +12604,7 @@ func (m *ResponseLoadSnapshotChunk) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12619,11 +12617,11 @@ func (m *ResponseLoadSnapshotChunk) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12635,15 +12633,15 @@ func (m *ResponseLoadSnapshotChunk) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12665,7 +12663,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12693,7 +12691,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { m.Result = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12710,7 +12708,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { var v uint32 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12727,7 +12725,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { var packedLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12740,11 +12738,11 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } } if packedLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + packedLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12764,7 +12762,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { var v uint32 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12788,7 +12786,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12802,11 +12800,11 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12815,15 +12813,15 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -12845,7 +12843,7 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12873,7 +12871,7 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12886,11 +12884,11 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12909,7 +12907,7 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12922,11 +12920,11 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12945,7 +12943,7 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -12958,11 +12956,11 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -12976,15 +12974,15 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13006,7 +13004,7 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13034,7 +13032,7 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { m.MaxBytes = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13053,7 +13051,7 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { m.MaxGas = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13067,15 +13065,15 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13097,7 +13095,7 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13125,7 +13123,7 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { m.Round = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13144,7 +13142,7 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13157,11 +13155,11 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13173,15 +13171,15 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13203,7 +13201,7 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13231,7 +13229,7 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13244,11 +13242,11 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13265,7 +13263,7 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13278,11 +13276,11 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13299,7 +13297,7 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13314,15 +13312,15 @@ func (m *EventAttribute) Unmarshal(dAtA []byte) error { m.Index = bool(v != 0) default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13344,7 +13342,7 @@ func (m *Event) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13372,7 +13370,7 @@ func (m *Event) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13386,11 +13384,11 @@ func (m *Event) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13404,7 +13402,7 @@ func (m *Event) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13417,11 +13415,11 @@ func (m *Event) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13433,15 +13431,15 @@ func (m *Event) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13463,7 +13461,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13491,7 +13489,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13510,7 +13508,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { m.Index = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13529,7 +13527,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13542,11 +13540,11 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13563,7 +13561,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13576,11 +13574,11 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13591,15 +13589,15 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13621,7 +13619,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13649,7 +13647,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13662,11 +13660,11 @@ func (m *Validator) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13683,7 +13681,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { m.Power = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13697,15 +13695,15 @@ func (m *Validator) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13727,7 +13725,7 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13755,7 +13753,7 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13768,11 +13766,11 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13788,7 +13786,7 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { m.Power = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13802,15 +13800,15 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13832,7 +13830,7 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13860,7 +13858,7 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13873,11 +13871,11 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13893,7 +13891,7 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13908,15 +13906,15 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { m.SignedLastBlock = bool(v != 0) default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -13938,7 +13936,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13966,7 +13964,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -13980,11 +13978,11 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -13998,7 +13996,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14011,11 +14009,11 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -14031,7 +14029,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14050,7 +14048,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14063,11 +14061,11 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -14083,7 +14081,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { m.TotalVotingPower = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14097,15 +14095,15 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -14127,7 +14125,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14155,7 +14153,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14174,7 +14172,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { m.Format = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14193,7 +14191,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { m.Chunks = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14212,7 +14210,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14225,11 +14223,11 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -14246,7 +14244,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTypes + return ErrIntOverflowAbci } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -14259,11 +14257,11 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { } } if byteLen < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } postIndex := iNdEx + byteLen if postIndex < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if postIndex > l { return io.ErrUnexpectedEOF @@ -14275,15 +14273,15 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) + skippy, err := skipAbci(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes + return ErrInvalidLengthAbci } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -14297,7 +14295,7 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { } return nil } -func skipTypes(dAtA []byte) (n int, err error) { +func skipAbci(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -14305,7 +14303,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, ErrIntOverflowAbci } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -14322,7 +14320,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, ErrIntOverflowAbci } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -14338,7 +14336,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, ErrIntOverflowAbci } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -14351,14 +14349,14 @@ func skipTypes(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthTypes + return 0, ErrInvalidLengthAbci } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTypes + return 0, ErrUnexpectedEndOfGroupAbci } depth-- case 5: @@ -14367,7 +14365,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, ErrInvalidLengthAbci } if depth == 0 { return iNdEx, nil @@ -14377,7 +14375,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") + ErrInvalidLengthAbci = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowAbci = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupAbci = fmt.Errorf("proto: unexpected end of group") ) diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go index 03986379d..8da12cfff 100644 --- a/abci/types/messages_test.go +++ b/abci/types/messages_test.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/assert" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func TestMarshalJSON(t *testing.T) { diff --git a/blockchain/msgs.go b/blockchain/msgs.go index dfcf95e3d..cd722bc19 100644 --- a/blockchain/msgs.go +++ b/blockchain/msgs.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" "github.com/tendermint/tendermint/types" ) diff --git a/blockchain/msgs_test.go b/blockchain/msgs_test.go index 7d1ff41f3..7d998368c 100644 --- a/blockchain/msgs_test.go +++ b/blockchain/msgs_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" ) func TestBcBlockRequestMessageValidateBasic(t *testing.T) { diff --git a/blockchain/v0/reactor.go b/blockchain/v0/reactor.go index f2a19c0ef..7928a1d0a 100644 --- a/blockchain/v0/reactor.go +++ b/blockchain/v0/reactor.go @@ -8,7 +8,7 @@ import ( bc "github.com/tendermint/tendermint/blockchain" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/blockchain/v1/reactor.go b/blockchain/v1/reactor.go index 060d05635..a63974962 100644 --- a/blockchain/v1/reactor.go +++ b/blockchain/v1/reactor.go @@ -9,7 +9,7 @@ import ( bc "github.com/tendermint/tendermint/blockchain" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/blockchain/v1/reactor_test.go b/blockchain/v1/reactor_test.go index e76779e72..620b6ad2a 100644 --- a/blockchain/v1/reactor_test.go +++ b/blockchain/v1/reactor_test.go @@ -18,7 +18,7 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/p2p" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" diff --git a/blockchain/v2/io.go b/blockchain/v2/io.go index 27de3b8af..78919af04 100644 --- a/blockchain/v2/io.go +++ b/blockchain/v2/io.go @@ -5,7 +5,7 @@ import ( bc "github.com/tendermint/tendermint/blockchain" "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/blockchain/v2/reactor.go b/blockchain/v2/reactor.go index 57a692f8f..f3f0bee4c 100644 --- a/blockchain/v2/reactor.go +++ b/blockchain/v2/reactor.go @@ -10,7 +10,7 @@ import ( bc "github.com/tendermint/tendermint/blockchain" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/blockchain/v2/reactor_test.go b/blockchain/v2/reactor_test.go index 7a2f48795..dbc15aa8e 100644 --- a/blockchain/v2/reactor_test.go +++ b/blockchain/v2/reactor_test.go @@ -21,7 +21,7 @@ import ( "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p/conn" - bcproto "github.com/tendermint/tendermint/proto/blockchain" + bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" diff --git a/buf.yaml b/buf.yaml index 7349a3516..a91b4da05 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,15 +1,15 @@ build: roots: - - . + - proto + - third_party/proto lint: use: - MINIMAL - FILE_LOWER_SNAKE_CASE - UNARY_RPC - except: - - PACKAGE_DIRECTORY_MATCH + - FILE_LAYOUT ignore: - - third_party + - gogoproto breaking: use: - FILE diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index e4792fe07..0a3b75867 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/p2p" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/consensus/common_test.go b/consensus/common_test.go index ff43af3b2..1bc93e9d6 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -33,7 +33,7 @@ import ( mempl "github.com/tendermint/tendermint/mempool" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/privval" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/consensus/msgs.go b/consensus/msgs.go index 86843e7dd..4de96b5f4 100644 --- a/consensus/msgs.go +++ b/consensus/msgs.go @@ -10,8 +10,8 @@ import ( "github.com/tendermint/tendermint/libs/bits" tmmath "github.com/tendermint/tendermint/libs/math" "github.com/tendermint/tendermint/p2p" - tmcons "github.com/tendermint/tendermint/proto/consensus" - tmproto "github.com/tendermint/tendermint/proto/types" + tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/consensus/msgs_test.go b/consensus/msgs_test.go index 759503b60..657af4311 100644 --- a/consensus/msgs_test.go +++ b/consensus/msgs_test.go @@ -11,8 +11,8 @@ import ( "github.com/tendermint/tendermint/libs/bits" tmrand "github.com/tendermint/tendermint/libs/rand" "github.com/tendermint/tendermint/p2p" - tmcons "github.com/tendermint/tendermint/proto/consensus" - tmproto "github.com/tendermint/tendermint/proto/types" + tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/consensus/reactor.go b/consensus/reactor.go index 84e6c03f1..2de9fcc39 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -15,8 +15,8 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" - tmcons "github.com/tendermint/tendermint/proto/consensus" - tmproto "github.com/tendermint/tendermint/proto/types" + tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go index 952b10cd2..069350a11 100644 --- a/consensus/reactor_test.go +++ b/consensus/reactor_test.go @@ -29,7 +29,7 @@ import ( mempl "github.com/tendermint/tendermint/mempool" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p/mock" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/consensus/replay_stubs.go b/consensus/replay_stubs.go index de153ae3b..8560af2d3 100644 --- a/consensus/replay_stubs.go +++ b/consensus/replay_stubs.go @@ -4,7 +4,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/clist" mempl "github.com/tendermint/tendermint/mempool" - tmstate "github.com/tendermint/tendermint/proto/state" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/consensus/replay_test.go b/consensus/replay_test.go index cd04fdf78..a584c8a8c 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -27,8 +27,8 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" mempl "github.com/tendermint/tendermint/mempool" "github.com/tendermint/tendermint/privval" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/consensus/state.go b/consensus/state.go index c9e32b65d..86962a88e 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -23,7 +23,7 @@ import ( tmos "github.com/tendermint/tendermint/libs/os" "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/p2p" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/consensus/state_test.go b/consensus/state_test.go index 55ebf689f..8fe483591 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -17,7 +17,7 @@ import ( tmpubsub "github.com/tendermint/tendermint/libs/pubsub" tmrand "github.com/tendermint/tendermint/libs/rand" p2pmock "github.com/tendermint/tendermint/p2p/mock" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/consensus/types/height_vote_set.go b/consensus/types/height_vote_set.go index 5304bf994..6a5c0b495 100644 --- a/consensus/types/height_vote_set.go +++ b/consensus/types/height_vote_set.go @@ -9,7 +9,7 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" tmmath "github.com/tendermint/tendermint/libs/math" "github.com/tendermint/tendermint/p2p" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/consensus/types/height_vote_set_test.go b/consensus/types/height_vote_set_test.go index c9bba1b75..68c4d98c0 100644 --- a/consensus/types/height_vote_set_test.go +++ b/consensus/types/height_vote_set_test.go @@ -8,7 +8,7 @@ import ( cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto/tmhash" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/consensus/wal.go b/consensus/wal.go index 1b434b359..3670170fc 100644 --- a/consensus/wal.go +++ b/consensus/wal.go @@ -16,7 +16,7 @@ import ( "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" "github.com/tendermint/tendermint/libs/service" - tmcons "github.com/tendermint/tendermint/proto/consensus" + tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/crypto/encoding/codec.go b/crypto/encoding/codec.go index 97db1b076..bcd8717e0 100644 --- a/crypto/encoding/codec.go +++ b/crypto/encoding/codec.go @@ -6,7 +6,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" - pc "github.com/tendermint/tendermint/proto/crypto/keys" + pc "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" ) // PubKeyToProto takes crypto.PubKey and transforms it to a protobuf Pubkey diff --git a/crypto/merkle/proof.go b/crypto/merkle/proof.go index 5f869a2a6..9a64410c6 100644 --- a/crypto/merkle/proof.go +++ b/crypto/merkle/proof.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/tendermint/tendermint/crypto/tmhash" - tmmerkle "github.com/tendermint/tendermint/proto/crypto/merkle" + tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" ) const ( diff --git a/crypto/merkle/proof_op.go b/crypto/merkle/proof_op.go index 8994a2926..ea73a1356 100644 --- a/crypto/merkle/proof_op.go +++ b/crypto/merkle/proof_op.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - tmmerkle "github.com/tendermint/tendermint/proto/crypto/merkle" + tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" ) //---------------------------------------- diff --git a/crypto/merkle/proof_test.go b/crypto/merkle/proof_test.go index fd89be23f..fc502d24c 100644 --- a/crypto/merkle/proof_test.go +++ b/crypto/merkle/proof_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - tmmerkle "github.com/tendermint/tendermint/proto/crypto/merkle" + tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" ) const ProofOpDomino = "test:domino" diff --git a/crypto/merkle/proof_value.go b/crypto/merkle/proof_value.go index 9d92d6992..ef899f99f 100644 --- a/crypto/merkle/proof_value.go +++ b/crypto/merkle/proof_value.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/tendermint/tendermint/crypto/tmhash" - tmmerkle "github.com/tendermint/tendermint/proto/crypto/merkle" + tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" ) const ProofOpValue = "simple:v" diff --git a/docs/architecture/adr-055-protobuf-design.md b/docs/architecture/adr-055-protobuf-design.md index 5500fc2d8..0f71689b5 100644 --- a/docs/architecture/adr-055-protobuf-design.md +++ b/docs/architecture/adr-055-protobuf-design.md @@ -3,6 +3,7 @@ ## Changelog - 2020-4-15: Created (@marbar3778) +- 2020-6-18: Updated (@marbar3778) ## Context @@ -33,13 +34,13 @@ There are a few options to pick from: Transition Tendermint to Protobuf because of its performance and tooling. The Ecosystem behind Protobuf is vast and has outstanding [support for many languages](https://developers.google.com/protocol-buffers/docs/tutorials). -We will be making this possible by keeping the current types in there current form (handwritten) and creating a `/proto` directory in which all the `.proto` files will live. Where encoding is needed, on disk and over the wire, we will call util functions that will transition the types from handwritten go types to protobuf generated types. +We will be making this possible by keeping the current types in there current form (handwritten) and creating a `/proto` directory in which all the `.proto` files will live. Where encoding is needed, on disk and over the wire, we will call util functions that will transition the types from handwritten go types to protobuf generated types. This is inline with the recommended file structure from [buf](https://buf.build). You can find more information on this file structure [here](https://buf.build/docs/lint-checkers#file_layout). By going with this design we will enable future changes to types and allow for a more modular codebase. ## Status -Proposed +Completed ## Consequences diff --git a/evidence/pool.go b/evidence/pool.go index 4e2a4f53d..cfeb2981b 100644 --- a/evidence/pool.go +++ b/evidence/pool.go @@ -11,7 +11,7 @@ import ( clist "github.com/tendermint/tendermint/libs/clist" "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/evidence/pool_test.go b/evidence/pool_test.go index 9bb03db1d..cfcf189e0 100644 --- a/evidence/pool_test.go +++ b/evidence/pool_test.go @@ -15,7 +15,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/evidence/reactor.go b/evidence/reactor.go index 4ac9c33e4..79c909a6b 100644 --- a/evidence/reactor.go +++ b/evidence/reactor.go @@ -8,8 +8,8 @@ import ( clist "github.com/tendermint/tendermint/libs/clist" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" - ep "github.com/tendermint/tendermint/proto/evidence" - tmproto "github.com/tendermint/tendermint/proto/types" + ep "github.com/tendermint/tendermint/proto/tendermint/evidence" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/libs/bits/bit_array.go b/libs/bits/bit_array.go index 2483d76cc..b0e4ecae9 100644 --- a/libs/bits/bit_array.go +++ b/libs/bits/bit_array.go @@ -9,7 +9,7 @@ import ( tmmath "github.com/tendermint/tendermint/libs/math" tmrand "github.com/tendermint/tendermint/libs/rand" - tmprotobits "github.com/tendermint/tendermint/proto/libs/bits" + tmprotobits "github.com/tendermint/tendermint/proto/tendermint/libs/bits" ) // BitArray is a thread-safe implementation of a bit array. diff --git a/light/helpers_test.go b/light/helpers_test.go index f96d4a2dd..9e00f722c 100644 --- a/light/helpers_test.go +++ b/light/helpers_test.go @@ -6,7 +6,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/light/store/db/db.go b/light/store/db/db.go index 0875e0017..6c94324de 100644 --- a/light/store/db/db.go +++ b/light/store/db/db.go @@ -11,7 +11,7 @@ import ( dbm "github.com/tendermint/tm-db" "github.com/tendermint/tendermint/light/store" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/p2p/conn/connection.go b/p2p/conn/connection.go index dc53bcd95..ff2319871 100644 --- a/p2p/conn/connection.go +++ b/p2p/conn/connection.go @@ -21,7 +21,7 @@ import ( "github.com/tendermint/tendermint/libs/protoio" "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/libs/timer" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) const ( diff --git a/p2p/conn/connection_test.go b/p2p/conn/connection_test.go index f5fe45bde..0f6c8e20c 100644 --- a/p2p/conn/connection_test.go +++ b/p2p/conn/connection_test.go @@ -11,8 +11,8 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/protoio" - tmp2p "github.com/tendermint/tendermint/proto/p2p" - "github.com/tendermint/tendermint/proto/types" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/tendermint/tendermint/proto/tendermint/types" ) const maxPingPongPacketSize = 1024 // bytes diff --git a/p2p/conn/evil_secret_connection_test.go b/p2p/conn/evil_secret_connection_test.go index 993b07f5a..43e4d8743 100644 --- a/p2p/conn/evil_secret_connection_test.go +++ b/p2p/conn/evil_secret_connection_test.go @@ -15,7 +15,7 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/libs/protoio" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) type buffer struct { diff --git a/p2p/conn/secret_connection.go b/p2p/conn/secret_connection.go index 4d3ea3491..5e0f2d2cc 100644 --- a/p2p/conn/secret_connection.go +++ b/p2p/conn/secret_connection.go @@ -27,7 +27,7 @@ import ( cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/libs/async" "github.com/tendermint/tendermint/libs/protoio" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) // 4 + 1024 == 1028 total frame size diff --git a/p2p/netaddress.go b/p2p/netaddress.go index abc828915..5a17788ab 100644 --- a/p2p/netaddress.go +++ b/p2p/netaddress.go @@ -14,7 +14,7 @@ import ( "strings" "time" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) // NetAddress defines information about a peer on the network diff --git a/p2p/node_info.go b/p2p/node_info.go index 5e6e46e06..8acc23676 100644 --- a/p2p/node_info.go +++ b/p2p/node_info.go @@ -7,7 +7,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" tmstrings "github.com/tendermint/tendermint/libs/strings" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" "github.com/tendermint/tendermint/version" ) diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go index cb0879c11..b1987cc3f 100644 --- a/p2p/pex/pex_reactor.go +++ b/p2p/pex/pex_reactor.go @@ -14,7 +14,7 @@ import ( "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) type Peer = p2p.Peer diff --git a/p2p/pex/pex_reactor_test.go b/p2p/pex/pex_reactor_test.go index 80d6c7175..aa4db2318 100644 --- a/p2p/pex/pex_reactor_test.go +++ b/p2p/pex/pex_reactor_test.go @@ -15,7 +15,7 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p/mock" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) var ( diff --git a/p2p/transport.go b/p2p/transport.go index 3d1821744..e597ac0a1 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/protoio" "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) const ( diff --git a/p2p/transport_test.go b/p2p/transport_test.go index 30149b615..91ff75e67 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -13,7 +13,7 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/libs/protoio" "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/p2p" + tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) var defaultNodeName = "host_peer" diff --git a/privval/file.go b/privval/file.go index e07e724ac..87bffe92e 100644 --- a/privval/file.go +++ b/privval/file.go @@ -16,7 +16,7 @@ import ( tmos "github.com/tendermint/tendermint/libs/os" "github.com/tendermint/tendermint/libs/protoio" "github.com/tendermint/tendermint/libs/tempfile" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/privval/file_test.go b/privval/file_test.go index 2d60cf816..69bd76874 100644 --- a/privval/file_test.go +++ b/privval/file_test.go @@ -15,7 +15,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" tmjson "github.com/tendermint/tendermint/libs/json" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/privval/messages.go b/privval/messages.go index 675051a8a..b7a95dbfe 100644 --- a/privval/messages.go +++ b/privval/messages.go @@ -5,7 +5,7 @@ import ( "github.com/gogo/protobuf/proto" - privvalproto "github.com/tendermint/tendermint/proto/privval" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" ) // TODO: Add ChainIDRequest diff --git a/privval/retry_signer_client.go b/privval/retry_signer_client.go index 7f0077e32..65c680ef0 100644 --- a/privval/retry_signer_client.go +++ b/privval/retry_signer_client.go @@ -5,7 +5,7 @@ import ( "time" "github.com/tendermint/tendermint/crypto" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/privval/signer_client.go b/privval/signer_client.go index f27203ef5..467c4a52d 100644 --- a/privval/signer_client.go +++ b/privval/signer_client.go @@ -7,8 +7,8 @@ import ( "github.com/tendermint/tendermint/crypto" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - privvalproto "github.com/tendermint/tendermint/proto/privval" - tmproto "github.com/tendermint/tendermint/proto/types" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/privval/signer_client_test.go b/privval/signer_client_test.go index a7708091c..08c994483 100644 --- a/privval/signer_client_test.go +++ b/privval/signer_client_test.go @@ -11,8 +11,8 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/tmhash" tmrand "github.com/tendermint/tendermint/libs/rand" - privvalproto "github.com/tendermint/tendermint/proto/privval" - tmproto "github.com/tendermint/tendermint/proto/types" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/privval/signer_endpoint.go b/privval/signer_endpoint.go index c18340465..aabb0b2da 100644 --- a/privval/signer_endpoint.go +++ b/privval/signer_endpoint.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/libs/protoio" "github.com/tendermint/tendermint/libs/service" - privvalproto "github.com/tendermint/tendermint/proto/privval" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" ) const ( diff --git a/privval/signer_listener_endpoint.go b/privval/signer_listener_endpoint.go index fdda05cc3..2c7609afd 100644 --- a/privval/signer_listener_endpoint.go +++ b/privval/signer_listener_endpoint.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" - privvalproto "github.com/tendermint/tendermint/proto/privval" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" ) // SignerValidatorEndpointOption sets an optional parameter on the SocketVal. diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go index b51a1296f..43fff3695 100644 --- a/privval/signer_requestHandler.go +++ b/privval/signer_requestHandler.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/crypto" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - privvalproto "github.com/tendermint/tendermint/proto/privval" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" "github.com/tendermint/tendermint/types" ) diff --git a/privval/signer_server.go b/privval/signer_server.go index 7853db05c..a8c28e541 100644 --- a/privval/signer_server.go +++ b/privval/signer_server.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/tendermint/tendermint/libs/service" - privvalproto "github.com/tendermint/tendermint/proto/privval" + privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" "github.com/tendermint/tendermint/types" ) diff --git a/proto/abci/types.proto b/proto/tendermint/abci/abci.proto similarity index 98% rename from proto/abci/types.proto rename to proto/tendermint/abci/abci.proto index 3b94899f4..66ec72f3e 100644 --- a/proto/abci/types.proto +++ b/proto/tendermint/abci/abci.proto @@ -1,15 +1,15 @@ 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 "proto/crypto/merkle/types.proto"; -import "proto/types/types.proto"; -import "proto/crypto/keys/types.proto"; -import "proto/types/params.proto"; +import "tendermint/crypto/merkle/types.proto"; +import "tendermint/types/types.proto"; +import "tendermint/crypto/keys/types.proto"; +import "tendermint/types/params.proto"; import "google/protobuf/timestamp.proto"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // This file is copied from http://github.com/tendermint/abci // NOTE: When using custom types, mind the warnings. diff --git a/proto/blockchain/msgs.pb.go b/proto/tendermint/blockchain/msgs.pb.go similarity index 92% rename from proto/blockchain/msgs.pb.go rename to proto/tendermint/blockchain/msgs.pb.go index a1f643ce4..3e4df6ce7 100644 --- a/proto/blockchain/msgs.pb.go +++ b/proto/tendermint/blockchain/msgs.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/blockchain/msgs.proto +// source: tendermint/blockchain/msgs.proto package blockchain import ( fmt "fmt" proto "github.com/gogo/protobuf/proto" - types "github.com/tendermint/tendermint/proto/types" + types "github.com/tendermint/tendermint/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -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_ecf660069f8bb334, []int{0} + return fileDescriptor_e5c108580a5f04a9, []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_ecf660069f8bb334, []int{1} + return fileDescriptor_e5c108580a5f04a9, []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_ecf660069f8bb334, []int{2} + return fileDescriptor_e5c108580a5f04a9, []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_ecf660069f8bb334, []int{3} + return fileDescriptor_e5c108580a5f04a9, []int{3} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -211,7 +211,7 @@ func (m *StatusRequest) GetBase() int64 { return 0 } -// StatusResponse is a peer response to infrom their status +// StatusResponse is a peer response to inform their status type StatusResponse struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Base int64 `protobuf:"varint,2,opt,name=base,proto3" json:"base,omitempty"` @@ -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_ecf660069f8bb334, []int{4} + return fileDescriptor_e5c108580a5f04a9, []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_ecf660069f8bb334, []int{5} + return fileDescriptor_e5c108580a5f04a9, []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("proto/blockchain/msgs.proto", fileDescriptor_ecf660069f8bb334) } +func init() { proto.RegisterFile("tendermint/blockchain/msgs.proto", fileDescriptor_e5c108580a5f04a9) } -var fileDescriptor_ecf660069f8bb334 = []byte{ - // 370 bytes of a gzipped FileDescriptorProto +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, 0xb9, 0x4d, 0xee, 0x85, 0x5c, 0x93, 0xc6, 0x54, - 0x25, 0xba, 0x70, 0x88, 0xb8, 0xd4, 0xb8, 0x60, 0x45, 0x34, 0x18, 0x53, 0x5d, 0xb9, 0x21, 0x2d, - 0x4e, 0xda, 0x46, 0xdb, 0x41, 0xce, 0x74, 0xe1, 0x5b, 0xf8, 0x0c, 0x3e, 0x8d, 0x4b, 0x96, 0x2e, - 0x0d, 0xbc, 0x88, 0x61, 0xa6, 0x94, 0xb6, 0xe1, 0xcf, 0x6e, 0xe6, 0xe4, 0x77, 0xbe, 0xf9, 0x7a, - 0x4e, 0x0a, 0x7b, 0xe3, 0x09, 0xe3, 0xac, 0xe3, 0xbe, 0xb0, 0xd1, 0xf3, 0xc8, 0x77, 0x82, 0xa8, - 0x13, 0xa2, 0x87, 0x44, 0x54, 0x8d, 0xbf, 0x9c, 0x46, 0x4f, 0x74, 0x12, 0x06, 0x11, 0x27, 0xab, - 0xc4, 0xff, 0xa6, 0xec, 0xe1, 0x6f, 0x63, 0x8a, 0xb2, 0x53, 0xe6, 0xad, 0x36, 0xd4, 0x7a, 0x8b, - 0xab, 0x4d, 0x5f, 0x63, 0x8a, 0xdc, 0xf8, 0x07, 0x15, 0x9f, 0x06, 0x9e, 0xcf, 0x5b, 0xea, 0xbe, - 0x7a, 0xac, 0xd9, 0xc9, 0xcd, 0x3a, 0x81, 0xc6, 0x2d, 0x4b, 0x92, 0x38, 0x66, 0x11, 0xd2, 0x8d, - 0xd1, 0x2b, 0xd0, 0xf3, 0xc1, 0x53, 0x28, 0x8b, 0x27, 0x45, 0xae, 0xda, 0x6d, 0x92, 0x8c, 0xa3, - 0x30, 0x22, 0x32, 0x2f, 0x53, 0xd6, 0x05, 0xe8, 0xf7, 0xdc, 0xe1, 0x31, 0xee, 0x70, 0x32, 0x0c, - 0x28, 0xb9, 0x0e, 0xd2, 0xd6, 0x2f, 0x51, 0x15, 0x67, 0xeb, 0x12, 0xea, 0xcb, 0xe6, 0xed, 0x9a, - 0x6b, 0xbb, 0x3f, 0x34, 0xf8, 0x3d, 0xa0, 0x88, 0x8e, 0x47, 0x8d, 0x6b, 0xd0, 0x85, 0xcf, 0x70, - 0x22, 0x35, 0x12, 0xfb, 0x03, 0xb2, 0x76, 0xc2, 0x24, 0x3b, 0xc5, 0xbe, 0x62, 0xd7, 0xdc, 0xec, - 0x54, 0x1f, 0xe0, 0x4f, 0xc4, 0x86, 0x4b, 0x9c, 0x14, 0x13, 0x0f, 0x57, 0xbb, 0xed, 0x0d, 0xbc, - 0xc2, 0xb4, 0xfb, 0x8a, 0xdd, 0x88, 0x0a, 0x0b, 0x18, 0x40, 0xbd, 0x80, 0xd4, 0x04, 0xf2, 0x70, - 0xbb, 0x62, 0x0a, 0xd4, 0xdd, 0x22, 0x0e, 0xc5, 0xe8, 0xd2, 0x2f, 0x2e, 0x6d, 0xc5, 0xe5, 0x96, - 0xb4, 0xc0, 0x61, 0x6e, 0x6b, 0x77, 0xd0, 0x48, 0x71, 0x89, 0x5e, 0x59, 0xf0, 0x8e, 0x76, 0xf0, - 0x52, 0xbf, 0x3a, 0xe6, 0x2a, 0xbd, 0x32, 0x68, 0x18, 0x87, 0xbd, 0x9b, 0xcf, 0x99, 0xa9, 0x4e, - 0x67, 0xa6, 0xfa, 0x3d, 0x33, 0xd5, 0xf7, 0xb9, 0xa9, 0x4c, 0xe7, 0xa6, 0xf2, 0x35, 0x37, 0x95, - 0xc7, 0x33, 0x2f, 0xe0, 0x7e, 0xec, 0x92, 0x11, 0x0b, 0x3b, 0xab, 0x37, 0xb2, 0xc7, 0xe2, 0xaf, - 0xe3, 0x56, 0x44, 0xe5, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xe0, 0xf2, 0x5a, 0x55, 0x03, - 0x00, 0x00, + 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, } func (m *BlockRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/blockchain/msgs.proto b/proto/tendermint/blockchain/msgs.proto similarity index 88% rename from proto/blockchain/msgs.proto rename to proto/tendermint/blockchain/msgs.proto index 6b83ec2d1..9b0e98d36 100644 --- a/proto/blockchain/msgs.proto +++ b/proto/tendermint/blockchain/msgs.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package tendermint.blockchain; -option go_package = "github.com/tendermint/tendermint/proto/blockchain"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/blockchain"; -import "proto/types/block.proto"; +import "tendermint/types/block.proto"; // BlockRequest requests a block for a specific height message BlockRequest { diff --git a/proto/consensus/msgs.pb.go b/proto/tendermint/consensus/msgs.pb.go similarity index 92% rename from proto/consensus/msgs.pb.go rename to proto/tendermint/consensus/msgs.pb.go index 3b05faaff..68a6973f2 100644 --- a/proto/consensus/msgs.pb.go +++ b/proto/tendermint/consensus/msgs.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/consensus/msgs.proto +// source: tendermint/consensus/msgs.proto package consensus @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - bits "github.com/tendermint/tendermint/proto/libs/bits" - types "github.com/tendermint/tendermint/proto/types" + bits "github.com/tendermint/tendermint/proto/tendermint/libs/bits" + types "github.com/tendermint/tendermint/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ func (m *NewRoundStep) Reset() { *m = NewRoundStep{} } func (m *NewRoundStep) String() string { return proto.CompactTextString(m) } func (*NewRoundStep) ProtoMessage() {} func (*NewRoundStep) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{0} + return fileDescriptor_84191ff733048dd1, []int{0} } func (m *NewRoundStep) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,7 +118,7 @@ func (m *NewValidBlock) Reset() { *m = NewValidBlock{} } func (m *NewValidBlock) String() string { return proto.CompactTextString(m) } func (*NewValidBlock) ProtoMessage() {} func (*NewValidBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{1} + return fileDescriptor_84191ff733048dd1, []int{1} } func (m *NewValidBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -191,7 +191,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{2} + return fileDescriptor_84191ff733048dd1, []int{2} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -238,7 +238,7 @@ func (m *ProposalPOL) Reset() { *m = ProposalPOL{} } func (m *ProposalPOL) String() string { return proto.CompactTextString(m) } func (*ProposalPOL) ProtoMessage() {} func (*ProposalPOL) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{3} + return fileDescriptor_84191ff733048dd1, []int{3} } func (m *ProposalPOL) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +299,7 @@ func (m *BlockPart) Reset() { *m = BlockPart{} } func (m *BlockPart) String() string { return proto.CompactTextString(m) } func (*BlockPart) ProtoMessage() {} func (*BlockPart) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{4} + return fileDescriptor_84191ff733048dd1, []int{4} } func (m *BlockPart) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -358,7 +358,7 @@ func (m *Vote) Reset() { *m = Vote{} } func (m *Vote) String() string { return proto.CompactTextString(m) } func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{5} + return fileDescriptor_84191ff733048dd1, []int{5} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -406,7 +406,7 @@ func (m *HasVote) Reset() { *m = HasVote{} } func (m *HasVote) String() string { return proto.CompactTextString(m) } func (*HasVote) ProtoMessage() {} func (*HasVote) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{6} + return fileDescriptor_84191ff733048dd1, []int{6} } func (m *HasVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -475,7 +475,7 @@ func (m *VoteSetMaj23) Reset() { *m = VoteSetMaj23{} } func (m *VoteSetMaj23) String() string { return proto.CompactTextString(m) } func (*VoteSetMaj23) ProtoMessage() {} func (*VoteSetMaj23) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{7} + return fileDescriptor_84191ff733048dd1, []int{7} } func (m *VoteSetMaj23) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -545,7 +545,7 @@ func (m *VoteSetBits) Reset() { *m = VoteSetBits{} } func (m *VoteSetBits) String() string { return proto.CompactTextString(m) } func (*VoteSetBits) ProtoMessage() {} func (*VoteSetBits) Descriptor() ([]byte, []int) { - return fileDescriptor_9de64017f8b3fc88, []int{8} + return fileDescriptor_84191ff733048dd1, []int{8} } func (m *VoteSetBits) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +627,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_9de64017f8b3fc88, []int{9} + return fileDescriptor_84191ff733048dd1, []int{9} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -798,64 +798,64 @@ func init() { proto.RegisterType((*Message)(nil), "tendermint.consensus.Message") } -func init() { proto.RegisterFile("proto/consensus/msgs.proto", fileDescriptor_9de64017f8b3fc88) } - -var fileDescriptor_9de64017f8b3fc88 = []byte{ - // 860 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xdd, 0x8e, 0xdb, 0x44, - 0x14, 0xb6, 0x59, 0x67, 0x93, 0x3d, 0xde, 0x1f, 0x18, 0xb5, 0x25, 0x6c, 0x45, 0xb2, 0x18, 0x09, - 0xad, 0x10, 0x72, 0xaa, 0xec, 0x05, 0x52, 0x85, 0x04, 0x98, 0x9f, 0xba, 0xab, 0xa6, 0x8d, 0x9c, - 0xaa, 0x42, 0xdc, 0x58, 0x4e, 0x3c, 0x72, 0x86, 0xc6, 0x1e, 0xcb, 0x33, 0xc9, 0x92, 0x5b, 0x9e, - 0x80, 0x07, 0xe0, 0x35, 0x90, 0x78, 0x84, 0x5e, 0xf6, 0x92, 0xab, 0x0a, 0x65, 0x1f, 0x01, 0xc1, - 0x35, 0x9a, 0x9f, 0xc4, 0x4e, 0xeb, 0x2e, 0xec, 0x0d, 0x52, 0x6f, 0xa2, 0x99, 0x39, 0xe7, 0x7c, - 0x73, 0xe6, 0x3b, 0xe7, 0x7c, 0x0e, 0x1c, 0xe7, 0x05, 0xe5, 0xb4, 0x37, 0xa1, 0x19, 0xc3, 0x19, - 0x9b, 0xb3, 0x5e, 0xca, 0x12, 0xe6, 0xca, 0x43, 0x74, 0x83, 0xe3, 0x2c, 0xc6, 0x45, 0x4a, 0x32, - 0xee, 0x6e, 0x1c, 0x8e, 0x3f, 0xe2, 0x53, 0x52, 0xc4, 0x61, 0x1e, 0x15, 0x7c, 0xd9, 0x53, 0xd1, - 0x09, 0x4d, 0x68, 0xb9, 0x52, 0xd1, 0xc7, 0xef, 0xaa, 0x13, 0xbe, 0xcc, 0x31, 0x53, 0xbf, 0xda, - 0x70, 0x5b, 0x19, 0x66, 0x64, 0xcc, 0x7a, 0x63, 0xc2, 0xb7, 0x8c, 0xce, 0xaf, 0x26, 0xec, 0x3f, - 0xc4, 0x17, 0x01, 0x9d, 0x67, 0xf1, 0x88, 0xe3, 0x1c, 0xdd, 0x82, 0xdd, 0x29, 0x26, 0xc9, 0x94, - 0xb7, 0xcd, 0x13, 0xf3, 0x74, 0x27, 0xd0, 0x3b, 0x74, 0x03, 0x1a, 0x85, 0x70, 0x6a, 0xbf, 0x75, - 0x62, 0x9e, 0x36, 0x02, 0xb5, 0x41, 0x08, 0x2c, 0xc6, 0x71, 0xde, 0xde, 0x39, 0x31, 0x4f, 0x0f, - 0x02, 0xb9, 0x46, 0x9f, 0x42, 0x9b, 0xe1, 0x09, 0xcd, 0x62, 0x16, 0x32, 0x92, 0x4d, 0x70, 0xc8, - 0x78, 0x54, 0xf0, 0x90, 0x93, 0x14, 0xb7, 0x2d, 0x89, 0x79, 0x53, 0xdb, 0x47, 0xc2, 0x3c, 0x12, - 0xd6, 0xc7, 0x24, 0xc5, 0xe8, 0x63, 0x78, 0x67, 0x16, 0x31, 0x1e, 0x4e, 0x68, 0x9a, 0x12, 0x1e, - 0xaa, 0xeb, 0x1a, 0xf2, 0xba, 0x23, 0x61, 0xf8, 0x4a, 0x9e, 0xcb, 0x54, 0x9d, 0xbf, 0x4c, 0x38, - 0x78, 0x88, 0x2f, 0x9e, 0x44, 0x33, 0x12, 0x7b, 0x33, 0x3a, 0x79, 0x7a, 0xcd, 0xc4, 0xbf, 0x83, - 0x9b, 0x63, 0x11, 0x26, 0x79, 0x0d, 0x19, 0xe6, 0xe1, 0x14, 0x47, 0x31, 0x2e, 0xe4, 0x4b, 0xec, - 0x7e, 0xd7, 0xad, 0xd4, 0x42, 0xf1, 0x35, 0x8c, 0x0a, 0x3e, 0xc2, 0xdc, 0x97, 0x6e, 0x9e, 0xf5, - 0xec, 0x45, 0xd7, 0x08, 0x90, 0xc4, 0xd8, 0xb2, 0xa0, 0xcf, 0xc1, 0x2e, 0x91, 0x99, 0x7c, 0xb1, - 0xdd, 0xef, 0x54, 0xf1, 0x44, 0x25, 0x5c, 0x51, 0x09, 0xd7, 0x23, 0xfc, 0xcb, 0xa2, 0x88, 0x96, - 0x01, 0x6c, 0x80, 0x18, 0xba, 0x0d, 0x7b, 0x84, 0x69, 0x12, 0xe4, 0xf3, 0x5b, 0x41, 0x8b, 0x30, - 0xf5, 0x78, 0xc7, 0x87, 0xd6, 0xb0, 0xa0, 0x39, 0x65, 0xd1, 0x0c, 0x7d, 0x06, 0xad, 0x5c, 0xaf, - 0xe5, 0x9b, 0xed, 0xfe, 0x71, 0x4d, 0xda, 0xda, 0x43, 0x67, 0xbc, 0x89, 0x70, 0x7e, 0x31, 0xc1, - 0x5e, 0x1b, 0x87, 0x8f, 0x1e, 0xbc, 0x96, 0xbf, 0x4f, 0x00, 0xad, 0x63, 0xc2, 0x9c, 0xce, 0xc2, - 0x2a, 0x99, 0x6f, 0xaf, 0x2d, 0x43, 0x3a, 0x93, 0x75, 0x41, 0xf7, 0x60, 0xbf, 0xea, 0xad, 0xe9, - 0xfc, 0x97, 0xe7, 0xeb, 0xdc, 0xec, 0x0a, 0x9a, 0xf3, 0x14, 0xf6, 0xbc, 0x35, 0x27, 0xd7, 0xac, - 0xed, 0x1d, 0xb0, 0x04, 0xf7, 0xfa, 0xee, 0x5b, 0xf5, 0xa5, 0xd4, 0x77, 0x4a, 0x4f, 0xa7, 0x0f, - 0xd6, 0x13, 0xca, 0x45, 0x07, 0x5a, 0x0b, 0xca, 0xb1, 0x66, 0xb3, 0x26, 0x52, 0x78, 0x05, 0xd2, - 0xc7, 0xf9, 0xc9, 0x84, 0xa6, 0x1f, 0x31, 0x19, 0x77, 0xbd, 0xfc, 0xce, 0xc0, 0x12, 0x68, 0x32, - 0xbf, 0xc3, 0xba, 0x56, 0x1b, 0x91, 0x24, 0xc3, 0xf1, 0x80, 0x25, 0x8f, 0x97, 0x39, 0x0e, 0xa4, - 0xb3, 0x80, 0x22, 0x59, 0x8c, 0x7f, 0x94, 0x0d, 0xd5, 0x08, 0xd4, 0xc6, 0xf9, 0xcd, 0x84, 0x7d, - 0x91, 0xc1, 0x08, 0xf3, 0x41, 0xf4, 0x43, 0xff, 0xec, 0xff, 0xc8, 0xe4, 0x1b, 0x68, 0xa9, 0x06, - 0x27, 0xb1, 0xee, 0xee, 0xf7, 0x5e, 0x0d, 0x94, 0xb5, 0xbb, 0xff, 0xb5, 0x77, 0x24, 0x58, 0x5e, - 0xbd, 0xe8, 0x36, 0xf5, 0x41, 0xd0, 0x94, 0xb1, 0xf7, 0x63, 0xe7, 0x4f, 0x13, 0x6c, 0x9d, 0xba, - 0x47, 0x38, 0x7b, 0x73, 0x32, 0x47, 0x77, 0xa1, 0x21, 0x3a, 0x80, 0xc9, 0xe1, 0xfc, 0xaf, 0xcd, - 0xad, 0x42, 0x9c, 0xbf, 0x2d, 0x68, 0x0e, 0x30, 0x63, 0x51, 0x82, 0xd1, 0x39, 0x1c, 0x66, 0xf8, - 0x42, 0x0d, 0x54, 0x28, 0x65, 0x54, 0xf5, 0x9d, 0xe3, 0xd6, 0x7d, 0x08, 0xdc, 0xaa, 0x4c, 0xfb, - 0x46, 0xb0, 0x9f, 0x55, 0x65, 0x7b, 0x00, 0x47, 0x02, 0x6b, 0x21, 0xf4, 0x30, 0x94, 0x89, 0x4a, - 0xbe, 0xec, 0xfe, 0x87, 0xaf, 0x05, 0x2b, 0xb5, 0xd3, 0x37, 0x82, 0x83, 0x6c, 0x4b, 0x4c, 0xab, - 0xd2, 0x52, 0x33, 0xc2, 0x25, 0xce, 0x5a, 0x41, 0xfc, 0x8a, 0xb4, 0xa0, 0x6f, 0x5f, 0x12, 0x01, - 0xc5, 0xf5, 0x07, 0x57, 0x23, 0x0c, 0x1f, 0x3d, 0xf0, 0xb7, 0x35, 0x00, 0x7d, 0x01, 0x50, 0x4a, - 0xa9, 0x66, 0xbb, 0x5b, 0x8f, 0xb2, 0xd1, 0x0a, 0xdf, 0x08, 0xf6, 0x36, 0x62, 0x2a, 0xa4, 0x40, - 0x0e, 0xf4, 0xee, 0xab, 0xf2, 0x58, 0xc6, 0x8a, 0x2e, 0xf4, 0x0d, 0x35, 0xd6, 0xe8, 0x2e, 0xb4, - 0xa6, 0x11, 0x0b, 0x65, 0x54, 0x53, 0x46, 0xbd, 0x5f, 0x1f, 0xa5, 0x67, 0xdf, 0x37, 0x82, 0xe6, - 0x54, 0xcb, 0xc0, 0x39, 0x1c, 0x8a, 0x38, 0xf9, 0x39, 0x49, 0xc5, 0x38, 0xb6, 0x5b, 0x57, 0x15, - 0xb4, 0x3a, 0xb8, 0xa2, 0xa0, 0x8b, 0xea, 0x20, 0xdf, 0x83, 0x83, 0x0d, 0x96, 0xe8, 0xa7, 0xf6, - 0xde, 0x55, 0x24, 0x56, 0x06, 0x49, 0x90, 0xb8, 0x28, 0xb7, 0x5e, 0x03, 0x76, 0xd8, 0x3c, 0xf5, - 0xce, 0x9f, 0xad, 0x3a, 0xe6, 0xf3, 0x55, 0xc7, 0xfc, 0x63, 0xd5, 0x31, 0x7f, 0xbe, 0xec, 0x18, - 0xcf, 0x2f, 0x3b, 0xc6, 0xef, 0x97, 0x1d, 0xe3, 0xfb, 0x3b, 0x09, 0xe1, 0xd3, 0xf9, 0xd8, 0x9d, - 0xd0, 0xb4, 0x57, 0x82, 0x57, 0x97, 0x2f, 0xfd, 0x67, 0x19, 0xef, 0xca, 0x83, 0xb3, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xc8, 0x89, 0x05, 0x9a, 0xcd, 0x08, 0x00, 0x00, +func init() { proto.RegisterFile("tendermint/consensus/msgs.proto", fileDescriptor_84191ff733048dd1) } + +var fileDescriptor_84191ff733048dd1 = []byte{ + // 856 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x8e, 0xe3, 0x44, + 0x10, 0xb6, 0x19, 0x67, 0x92, 0x94, 0x93, 0x19, 0x68, 0xcd, 0xae, 0xc2, 0x00, 0x49, 0x30, 0x97, + 0x11, 0x42, 0x0e, 0xca, 0x1c, 0x90, 0x16, 0x24, 0xc0, 0xfc, 0xac, 0x77, 0xb5, 0xd9, 0x8d, 0x9c, + 0x65, 0x85, 0xb8, 0x58, 0x4e, 0xdc, 0x72, 0x9a, 0x8d, 0xdd, 0x96, 0xbb, 0x93, 0x61, 0xae, 0x3c, + 0x01, 0x0f, 0xc0, 0x6b, 0x20, 0xf1, 0x08, 0x7b, 0xdc, 0x23, 0xa7, 0x11, 0xca, 0x3c, 0x02, 0x82, + 0x33, 0xea, 0x76, 0x27, 0x76, 0x18, 0xcf, 0xc0, 0x5c, 0x90, 0xf6, 0x12, 0x75, 0xa7, 0xaa, 0xbe, + 0xae, 0xfe, 0xaa, 0xea, 0x73, 0x43, 0x8f, 0xe3, 0x24, 0xc4, 0x59, 0x4c, 0x12, 0x3e, 0x98, 0xd1, + 0x84, 0xe1, 0x84, 0x2d, 0xd9, 0x20, 0x66, 0x11, 0xb3, 0xd3, 0x8c, 0x72, 0x8a, 0x8e, 0x0a, 0x07, + 0x7b, 0xeb, 0x70, 0x7c, 0x14, 0xd1, 0x88, 0x4a, 0x87, 0x81, 0x58, 0xe5, 0xbe, 0xc7, 0x6f, 0x97, + 0xc0, 0xf8, 0x79, 0x8a, 0x59, 0xfe, 0xab, 0xac, 0xfd, 0x92, 0x75, 0x41, 0xa6, 0x6c, 0x30, 0x25, + 0x7c, 0xc7, 0xc3, 0xfa, 0x45, 0x87, 0xd6, 0x63, 0x7c, 0xe6, 0xd1, 0x65, 0x12, 0x4e, 0x38, 0x4e, + 0xd1, 0x5d, 0xd8, 0x9f, 0x63, 0x12, 0xcd, 0x79, 0x47, 0xef, 0xeb, 0x27, 0x7b, 0x9e, 0xda, 0xa1, + 0x23, 0xa8, 0x65, 0xc2, 0xa9, 0xf3, 0x5a, 0x5f, 0x3f, 0xa9, 0x79, 0xf9, 0x06, 0x21, 0x30, 0x18, + 0xc7, 0x69, 0x67, 0xaf, 0xaf, 0x9f, 0xb4, 0x3d, 0xb9, 0x46, 0x1f, 0x41, 0x87, 0xe1, 0x19, 0x4d, + 0x42, 0xe6, 0x33, 0x92, 0xcc, 0xb0, 0xcf, 0x78, 0x90, 0x71, 0x9f, 0x93, 0x18, 0x77, 0x0c, 0x89, + 0x79, 0x47, 0xd9, 0x27, 0xc2, 0x3c, 0x11, 0xd6, 0xa7, 0x24, 0xc6, 0xe8, 0x7d, 0x78, 0x63, 0x11, + 0x30, 0xee, 0xcf, 0x68, 0x1c, 0x13, 0xee, 0xe7, 0xc7, 0xd5, 0xe4, 0x71, 0x87, 0xc2, 0xf0, 0x85, + 0xfc, 0x5f, 0xa6, 0x6a, 0xfd, 0xa9, 0x43, 0xfb, 0x31, 0x3e, 0x7b, 0x16, 0x2c, 0x48, 0xe8, 0x2c, + 0xe8, 0xec, 0xf9, 0x2d, 0x13, 0xff, 0x16, 0xee, 0x4c, 0x45, 0x98, 0x9f, 0x8a, 0xdc, 0x18, 0xe6, + 0xfe, 0x1c, 0x07, 0x21, 0xce, 0xe4, 0x4d, 0xcc, 0x61, 0xcf, 0x2e, 0xd5, 0x20, 0xe7, 0x6b, 0x1c, + 0x64, 0x7c, 0x82, 0xb9, 0x2b, 0xdd, 0x1c, 0xe3, 0xc5, 0x45, 0x4f, 0xf3, 0x90, 0xc4, 0xd8, 0xb1, + 0xa0, 0x4f, 0xc1, 0x2c, 0x90, 0x99, 0xbc, 0xb1, 0x39, 0xec, 0x96, 0xf1, 0x44, 0x25, 0x6c, 0x51, + 0x09, 0xdb, 0x21, 0xfc, 0xf3, 0x2c, 0x0b, 0xce, 0x3d, 0xd8, 0x02, 0x31, 0xf4, 0x16, 0x34, 0x09, + 0x53, 0x24, 0xc8, 0xeb, 0x37, 0xbc, 0x06, 0x61, 0xf9, 0xe5, 0x2d, 0x17, 0x1a, 0xe3, 0x8c, 0xa6, + 0x94, 0x05, 0x0b, 0xf4, 0x09, 0x34, 0x52, 0xb5, 0x96, 0x77, 0x36, 0x87, 0xc7, 0x15, 0x69, 0x2b, + 0x0f, 0x95, 0xf1, 0x36, 0xc2, 0xfa, 0x59, 0x07, 0x73, 0x63, 0x1c, 0x3f, 0x79, 0x74, 0x2d, 0x7f, + 0x1f, 0x00, 0xda, 0xc4, 0xf8, 0x29, 0x5d, 0xf8, 0x65, 0x32, 0x5f, 0xdf, 0x58, 0xc6, 0x74, 0x21, + 0xeb, 0x82, 0xee, 0x43, 0xab, 0xec, 0xad, 0xe8, 0xfc, 0x97, 0xeb, 0xab, 0xdc, 0xcc, 0x12, 0x9a, + 0xf5, 0x1c, 0x9a, 0xce, 0x86, 0x93, 0x5b, 0xd6, 0xf6, 0x43, 0x30, 0x04, 0xf7, 0xea, 0xec, 0xbb, + 0xd5, 0xa5, 0x54, 0x67, 0x4a, 0x4f, 0x6b, 0x08, 0xc6, 0x33, 0xca, 0x45, 0x07, 0x1a, 0x2b, 0xca, + 0xb1, 0x62, 0xb3, 0x22, 0x52, 0x78, 0x79, 0xd2, 0xc7, 0xfa, 0x51, 0x87, 0xba, 0x1b, 0x30, 0x19, + 0x77, 0xbb, 0xfc, 0x4e, 0xc1, 0x10, 0x68, 0x32, 0xbf, 0x83, 0xaa, 0x56, 0x9b, 0x90, 0x28, 0xc1, + 0xe1, 0x88, 0x45, 0x4f, 0xcf, 0x53, 0xec, 0x49, 0x67, 0x01, 0x45, 0x92, 0x10, 0xff, 0x20, 0x1b, + 0xaa, 0xe6, 0xe5, 0x1b, 0xeb, 0x57, 0x1d, 0x5a, 0x22, 0x83, 0x09, 0xe6, 0xa3, 0xe0, 0xfb, 0xe1, + 0xe9, 0xff, 0x91, 0xc9, 0x57, 0xd0, 0xc8, 0x1b, 0x9c, 0x84, 0xaa, 0xbb, 0xdf, 0xbc, 0x1a, 0x28, + 0x6b, 0xf7, 0xe0, 0x4b, 0xe7, 0x50, 0xb0, 0xbc, 0xbe, 0xe8, 0xd5, 0xd5, 0x1f, 0x5e, 0x5d, 0xc6, + 0x3e, 0x08, 0xad, 0x3f, 0x74, 0x30, 0x55, 0xea, 0x0e, 0xe1, 0xec, 0xd5, 0xc9, 0x1c, 0xdd, 0x83, + 0x9a, 0xe8, 0x00, 0x26, 0x87, 0xf3, 0xbf, 0x36, 0x77, 0x1e, 0x62, 0xfd, 0x65, 0x40, 0x7d, 0x84, + 0x19, 0x0b, 0x22, 0x8c, 0x1e, 0xc2, 0x41, 0x82, 0xcf, 0xf2, 0x81, 0xf2, 0xa5, 0x8c, 0xe6, 0x7d, + 0x67, 0xd9, 0x55, 0x1f, 0x00, 0xbb, 0x2c, 0xd3, 0xae, 0xe6, 0xb5, 0x92, 0xb2, 0x6c, 0x8f, 0xe0, + 0x50, 0x60, 0xad, 0x84, 0x1e, 0xfa, 0x32, 0x51, 0xc9, 0x97, 0x39, 0x7c, 0xef, 0x5a, 0xb0, 0x42, + 0x3b, 0x5d, 0xcd, 0x6b, 0x27, 0x3b, 0x62, 0x5a, 0x96, 0x96, 0x8a, 0x11, 0x2e, 0x70, 0x36, 0x0a, + 0xe2, 0x96, 0xa4, 0x05, 0x7d, 0xfd, 0x0f, 0x11, 0xc8, 0xb9, 0x7e, 0xf7, 0x66, 0x84, 0xf1, 0x93, + 0x47, 0xee, 0xae, 0x06, 0xa0, 0xcf, 0x00, 0x0a, 0x29, 0x55, 0x6c, 0xf7, 0xaa, 0x51, 0xb6, 0x5a, + 0xe1, 0x6a, 0x5e, 0x73, 0x2b, 0xa6, 0x42, 0x0a, 0xe4, 0x40, 0xef, 0x5f, 0x95, 0xc7, 0x22, 0x56, + 0x74, 0xa1, 0xab, 0xe5, 0x63, 0x8d, 0xee, 0x41, 0x63, 0x1e, 0x30, 0x5f, 0x46, 0xd5, 0x65, 0xd4, + 0x3b, 0xd5, 0x51, 0x6a, 0xf6, 0x5d, 0xcd, 0xab, 0xcf, 0x95, 0x0c, 0x3c, 0x84, 0x03, 0x11, 0x27, + 0x3f, 0x27, 0xb1, 0x18, 0xc7, 0x4e, 0xe3, 0xa6, 0x82, 0x96, 0x07, 0x57, 0x14, 0x74, 0x55, 0x1e, + 0xe4, 0xfb, 0xd0, 0xde, 0x62, 0x89, 0x7e, 0xea, 0x34, 0x6f, 0x22, 0xb1, 0x34, 0x48, 0x82, 0xc4, + 0x55, 0xb1, 0x75, 0x6a, 0xb0, 0xc7, 0x96, 0xb1, 0xf3, 0xcd, 0x8b, 0x75, 0x57, 0x7f, 0xb9, 0xee, + 0xea, 0xbf, 0xaf, 0xbb, 0xfa, 0x4f, 0x97, 0x5d, 0xed, 0xe5, 0x65, 0x57, 0xfb, 0xed, 0xb2, 0xab, + 0x7d, 0xf7, 0x71, 0x44, 0xf8, 0x7c, 0x39, 0xb5, 0x67, 0x34, 0x1e, 0x94, 0x5f, 0x13, 0xc5, 0x32, + 0x7f, 0x75, 0x54, 0x3d, 0x5b, 0xa6, 0xfb, 0xd2, 0x76, 0xfa, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x4e, 0xeb, 0xda, 0xa1, 0xd5, 0x08, 0x00, 0x00, } func (m *NewRoundStep) Marshal() (dAtA []byte, err error) { diff --git a/proto/consensus/msgs.proto b/proto/tendermint/consensus/msgs.proto similarity index 94% rename from proto/consensus/msgs.proto rename to proto/tendermint/consensus/msgs.proto index 663182b91..adbe04068 100644 --- a/proto/consensus/msgs.proto +++ b/proto/tendermint/consensus/msgs.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package tendermint.consensus; -option go_package = "github.com/tendermint/tendermint/proto/consensus"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/types/types.proto"; -import "proto/libs/bits/types.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/types/types.proto"; +import "tendermint/libs/bits/types.proto"; // NewRoundStepMessage is sent for every step taken in the ConsensusState. // For every height/round/step transition diff --git a/proto/consensus/walmsgs.pb.go b/proto/tendermint/consensus/walmsgs.pb.go similarity index 89% rename from proto/consensus/walmsgs.pb.go rename to proto/tendermint/consensus/walmsgs.pb.go index 14618ce07..a834b7a0b 100644 --- a/proto/consensus/walmsgs.pb.go +++ b/proto/tendermint/consensus/walmsgs.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/consensus/walmsgs.proto +// source: tendermint/consensus/walmsgs.proto package consensus @@ -10,7 +10,7 @@ import ( _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" - types "github.com/tendermint/tendermint/proto/types" + types "github.com/tendermint/tendermint/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -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_60ad80fa14e37285, []int{0} + return fileDescriptor_ba295fe8d98f7e98, []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_60ad80fa14e37285, []int{1} + return fileDescriptor_ba295fe8d98f7e98, []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_60ad80fa14e37285, []int{2} + return fileDescriptor_ba295fe8d98f7e98, []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_60ad80fa14e37285, []int{3} + return fileDescriptor_ba295fe8d98f7e98, []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_60ad80fa14e37285, []int{4} + return fileDescriptor_ba295fe8d98f7e98, []int{4} } func (m *TimedWALMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -369,45 +369,46 @@ func init() { proto.RegisterType((*TimedWALMessage)(nil), "tendermint.consensus.TimedWALMessage") } -func init() { proto.RegisterFile("proto/consensus/walmsgs.proto", fileDescriptor_60ad80fa14e37285) } - -var fileDescriptor_60ad80fa14e37285 = []byte{ - // 549 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xd1, 0x6a, 0x13, 0x41, - 0x14, 0xdd, 0x69, 0xd2, 0xb4, 0xb9, 0x51, 0x84, 0xb5, 0x94, 0x18, 0xe8, 0x26, 0xa6, 0x28, 0x79, - 0xda, 0x95, 0x8a, 0x20, 0xbe, 0xa8, 0x21, 0x95, 0x44, 0x2c, 0xc8, 0x58, 0x10, 0x44, 0x58, 0x36, - 0xdd, 0x9b, 0xc9, 0x42, 0x77, 0x66, 0xd9, 0x99, 0x55, 0xfa, 0xe4, 0x2f, 0xe4, 0xd1, 0x3f, 0xf1, - 0x17, 0xfa, 0xd8, 0x47, 0x9f, 0xaa, 0x24, 0x3f, 0x22, 0x3b, 0xb3, 0x49, 0x96, 0x34, 0xbe, 0xed, - 0xcc, 0xbd, 0xe7, 0x9c, 0x7b, 0xcf, 0x99, 0x85, 0xa3, 0x24, 0x15, 0x4a, 0x78, 0x17, 0x82, 0x4b, - 0xe4, 0x32, 0x93, 0xde, 0xf7, 0xe0, 0x32, 0x96, 0x4c, 0xba, 0xfa, 0xde, 0x3e, 0x50, 0xc8, 0x43, - 0x4c, 0xe3, 0x88, 0x2b, 0x77, 0xd5, 0xd3, 0x7a, 0xaa, 0xa6, 0x51, 0x1a, 0xfa, 0x49, 0x90, 0xaa, - 0x2b, 0xcf, 0x10, 0x30, 0xc1, 0xc4, 0xfa, 0xcb, 0xa0, 0x5b, 0xad, 0x4d, 0xf2, 0x35, 0x73, 0xab, - 0x69, 0x6a, 0xea, 0x2a, 0x41, 0xe9, 0xe1, 0x37, 0xe4, 0x6a, 0x59, 0x71, 0x98, 0x10, 0xec, 0x12, - 0x0d, 0xf1, 0x38, 0x9b, 0x78, 0x61, 0x96, 0x06, 0x2a, 0x12, 0xbc, 0xa8, 0xb7, 0x37, 0xeb, 0x2a, - 0x8a, 0x51, 0xaa, 0x20, 0x4e, 0x4c, 0x43, 0x17, 0x61, 0xef, 0x4c, 0xb2, 0x11, 0x9f, 0x08, 0xfb, - 0x05, 0x54, 0x62, 0xc9, 0x9a, 0xa4, 0x43, 0x7a, 0x8d, 0x93, 0x23, 0x77, 0xdb, 0x36, 0xee, 0x19, - 0x4a, 0x19, 0x30, 0xec, 0x57, 0xaf, 0x6f, 0xdb, 0x16, 0xcd, 0xfb, 0xed, 0x63, 0xd8, 0x4b, 0x10, - 0x53, 0x3f, 0x0a, 0x9b, 0x3b, 0x1d, 0xd2, 0xab, 0xf7, 0x61, 0x7e, 0xdb, 0xae, 0x7d, 0x44, 0x4c, - 0x47, 0x03, 0x5a, 0xcb, 0x4b, 0xa3, 0xb0, 0x3b, 0x23, 0xd0, 0x38, 0x8f, 0x62, 0x14, 0x99, 0xd2, - 0x5a, 0xaf, 0x61, 0x7f, 0x39, 0x69, 0x21, 0xf8, 0xc8, 0x35, 0xa3, 0xba, 0xcb, 0x51, 0xdd, 0x41, - 0xd1, 0xd0, 0xdf, 0xcf, 0xc5, 0x7e, 0xfe, 0x69, 0x13, 0xba, 0x02, 0xd9, 0x87, 0x50, 0x9b, 0x62, - 0xc4, 0xa6, 0x4a, 0x8b, 0x56, 0x68, 0x71, 0xb2, 0x0f, 0x60, 0x37, 0x15, 0x19, 0x0f, 0x9b, 0x95, - 0x0e, 0xe9, 0xed, 0x52, 0x73, 0xb0, 0x6d, 0xa8, 0x4a, 0x85, 0x49, 0xb3, 0xda, 0x21, 0xbd, 0xfb, - 0x54, 0x7f, 0x77, 0x8f, 0xa1, 0x7e, 0xca, 0xc3, 0xa1, 0x81, 0xad, 0xe9, 0x48, 0x99, 0xae, 0xfb, - 0x6b, 0x07, 0xe0, 0xf3, 0xdb, 0x0f, 0xc5, 0xda, 0xf6, 0x57, 0x38, 0xd4, 0xf6, 0xfb, 0x61, 0xa0, - 0x02, 0x5f, 0x73, 0xfb, 0x52, 0x05, 0x0a, 0x8b, 0x25, 0x9e, 0x94, 0x5d, 0xd3, 0x71, 0xb9, 0xa7, - 0x79, 0xff, 0x20, 0x50, 0x01, 0xcd, 0xbb, 0x3f, 0xe5, 0xcd, 0x43, 0x8b, 0x3e, 0xc4, 0xbb, 0xd7, - 0xf6, 0x2b, 0xd8, 0x8f, 0x25, 0xf3, 0x23, 0x3e, 0x11, 0x7a, 0xab, 0xff, 0xa7, 0x60, 0x12, 0x1b, - 0x5a, 0x74, 0x2f, 0x2e, 0xc2, 0x7b, 0x07, 0xf7, 0x94, 0xf1, 0xd7, 0xe0, 0x2b, 0x1a, 0xff, 0x78, - 0x3b, 0xbe, 0x94, 0xc4, 0xd0, 0xa2, 0x0d, 0x55, 0x0a, 0xe6, 0x0d, 0x00, 0xf2, 0xd0, 0x2f, 0xcc, - 0xa8, 0x6a, 0x96, 0xf6, 0x76, 0x96, 0x95, 0x7b, 0x43, 0x8b, 0xd6, 0x71, 0x79, 0xe8, 0xef, 0x42, - 0x45, 0x66, 0x71, 0xf7, 0x07, 0x3c, 0xc8, 0x65, 0xc2, 0x92, 0x7b, 0x2f, 0xa1, 0x9a, 0x4b, 0x15, - 0x5e, 0xb5, 0xee, 0x04, 0x7e, 0xbe, 0x7c, 0x9b, 0x26, 0xf1, 0x59, 0x9e, 0xb8, 0x46, 0xd8, 0x27, - 0xe6, 0x69, 0x1a, 0x53, 0x3a, 0xdb, 0xc7, 0x59, 0x0b, 0xe9, 0x77, 0xd9, 0x7f, 0x7f, 0x3d, 0x77, - 0xc8, 0xcd, 0xdc, 0x21, 0x7f, 0xe7, 0x0e, 0x99, 0x2d, 0x1c, 0xeb, 0x66, 0xe1, 0x58, 0xbf, 0x17, - 0x8e, 0xf5, 0xe5, 0x19, 0x8b, 0xd4, 0x34, 0x1b, 0xbb, 0x17, 0x22, 0xf6, 0xd6, 0x54, 0xe5, 0xcf, - 0x8d, 0x7f, 0x71, 0x5c, 0xd3, 0x17, 0xcf, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x16, 0x65, - 0xf3, 0x02, 0x04, 0x00, 0x00, +func init() { + proto.RegisterFile("tendermint/consensus/walmsgs.proto", fileDescriptor_ba295fe8d98f7e98) +} + +var fileDescriptor_ba295fe8d98f7e98 = []byte{ + // 542 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, } func (m *MsgInfo) Marshal() (dAtA []byte, err error) { diff --git a/proto/consensus/walmsgs.proto b/proto/tendermint/consensus/walmsgs.proto similarity index 86% rename from proto/consensus/walmsgs.proto rename to proto/tendermint/consensus/walmsgs.proto index 7b4b15e81..300806c70 100644 --- a/proto/consensus/walmsgs.proto +++ b/proto/tendermint/consensus/walmsgs.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package tendermint.consensus; -option go_package = "github.com/tendermint/tendermint/proto/consensus"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/consensus/msgs.proto"; -import "proto/types/events.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/consensus/msgs.proto"; +import "tendermint/types/events.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/crypto/keys/types.pb.go b/proto/tendermint/crypto/keys/types.pb.go similarity index 90% rename from proto/crypto/keys/types.pb.go rename to proto/tendermint/crypto/keys/types.pb.go index 1b7340ce2..a672f4656 100644 --- a/proto/crypto/keys/types.pb.go +++ b/proto/tendermint/crypto/keys/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/crypto/keys/types.proto +// source: tendermint/crypto/keys/types.proto package keys @@ -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_943d79b57ec0188f, []int{0} + return fileDescriptor_6e4a90a3275dcf41, []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_943d79b57ec0188f, []int{1} + return fileDescriptor_6e4a90a3275dcf41, []int{1} } func (m *PrivateKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -178,24 +178,25 @@ func init() { proto.RegisterType((*PrivateKey)(nil), "tendermint.crypto.keys.PrivateKey") } -func init() { proto.RegisterFile("proto/crypto/keys/types.proto", fileDescriptor_943d79b57ec0188f) } - -var fileDescriptor_943d79b57ec0188f = []byte{ - // 213 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2f, 0xa9, - 0x2c, 0x48, 0x2d, 0xd6, 0x03, 0x8b, 0x0b, 0x89, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, - 0xe6, 0x95, 0xe8, 0x41, 0xd4, 0xe8, 0x81, 0xd4, 0x48, 0xa9, 0x95, 0x64, 0x64, 0x16, 0xa5, 0xc4, - 0x17, 0x24, 0x16, 0x95, 0x54, 0xea, 0x43, 0x8c, 0x48, 0xcf, 0x4f, 0xcf, 0x47, 0xb0, 0x20, 0xfa, - 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, 0x93, 0xcf, 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, - 0x19, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0xfc, 0x83, 0xcc, - 0xc4, 0x08, 0x84, 0x24, 0x36, 0xb0, 0x90, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x65, 0xc0, 0xc2, - 0x6d, 0x20, 0x01, 0x00, 0x00, +func init() { + proto.RegisterFile("tendermint/crypto/keys/types.proto", fileDescriptor_6e4a90a3275dcf41) +} + +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, + 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, } func (this *PublicKey) Compare(that interface{}) int { diff --git a/proto/crypto/keys/types.proto b/proto/tendermint/crypto/keys/types.proto similarity index 79% rename from proto/crypto/keys/types.proto rename to proto/tendermint/crypto/keys/types.proto index 4cf3f57b0..4e9d7268a 100644 --- a/proto/crypto/keys/types.proto +++ b/proto/tendermint/crypto/keys/types.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package tendermint.crypto.keys; -option go_package = "github.com/tendermint/tendermint/proto/crypto/keys"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto/keys"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // PublicKey defines the keys available for use with Tendermint Validators message PublicKey { diff --git a/proto/crypto/merkle/types.pb.go b/proto/tendermint/crypto/merkle/types.pb.go similarity index 91% rename from proto/crypto/merkle/types.pb.go rename to proto/tendermint/crypto/merkle/types.pb.go index 68298bf7f..96b225e16 100644 --- a/proto/crypto/merkle/types.pb.go +++ b/proto/tendermint/crypto/merkle/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/crypto/merkle/types.proto +// source: tendermint/crypto/merkle/types.proto package merkle @@ -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_57e39eefdaf7ae96, []int{0} + return fileDescriptor_ae49ae2f7da97579, []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_57e39eefdaf7ae96, []int{1} + return fileDescriptor_ae49ae2f7da97579, []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_57e39eefdaf7ae96, []int{2} + return fileDescriptor_ae49ae2f7da97579, []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_57e39eefdaf7ae96, []int{3} + return fileDescriptor_ae49ae2f7da97579, []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_57e39eefdaf7ae96, []int{4} + return fileDescriptor_ae49ae2f7da97579, []int{4} } func (m *ProofOps) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -321,34 +321,35 @@ func init() { proto.RegisterType((*ProofOps)(nil), "tendermint.crypto.merkle.ProofOps") } -func init() { proto.RegisterFile("proto/crypto/merkle/types.proto", fileDescriptor_57e39eefdaf7ae96) } +func init() { + proto.RegisterFile("tendermint/crypto/merkle/types.proto", fileDescriptor_ae49ae2f7da97579) +} -var fileDescriptor_57e39eefdaf7ae96 = []byte{ - // 371 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4e, 0xeb, 0x30, - 0x18, 0xc5, 0x93, 0x26, 0xfd, 0xe7, 0x76, 0xb8, 0xb2, 0xae, 0xae, 0xa2, 0x8b, 0x94, 0x86, 0x0c, - 0x28, 0x53, 0x22, 0x15, 0x18, 0x58, 0x0b, 0x48, 0x88, 0x81, 0x22, 0x0f, 0x0c, 0x2c, 0x95, 0xdb, - 0xb8, 0x4d, 0xd4, 0x24, 0xb6, 0x1c, 0x47, 0x22, 0x6f, 0xc1, 0x63, 0x75, 0xec, 0xc8, 0x84, 0x50, - 0xfb, 0x22, 0xc8, 0x76, 0x50, 0x41, 0x02, 0xb1, 0x9d, 0x73, 0xf2, 0xf9, 0xe7, 0xf3, 0x45, 0x06, - 0x23, 0xc6, 0xa9, 0xa0, 0xd1, 0x82, 0xd7, 0x4c, 0xd0, 0x28, 0x27, 0x7c, 0x9d, 0x91, 0x48, 0xd4, - 0x8c, 0x94, 0xa1, 0xfa, 0x02, 0x1d, 0x41, 0x8a, 0x98, 0xf0, 0x3c, 0x2d, 0x44, 0xa8, 0xa7, 0x42, - 0x3d, 0xf5, 0xff, 0x44, 0x24, 0x29, 0x8f, 0x67, 0x0c, 0x73, 0x51, 0x47, 0x1a, 0xb3, 0xa2, 0x2b, - 0x7a, 0x50, 0x9a, 0xe0, 0x2f, 0x41, 0xfb, 0x9e, 0x53, 0xba, 0x84, 0x7f, 0x41, 0x5b, 0x50, 0x81, - 0x33, 0xc7, 0xf4, 0xcc, 0xc0, 0x42, 0xda, 0xc8, 0x34, 0x2d, 0x62, 0xf2, 0xe4, 0xb4, 0x74, 0xaa, - 0x0c, 0x3c, 0x02, 0xfd, 0x8c, 0xe0, 0xe5, 0x2c, 0xc1, 0x65, 0xe2, 0x58, 0x9e, 0x19, 0x0c, 0x51, - 0x4f, 0x06, 0x37, 0xb8, 0x4c, 0xe4, 0x11, 0x5c, 0x15, 0xa2, 0x74, 0x6c, 0xcf, 0x0a, 0x86, 0x48, - 0x1b, 0x1f, 0x81, 0xee, 0x03, 0xce, 0x2a, 0x32, 0x65, 0xf0, 0x0f, 0xb0, 0xd6, 0xa4, 0x56, 0xf7, - 0x0c, 0x91, 0x94, 0xf0, 0x1c, 0xb4, 0x99, 0x2c, 0xa1, 0x6e, 0x19, 0x8c, 0x47, 0xe1, 0x4f, 0x6b, - 0x85, 0xaa, 0x2b, 0xd2, 0xd3, 0xfe, 0x2d, 0xe8, 0x5d, 0xd1, 0x3c, 0x2d, 0xe8, 0x57, 0x68, 0x5f, - 0x43, 0x55, 0x75, 0x56, 0x09, 0x05, 0xed, 0x23, 0x6d, 0xe0, 0x3f, 0xd0, 0xa1, 0x95, 0x90, 0xb1, - 0xa5, 0xe2, 0xc6, 0xf9, 0x97, 0xa0, 0xab, 0xd8, 0x53, 0x06, 0x21, 0xb0, 0xe5, 0x3f, 0x6e, 0x58, - 0x4a, 0x7f, 0xe0, 0x5b, 0x87, 0xce, 0x10, 0xd8, 0x31, 0x16, 0xb8, 0x59, 0x5f, 0x69, 0xff, 0x1a, - 0xf4, 0x1a, 0x48, 0x09, 0x2f, 0x80, 0x45, 0x59, 0xe9, 0x98, 0x9e, 0x15, 0x0c, 0xc6, 0xc7, 0xbf, - 0x6c, 0x34, 0x65, 0x13, 0x7b, 0xf3, 0x3a, 0x32, 0x90, 0x3c, 0x33, 0xb9, 0xdb, 0xec, 0x5c, 0x73, - 0xbb, 0x73, 0xcd, 0xb7, 0x9d, 0x6b, 0x3e, 0xef, 0x5d, 0x63, 0xbb, 0x77, 0x8d, 0x97, 0xbd, 0x6b, - 0x3c, 0x9e, 0xad, 0x52, 0x91, 0x54, 0xf3, 0x70, 0x41, 0xf3, 0xe8, 0x40, 0xfc, 0x2c, 0xbf, 0x79, - 0x31, 0xf3, 0x8e, 0x0a, 0x4f, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x94, 0xcb, 0xb9, 0x4f, - 0x02, 0x00, 0x00, +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, } func (m *Proof) Marshal() (dAtA []byte, err error) { diff --git a/proto/crypto/merkle/types.proto b/proto/tendermint/crypto/merkle/types.proto similarity index 86% rename from proto/crypto/merkle/types.proto rename to proto/tendermint/crypto/merkle/types.proto index 77c0d7535..95aa6582b 100644 --- a/proto/crypto/merkle/types.proto +++ b/proto/tendermint/crypto/merkle/types.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package tendermint.crypto.merkle; -option go_package = "github.com/tendermint/tendermint/proto/crypto/merkle"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; message Proof { int64 total = 1; diff --git a/proto/evidence/msgs.pb.go b/proto/tendermint/evidence/msgs.pb.go similarity index 86% rename from proto/evidence/msgs.pb.go rename to proto/tendermint/evidence/msgs.pb.go index 4819650b9..209b915f6 100644 --- a/proto/evidence/msgs.pb.go +++ b/proto/tendermint/evidence/msgs.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/evidence/msgs.proto +// source: tendermint/evidence/msgs.proto package evidence @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - types "github.com/tendermint/tendermint/proto/types" + types "github.com/tendermint/tendermint/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -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_df8322769b0bd7d6, []int{0} + return fileDescriptor_241b0b668c736d2f, []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_df8322769b0bd7d6, []int{1} + return fileDescriptor_241b0b668c736d2f, []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("proto/evidence/msgs.proto", fileDescriptor_df8322769b0bd7d6) } +func init() { proto.RegisterFile("tendermint/evidence/msgs.proto", fileDescriptor_241b0b668c736d2f) } -var fileDescriptor_df8322769b0bd7d6 = []byte{ - // 254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x4f, 0x2d, 0xcb, 0x4c, 0x49, 0xcd, 0x4b, 0x4e, 0xd5, 0xcf, 0x2d, 0x4e, 0x2f, 0xd6, - 0x03, 0x8b, 0x09, 0x09, 0x97, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0xc1, - 0xe4, 0xa5, 0xd4, 0x4a, 0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21, - 0x7a, 0xd3, 0xf3, 0xd3, 0xf3, 0x11, 0x2c, 0x88, 0x66, 0x29, 0x29, 0x88, 0x48, 0x49, 0x65, 0x41, - 0x6a, 0x31, 0xdc, 0x74, 0x88, 0x9c, 0x92, 0x1d, 0x17, 0x8b, 0x4f, 0x66, 0x71, 0x89, 0x90, 0x19, - 0x17, 0x07, 0x4c, 0x46, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4a, 0x0f, 0xc9, 0x4e, 0xb0, - 0x5e, 0x3d, 0x57, 0xa8, 0x8a, 0x20, 0xb8, 0x5a, 0xa5, 0x3a, 0x2e, 0x16, 0xcf, 0xbc, 0xb4, 0x7c, - 0x21, 0x19, 0x2e, 0xce, 0xe4, 0xfc, 0xdc, 0xdc, 0xcc, 0x92, 0x92, 0xd4, 0x14, 0x09, 0x46, 0x05, - 0x46, 0x0d, 0x8e, 0x20, 0x84, 0x80, 0x90, 0x14, 0x17, 0x47, 0x41, 0x51, 0x66, 0x7e, 0x51, 0x66, - 0x49, 0xa5, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x73, 0x10, 0x9c, 0x2f, 0x64, 0x83, 0x64, 0x33, 0xb3, - 0x02, 0x23, 0x7e, 0x9b, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x40, 0xd8, 0xef, 0xe4, 0x79, 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, 0xfa, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, - 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0xf3, 0x90, 0x99, 0xa8, 0xc1, 0x9d, 0xc4, 0x06, 0xe6, 0x1b, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x48, 0xa8, 0xde, 0xed, 0x87, 0x01, 0x00, 0x00, +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, + 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, } func (m *List) Marshal() (dAtA []byte, err error) { diff --git a/proto/evidence/msgs.proto b/proto/tendermint/evidence/msgs.proto similarity index 65% rename from proto/evidence/msgs.proto rename to proto/tendermint/evidence/msgs.proto index e896e30c1..7f24cd631 100644 --- a/proto/evidence/msgs.proto +++ b/proto/tendermint/evidence/msgs.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package tendermint.evidence; -option go_package = "github.com/tendermint/tendermint/proto/evidence"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/evidence"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/types/evidence.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/types/evidence.proto"; message List { repeated tendermint.types.Evidence evidence = 1; diff --git a/proto/libs/bits/types.pb.go b/proto/tendermint/libs/bits/types.pb.go similarity index 87% rename from proto/libs/bits/types.pb.go rename to proto/tendermint/libs/bits/types.pb.go index ce57ae024..ad87f854f 100644 --- a/proto/libs/bits/types.pb.go +++ b/proto/tendermint/libs/bits/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/libs/bits/types.proto +// source: tendermint/libs/bits/types.proto package bits @@ -31,7 +31,7 @@ func (m *BitArray) Reset() { *m = BitArray{} } func (m *BitArray) String() string { return proto.CompactTextString(m) } func (*BitArray) ProtoMessage() {} func (*BitArray) Descriptor() ([]byte, []int) { - return fileDescriptor_3f1fbe70d7999e09, []int{0} + return fileDescriptor_e91ab2672920d7d4, []int{0} } func (m *BitArray) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -78,21 +78,21 @@ func init() { proto.RegisterType((*BitArray)(nil), "tendermint.libs.bits.BitArray") } -func init() { proto.RegisterFile("proto/libs/bits/types.proto", fileDescriptor_3f1fbe70d7999e09) } +func init() { proto.RegisterFile("tendermint/libs/bits/types.proto", fileDescriptor_e91ab2672920d7d4) } -var fileDescriptor_3f1fbe70d7999e09 = []byte{ - // 164 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, 0x2c, 0x29, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, - 0x2d, 0xd6, 0x03, 0x8b, 0x0a, 0x89, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, - 0xe8, 0x81, 0x54, 0xe8, 0x81, 0x54, 0x28, 0x99, 0x70, 0x71, 0x38, 0x65, 0x96, 0x38, 0x16, 0x15, - 0x25, 0x56, 0x0a, 0x09, 0x71, 0xb1, 0x80, 0xc4, 0x24, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xc0, - 0x6c, 0x21, 0x11, 0x2e, 0xd6, 0xd4, 0x9c, 0xd4, 0xdc, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x96, - 0x20, 0x08, 0xc7, 0xc9, 0xeb, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, - 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x0c, - 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x11, 0x16, 0x22, 0x33, 0xd1, - 0xdc, 0x98, 0xc4, 0x06, 0x16, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x77, 0x8d, 0x7a, 0x08, - 0xbd, 0x00, 0x00, 0x00, +var fileDescriptor_e91ab2672920d7d4 = []byte{ + // 168 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, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, 0x2c, 0x29, + 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0xa8, + 0xd0, 0x03, 0xa9, 0xd0, 0x03, 0xa9, 0x50, 0x32, 0xe1, 0xe2, 0x70, 0xca, 0x2c, 0x71, 0x2c, 0x2a, + 0x4a, 0xac, 0x14, 0x12, 0xe2, 0x62, 0x01, 0x89, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x81, + 0xd9, 0x42, 0x22, 0x5c, 0xac, 0xa9, 0x39, 0xa9, 0xb9, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x2c, + 0x41, 0x10, 0x8e, 0x53, 0xe8, 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, + 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x39, 0x09, 0x89, 0x09, + 0x76, 0x8d, 0x3e, 0x36, 0xe7, 0x26, 0xb1, 0x81, 0xe5, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x5b, 0x0c, 0xe3, 0x3e, 0xcd, 0x00, 0x00, 0x00, } func (m *BitArray) Marshal() (dAtA []byte, err error) { diff --git a/proto/libs/bits/types.proto b/proto/tendermint/libs/bits/types.proto similarity index 61% rename from proto/libs/bits/types.proto rename to proto/tendermint/libs/bits/types.proto index 0fad7a443..3111d113a 100644 --- a/proto/libs/bits/types.proto +++ b/proto/tendermint/libs/bits/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tendermint.libs.bits; -option go_package = "github.com/tendermint/tendermint/proto/libs/bits"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/libs/bits"; message BitArray { int64 bits = 1; diff --git a/proto/p2p/conn_msgs.pb.go b/proto/tendermint/p2p/conn_msgs.pb.go similarity index 90% rename from proto/p2p/conn_msgs.pb.go rename to proto/tendermint/p2p/conn_msgs.pb.go index 399115590..ec7ea4b4e 100644 --- a/proto/p2p/conn_msgs.pb.go +++ b/proto/tendermint/p2p/conn_msgs.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/p2p/conn_msgs.proto +// source: tendermint/p2p/conn_msgs.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/crypto/keys" + keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" 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_8c680f0b24d73fe7, []int{0} + return fileDescriptor_be90553d47cad78e, []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_8c680f0b24d73fe7, []int{1} + return fileDescriptor_be90553d47cad78e, []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_8c680f0b24d73fe7, []int{2} + return fileDescriptor_be90553d47cad78e, []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_8c680f0b24d73fe7, []int{3} + return fileDescriptor_be90553d47cad78e, []int{3} } func (m *Packet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -263,7 +263,7 @@ 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_8c680f0b24d73fe7, []int{4} + return fileDescriptor_be90553d47cad78e, []int{4} } func (m *AuthSigMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -314,36 +314,36 @@ func init() { proto.RegisterType((*AuthSigMessage)(nil), "tendermint.p2p.AuthSigMessage") } -func init() { proto.RegisterFile("proto/p2p/conn_msgs.proto", fileDescriptor_8c680f0b24d73fe7) } - -var fileDescriptor_8c680f0b24d73fe7 = []byte{ - // 405 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0xc6, 0x13, 0xb3, 0xdb, 0xa5, 0x6f, 0xeb, 0x22, 0x73, 0x6a, 0x0b, 0xa6, 0x6b, 0x0f, 0xb2, - 0x88, 0x24, 0x10, 0x6f, 0x82, 0xa0, 0x71, 0x15, 0x97, 0xa5, 0x58, 0xe2, 0xcd, 0x4b, 0xc8, 0x9f, - 0x71, 0x32, 0x74, 0x33, 0x33, 0x64, 0x26, 0x87, 0x7c, 0x0b, 0x3f, 0xd6, 0x7a, 0xdb, 0xa3, 0xa7, - 0x22, 0xe9, 0x17, 0x91, 0xcc, 0xc4, 0x6d, 0x0a, 0xee, 0xed, 0x79, 0x1e, 0xe6, 0xf7, 0xfe, 0xc9, - 0x1b, 0x98, 0x8b, 0x8a, 0x2b, 0xee, 0x8b, 0x40, 0xf8, 0x19, 0x67, 0x2c, 0x2e, 0x25, 0x91, 0x9e, - 0xce, 0xd0, 0xb9, 0xc2, 0x2c, 0xc7, 0x55, 0x49, 0x99, 0xf2, 0x44, 0x20, 0x16, 0x2f, 0x55, 0x41, - 0xab, 0x3c, 0x16, 0x49, 0xa5, 0x1a, 0xdf, 0x60, 0x84, 0x13, 0x7e, 0x50, 0x86, 0x5b, 0x3c, 0x37, - 0x49, 0x56, 0x35, 0x42, 0x71, 0x7f, 0x8b, 0x1b, 0xe9, 0xab, 0x46, 0xe0, 0xbe, 0xec, 0x6a, 0x0a, - 0xb0, 0x49, 0xb2, 0x2d, 0x56, 0x1b, 0xca, 0xc8, 0xc0, 0x71, 0x46, 0x56, 0x05, 0x8c, 0x8d, 0x5b, - 0x4b, 0x82, 0x5e, 0x03, 0x64, 0x45, 0xc2, 0x18, 0xbe, 0x8d, 0x69, 0x3e, 0xb3, 0x2f, 0xec, 0xcb, - 0xd3, 0xf0, 0x69, 0xbb, 0x5b, 0x8e, 0x3f, 0x9a, 0xf4, 0xfa, 0x2a, 0x1a, 0xf7, 0x0f, 0xae, 0x73, - 0x34, 0x07, 0x07, 0xf3, 0x1f, 0xb3, 0x27, 0xfa, 0xd9, 0x59, 0xbb, 0x5b, 0x3a, 0x9f, 0xbe, 0x7e, - 0x8e, 0xba, 0x0c, 0x21, 0x38, 0xc9, 0x13, 0x95, 0xcc, 0x9c, 0x0b, 0xfb, 0x72, 0x1a, 0x69, 0xbd, - 0xfa, 0x65, 0xc3, 0xc8, 0xb4, 0x42, 0xef, 0x60, 0x22, 0xb4, 0x8a, 0x05, 0x65, 0x44, 0x37, 0x9a, - 0x04, 0x0b, 0xef, 0x78, 0x7b, 0xef, 0x30, 0xf3, 0x17, 0x2b, 0x02, 0xf1, 0xe0, 0x86, 0x38, 0x67, - 0x44, 0x0f, 0xf0, 0x38, 0xce, 0x8f, 0x70, 0xce, 0x08, 0x7a, 0x0b, 0xbd, 0xeb, 0x3e, 0xbd, 0x1e, - 0x71, 0x12, 0xcc, 0xff, 0x4f, 0xaf, 0x65, 0x07, 0x8f, 0xc5, 0x3f, 0x13, 0x9e, 0x82, 0x23, 0xeb, - 0x72, 0x95, 0xc3, 0xf9, 0x87, 0x5a, 0x15, 0xdf, 0x28, 0x59, 0x63, 0x29, 0x13, 0x82, 0xd1, 0x7b, - 0x38, 0x13, 0x75, 0x1a, 0x6f, 0x71, 0xd3, 0xaf, 0xf3, 0x62, 0x58, 0xd1, 0x5c, 0xc6, 0xeb, 0x2e, - 0xe3, 0x6d, 0xea, 0xf4, 0x96, 0x66, 0x37, 0xb8, 0x09, 0x4f, 0xee, 0x76, 0x4b, 0x2b, 0x1a, 0x89, - 0x3a, 0xbd, 0xc1, 0x0d, 0x7a, 0x06, 0x8e, 0xa4, 0x66, 0x9b, 0x69, 0xd4, 0xc9, 0xf0, 0xea, 0xae, - 0x75, 0xed, 0xfb, 0xd6, 0xb5, 0xff, 0xb4, 0xae, 0xfd, 0x73, 0xef, 0x5a, 0xf7, 0x7b, 0xd7, 0xfa, - 0xbd, 0x77, 0xad, 0xef, 0xaf, 0x08, 0x55, 0x45, 0x9d, 0x7a, 0x19, 0x2f, 0xfd, 0x43, 0x9b, 0xa1, - 0x7c, 0xf8, 0xc9, 0xd2, 0x91, 0x96, 0x6f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x52, 0x09, - 0x89, 0x78, 0x02, 0x00, 0x00, +func init() { proto.RegisterFile("tendermint/p2p/conn_msgs.proto", fileDescriptor_be90553d47cad78e) } + +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, } func (m *PacketPing) Marshal() (dAtA []byte, err error) { diff --git a/proto/p2p/conn_msgs.proto b/proto/tendermint/p2p/conn_msgs.proto similarity index 77% rename from proto/p2p/conn_msgs.proto rename to proto/tendermint/p2p/conn_msgs.proto index 16b8c2ef6..d202ce917 100644 --- a/proto/p2p/conn_msgs.proto +++ b/proto/tendermint/p2p/conn_msgs.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package tendermint.p2p; -option go_package = "github.com/tendermint/tendermint/proto/p2p"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/crypto/keys/types.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/crypto/keys/types.proto"; message PacketPing {} diff --git a/proto/p2p/pex_msgs.pb.go b/proto/tendermint/p2p/pex_msgs.pb.go similarity index 89% rename from proto/p2p/pex_msgs.pb.go rename to proto/tendermint/p2p/pex_msgs.pb.go index 02b55722c..84f5fa9c9 100644 --- a/proto/p2p/pex_msgs.pb.go +++ b/proto/tendermint/p2p/pex_msgs.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/p2p/pex_msgs.proto +// source: tendermint/p2p/pex_msgs.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_b4d6fe6b009e47d8, []int{0} + return fileDescriptor_44a0de202547e95e, []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_b4d6fe6b009e47d8, []int{1} + return fileDescriptor_44a0de202547e95e, []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_b4d6fe6b009e47d8, []int{2} + return fileDescriptor_44a0de202547e95e, []int{2} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -194,28 +194,27 @@ func init() { proto.RegisterType((*Message)(nil), "tendermint.p2p.Message") } -func init() { proto.RegisterFile("proto/p2p/pex_msgs.proto", fileDescriptor_b4d6fe6b009e47d8) } - -var fileDescriptor_b4d6fe6b009e47d8 = []byte{ - // 278 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0x88, 0xcf, 0x2d, 0x4e, 0x2f, 0xd6, 0x03, - 0x0b, 0x09, 0xf1, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x15, 0x18, - 0x15, 0x48, 0x89, 0x22, 0x54, 0x96, 0x54, 0x16, 0xa4, 0x42, 0x95, 0x49, 0xa9, 0x95, 0x64, 0x64, - 0x16, 0xa5, 0xc4, 0x17, 0x24, 0x16, 0x95, 0x54, 0xea, 0x43, 0x94, 0xa4, 0xe7, 0xa7, 0xe7, 0x23, - 0x58, 0x10, 0x75, 0x4a, 0x3c, 0x5c, 0x5c, 0x01, 0xa9, 0x15, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, - 0x25, 0x4a, 0x4e, 0x5c, 0x1c, 0x01, 0xa9, 0x15, 0x8e, 0x29, 0x29, 0x45, 0xc5, 0x42, 0x66, 0x5c, - 0xac, 0x89, 0x20, 0x86, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0x94, 0x1e, 0xaa, 0xc5, 0x7a, - 0x7e, 0xa9, 0x25, 0x20, 0x85, 0xa9, 0xc5, 0xc5, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, - 0x94, 0x2b, 0x75, 0x30, 0x72, 0xb1, 0xfb, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0xd9, 0x72, - 0x71, 0x83, 0x9c, 0x5f, 0x04, 0x31, 0x5e, 0x82, 0x51, 0x81, 0x11, 0x9b, 0x49, 0x08, 0x07, 0x78, - 0x30, 0x04, 0x71, 0x15, 0xc0, 0x79, 0x42, 0xe6, 0x5c, 0x9c, 0x20, 0xed, 0x10, 0x67, 0x30, 0x81, - 0x35, 0x4b, 0x60, 0xd1, 0x0c, 0x76, 0xaf, 0x07, 0x43, 0x10, 0x47, 0x01, 0x94, 0xed, 0xc4, 0xca, - 0xc5, 0x5c, 0x5c, 0x9a, 0xeb, 0xe4, 0x72, 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, 0x5a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0x03, 0x91, - 0x99, 0xf0, 0x60, 0x4d, 0x62, 0x03, 0x33, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x15, 0x30, - 0x3c, 0xbc, 0x94, 0x01, 0x00, 0x00, +func init() { proto.RegisterFile("tendermint/p2p/pex_msgs.proto", fileDescriptor_44a0de202547e95e) } + +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, } func (m *PexRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/p2p/pex_msgs.proto b/proto/tendermint/p2p/pex_msgs.proto similarity index 63% rename from proto/p2p/pex_msgs.proto rename to proto/tendermint/p2p/pex_msgs.proto index ff52f64aa..dfe238dbe 100644 --- a/proto/p2p/pex_msgs.proto +++ b/proto/tendermint/p2p/pex_msgs.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package tendermint.p2p; -option go_package = "github.com/tendermint/tendermint/proto/p2p"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; -import "proto/p2p/types.proto"; -import "third_party/proto/gogoproto/gogo.proto"; +import "tendermint/p2p/types.proto"; +import "gogoproto/gogo.proto"; message PexRequest {} diff --git a/proto/p2p/types.pb.go b/proto/tendermint/p2p/types.pb.go similarity index 90% rename from proto/p2p/types.pb.go rename to proto/tendermint/p2p/types.pb.go index c7f9e5d30..127bef662 100644 --- a/proto/p2p/types.pb.go +++ b/proto/tendermint/p2p/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/p2p/types.proto +// source: tendermint/p2p/types.proto package p2p @@ -34,7 +34,7 @@ func (m *NetAddress) Reset() { *m = NetAddress{} } func (m *NetAddress) String() string { return proto.CompactTextString(m) } func (*NetAddress) ProtoMessage() {} func (*NetAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_5c4320c1810ca85c, []int{0} + return fileDescriptor_c8a29e659aeca578, []int{0} } func (m *NetAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -101,7 +101,7 @@ func (m *ProtocolVersion) Reset() { *m = ProtocolVersion{} } func (m *ProtocolVersion) String() string { return proto.CompactTextString(m) } func (*ProtocolVersion) ProtoMessage() {} func (*ProtocolVersion) Descriptor() ([]byte, []int) { - return fileDescriptor_5c4320c1810ca85c, []int{1} + return fileDescriptor_c8a29e659aeca578, []int{1} } func (m *ProtocolVersion) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -166,7 +166,7 @@ func (m *DefaultNodeInfo) Reset() { *m = DefaultNodeInfo{} } func (m *DefaultNodeInfo) String() string { return proto.CompactTextString(m) } func (*DefaultNodeInfo) ProtoMessage() {} func (*DefaultNodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_5c4320c1810ca85c, []int{2} + return fileDescriptor_c8a29e659aeca578, []int{2} } func (m *DefaultNodeInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -260,7 +260,7 @@ func (m *DefaultNodeInfoOther) Reset() { *m = DefaultNodeInfoOther{} } func (m *DefaultNodeInfoOther) String() string { return proto.CompactTextString(m) } func (*DefaultNodeInfoOther) ProtoMessage() {} func (*DefaultNodeInfoOther) Descriptor() ([]byte, []int) { - return fileDescriptor_5c4320c1810ca85c, []int{3} + return fileDescriptor_c8a29e659aeca578, []int{3} } func (m *DefaultNodeInfoOther) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -310,41 +310,41 @@ func init() { proto.RegisterType((*DefaultNodeInfoOther)(nil), "tendermint.p2p.DefaultNodeInfoOther") } -func init() { proto.RegisterFile("proto/p2p/types.proto", fileDescriptor_5c4320c1810ca85c) } +func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) } -var fileDescriptor_5c4320c1810ca85c = []byte{ - // 493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x4f, 0x6f, 0xda, 0x30, - 0x1c, 0x25, 0x21, 0xfc, 0xe9, 0x8f, 0x51, 0x3a, 0xab, 0x9b, 0xd2, 0x1e, 0x12, 0x84, 0xa6, 0x09, - 0xed, 0x00, 0x12, 0x3b, 0xed, 0xb6, 0x31, 0x2e, 0x5c, 0xba, 0xc8, 0x9a, 0x76, 0xd8, 0x25, 0x82, - 0xd8, 0x05, 0x0b, 0xb0, 0x2d, 0xc7, 0xdd, 0xe8, 0xb7, 0xd8, 0xc7, 0xea, 0xb1, 0xc7, 0x9d, 0xd0, - 0x14, 0x8e, 0xfb, 0x12, 0x93, 0xed, 0xb4, 0x65, 0xa8, 0xb7, 0xf7, 0x7e, 0xfe, 0xbd, 0xbc, 0x97, - 0x27, 0x1b, 0x5e, 0x49, 0x25, 0xb4, 0x18, 0xca, 0x91, 0x1c, 0xea, 0x5b, 0x49, 0xf3, 0x81, 0xe5, - 0xe8, 0x54, 0x53, 0x4e, 0xa8, 0xda, 0x30, 0xae, 0x07, 0x72, 0x24, 0x2f, 0xdf, 0xea, 0x25, 0x53, - 0x24, 0x95, 0x33, 0xa5, 0x6f, 0x87, 0x4e, 0xb2, 0x10, 0x0b, 0xf1, 0x84, 0x9c, 0xae, 0x37, 0x07, - 0xb8, 0xa2, 0xfa, 0x13, 0x21, 0x8a, 0xe6, 0x39, 0x7a, 0x0d, 0x3e, 0x23, 0xa1, 0xd7, 0xf5, 0xfa, - 0x27, 0xe3, 0x7a, 0xb1, 0x8b, 0xfd, 0xe9, 0x04, 0xfb, 0x8c, 0xd8, 0xb9, 0x0c, 0xfd, 0x83, 0x79, - 0x82, 0x7d, 0x26, 0x11, 0x82, 0x40, 0x0a, 0xa5, 0xc3, 0x6a, 0xd7, 0xeb, 0xb7, 0xb1, 0xc5, 0xe8, - 0x0c, 0xaa, 0xb9, 0x56, 0x61, 0x60, 0x96, 0xb1, 0x81, 0xbd, 0xaf, 0xd0, 0x49, 0x8c, 0x59, 0x26, - 0xd6, 0xdf, 0xa8, 0xca, 0x99, 0xe0, 0xe8, 0x02, 0xaa, 0x72, 0x24, 0xad, 0x53, 0x30, 0x6e, 0x14, - 0xbb, 0xb8, 0x9a, 0x8c, 0x12, 0x6c, 0x66, 0xe8, 0x1c, 0x6a, 0xf3, 0xb5, 0xc8, 0x56, 0xd6, 0x2e, - 0xc0, 0x8e, 0x98, 0xaf, 0xce, 0xa4, 0xb4, 0x46, 0x01, 0x36, 0xb0, 0xf7, 0xd7, 0x87, 0xce, 0x84, - 0x5e, 0xcf, 0x6e, 0xd6, 0xfa, 0x4a, 0x10, 0x3a, 0xe5, 0xd7, 0x02, 0x25, 0x70, 0x26, 0x4b, 0xa7, - 0xf4, 0x87, 0xb3, 0xb2, 0x1e, 0xad, 0x51, 0x3c, 0xf8, 0xbf, 0xa0, 0xc1, 0x51, 0xa2, 0x71, 0x70, - 0xb7, 0x8b, 0x2b, 0xb8, 0x23, 0x8f, 0x82, 0x7e, 0x80, 0x0e, 0x71, 0x26, 0x29, 0x17, 0x84, 0xa6, - 0x8c, 0x94, 0x35, 0xbc, 0x2c, 0x76, 0x71, 0xfb, 0xd0, 0x7f, 0x82, 0xdb, 0xe4, 0x80, 0x12, 0x14, - 0x43, 0x6b, 0xcd, 0x72, 0x4d, 0x79, 0x3a, 0x23, 0x44, 0xd9, 0xe8, 0x27, 0x18, 0xdc, 0xc8, 0x14, - 0x8e, 0x42, 0x68, 0x70, 0xaa, 0x7f, 0x0a, 0xb5, 0x2a, 0xdb, 0x7a, 0xa0, 0xe6, 0xe4, 0x21, 0x7e, - 0xcd, 0x9d, 0x94, 0x14, 0x5d, 0x42, 0x33, 0x5b, 0xce, 0x38, 0xa7, 0xeb, 0x3c, 0xac, 0x77, 0xbd, - 0xfe, 0x0b, 0xfc, 0xc8, 0x8d, 0x6a, 0x23, 0x38, 0x5b, 0x51, 0x15, 0x36, 0x9c, 0xaa, 0xa4, 0xe8, - 0x23, 0xd4, 0x84, 0x5e, 0x52, 0x15, 0x36, 0x6d, 0x19, 0x6f, 0x8e, 0xcb, 0x38, 0xea, 0xf1, 0x8b, - 0xd9, 0x2d, 0x1b, 0x71, 0xc2, 0xde, 0x1c, 0xce, 0x9f, 0x5b, 0x42, 0x17, 0xd0, 0xd4, 0xdb, 0x94, - 0x71, 0x42, 0xb7, 0xee, 0xde, 0xe0, 0x86, 0xde, 0x4e, 0x0d, 0x45, 0x43, 0x68, 0x29, 0x99, 0xd9, - 0x9f, 0xa7, 0x79, 0x5e, 0xd6, 0x76, 0x5a, 0xec, 0x62, 0xc0, 0xc9, 0xe7, 0xf2, 0xc6, 0x61, 0x50, - 0x32, 0x2b, 0xf1, 0x78, 0x72, 0x57, 0x44, 0xde, 0x7d, 0x11, 0x79, 0x7f, 0x8a, 0xc8, 0xfb, 0xb5, - 0x8f, 0x2a, 0xf7, 0xfb, 0xa8, 0xf2, 0x7b, 0x1f, 0x55, 0xbe, 0xbf, 0x5b, 0x30, 0xbd, 0xbc, 0x99, - 0x0f, 0x32, 0xb1, 0x19, 0x3e, 0x45, 0x3f, 0x84, 0x8f, 0xaf, 0x62, 0x5e, 0xb7, 0xf0, 0xfd, 0xbf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x9d, 0xcd, 0x35, 0x29, 0x03, 0x00, 0x00, +var fileDescriptor_c8a29e659aeca578 = []byte{ + // 488 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x3d, 0x8f, 0xda, 0x40, + 0x10, 0xc5, 0xc6, 0x7c, 0xdc, 0x10, 0x8e, 0xcb, 0x0a, 0x45, 0x3e, 0x0a, 0x1b, 0xa1, 0x14, 0x54, + 0x20, 0x11, 0xa5, 0x48, 0x97, 0x10, 0x1a, 0x9a, 0x3b, 0x6b, 0x15, 0xa5, 0x48, 0x83, 0xc0, 0xbb, + 0x07, 0x2b, 0xcc, 0xee, 0x6a, 0xbd, 0x97, 0x90, 0x7f, 0x91, 0x9f, 0x75, 0xe5, 0x95, 0xa9, 0xac, + 0xc8, 0x94, 0xf9, 0x13, 0xd1, 0xae, 0x7d, 0x89, 0x0f, 0xa5, 0x9b, 0xf7, 0x66, 0xc6, 0x6f, 0xfc, + 0xf4, 0x16, 0x06, 0x9a, 0x72, 0x42, 0xd5, 0x81, 0x71, 0x3d, 0x95, 0x33, 0x39, 0xd5, 0xdf, 0x25, + 0x4d, 0x27, 0x52, 0x09, 0x2d, 0xd0, 0xe5, 0xbf, 0xde, 0x44, 0xce, 0xe4, 0xa0, 0xbf, 0x15, 0x5b, + 0x61, 0x5b, 0x53, 0x53, 0x15, 0x53, 0xa3, 0x0d, 0xc0, 0x0d, 0xd5, 0x1f, 0x08, 0x51, 0x34, 0x4d, + 0xd1, 0x2b, 0x70, 0x19, 0xf1, 0x9d, 0xa1, 0x33, 0xbe, 0x98, 0x37, 0xf3, 0x2c, 0x74, 0x97, 0x0b, + 0xec, 0x32, 0x62, 0x79, 0xe9, 0xbb, 0x15, 0x3e, 0xc2, 0x2e, 0x93, 0x08, 0x81, 0x27, 0x85, 0xd2, + 0x7e, 0x7d, 0xe8, 0x8c, 0xbb, 0xd8, 0xd6, 0xe8, 0x0a, 0xea, 0xa9, 0x56, 0xbe, 0x67, 0x86, 0xb1, + 0x29, 0x47, 0x9f, 0xa0, 0x17, 0x19, 0xb1, 0x58, 0x24, 0x9f, 0xa9, 0x4a, 0x99, 0xe0, 0xe8, 0x1a, + 0xea, 0x72, 0x26, 0xad, 0x92, 0x37, 0x6f, 0xe5, 0x59, 0x58, 0x8f, 0x66, 0x11, 0x36, 0x1c, 0xea, + 0x43, 0x63, 0x93, 0x88, 0x78, 0x6f, 0xe5, 0x3c, 0x5c, 0x00, 0xf3, 0xd5, 0xb5, 0x94, 0x56, 0xc8, + 0xc3, 0xa6, 0x1c, 0xfd, 0x76, 0xa1, 0xb7, 0xa0, 0x77, 0xeb, 0xfb, 0x44, 0xdf, 0x08, 0x42, 0x97, + 0xfc, 0x4e, 0xa0, 0x08, 0xae, 0x64, 0xa9, 0xb4, 0xfa, 0x5a, 0x48, 0x59, 0x8d, 0xce, 0x2c, 0x9c, + 0x3c, 0xb7, 0x63, 0x72, 0x76, 0xd1, 0xdc, 0x7b, 0xc8, 0xc2, 0x1a, 0xee, 0xc9, 0xb3, 0x43, 0xdf, + 0x41, 0x8f, 0x14, 0x22, 0x2b, 0x2e, 0x08, 0x5d, 0x31, 0x52, 0xda, 0xf0, 0x32, 0xcf, 0xc2, 0x6e, + 0x55, 0x7f, 0x81, 0xbb, 0xa4, 0x02, 0x09, 0x0a, 0xa1, 0x93, 0xb0, 0x54, 0x53, 0xbe, 0x5a, 0x13, + 0xa2, 0xec, 0xe9, 0x17, 0x18, 0x0a, 0xca, 0x18, 0x8e, 0x7c, 0x68, 0x71, 0xaa, 0xbf, 0x09, 0xb5, + 0x2f, 0xdd, 0x7a, 0x82, 0xa6, 0xf3, 0x74, 0x7e, 0xa3, 0xe8, 0x94, 0x10, 0x0d, 0xa0, 0x1d, 0xef, + 0xd6, 0x9c, 0xd3, 0x24, 0xf5, 0x9b, 0x43, 0x67, 0xfc, 0x02, 0xff, 0xc5, 0x66, 0xeb, 0x20, 0x38, + 0xdb, 0x53, 0xe5, 0xb7, 0x8a, 0xad, 0x12, 0xa2, 0xf7, 0xd0, 0x10, 0x7a, 0x47, 0x95, 0xdf, 0xb6, + 0x66, 0xbc, 0x3e, 0x37, 0xe3, 0xcc, 0xc7, 0x5b, 0x33, 0x5b, 0x3a, 0x52, 0x2c, 0x8e, 0x36, 0xd0, + 0xff, 0xdf, 0x10, 0xba, 0x86, 0xb6, 0x3e, 0xae, 0x18, 0x27, 0xf4, 0x58, 0xe4, 0x06, 0xb7, 0xf4, + 0x71, 0x69, 0x20, 0x9a, 0x42, 0x47, 0xc9, 0xd8, 0xfe, 0x3c, 0x4d, 0xd3, 0xd2, 0xb6, 0xcb, 0x3c, + 0x0b, 0x01, 0x47, 0x1f, 0xcb, 0xc4, 0x61, 0x50, 0x32, 0x2e, 0xeb, 0xf9, 0xed, 0x43, 0x1e, 0x38, + 0x8f, 0x79, 0xe0, 0xfc, 0xca, 0x03, 0xe7, 0xc7, 0x29, 0xa8, 0x3d, 0x9e, 0x82, 0xda, 0xcf, 0x53, + 0x50, 0xfb, 0xf2, 0x76, 0xcb, 0xf4, 0xee, 0x7e, 0x33, 0x89, 0xc5, 0x61, 0x5a, 0x89, 0x7c, 0x35, + 0xfd, 0x36, 0xd8, 0xcf, 0x9f, 0xc3, 0xa6, 0x69, 0xd9, 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, + 0xd8, 0x1a, 0xd5, 0x03, 0x27, 0x03, 0x00, 0x00, } func (m *NetAddress) Marshal() (dAtA []byte, err error) { diff --git a/proto/p2p/types.proto b/proto/tendermint/p2p/types.proto similarity index 89% rename from proto/p2p/types.proto rename to proto/tendermint/p2p/types.proto index d571b27c3..de51ecfe8 100644 --- a/proto/p2p/types.proto +++ b/proto/tendermint/p2p/types.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package tendermint.p2p; -option go_package = "github.com/tendermint/tendermint/proto/p2p"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; message NetAddress { string id = 1 [(gogoproto.customname) = "ID"]; diff --git a/proto/privval/msgs.pb.go b/proto/tendermint/privval/msgs.pb.go similarity index 92% rename from proto/privval/msgs.pb.go rename to proto/tendermint/privval/msgs.pb.go index 12e7d78d4..685adeceb 100644 --- a/proto/privval/msgs.pb.go +++ b/proto/tendermint/privval/msgs.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/privval/msgs.proto +// source: tendermint/privval/msgs.proto package privval @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - keys "github.com/tendermint/tendermint/proto/crypto/keys" - types "github.com/tendermint/tendermint/proto/types" + keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" + types "github.com/tendermint/tendermint/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,7 @@ func (m *RemoteSignerError) Reset() { *m = RemoteSignerError{} } func (m *RemoteSignerError) String() string { return proto.CompactTextString(m) } func (*RemoteSignerError) ProtoMessage() {} func (*RemoteSignerError) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{0} + return fileDescriptor_7e8a3ca18a818327, []int{0} } func (m *RemoteSignerError) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,7 +85,7 @@ func (m *PubKeyRequest) Reset() { *m = PubKeyRequest{} } func (m *PubKeyRequest) String() string { return proto.CompactTextString(m) } func (*PubKeyRequest) ProtoMessage() {} func (*PubKeyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{1} + return fileDescriptor_7e8a3ca18a818327, []int{1} } func (m *PubKeyRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,7 +124,7 @@ func (m *PubKeyResponse) Reset() { *m = PubKeyResponse{} } func (m *PubKeyResponse) String() string { return proto.CompactTextString(m) } func (*PubKeyResponse) ProtoMessage() {} func (*PubKeyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{2} + return fileDescriptor_7e8a3ca18a818327, []int{2} } func (m *PubKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -176,7 +176,7 @@ func (m *SignVoteRequest) Reset() { *m = SignVoteRequest{} } func (m *SignVoteRequest) String() string { return proto.CompactTextString(m) } func (*SignVoteRequest) ProtoMessage() {} func (*SignVoteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{3} + return fileDescriptor_7e8a3ca18a818327, []int{3} } func (m *SignVoteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -222,7 +222,7 @@ func (m *SignedVoteResponse) Reset() { *m = SignedVoteResponse{} } func (m *SignedVoteResponse) String() string { return proto.CompactTextString(m) } func (*SignedVoteResponse) ProtoMessage() {} func (*SignedVoteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{4} + return fileDescriptor_7e8a3ca18a818327, []int{4} } func (m *SignedVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -274,7 +274,7 @@ func (m *SignProposalRequest) Reset() { *m = SignProposalRequest{} } func (m *SignProposalRequest) String() string { return proto.CompactTextString(m) } func (*SignProposalRequest) ProtoMessage() {} func (*SignProposalRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{5} + return fileDescriptor_7e8a3ca18a818327, []int{5} } func (m *SignProposalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -320,7 +320,7 @@ func (m *SignedProposalResponse) Reset() { *m = SignedProposalResponse{} func (m *SignedProposalResponse) String() string { return proto.CompactTextString(m) } func (*SignedProposalResponse) ProtoMessage() {} func (*SignedProposalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{6} + return fileDescriptor_7e8a3ca18a818327, []int{6} } func (m *SignedProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -371,7 +371,7 @@ func (m *PingRequest) Reset() { *m = PingRequest{} } func (m *PingRequest) String() string { return proto.CompactTextString(m) } func (*PingRequest) ProtoMessage() {} func (*PingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{7} + return fileDescriptor_7e8a3ca18a818327, []int{7} } func (m *PingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -408,7 +408,7 @@ func (m *PingResponse) Reset() { *m = PingResponse{} } func (m *PingResponse) String() string { return proto.CompactTextString(m) } func (*PingResponse) ProtoMessage() {} func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9ec52cc5e378f9a4, []int{8} + return fileDescriptor_7e8a3ca18a818327, []int{8} } func (m *PingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -454,7 +454,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_9ec52cc5e378f9a4, []int{9} + return fileDescriptor_7e8a3ca18a818327, []int{9} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -613,50 +613,49 @@ func init() { proto.RegisterType((*Message)(nil), "tendermint.privval.Message") } -func init() { proto.RegisterFile("proto/privval/msgs.proto", fileDescriptor_9ec52cc5e378f9a4) } - -var fileDescriptor_9ec52cc5e378f9a4 = []byte{ - // 625 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x6b, 0x13, 0x41, - 0x18, 0xc7, 0x77, 0x6d, 0xd2, 0xd6, 0x27, 0x4d, 0x63, 0xa7, 0x5a, 0x43, 0xc0, 0x34, 0xae, 0x58, - 0x4b, 0x0f, 0xbb, 0x50, 0xc1, 0x83, 0x2f, 0x97, 0xa2, 0xb8, 0x52, 0x94, 0x38, 0x05, 0x0f, 0x05, - 0x09, 0x79, 0x19, 0xb7, 0x4b, 0x9b, 0x9d, 0x71, 0x66, 0xb6, 0xb0, 0x07, 0x3f, 0x80, 0x07, 0xc1, - 0xcf, 0xe2, 0xa7, 0xe8, 0xb1, 0x47, 0x4f, 0x22, 0xcd, 0x17, 0x91, 0x9d, 0x99, 0xcd, 0x6e, 0xde, - 0x84, 0xd2, 0xdb, 0xce, 0x33, 0xf3, 0xfc, 0xe6, 0xf7, 0x64, 0xfe, 0x10, 0xa8, 0x33, 0x4e, 0x25, - 0xf5, 0x18, 0x0f, 0xcf, 0xcf, 0xbb, 0x67, 0xde, 0x50, 0x04, 0xc2, 0x55, 0x25, 0x84, 0x24, 0x89, - 0x06, 0x84, 0x0f, 0xc3, 0x48, 0xba, 0x66, 0xbb, 0xb1, 0x23, 0x4f, 0x42, 0x3e, 0xe8, 0xb0, 0x2e, - 0x97, 0x89, 0xa7, 0x3b, 0x03, 0x1a, 0xd0, 0xfc, 0x4b, 0xf7, 0x36, 0x1e, 0xe8, 0x4a, 0x9f, 0x27, - 0x4c, 0x52, 0xef, 0x94, 0x24, 0xc2, 0x93, 0x09, 0x23, 0x06, 0xdd, 0xb8, 0xaf, 0xb7, 0x55, 0xa9, - 0xb8, 0xe1, 0xbc, 0x83, 0x0d, 0x4c, 0x86, 0x54, 0x92, 0xa3, 0x30, 0x88, 0x08, 0x7f, 0xc3, 0x39, - 0xe5, 0x08, 0x41, 0xa9, 0x4f, 0x07, 0xa4, 0x6e, 0xb7, 0xec, 0xdd, 0x32, 0x56, 0xdf, 0xa8, 0x05, - 0x95, 0x01, 0x11, 0x7d, 0x1e, 0x32, 0x19, 0xd2, 0xa8, 0x7e, 0xab, 0x65, 0xef, 0xde, 0xc6, 0xc5, - 0x92, 0x53, 0x83, 0x6a, 0x3b, 0xee, 0x1d, 0x92, 0x04, 0x93, 0xaf, 0x31, 0x11, 0xd2, 0xf9, 0x6e, - 0xc3, 0x7a, 0x56, 0x11, 0x8c, 0x46, 0x82, 0xa0, 0xe7, 0xb0, 0xc2, 0xe2, 0x5e, 0xe7, 0x94, 0x24, - 0x0a, 0x5e, 0xd9, 0x7f, 0xe8, 0x16, 0x86, 0xd6, 0xf6, 0x6e, 0x6a, 0xef, 0xb6, 0xe3, 0xde, 0x59, - 0xd8, 0x4f, 0x7b, 0x97, 0x99, 0x62, 0xa0, 0x17, 0x50, 0x26, 0xa9, 0x9e, 0xba, 0xbb, 0xb2, 0xff, - 0xd8, 0x9d, 0xfd, 0xb9, 0xdc, 0x99, 0x59, 0xb0, 0xee, 0x71, 0x5e, 0x41, 0x2d, 0xad, 0x7e, 0xa2, - 0x92, 0x18, 0x3d, 0xb4, 0x07, 0xa5, 0x73, 0x2a, 0x89, 0x11, 0xd9, 0x2a, 0xe2, 0xf4, 0x2f, 0xa4, - 0x0e, 0xab, 0x33, 0xce, 0x37, 0x40, 0x0a, 0x3a, 0xd0, 0x00, 0x33, 0xcd, 0x35, 0x08, 0x37, 0xb3, - 0x3f, 0x82, 0xcd, 0xb4, 0xda, 0xe6, 0x94, 0x51, 0xd1, 0x3d, 0xcb, 0x26, 0x78, 0x09, 0xab, 0xcc, - 0x94, 0x8c, 0x43, 0x63, 0xd6, 0x21, 0x6b, 0x3a, 0x28, 0x5d, 0xfc, 0xd9, 0xb6, 0xf0, 0xb8, 0xc3, - 0xf9, 0x61, 0xc3, 0x96, 0x1e, 0x2a, 0xe7, 0x9a, 0xc1, 0x9e, 0x5d, 0x07, 0x9c, 0x23, 0x6f, 0x36, - 0x64, 0x15, 0x2a, 0xed, 0x30, 0x0a, 0xb2, 0xf4, 0xac, 0xc3, 0x9a, 0x5e, 0x6a, 0x27, 0xe7, 0x57, - 0x19, 0x56, 0xde, 0x13, 0x21, 0xba, 0x01, 0x41, 0x87, 0x50, 0x33, 0x31, 0xea, 0x70, 0x7d, 0x7c, - 0x5e, 0x9c, 0xb2, 0x1b, 0x27, 0x52, 0xe9, 0x5b, 0xb8, 0xca, 0x8a, 0x05, 0xf4, 0x01, 0xee, 0xe4, - 0x30, 0x7d, 0x99, 0xf1, 0x77, 0xfe, 0x47, 0xd3, 0x27, 0x7d, 0x0b, 0xaf, 0xb3, 0xc9, 0x8c, 0x7f, - 0x84, 0x0d, 0x11, 0x06, 0x51, 0x27, 0x7d, 0xf6, 0xb1, 0xde, 0x92, 0x02, 0x3e, 0x9a, 0x07, 0x9c, - 0xca, 0xa5, 0x6f, 0xe1, 0x9a, 0x98, 0x8a, 0xea, 0x31, 0xdc, 0x15, 0xea, 0xa5, 0x32, 0xa8, 0xd1, - 0x2c, 0x29, 0xea, 0xce, 0x22, 0xea, 0x64, 0x5c, 0x7d, 0x0b, 0x23, 0x31, 0x1b, 0xe2, 0xcf, 0x70, - 0x4f, 0xe9, 0x66, 0x8f, 0x38, 0x56, 0x2e, 0x2b, 0xf8, 0x93, 0x45, 0xf0, 0xa9, 0x30, 0xfa, 0x16, - 0xde, 0x14, 0x73, 0x32, 0xfa, 0x05, 0xea, 0x46, 0xbd, 0x70, 0x81, 0xd1, 0x5f, 0x56, 0x37, 0xec, - 0x2d, 0xd6, 0x9f, 0x0e, 0xa6, 0x6f, 0xe1, 0x2d, 0x31, 0x3f, 0xb2, 0xaf, 0x61, 0x8d, 0x85, 0x51, - 0x30, 0xb6, 0x5f, 0x51, 0xec, 0xed, 0xb9, 0x2f, 0x98, 0xa7, 0xcc, 0xb7, 0x70, 0x85, 0xe5, 0x4b, - 0xf4, 0x16, 0xaa, 0x86, 0x62, 0x14, 0x57, 0x15, 0xa6, 0xb5, 0x18, 0x33, 0x16, 0x5b, 0x63, 0x85, - 0xf5, 0x41, 0x19, 0x96, 0x44, 0x3c, 0x3c, 0xf0, 0x2f, 0xae, 0x9a, 0xf6, 0xe5, 0x55, 0xd3, 0xfe, - 0x7b, 0xd5, 0xb4, 0x7f, 0x8e, 0x9a, 0xd6, 0xe5, 0xa8, 0x69, 0xfd, 0x1e, 0x35, 0xad, 0x63, 0x37, - 0x08, 0xe5, 0x49, 0xdc, 0x73, 0xfb, 0x74, 0xe8, 0xe5, 0xf0, 0xe2, 0xe7, 0xc4, 0xff, 0x44, 0x6f, - 0x59, 0x2d, 0x9f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x49, 0xf1, 0xd7, 0x3f, 0x06, 0x00, - 0x00, +func init() { proto.RegisterFile("tendermint/privval/msgs.proto", fileDescriptor_7e8a3ca18a818327) } + +var fileDescriptor_7e8a3ca18a818327 = []byte{ + // 623 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x8b, 0xd3, 0x40, + 0x18, 0xc7, 0x13, 0xb7, 0xdd, 0x5d, 0x9f, 0xbe, 0xb9, 0xb3, 0x6b, 0x29, 0x45, 0xb3, 0x35, 0xa2, + 0x2e, 0x7b, 0x48, 0x60, 0x05, 0xc1, 0xb7, 0x4b, 0x51, 0x8c, 0x2c, 0x4a, 0x9d, 0x82, 0x87, 0x05, + 0x29, 0x7d, 0x19, 0x63, 0xd8, 0x36, 0x33, 0x66, 0x92, 0x42, 0x0f, 0x7e, 0x00, 0x0f, 0x82, 0x9f, + 0xc5, 0x4f, 0xb1, 0xc7, 0x3d, 0x7a, 0x12, 0x69, 0xbf, 0x88, 0x64, 0x32, 0x69, 0xa6, 0x6f, 0xc2, + 0xb2, 0xb7, 0xcc, 0x33, 0xcf, 0xfc, 0x9e, 0xff, 0x3f, 0xf3, 0x27, 0x81, 0xbb, 0x21, 0xf1, 0x07, + 0x24, 0x18, 0x79, 0x7e, 0x68, 0xb3, 0xc0, 0x1b, 0x8f, 0xbb, 0x43, 0x7b, 0xc4, 0x5d, 0x6e, 0xb1, + 0x80, 0x86, 0x14, 0xa1, 0x6c, 0xdb, 0x92, 0xdb, 0xf5, 0x03, 0x97, 0xba, 0x54, 0x6c, 0xdb, 0xf1, + 0x53, 0xd2, 0x59, 0x37, 0x15, 0x50, 0x3f, 0x98, 0xb0, 0x90, 0xda, 0xe7, 0x64, 0xc2, 0xed, 0x70, + 0xc2, 0x88, 0xa4, 0xd5, 0xef, 0x28, 0x3d, 0xa2, 0xae, 0xee, 0x9a, 0x6f, 0x61, 0x0f, 0x93, 0x11, + 0x0d, 0x49, 0xdb, 0x73, 0x7d, 0x12, 0xbc, 0x0e, 0x02, 0x1a, 0x20, 0x04, 0xb9, 0x3e, 0x1d, 0x90, + 0x9a, 0xde, 0xd0, 0x8f, 0xf2, 0x58, 0x3c, 0xa3, 0x06, 0x14, 0x06, 0x84, 0xf7, 0x03, 0x8f, 0x85, + 0x1e, 0xf5, 0x6b, 0x37, 0x1a, 0xfa, 0xd1, 0x4d, 0xac, 0x96, 0xcc, 0x0a, 0x94, 0x5a, 0x51, 0xef, + 0x94, 0x4c, 0x30, 0xf9, 0x1a, 0x11, 0x1e, 0x9a, 0xdf, 0x75, 0x28, 0xa7, 0x15, 0xce, 0xa8, 0xcf, + 0x09, 0x7a, 0x06, 0x3b, 0x2c, 0xea, 0x75, 0xce, 0xc9, 0x44, 0xc0, 0x0b, 0x27, 0xf7, 0x2c, 0xc5, + 0x6c, 0x62, 0xc1, 0x8a, 0x2d, 0x58, 0xad, 0xa8, 0x37, 0xf4, 0xfa, 0xf1, 0xd9, 0x6d, 0x26, 0x18, + 0xe8, 0x39, 0xe4, 0x49, 0x2c, 0x4f, 0xcc, 0x2e, 0x9c, 0x3c, 0xb0, 0x56, 0x5f, 0x93, 0xb5, 0xe2, + 0x05, 0x27, 0x67, 0xcc, 0x97, 0x50, 0x89, 0xab, 0x1f, 0x69, 0x48, 0xa4, 0x3c, 0x74, 0x0c, 0xb9, + 0x31, 0x0d, 0x89, 0x14, 0x52, 0x55, 0x71, 0xc9, 0x1b, 0x12, 0xcd, 0xa2, 0xc7, 0xfc, 0x06, 0x48, + 0x40, 0x07, 0x09, 0x40, 0xba, 0xb9, 0x02, 0xe1, 0x7a, 0xea, 0xdb, 0xb0, 0x1f, 0x57, 0x5b, 0x01, + 0x65, 0x94, 0x77, 0x87, 0xa9, 0x83, 0x17, 0xb0, 0xcb, 0x64, 0x49, 0x6a, 0xa8, 0xaf, 0x6a, 0x48, + 0x0f, 0x35, 0x73, 0x17, 0x7f, 0x0e, 0x35, 0x3c, 0x3f, 0x61, 0xfe, 0xd0, 0xa1, 0x9a, 0x98, 0xca, + 0xb8, 0xd2, 0xd8, 0x93, 0xab, 0x80, 0x33, 0xe4, 0xf5, 0x4c, 0x96, 0xa0, 0xd0, 0xf2, 0x7c, 0x37, + 0x4d, 0x4f, 0x19, 0x8a, 0xc9, 0x32, 0xd1, 0x64, 0xfe, 0xca, 0xc3, 0xce, 0x3b, 0xc2, 0x79, 0xd7, + 0x25, 0xe8, 0x14, 0x2a, 0x32, 0x46, 0x9d, 0x20, 0x69, 0x5f, 0x17, 0xa7, 0x74, 0xe2, 0x42, 0x2a, + 0x1d, 0x0d, 0x97, 0x98, 0x5a, 0x40, 0xef, 0xe1, 0x56, 0x06, 0x4b, 0x86, 0x49, 0xfd, 0xe6, 0xff, + 0x68, 0x49, 0xa7, 0xa3, 0xe1, 0x32, 0x5b, 0xcc, 0xf8, 0x07, 0xd8, 0xe3, 0x9e, 0xeb, 0x77, 0xe2, + 0x6b, 0x9f, 0xcb, 0xdb, 0x12, 0xc0, 0xfb, 0xeb, 0x80, 0x4b, 0xb9, 0x74, 0x34, 0x5c, 0xe1, 0x4b, + 0x51, 0x3d, 0x83, 0x03, 0x2e, 0x6e, 0x2a, 0x85, 0x4a, 0x99, 0x39, 0x41, 0x7d, 0xb8, 0x89, 0xba, + 0x18, 0x57, 0x47, 0xc3, 0x88, 0xaf, 0x86, 0xf8, 0x13, 0xdc, 0x16, 0x72, 0xd3, 0x4b, 0x9c, 0x4b, + 0xce, 0x0b, 0xf8, 0xa3, 0x4d, 0xf0, 0xa5, 0x30, 0x3a, 0x1a, 0xde, 0xe7, 0x6b, 0x32, 0xfa, 0x19, + 0x6a, 0x52, 0xba, 0x32, 0x40, 0xca, 0xdf, 0x16, 0x13, 0x8e, 0x37, 0xcb, 0x5f, 0x0e, 0xa6, 0xa3, + 0xe1, 0x2a, 0x5f, 0x1f, 0xd9, 0x57, 0x50, 0x64, 0x9e, 0xef, 0xce, 0xd5, 0xef, 0x08, 0xf6, 0xe1, + 0xda, 0x1b, 0xcc, 0x52, 0xe6, 0x68, 0xb8, 0xc0, 0xb2, 0x25, 0x7a, 0x03, 0x25, 0x49, 0x91, 0x12, + 0x77, 0x05, 0xa6, 0xb1, 0x19, 0x33, 0x17, 0x56, 0x64, 0xca, 0xba, 0x99, 0x87, 0x2d, 0x1e, 0x8d, + 0x9a, 0xed, 0x8b, 0xa9, 0xa1, 0x5f, 0x4e, 0x0d, 0xfd, 0xef, 0xd4, 0xd0, 0x7f, 0xce, 0x0c, 0xed, + 0x72, 0x66, 0x68, 0xbf, 0x67, 0x86, 0x76, 0xf6, 0xd4, 0xf5, 0xc2, 0x2f, 0x51, 0xcf, 0xea, 0xd3, + 0x91, 0xad, 0x7e, 0xa1, 0xd5, 0x3f, 0x43, 0xfc, 0xb5, 0x5f, 0xfd, 0x55, 0xf4, 0xb6, 0xc5, 0xce, + 0xe3, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x43, 0xa1, 0xa9, 0x47, 0x06, 0x00, 0x00, } func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) { diff --git a/proto/privval/msgs.proto b/proto/tendermint/privval/msgs.proto similarity index 89% rename from proto/privval/msgs.proto rename to proto/tendermint/privval/msgs.proto index 282ad0fe7..1ab1312c9 100644 --- a/proto/privval/msgs.proto +++ b/proto/tendermint/privval/msgs.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package tendermint.privval; -option go_package = "github.com/tendermint/tendermint/proto/privval"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/crypto/keys/types.proto"; -import "proto/types/types.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/crypto/keys/types.proto"; +import "tendermint/types/types.proto"; message RemoteSignerError { int32 code = 1; diff --git a/proto/privval/types.pb.go b/proto/tendermint/privval/types.pb.go similarity index 74% rename from proto/privval/types.pb.go rename to proto/tendermint/privval/types.pb.go index 332125161..0828463d4 100644 --- a/proto/privval/types.pb.go +++ b/proto/tendermint/privval/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/privval/types.proto +// source: tendermint/privval/types.proto package privval @@ -54,20 +54,20 @@ func (x Errors) String() string { } func (Errors) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a9d74c406df3ad93, []int{0} + return fileDescriptor_cb4e437a5328cf9c, []int{0} } func init() { proto.RegisterEnum("tendermint.privval.Errors", Errors_name, Errors_value) } -func init() { proto.RegisterFile("proto/privval/types.proto", fileDescriptor_a9d74c406df3ad93) } +func init() { proto.RegisterFile("tendermint/privval/types.proto", fileDescriptor_cb4e437a5328cf9c) } -var fileDescriptor_a9d74c406df3ad93 = []byte{ - // 232 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0x28, 0xca, 0x2c, 0x2b, 0x4b, 0xcc, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, - 0x03, 0x8b, 0x09, 0x09, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x41, +var fileDescriptor_cb4e437a5328cf9c = []byte{ + // 237 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, 0x28, 0xca, 0x2c, 0x2b, 0x4b, 0xcc, 0xd1, 0x2f, + 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41, 0xe5, 0xb5, 0x56, 0x30, 0x72, 0xb1, 0xb9, 0x16, 0x15, 0xe5, 0x17, 0x15, 0x0b, 0x09, 0x71, 0xf1, 0xb9, 0x06, 0x05, 0xf9, 0x07, 0x05, 0xc7, 0x87, 0xfa, 0x79, 0xfb, 0xf9, 0x87, 0xfb, 0x09, 0x30, 0x08, 0xc9, 0x71, 0x49, 0xc1, 0xc5, 0x5c, 0x23, 0x02, 0x5c, 0x9d, 0x43, 0x5c, 0x5d, 0xe2, 0x83, @@ -75,9 +75,9 @@ var fileDescriptor_a9d74c406df3ad93 = []byte{ 0xfe, 0xf1, 0xce, 0xfe, 0x7e, 0x7e, 0xae, 0xce, 0x21, 0x9e, 0xfe, 0x7e, 0x02, 0x4c, 0x42, 0xb2, 0x5c, 0x92, 0x50, 0x19, 0x84, 0x70, 0x7c, 0x88, 0xa7, 0xaf, 0xab, 0x7f, 0x68, 0x88, 0x00, 0xb3, 0x90, 0x38, 0x97, 0x30, 0x54, 0x3a, 0xc8, 0xd5, 0xd1, 0x05, 0x2e, 0xc1, 0x82, 0x64, 0x62, 0x78, - 0x90, 0x67, 0x88, 0x2b, 0x5c, 0x86, 0xd5, 0xc9, 0xe3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, + 0x90, 0x67, 0x88, 0x2b, 0x5c, 0x86, 0xd5, 0x29, 0xf8, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, - 0xe5, 0x18, 0xa2, 0xf4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x11, - 0x7e, 0x44, 0x66, 0xa2, 0x04, 0x4a, 0x12, 0x1b, 0x98, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0x85, 0x3d, 0x1d, 0x57, 0x2c, 0x01, 0x00, 0x00, + 0xe5, 0x18, 0xa2, 0x2c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x91, + 0xc2, 0x00, 0x25, 0x38, 0xf2, 0x4b, 0xf2, 0xf5, 0x31, 0xc3, 0x27, 0x89, 0x0d, 0x2c, 0x63, 0x0c, + 0x08, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x8d, 0x1a, 0x15, 0x3c, 0x01, 0x00, 0x00, } diff --git a/proto/privval/types.proto b/proto/tendermint/privval/types.proto similarity index 76% rename from proto/privval/types.proto rename to proto/tendermint/privval/types.proto index 24bd04ffe..9da46cc37 100644 --- a/proto/privval/types.proto +++ b/proto/tendermint/privval/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tendermint.privval; -option go_package = "github.com/tendermint/tendermint/proto/privval"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval"; enum Errors { ERRORS_UNKNOWN = 0; diff --git a/proto/rpc/types.proto b/proto/tendermint/rpc/grpc/types.proto similarity index 79% rename from proto/rpc/types.proto rename to proto/tendermint/rpc/grpc/types.proto index ac58617ac..2ea69e244 100644 --- a/proto/rpc/types.proto +++ b/proto/tendermint/rpc/grpc/types.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package tendermint.rpc.grpc; option go_package = "github.com/tendermint/tendermint/rpc/grpc;coregrpc"; -import "proto/abci/types.proto"; +import "tendermint/abci/abci.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; } //---------------------------------------- diff --git a/proto/state/types.pb.go b/proto/tendermint/state/types.pb.go similarity index 89% rename from proto/state/types.pb.go rename to proto/tendermint/state/types.pb.go index cad0093ba..13b83a7c1 100644 --- a/proto/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/state/types.proto +// source: tendermint/state/types.proto package state @@ -10,8 +10,8 @@ import ( _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/tendermint/tendermint/abci/types" - types1 "github.com/tendermint/tendermint/proto/types" - version "github.com/tendermint/tendermint/proto/version" + types1 "github.com/tendermint/tendermint/proto/tendermint/types" + version "github.com/tendermint/tendermint/proto/tendermint/version" io "io" math "math" math_bits "math/bits" @@ -43,7 +43,7 @@ func (m *ABCIResponses) Reset() { *m = ABCIResponses{} } func (m *ABCIResponses) String() string { return proto.CompactTextString(m) } func (*ABCIResponses) ProtoMessage() {} func (*ABCIResponses) Descriptor() ([]byte, []int) { - return fileDescriptor_00e69fef8162ea9b, []int{0} + return fileDescriptor_ccfacf933f22bf93, []int{0} } func (m *ABCIResponses) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -103,7 +103,7 @@ func (m *ValidatorsInfo) Reset() { *m = ValidatorsInfo{} } func (m *ValidatorsInfo) String() string { return proto.CompactTextString(m) } func (*ValidatorsInfo) ProtoMessage() {} func (*ValidatorsInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_00e69fef8162ea9b, []int{1} + return fileDescriptor_ccfacf933f22bf93, []int{1} } func (m *ValidatorsInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -156,7 +156,7 @@ func (m *ConsensusParamsInfo) Reset() { *m = ConsensusParamsInfo{} } func (m *ConsensusParamsInfo) String() string { return proto.CompactTextString(m) } func (*ConsensusParamsInfo) ProtoMessage() {} func (*ConsensusParamsInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_00e69fef8162ea9b, []int{2} + return fileDescriptor_ccfacf933f22bf93, []int{2} } func (m *ConsensusParamsInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -208,7 +208,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_00e69fef8162ea9b, []int{3} + return fileDescriptor_ccfacf933f22bf93, []int{3} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -283,7 +283,7 @@ func (m *State) Reset() { *m = State{} } func (m *State) String() string { return proto.CompactTextString(m) } func (*State) ProtoMessage() {} func (*State) Descriptor() ([]byte, []int) { - return fileDescriptor_00e69fef8162ea9b, []int{4} + return fileDescriptor_ccfacf933f22bf93, []int{4} } func (m *State) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -411,58 +411,58 @@ func init() { proto.RegisterType((*State)(nil), "tendermint.state.State") } -func init() { proto.RegisterFile("proto/state/types.proto", fileDescriptor_00e69fef8162ea9b) } - -var fileDescriptor_00e69fef8162ea9b = []byte{ - // 755 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x4a, - 0x18, 0x8d, 0x6f, 0xda, 0x26, 0x19, 0x37, 0x4d, 0xef, 0x54, 0xba, 0xd7, 0x4d, 0x85, 0x13, 0x22, - 0x54, 0x02, 0x42, 0x8e, 0x54, 0x56, 0x6c, 0x90, 0xea, 0x04, 0xa8, 0x51, 0x85, 0x90, 0x5b, 0x75, - 0xc1, 0xc6, 0x9a, 0xc4, 0x53, 0xdb, 0x22, 0xb1, 0x2d, 0xcf, 0x24, 0xb4, 0x0f, 0xc0, 0xbe, 0x5b, - 0x5e, 0x85, 0x27, 0xe8, 0xb2, 0x4b, 0x56, 0x05, 0xa5, 0x5b, 0x1e, 0x02, 0xcd, 0x8c, 0x7f, 0x26, - 0x29, 0x52, 0x8b, 0x58, 0x65, 0xfc, 0x9d, 0x39, 0x67, 0xce, 0x37, 0x73, 0x3e, 0x05, 0xfc, 0x1f, - 0x27, 0x11, 0x8d, 0x7a, 0x84, 0x22, 0x8a, 0x7b, 0xf4, 0x3c, 0xc6, 0xc4, 0xe0, 0x15, 0xb8, 0x49, - 0x71, 0xe8, 0xe2, 0x64, 0x12, 0x84, 0xd4, 0xe0, 0x68, 0x73, 0x97, 0xfa, 0x41, 0xe2, 0x3a, 0x31, - 0x4a, 0xe8, 0x79, 0x4f, 0xd0, 0xbc, 0xc8, 0x8b, 0x8a, 0x95, 0x60, 0x36, 0xff, 0x13, 0x15, 0x34, - 0x1c, 0x05, 0xb2, 0x62, 0x33, 0x3d, 0x8a, 0x97, 0x16, 0x80, 0x1d, 0x19, 0x98, 0xa1, 0x71, 0xe0, - 0x22, 0x1a, 0x25, 0x29, 0xa8, 0xc9, 0x60, 0x8c, 0x12, 0x34, 0x59, 0xa2, 0xcd, 0x70, 0x42, 0x82, - 0x28, 0xcc, 0x7e, 0x53, 0xb0, 0xe5, 0x45, 0x91, 0x37, 0xc6, 0xc2, 0xe7, 0x70, 0x7a, 0xda, 0xa3, - 0xc1, 0x04, 0x13, 0x8a, 0x26, 0xb1, 0xd8, 0xd0, 0xf9, 0xa9, 0x80, 0xfa, 0xbe, 0xd9, 0xb7, 0x6c, - 0x4c, 0xe2, 0x28, 0x24, 0x98, 0x40, 0x0b, 0xa8, 0x2e, 0x1e, 0x07, 0x33, 0x9c, 0x38, 0xf4, 0x8c, - 0x68, 0x4a, 0xbb, 0xdc, 0x55, 0xf7, 0xba, 0x86, 0x74, 0x0f, 0xac, 0x25, 0x43, 0x38, 0xcf, 0x68, - 0x03, 0xc1, 0x38, 0x3e, 0xb3, 0x81, 0x9b, 0x2d, 0x09, 0x1c, 0x80, 0x1a, 0x0e, 0x5d, 0x67, 0x38, - 0x8e, 0x46, 0x1f, 0xb5, 0x7f, 0xda, 0x4a, 0x57, 0xdd, 0x7b, 0x7c, 0x87, 0xd0, 0xab, 0xd0, 0x35, - 0xd9, 0x76, 0xbb, 0x8a, 0xd3, 0x15, 0x7c, 0x0b, 0xd4, 0x21, 0xf6, 0x82, 0x30, 0xd5, 0x29, 0x73, - 0x9d, 0x27, 0x77, 0xe8, 0x98, 0x8c, 0x21, 0x94, 0xc0, 0x30, 0x5f, 0x77, 0x3e, 0x2b, 0x60, 0xe3, - 0x24, 0xbb, 0x5a, 0x62, 0x85, 0xa7, 0x11, 0xec, 0x83, 0x7a, 0x7e, 0xd9, 0x0e, 0xc1, 0x54, 0x53, - 0xf8, 0x01, 0xba, 0x7c, 0x80, 0xd0, 0xce, 0x89, 0x47, 0x98, 0xda, 0xeb, 0x33, 0xe9, 0x0b, 0x1a, - 0x60, 0x6b, 0x8c, 0x08, 0x75, 0x7c, 0x1c, 0x78, 0x3e, 0x75, 0x46, 0x3e, 0x0a, 0x3d, 0xec, 0xf2, - 0x9e, 0xcb, 0xf6, 0xbf, 0x0c, 0x3a, 0xe0, 0x48, 0x5f, 0x00, 0x9d, 0x2f, 0x0a, 0xd8, 0xea, 0x33, - 0x9f, 0x21, 0x99, 0x92, 0xf7, 0xfc, 0x39, 0xb9, 0x19, 0x1b, 0x6c, 0x8e, 0xb2, 0xb2, 0x23, 0x9e, - 0x39, 0xf5, 0xf3, 0xf0, 0xb6, 0x9f, 0x25, 0x01, 0x73, 0xe5, 0xf2, 0xba, 0x55, 0xb2, 0x1b, 0xa3, - 0xc5, 0xf2, 0x1f, 0x7b, 0xf3, 0x41, 0xe5, 0x44, 0x84, 0x08, 0xee, 0x83, 0x5a, 0xae, 0x96, 0xfa, - 0x78, 0x20, 0xfb, 0xc8, 0xc2, 0x96, 0x3b, 0x49, 0x3d, 0x14, 0x2c, 0xd8, 0x04, 0x55, 0x12, 0x9d, - 0xd2, 0x4f, 0x28, 0xc1, 0xfc, 0xc8, 0x9a, 0x9d, 0x7f, 0x77, 0xbe, 0xae, 0x81, 0xd5, 0x23, 0x36, - 0x54, 0xf0, 0x05, 0xa8, 0xa4, 0x5a, 0xe9, 0x31, 0xdb, 0xc6, 0xf2, 0xe0, 0x19, 0xa9, 0xa9, 0xf4, - 0x88, 0x6c, 0x3f, 0xdc, 0x05, 0xd5, 0x91, 0x8f, 0x82, 0xd0, 0x09, 0x44, 0x4f, 0x35, 0x53, 0x9d, - 0x5f, 0xb7, 0x2a, 0x7d, 0x56, 0xb3, 0x06, 0x76, 0x85, 0x83, 0x96, 0x0b, 0x9f, 0x02, 0xde, 0xab, - 0x48, 0x51, 0x7a, 0x19, 0x3c, 0x4c, 0x65, 0xbb, 0xc1, 0x00, 0x1e, 0x10, 0x71, 0x13, 0xd0, 0x06, - 0x75, 0x69, 0x6f, 0xe0, 0x6a, 0x2b, 0xb7, 0x4d, 0x89, 0x37, 0xe0, 0x2c, 0x6b, 0x60, 0x6e, 0x31, - 0x53, 0xf3, 0xeb, 0x96, 0x7a, 0x98, 0x49, 0x59, 0x03, 0x5b, 0xcd, 0x75, 0x2d, 0x17, 0x1e, 0x82, - 0x86, 0xa4, 0xc9, 0xe6, 0x50, 0x5b, 0xe5, 0xaa, 0x4d, 0x43, 0x0c, 0xa9, 0x91, 0x0d, 0xa9, 0x71, - 0x9c, 0x0d, 0xa9, 0x59, 0x65, 0xb2, 0x17, 0xdf, 0x5b, 0x8a, 0x5d, 0xcf, 0xb5, 0x18, 0x0a, 0xdf, - 0x80, 0x46, 0x88, 0xcf, 0xa8, 0x93, 0xa7, 0x90, 0x68, 0x6b, 0xf7, 0xca, 0xed, 0x06, 0xa3, 0x15, - 0x23, 0x00, 0x5f, 0x02, 0x20, 0x69, 0x54, 0xee, 0xa5, 0x21, 0x31, 0x98, 0x11, 0xde, 0x96, 0x24, - 0x52, 0xbd, 0x9f, 0x11, 0x46, 0x93, 0x8c, 0xf4, 0x81, 0x2e, 0xc7, 0xb4, 0xd0, 0xcb, 0x13, 0x5b, - 0xe3, 0x8f, 0xb5, 0x53, 0x24, 0xb6, 0x60, 0xa7, 0xd9, 0xfd, 0xed, 0xfc, 0x80, 0xbf, 0x9c, 0x9f, - 0x77, 0xe0, 0xd1, 0xc2, 0xfc, 0x2c, 0xe9, 0xe7, 0xf6, 0x54, 0x6e, 0xaf, 0x2d, 0x0d, 0xd4, 0xa2, - 0x50, 0xe6, 0x31, 0x0b, 0x62, 0x82, 0xc9, 0x74, 0x4c, 0x89, 0xe3, 0x23, 0xe2, 0x6b, 0xeb, 0x6d, - 0xa5, 0xbb, 0x2e, 0x82, 0x68, 0x8b, 0xfa, 0x01, 0x22, 0x3e, 0xdc, 0x06, 0x55, 0x14, 0xc7, 0x62, - 0x4b, 0x9d, 0x6f, 0xa9, 0xa0, 0x38, 0x66, 0x90, 0xf9, 0xfa, 0x72, 0xae, 0x2b, 0x57, 0x73, 0x5d, - 0xf9, 0x31, 0xd7, 0x95, 0x8b, 0x1b, 0xbd, 0x74, 0x75, 0xa3, 0x97, 0xbe, 0xdd, 0xe8, 0xa5, 0x0f, - 0xcf, 0xbc, 0x80, 0xfa, 0xd3, 0xa1, 0x31, 0x8a, 0x26, 0xbd, 0xa2, 0x69, 0x79, 0x29, 0xfd, 0xdb, - 0x0d, 0xd7, 0xf8, 0xc7, 0xf3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x85, 0xf0, 0x16, 0x03, - 0x07, 0x00, 0x00, +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, 0xc1, 0x4e, 0xdb, 0x4a, + 0x14, 0x86, 0xe3, 0x1b, 0x20, 0xc9, 0x31, 0x21, 0xdc, 0xe1, 0x2e, 0x42, 0xee, 0xc5, 0x09, 0xb9, + 0x55, 0x85, 0xba, 0x70, 0x24, 0xba, 0xa8, 0xba, 0x41, 0xc2, 0x49, 0x55, 0x22, 0xa1, 0xaa, 0x35, + 0x88, 0x45, 0x37, 0xd6, 0x24, 0x1e, 0x6c, 0xab, 0x89, 0x6d, 0x79, 0x26, 0x29, 0x7d, 0x80, 0xee, + 0xd9, 0xf6, 0x55, 0xfa, 0x04, 0x2c, 0x59, 0x56, 0x5d, 0xd0, 0x2a, 0xbc, 0x48, 0x35, 0x33, 0xb6, + 0x33, 0x24, 0x20, 0x51, 0x75, 0x93, 0x8c, 0xe7, 0x9c, 0xf3, 0xcd, 0x3f, 0x33, 0xff, 0xd1, 0xc0, + 0x7f, 0x8c, 0x84, 0x2e, 0x49, 0xc6, 0x41, 0xc8, 0x3a, 0x94, 0x61, 0x46, 0x3a, 0xec, 0x53, 0x4c, + 0xa8, 0x19, 0x27, 0x11, 0x8b, 0xd0, 0xe6, 0x3c, 0x6a, 0x8a, 0x68, 0xe3, 0x1f, 0x2f, 0xf2, 0x22, + 0x11, 0xec, 0xf0, 0x91, 0xcc, 0x6b, 0x34, 0x14, 0x0a, 0x1e, 0x0c, 0x03, 0xf1, 0x93, 0xc6, 0xd4, + 0x15, 0x04, 0x5b, 0x5d, 0xa1, 0xd1, 0x5a, 0x8a, 0x4e, 0xf1, 0x28, 0x70, 0x31, 0x8b, 0x92, 0x34, + 0x63, 0x67, 0x29, 0x23, 0xc6, 0x09, 0x1e, 0xdf, 0x07, 0x98, 0x92, 0x84, 0x06, 0x51, 0x98, 0xfd, + 0xa7, 0x19, 0x4d, 0x2f, 0x8a, 0xbc, 0x11, 0xe9, 0x88, 0xaf, 0xc1, 0xe4, 0xbc, 0xc3, 0x82, 0x31, + 0xa1, 0x0c, 0x8f, 0x63, 0x99, 0xd0, 0xfe, 0xae, 0x41, 0xf5, 0xd0, 0xea, 0xf6, 0x6d, 0x42, 0xe3, + 0x28, 0xa4, 0x84, 0xa2, 0x2e, 0xe8, 0x2e, 0x19, 0x05, 0x53, 0x92, 0x38, 0xec, 0x82, 0xd6, 0xb5, + 0x56, 0x71, 0x4f, 0xdf, 0x6f, 0x9b, 0xca, 0x69, 0x88, 0x0d, 0x66, 0x05, 0x3d, 0x99, 0x7b, 0x7a, + 0x61, 0x83, 0x9b, 0x0d, 0x29, 0x3a, 0x80, 0x0a, 0x09, 0x5d, 0x67, 0x30, 0x8a, 0x86, 0x1f, 0xea, + 0x7f, 0xb5, 0xb4, 0x3d, 0x7d, 0x7f, 0xf7, 0x41, 0xc4, 0xab, 0xd0, 0xb5, 0x78, 0xa2, 0x5d, 0x26, + 0xe9, 0x08, 0xf5, 0x40, 0x1f, 0x10, 0x2f, 0x08, 0x53, 0x42, 0x51, 0x10, 0xfe, 0x7f, 0x90, 0x60, + 0xf1, 0x5c, 0xc9, 0x80, 0x41, 0x3e, 0x6e, 0x7f, 0xd6, 0x60, 0xe3, 0x2c, 0x3b, 0x52, 0xda, 0x0f, + 0xcf, 0x23, 0xd4, 0x85, 0x6a, 0x7e, 0xc8, 0x0e, 0x25, 0xac, 0xae, 0x09, 0xb4, 0xa1, 0xa2, 0xe5, + 0x1d, 0xe5, 0x85, 0x27, 0x84, 0xd9, 0xeb, 0x53, 0xe5, 0x0b, 0x99, 0xb0, 0x35, 0xc2, 0x94, 0x39, + 0x3e, 0x09, 0x3c, 0x9f, 0x39, 0x43, 0x1f, 0x87, 0x1e, 0x71, 0xc5, 0x3e, 0x8b, 0xf6, 0xdf, 0x3c, + 0x74, 0x24, 0x22, 0x5d, 0x19, 0x68, 0x7f, 0xd1, 0x60, 0xab, 0xcb, 0x75, 0x86, 0x74, 0x42, 0xdf, + 0x8a, 0x1b, 0x14, 0x62, 0x6c, 0xd8, 0x1c, 0x66, 0xd3, 0x8e, 0xbc, 0xd9, 0x54, 0xcf, 0xee, 0xb2, + 0x9e, 0x05, 0x80, 0xb5, 0x72, 0x75, 0xd3, 0x2c, 0xd8, 0xb5, 0xe1, 0xdd, 0xe9, 0xdf, 0xd6, 0xe6, + 0x43, 0xe9, 0x4c, 0x5a, 0x06, 0x1d, 0x42, 0x25, 0xa7, 0xa5, 0x3a, 0x76, 0x54, 0x1d, 0x99, 0xb5, + 0x72, 0x25, 0xa9, 0x86, 0x79, 0x15, 0x6a, 0x40, 0x99, 0x46, 0xe7, 0xec, 0x23, 0x4e, 0x88, 0x58, + 0xb2, 0x62, 0xe7, 0xdf, 0xed, 0xaf, 0x6b, 0xb0, 0x7a, 0xc2, 0x1b, 0x09, 0xbd, 0x84, 0x52, 0xca, + 0x4a, 0x97, 0xd9, 0x36, 0x17, 0x9b, 0xcd, 0x4c, 0x45, 0xa5, 0x4b, 0x64, 0xf9, 0xe8, 0x29, 0x94, + 0x87, 0x3e, 0x0e, 0x42, 0x27, 0x90, 0x7b, 0xaa, 0x58, 0xfa, 0xec, 0xa6, 0x59, 0xea, 0xf2, 0xb9, + 0x7e, 0xcf, 0x2e, 0x89, 0x60, 0xdf, 0x45, 0xcf, 0x40, 0xec, 0x55, 0xfa, 0x27, 0x3d, 0x0c, 0x61, + 0xa3, 0xa2, 0x5d, 0xe3, 0x01, 0x61, 0x10, 0x79, 0x12, 0xc8, 0x86, 0xaa, 0x92, 0x1b, 0xb8, 0xf5, + 0x95, 0x65, 0x51, 0xf2, 0x0e, 0x44, 0x55, 0xbf, 0x67, 0x6d, 0x71, 0x51, 0xb3, 0x9b, 0xa6, 0x7e, + 0x9c, 0xa1, 0xfa, 0x3d, 0x5b, 0xcf, 0xb9, 0x7d, 0x17, 0x1d, 0x43, 0x4d, 0x61, 0xf2, 0xae, 0xab, + 0xaf, 0x0a, 0x6a, 0xc3, 0x94, 0x2d, 0x69, 0x66, 0x2d, 0x69, 0x9e, 0x66, 0x2d, 0x69, 0x95, 0x39, + 0xf6, 0xf2, 0x47, 0x53, 0xb3, 0xab, 0x39, 0x8b, 0x47, 0xd1, 0x6b, 0xa8, 0x85, 0xe4, 0x82, 0x39, + 0xb9, 0x0b, 0x69, 0x7d, 0xed, 0x51, 0xbe, 0xdd, 0xe0, 0x65, 0xf3, 0x16, 0x40, 0x07, 0x00, 0x0a, + 0xa3, 0xf4, 0x28, 0x86, 0x52, 0xc1, 0x85, 0x88, 0x6d, 0x29, 0x90, 0xf2, 0xe3, 0x84, 0xf0, 0x32, + 0x45, 0x48, 0x17, 0x0c, 0xd5, 0xa6, 0x73, 0x5e, 0xee, 0xd8, 0x8a, 0xb8, 0xac, 0x7f, 0xe7, 0x8e, + 0x9d, 0x57, 0xa7, 0xde, 0xbd, 0xb7, 0x7f, 0xe0, 0x0f, 0xfb, 0xe7, 0x0d, 0x3c, 0xb9, 0xd3, 0x3f, + 0x0b, 0xfc, 0x5c, 0x9e, 0x2e, 0xe4, 0xb5, 0x94, 0x86, 0xba, 0x0b, 0xca, 0x34, 0x66, 0x46, 0x4c, + 0x08, 0x9d, 0x8c, 0x18, 0x75, 0x7c, 0x4c, 0xfd, 0xfa, 0x7a, 0x4b, 0xdb, 0x5b, 0x97, 0x46, 0xb4, + 0xe5, 0xfc, 0x11, 0xa6, 0x3e, 0xda, 0x86, 0x32, 0x8e, 0x63, 0x99, 0x52, 0x15, 0x29, 0x25, 0x1c, + 0xc7, 0x3c, 0x64, 0xbd, 0xbb, 0x9a, 0x19, 0xda, 0xf5, 0xcc, 0xd0, 0x7e, 0xce, 0x0c, 0xed, 0xf2, + 0xd6, 0x28, 0x5c, 0xdf, 0x1a, 0x85, 0x6f, 0xb7, 0x46, 0xe1, 0xfd, 0x0b, 0x2f, 0x60, 0xfe, 0x64, + 0x60, 0x0e, 0xa3, 0x71, 0x47, 0x7d, 0x2e, 0xe6, 0x43, 0xf9, 0x64, 0x2d, 0x3e, 0x76, 0x83, 0x35, + 0x31, 0xff, 0xfc, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc8, 0x89, 0x5e, 0x07, 0x07, 0x00, + 0x00, } func (m *ABCIResponses) Marshal() (dAtA []byte, err error) { diff --git a/proto/state/types.proto b/proto/tendermint/state/types.proto similarity index 83% rename from proto/state/types.proto rename to proto/tendermint/state/types.proto index 859e8ea13..37b399b07 100644 --- a/proto/state/types.proto +++ b/proto/tendermint/state/types.proto @@ -1,23 +1,23 @@ syntax = "proto3"; package tendermint.state; -option go_package = "github.com/tendermint/tendermint/proto/state"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/state"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/abci/types.proto"; -import "proto/types/types.proto"; -import "proto/types/validator.proto"; -import "proto/types/params.proto"; -import "proto/version/version.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/abci/abci.proto"; +import "tendermint/types/types.proto"; +import "tendermint/types/validator.proto"; +import "tendermint/types/params.proto"; +import "tendermint/version/version.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 diff --git a/proto/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go similarity index 92% rename from proto/statesync/types.pb.go rename to proto/tendermint/statesync/types.pb.go index 90e4d0dcc..4bfe9605d 100644 --- a/proto/statesync/types.pb.go +++ b/proto/tendermint/statesync/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/statesync/types.proto +// source: tendermint/statesync/types.proto package statesync @@ -35,7 +35,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_bef273312884335b, []int{0} + return fileDescriptor_a1c2869546ca7914, []int{0} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -140,7 +140,7 @@ func (m *SnapshotsRequest) Reset() { *m = SnapshotsRequest{} } func (m *SnapshotsRequest) String() string { return proto.CompactTextString(m) } func (*SnapshotsRequest) ProtoMessage() {} func (*SnapshotsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_bef273312884335b, []int{1} + return fileDescriptor_a1c2869546ca7914, []int{1} } func (m *SnapshotsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -181,7 +181,7 @@ func (m *SnapshotsResponse) Reset() { *m = SnapshotsResponse{} } func (m *SnapshotsResponse) String() string { return proto.CompactTextString(m) } func (*SnapshotsResponse) ProtoMessage() {} func (*SnapshotsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_bef273312884335b, []int{2} + return fileDescriptor_a1c2869546ca7914, []int{2} } func (m *SnapshotsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -255,7 +255,7 @@ func (m *ChunkRequest) Reset() { *m = ChunkRequest{} } func (m *ChunkRequest) String() string { return proto.CompactTextString(m) } func (*ChunkRequest) ProtoMessage() {} func (*ChunkRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_bef273312884335b, []int{3} + return fileDescriptor_a1c2869546ca7914, []int{3} } func (m *ChunkRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -317,7 +317,7 @@ func (m *ChunkResponse) Reset() { *m = ChunkResponse{} } func (m *ChunkResponse) String() string { return proto.CompactTextString(m) } func (*ChunkResponse) ProtoMessage() {} func (*ChunkResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_bef273312884335b, []int{4} + return fileDescriptor_a1c2869546ca7914, []int{4} } func (m *ChunkResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -389,35 +389,35 @@ func init() { proto.RegisterType((*ChunkResponse)(nil), "tendermint.statesync.ChunkResponse") } -func init() { proto.RegisterFile("proto/statesync/types.proto", fileDescriptor_bef273312884335b) } +func init() { proto.RegisterFile("tendermint/statesync/types.proto", fileDescriptor_a1c2869546ca7914) } -var fileDescriptor_bef273312884335b = []byte{ - // 389 bytes of a gzipped FileDescriptorProto +var fileDescriptor_a1c2869546ca7914 = []byte{ + // 393 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6a, 0xdb, 0x40, - 0x18, 0x94, 0xfc, 0xcf, 0x57, 0xab, 0xd8, 0x8b, 0x29, 0xa2, 0x05, 0x51, 0x54, 0x68, 0x7b, 0x92, - 0x4b, 0xfb, 0x06, 0xee, 0xc5, 0x2d, 0xc9, 0x65, 0x93, 0x40, 0xc8, 0x25, 0xac, 0xe5, 0x8d, 0x24, - 0x82, 0x56, 0x8a, 0xbe, 0x15, 0xc4, 0x0f, 0x90, 0x53, 0x2e, 0x79, 0xac, 0x1c, 0x7d, 0x0c, 0x39, - 0x05, 0xfb, 0x45, 0x82, 0x56, 0xb2, 0xac, 0x28, 0x26, 0x21, 0x90, 0xdb, 0x37, 0xc3, 0x68, 0x34, - 0x33, 0x42, 0xf0, 0x25, 0x4e, 0x22, 0x19, 0x8d, 0x51, 0x32, 0xc9, 0x71, 0x21, 0xdc, 0xb1, 0x5c, - 0xc4, 0x1c, 0x1d, 0xc5, 0x92, 0x91, 0xe4, 0x62, 0xce, 0x93, 0x30, 0x10, 0xd2, 0x29, 0x15, 0xf6, - 0x7d, 0x03, 0xba, 0xfb, 0x1c, 0x91, 0x79, 0x9c, 0x1c, 0xc1, 0x10, 0x05, 0x8b, 0xd1, 0x8f, 0x24, - 0x9e, 0x26, 0xfc, 0x22, 0xe5, 0x28, 0x4d, 0xfd, 0xab, 0xfe, 0xf3, 0xc3, 0xef, 0xef, 0xce, 0xae, - 0xa7, 0x9d, 0x83, 0x8d, 0x9c, 0xe6, 0xea, 0xa9, 0x46, 0x07, 0x58, 0xe3, 0xc8, 0x31, 0x90, 0xaa, - 0x2d, 0xc6, 0x91, 0x40, 0x6e, 0x36, 0x94, 0xef, 0x8f, 0x57, 0x7d, 0x73, 0xf9, 0x54, 0xa3, 0x43, - 0xac, 0x93, 0xe4, 0x1f, 0x18, 0xae, 0x9f, 0x8a, 0xf3, 0x32, 0x6c, 0x53, 0x99, 0xda, 0xbb, 0x4d, - 0xff, 0x66, 0xd2, 0x6d, 0xd0, 0xbe, 0x5b, 0xc1, 0x64, 0x0f, 0x3e, 0x6e, 0xac, 0x8a, 0x80, 0x2d, - 0xe5, 0xf5, 0xed, 0x45, 0xaf, 0x32, 0x9c, 0xe1, 0x56, 0x89, 0x49, 0x1b, 0x9a, 0x98, 0x86, 0x36, - 0x81, 0x41, 0x7d, 0x21, 0xfb, 0x5a, 0x87, 0xe1, 0xb3, 0x7a, 0xe4, 0x13, 0x74, 0x7c, 0x1e, 0x78, - 0x7e, 0xbe, 0x77, 0x8b, 0x16, 0x28, 0xe3, 0xcf, 0xa2, 0x24, 0x64, 0x52, 0xed, 0x65, 0xd0, 0x02, - 0x65, 0xbc, 0x7a, 0x23, 0xaa, 0xca, 0x06, 0x2d, 0x10, 0x21, 0xd0, 0xf2, 0x19, 0xfa, 0x2a, 0x7c, - 0x9f, 0xaa, 0x9b, 0x7c, 0x86, 0x5e, 0xc8, 0x25, 0x9b, 0x33, 0xc9, 0xcc, 0xb6, 0xe2, 0x4b, 0x6c, - 0x1f, 0x42, 0xbf, 0x3a, 0xcb, 0x9b, 0x73, 0x8c, 0xa0, 0x1d, 0x88, 0x39, 0xbf, 0x2c, 0x62, 0xe4, - 0xc0, 0xbe, 0xd2, 0xc1, 0x78, 0xb2, 0xd0, 0xfb, 0xf8, 0x66, 0xac, 0xea, 0x59, 0xd4, 0xcb, 0x01, - 0x31, 0xa1, 0x1b, 0x06, 0x88, 0x81, 0xf0, 0x54, 0xbd, 0x1e, 0xdd, 0xc0, 0xc9, 0xff, 0xdb, 0x95, - 0xa5, 0x2f, 0x57, 0x96, 0xfe, 0xb0, 0xb2, 0xf4, 0x9b, 0xb5, 0xa5, 0x2d, 0xd7, 0x96, 0x76, 0xb7, - 0xb6, 0xb4, 0x93, 0x5f, 0x5e, 0x20, 0xfd, 0x74, 0xe6, 0xb8, 0x51, 0x38, 0xde, 0x7e, 0xe0, 0xea, - 0x59, 0xfb, 0x95, 0x66, 0x1d, 0x45, 0xfc, 0x79, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x0d, 0x38, - 0x7f, 0x64, 0x03, 0x00, 0x00, + 0x18, 0x94, 0xfc, 0xcf, 0x57, 0xab, 0xd8, 0x8b, 0x29, 0xa2, 0x07, 0x61, 0x54, 0x68, 0x7b, 0x92, + 0xa0, 0x3d, 0xf6, 0xe6, 0x5e, 0x5c, 0x68, 0x2f, 0xdb, 0x18, 0x42, 0x2e, 0x61, 0x2d, 0x6f, 0x24, + 0x11, 0xb4, 0x52, 0xf4, 0xad, 0x20, 0x7e, 0x80, 0x9c, 0x72, 0xc9, 0x63, 0xe5, 0xe8, 0x63, 0xc8, + 0x29, 0xd8, 0x2f, 0x12, 0xb4, 0x92, 0x65, 0xc5, 0x31, 0x09, 0x81, 0xdc, 0x76, 0xc6, 0xe3, 0xd1, + 0xcc, 0xc0, 0x07, 0x63, 0xc9, 0xc5, 0x82, 0xa7, 0x51, 0x28, 0xa4, 0x8b, 0x92, 0x49, 0x8e, 0x4b, + 0xe1, 0xb9, 0x72, 0x99, 0x70, 0x74, 0x92, 0x34, 0x96, 0x31, 0x19, 0xed, 0x14, 0x4e, 0xa5, 0xb0, + 0xef, 0x1b, 0xd0, 0xfd, 0xc7, 0x11, 0x99, 0xcf, 0xc9, 0x0c, 0x86, 0x28, 0x58, 0x82, 0x41, 0x2c, + 0xf1, 0x34, 0xe5, 0x17, 0x19, 0x47, 0x69, 0xea, 0x63, 0xfd, 0xfb, 0x87, 0x1f, 0x5f, 0x9d, 0x43, + 0xff, 0x76, 0xfe, 0x6f, 0xe5, 0xb4, 0x50, 0x4f, 0x35, 0x3a, 0xc0, 0x3d, 0x8e, 0x1c, 0x03, 0xa9, + 0xdb, 0x62, 0x12, 0x0b, 0xe4, 0x66, 0x43, 0xf9, 0x7e, 0x7b, 0xd5, 0xb7, 0x90, 0x4f, 0x35, 0x3a, + 0xc4, 0x7d, 0x92, 0xfc, 0x01, 0xc3, 0x0b, 0x32, 0x71, 0x5e, 0x85, 0x6d, 0x2a, 0x53, 0xfb, 0xb0, + 0xe9, 0xef, 0x5c, 0xba, 0x0b, 0xda, 0xf7, 0x6a, 0x98, 0xfc, 0x85, 0x8f, 0x5b, 0xab, 0x32, 0x60, + 0x4b, 0x79, 0x7d, 0x79, 0xd1, 0xab, 0x0a, 0x67, 0x78, 0x75, 0x62, 0xd2, 0x86, 0x26, 0x66, 0x91, + 0x4d, 0x60, 0xb0, 0xbf, 0x90, 0x7d, 0xad, 0xc3, 0xf0, 0x59, 0x3d, 0xf2, 0x09, 0x3a, 0x01, 0x0f, + 0xfd, 0xa0, 0xd8, 0xbb, 0x45, 0x4b, 0x94, 0xf3, 0x67, 0x71, 0x1a, 0x31, 0xa9, 0xf6, 0x32, 0x68, + 0x89, 0x72, 0x5e, 0x7d, 0x11, 0x55, 0x65, 0x83, 0x96, 0x88, 0x10, 0x68, 0x05, 0x0c, 0x03, 0x15, + 0xbe, 0x4f, 0xd5, 0x9b, 0x7c, 0x86, 0x5e, 0xc4, 0x25, 0x5b, 0x30, 0xc9, 0xcc, 0xb6, 0xe2, 0x2b, + 0x6c, 0x1f, 0x41, 0xbf, 0x3e, 0xcb, 0x9b, 0x73, 0x8c, 0xa0, 0x1d, 0x8a, 0x05, 0xbf, 0x2c, 0x63, + 0x14, 0xc0, 0xbe, 0xd2, 0xc1, 0x78, 0xb2, 0xd0, 0xfb, 0xf8, 0xe6, 0xac, 0xea, 0x59, 0xd6, 0x2b, + 0x00, 0x31, 0xa1, 0x1b, 0x85, 0x88, 0xa1, 0xf0, 0x55, 0xbd, 0x1e, 0xdd, 0xc2, 0xc9, 0xec, 0x76, + 0x6d, 0xe9, 0xab, 0xb5, 0xa5, 0x3f, 0xac, 0x2d, 0xfd, 0x66, 0x63, 0x69, 0xab, 0x8d, 0xa5, 0xdd, + 0x6d, 0x2c, 0xed, 0xe4, 0x97, 0x1f, 0xca, 0x20, 0x9b, 0x3b, 0x5e, 0x1c, 0xb9, 0xb5, 0xcb, 0xa9, + 0x3d, 0xd5, 0xd1, 0xb8, 0x87, 0xae, 0x6a, 0xde, 0x51, 0xbf, 0xfd, 0x7c, 0x0c, 0x00, 0x00, 0xff, + 0xff, 0xcc, 0x16, 0xc2, 0x8b, 0x74, 0x03, 0x00, 0x00, } func (m *Message) Marshal() (dAtA []byte, err error) { diff --git a/proto/statesync/types.proto b/proto/tendermint/statesync/types.proto similarity index 89% rename from proto/statesync/types.proto rename to proto/tendermint/statesync/types.proto index b7d1972e2..8d4a714c1 100644 --- a/proto/statesync/types.proto +++ b/proto/tendermint/statesync/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tendermint.statesync; -option go_package = "github.com/tendermint/tendermint/proto/statesync"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/statesync"; message Message { oneof sum { diff --git a/proto/store/types.pb.go b/proto/tendermint/store/types.pb.go similarity index 89% rename from proto/store/types.pb.go rename to proto/tendermint/store/types.pb.go index 02b2d3afe..c18c88fa4 100644 --- a/proto/store/types.pb.go +++ b/proto/tendermint/store/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/store/types.proto +// source: tendermint/store/types.proto package store @@ -31,7 +31,7 @@ func (m *BlockStoreState) Reset() { *m = BlockStoreState{} } func (m *BlockStoreState) String() string { return proto.CompactTextString(m) } func (*BlockStoreState) ProtoMessage() {} func (*BlockStoreState) Descriptor() ([]byte, []int) { - return fileDescriptor_45a8553e38baf31c, []int{0} + return fileDescriptor_ff9e53a0a74267f7, []int{0} } func (m *BlockStoreState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -78,21 +78,21 @@ func init() { proto.RegisterType((*BlockStoreState)(nil), "tendermint.store.BlockStoreState") } -func init() { proto.RegisterFile("proto/store/types.proto", fileDescriptor_45a8553e38baf31c) } +func init() { proto.RegisterFile("tendermint/store/types.proto", fileDescriptor_ff9e53a0a74267f7) } -var fileDescriptor_45a8553e38baf31c = []byte{ - // 162 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x03, 0x8b, - 0x08, 0x09, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x81, 0x65, 0x95, +var fileDescriptor_ff9e53a0a74267f7 = []byte{ + // 165 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, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0xa9, 0x2c, + 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0xc8, 0xea, 0x81, 0x65, 0x95, 0x6c, 0xb9, 0xf8, 0x9d, 0x72, 0xf2, 0x93, 0xb3, 0x83, 0x41, 0xbc, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x21, 0x2e, 0x96, 0xa4, 0xc4, 0xe2, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x30, 0x5b, 0x48, 0x8c, 0x8b, 0x2d, 0x23, 0x35, 0x33, 0x3d, 0xa3, 0x44, 0x82, 0x09, 0x2c, 0x0a, 0xe5, - 0x39, 0xb9, 0x9d, 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, 0x4e, 0x7a, 0x66, - 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xc2, 0x56, 0x64, 0x26, 0x92, 0x23, 0x93, - 0xd8, 0xc0, 0x1c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x79, 0x1a, 0xba, 0xba, 0x00, - 0x00, 0x00, + 0x39, 0x05, 0x9e, 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, 0x79, 0x7a, 0x66, + 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x92, 0x9b, 0x90, 0x98, 0x60, 0x27, 0xe9, + 0xa3, 0xbb, 0x37, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xef, 0xa6, 0x30, + 0x63, 0xca, 0x00, 0x00, 0x00, } func (m *BlockStoreState) Marshal() (dAtA []byte, err error) { diff --git a/proto/store/types.proto b/proto/tendermint/store/types.proto similarity index 59% rename from proto/store/types.proto rename to proto/tendermint/store/types.proto index 1d71b45f2..af2f97ad0 100644 --- a/proto/store/types.proto +++ b/proto/tendermint/store/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tendermint.store; -option go_package = "github.com/tendermint/tendermint/proto/store"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/store"; message BlockStoreState { int64 base = 1; diff --git a/proto/types/block.pb.go b/proto/tendermint/types/block.pb.go similarity index 84% rename from proto/types/block.pb.go rename to proto/tendermint/types/block.pb.go index e96b0148f..206da91aa 100644 --- a/proto/types/block.pb.go +++ b/proto/tendermint/types/block.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/block.proto +// source: tendermint/types/block.proto package types @@ -34,7 +34,7 @@ func (m *Block) Reset() { *m = Block{} } func (m *Block) String() string { return proto.CompactTextString(m) } func (*Block) ProtoMessage() {} func (*Block) Descriptor() ([]byte, []int) { - return fileDescriptor_3aa007336dea920d, []int{0} + return fileDescriptor_70840e82f4357ab1, []int{0} } func (m *Block) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -95,27 +95,27 @@ func init() { proto.RegisterType((*Block)(nil), "tendermint.types.Block") } -func init() { proto.RegisterFile("proto/types/block.proto", fileDescriptor_3aa007336dea920d) } +func init() { proto.RegisterFile("tendermint/types/block.proto", fileDescriptor_70840e82f4357ab1) } -var fileDescriptor_3aa007336dea920d = []byte{ - // 270 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0xd6, 0x03, 0x8b, - 0x08, 0x09, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x81, 0x65, 0xa5, - 0xd4, 0x4a, 0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21, 0xda, 0xd2, - 0xf3, 0xd3, 0xf3, 0x11, 0x2c, 0x88, 0x4e, 0x29, 0x14, 0x23, 0xc1, 0x24, 0x54, 0x42, 0x0a, 0x59, - 0x22, 0xb5, 0x2c, 0x33, 0x25, 0x35, 0x2f, 0x39, 0x15, 0x22, 0xa7, 0xf4, 0x8e, 0x91, 0x8b, 0xd5, - 0x09, 0x64, 0xbd, 0x90, 0x19, 0x17, 0x5b, 0x46, 0x6a, 0x62, 0x4a, 0x6a, 0x91, 0x04, 0xa3, 0x02, - 0xa3, 0x06, 0xb7, 0x91, 0x84, 0x1e, 0xba, 0x4b, 0xf4, 0x3c, 0xc0, 0xf2, 0x4e, 0x2c, 0x27, 0xee, - 0xc9, 0x33, 0x04, 0x41, 0x55, 0x0b, 0x19, 0x70, 0xb1, 0xa4, 0x24, 0x96, 0x24, 0x4a, 0x30, 0x81, - 0x75, 0x89, 0x61, 0xea, 0x72, 0x49, 0x2c, 0x49, 0x84, 0xea, 0x01, 0xab, 0x14, 0x72, 0xe0, 0xe2, - 0x80, 0xb9, 0x42, 0x82, 0x19, 0xac, 0x4b, 0x0e, 0x53, 0x97, 0x2b, 0x54, 0x05, 0x92, 0x6e, 0xb8, - 0x2e, 0x21, 0x4b, 0x2e, 0xee, 0x9c, 0xc4, 0xe2, 0x92, 0xf8, 0xe4, 0xfc, 0xdc, 0xdc, 0xcc, 0x12, - 0x09, 0x16, 0x5c, 0x0e, 0x76, 0x06, 0xcb, 0x07, 0x71, 0x81, 0x14, 0x43, 0xd8, 0x4e, 0x6e, 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, 0xa5, 0x93, 0x9e, 0x59, 0x92, 0x51, 0x9a, - 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, 0x30, 0x09, 0x99, 0x89, 0x14, 0x8e, 0x49, 0x6c, 0x60, 0x8e, - 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x84, 0x9a, 0x05, 0x41, 0xc9, 0x01, 0x00, 0x00, +var fileDescriptor_70840e82f4357ab1 = []byte{ + // 262 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, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xca, 0xc9, + 0x4f, 0xce, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0xc8, 0xea, 0x81, 0x65, 0xa5, + 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x92, 0xfa, 0x20, 0x16, 0x44, 0x9d, 0x14, 0xa6, 0x29, 0x60, + 0x12, 0x2a, 0x2b, 0x8f, 0x21, 0x9b, 0x5a, 0x96, 0x99, 0x92, 0x9a, 0x97, 0x9c, 0x0a, 0x51, 0xa0, + 0xf4, 0x8e, 0x91, 0x8b, 0xd5, 0x09, 0x64, 0xad, 0x90, 0x19, 0x17, 0x5b, 0x46, 0x6a, 0x62, 0x4a, + 0x6a, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x84, 0x1e, 0xba, 0x0b, 0xf4, 0x3c, 0xc0, + 0xf2, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0x55, 0x0b, 0x19, 0x70, 0xb1, 0xa4, 0x24, + 0x96, 0x24, 0x4a, 0x30, 0x81, 0x75, 0x89, 0x61, 0xea, 0x72, 0x49, 0x2c, 0x49, 0x84, 0xea, 0x01, + 0xab, 0x14, 0x72, 0xe0, 0xe2, 0x80, 0xb9, 0x42, 0x82, 0x19, 0xac, 0x4b, 0x0e, 0x53, 0x97, 0x2b, + 0x54, 0x05, 0x92, 0x6e, 0xb8, 0x2e, 0x21, 0x4b, 0x2e, 0xee, 0x9c, 0xc4, 0xe2, 0x92, 0xf8, 0xe4, + 0xfc, 0xdc, 0xdc, 0xcc, 0x12, 0x09, 0x16, 0x5c, 0x0e, 0x76, 0x06, 0xcb, 0x07, 0x71, 0x81, 0x14, + 0x43, 0xd8, 0x4e, 0x81, 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, 0x9e, + 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, 0x1c, 0x6c, 0x08, 0x26, 0x24, + 0xf0, 0xd1, 0x83, 0x34, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x4b, + 0x9b, 0x9a, 0xd1, 0x01, 0x00, 0x00, } func (m *Block) Marshal() (dAtA []byte, err error) { diff --git a/proto/types/block.proto b/proto/tendermint/types/block.proto similarity index 65% rename from proto/types/block.proto rename to proto/tendermint/types/block.proto index 0129bbfdb..18984c06a 100644 --- a/proto/types/block.proto +++ b/proto/tendermint/types/block.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/types/types.proto"; -import "proto/types/evidence.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/types/types.proto"; +import "tendermint/types/evidence.proto"; message Block { Header header = 1 [(gogoproto.nullable) = false]; diff --git a/proto/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go similarity index 90% rename from proto/types/canonical.pb.go rename to proto/tendermint/types/canonical.pb.go index caeda9fbc..6a9b0a18b 100644 --- a/proto/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/canonical.proto +// source: tendermint/types/canonical.proto package types @@ -37,7 +37,7 @@ func (m *CanonicalBlockID) Reset() { *m = CanonicalBlockID{} } func (m *CanonicalBlockID) String() string { return proto.CompactTextString(m) } func (*CanonicalBlockID) ProtoMessage() {} func (*CanonicalBlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_3f9b1d584b46f180, []int{0} + return fileDescriptor_8d1a1a84ff7267ed, []int{0} } func (m *CanonicalBlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -89,7 +89,7 @@ func (m *CanonicalPartSetHeader) Reset() { *m = CanonicalPartSetHeader{} func (m *CanonicalPartSetHeader) String() string { return proto.CompactTextString(m) } func (*CanonicalPartSetHeader) ProtoMessage() {} func (*CanonicalPartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_3f9b1d584b46f180, []int{1} + return fileDescriptor_8d1a1a84ff7267ed, []int{1} } func (m *CanonicalPartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -146,7 +146,7 @@ func (m *CanonicalProposal) Reset() { *m = CanonicalProposal{} } func (m *CanonicalProposal) String() string { return proto.CompactTextString(m) } func (*CanonicalProposal) ProtoMessage() {} func (*CanonicalProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_3f9b1d584b46f180, []int{2} + return fileDescriptor_8d1a1a84ff7267ed, []int{2} } func (m *CanonicalProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -237,7 +237,7 @@ func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } func (m *CanonicalVote) String() string { return proto.CompactTextString(m) } func (*CanonicalVote) ProtoMessage() {} func (*CanonicalVote) Descriptor() ([]byte, []int) { - return fileDescriptor_3f9b1d584b46f180, []int{3} + return fileDescriptor_8d1a1a84ff7267ed, []int{3} } func (m *CanonicalVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -315,41 +315,41 @@ func init() { proto.RegisterType((*CanonicalVote)(nil), "tendermint.types.CanonicalVote") } -func init() { proto.RegisterFile("proto/types/canonical.proto", fileDescriptor_3f9b1d584b46f180) } +func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } -var fileDescriptor_3f9b1d584b46f180 = []byte{ - // 493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xe3, 0xd4, 0x49, 0x9c, 0x6d, 0x03, 0x61, 0x85, 0x8a, 0x15, 0x24, 0x3b, 0xf2, 0xa1, - 0x32, 0x12, 0xb2, 0xa5, 0xf6, 0x0d, 0x5c, 0x84, 0x08, 0x02, 0x51, 0xb9, 0x55, 0x0f, 0x5c, 0xac, - 0x8d, 0xbd, 0xd8, 0x2b, 0x1c, 0xef, 0xca, 0xde, 0x1c, 0x72, 0xe1, 0x19, 0xfa, 0x1c, 0x3c, 0x49, - 0x8f, 0x3d, 0xc2, 0x25, 0x20, 0xe7, 0x45, 0xd0, 0xee, 0x26, 0xb1, 0xc5, 0xbf, 0x0b, 0xa8, 0x97, - 0x68, 0x66, 0xf6, 0x9b, 0x99, 0x5f, 0xbe, 0x91, 0xc1, 0x53, 0x56, 0x52, 0x4e, 0x7d, 0xbe, 0x62, - 0xb8, 0xf2, 0x63, 0x54, 0xd0, 0x82, 0xc4, 0x28, 0xf7, 0x64, 0x15, 0x8e, 0x39, 0x2e, 0x12, 0x5c, - 0x2e, 0x48, 0xc1, 0x3d, 0xa9, 0x98, 0x9c, 0xf0, 0x8c, 0x94, 0x49, 0xc4, 0x50, 0xc9, 0x57, 0xbe, - 0x6a, 0x4d, 0x69, 0x4a, 0x9b, 0x48, 0x75, 0x4e, 0x9e, 0xb4, 0xc7, 0xca, 0xdf, 0xed, 0x83, 0x9d, - 0x52, 0x9a, 0xe6, 0x58, 0xf5, 0xce, 0x97, 0x1f, 0x7c, 0x4e, 0x16, 0xb8, 0xe2, 0x68, 0xc1, 0x94, - 0xc0, 0xf9, 0x04, 0xc6, 0xe7, 0x3b, 0x8c, 0x20, 0xa7, 0xf1, 0xc7, 0xd9, 0x0b, 0x08, 0x81, 0x9e, - 0xa1, 0x2a, 0x33, 0xb5, 0xa9, 0xe6, 0x1e, 0x85, 0x32, 0x86, 0xd7, 0xe0, 0xa1, 0xa0, 0x88, 0x2a, - 0xcc, 0xa3, 0x0c, 0xa3, 0x04, 0x97, 0x66, 0x77, 0xaa, 0xb9, 0x87, 0xa7, 0xae, 0xf7, 0x33, 0xb5, - 0xb7, 0x1f, 0x78, 0x81, 0x4a, 0x7e, 0x89, 0xf9, 0x2b, 0xa9, 0x0f, 0xf4, 0xdb, 0xb5, 0xdd, 0x09, - 0x47, 0xac, 0x5d, 0x74, 0x02, 0x70, 0xfc, 0x7b, 0x39, 0x7c, 0x0c, 0x7a, 0x9c, 0x72, 0x94, 0x4b, - 0x8c, 0x51, 0xa8, 0x92, 0x3d, 0x5b, 0xb7, 0x61, 0x73, 0xbe, 0x76, 0xc1, 0xa3, 0x66, 0x48, 0x49, - 0x19, 0xad, 0x50, 0x0e, 0xcf, 0x80, 0x2e, 0x70, 0x64, 0xfb, 0x83, 0x53, 0xfb, 0x57, 0xcc, 0x4b, - 0x92, 0x16, 0x38, 0x79, 0x5b, 0xa5, 0x57, 0x2b, 0x86, 0x43, 0x29, 0x86, 0xc7, 0xa0, 0x9f, 0x61, - 0x92, 0x66, 0x5c, 0x2e, 0x18, 0x87, 0xdb, 0x4c, 0xc0, 0x94, 0x74, 0x59, 0x24, 0xe6, 0x81, 0x2c, - 0xab, 0x04, 0x3e, 0x03, 0x43, 0x46, 0xf3, 0x48, 0xbd, 0xe8, 0x53, 0xcd, 0x3d, 0x08, 0x8e, 0xea, - 0xb5, 0x6d, 0x5c, 0xbc, 0x7b, 0x13, 0x8a, 0x5a, 0x68, 0x30, 0x9a, 0xcb, 0x08, 0xbe, 0x06, 0xc6, - 0x5c, 0xd8, 0x1b, 0x91, 0xc4, 0xec, 0x49, 0xe3, 0x9c, 0xbf, 0x18, 0xb7, 0xbd, 0x44, 0x70, 0x58, - 0xaf, 0xed, 0xc1, 0x36, 0x09, 0x07, 0x72, 0xc0, 0x2c, 0x81, 0x01, 0x18, 0xee, 0xcf, 0x68, 0xf6, - 0xe5, 0xb0, 0x89, 0xa7, 0x0e, 0xed, 0xed, 0x0e, 0xed, 0x5d, 0xed, 0x14, 0x81, 0x21, 0x7c, 0xbf, - 0xf9, 0x66, 0x6b, 0x61, 0xd3, 0x06, 0x4f, 0x80, 0x11, 0x67, 0x88, 0x14, 0x82, 0x67, 0x30, 0xd5, - 0xdc, 0xa1, 0xda, 0x75, 0x2e, 0x6a, 0x62, 0x97, 0x7c, 0x9c, 0x25, 0xce, 0xe7, 0x2e, 0x18, 0xed, - 0xb1, 0xae, 0x29, 0xc7, 0xf7, 0xe1, 0x6b, 0xdb, 0x2c, 0xfd, 0x7f, 0x9a, 0xd5, 0xfb, 0x77, 0xb3, - 0xfa, 0x7f, 0x36, 0x2b, 0x78, 0x79, 0x5b, 0x5b, 0xda, 0x5d, 0x6d, 0x69, 0xdf, 0x6b, 0x4b, 0xbb, - 0xd9, 0x58, 0x9d, 0xbb, 0x8d, 0xd5, 0xf9, 0xb2, 0xb1, 0x3a, 0xef, 0x9f, 0xa7, 0x84, 0x67, 0xcb, - 0xb9, 0x17, 0xd3, 0x85, 0xdf, 0xfc, 0x93, 0x76, 0xd8, 0xfa, 0x82, 0xe7, 0x7d, 0x99, 0x9c, 0xfd, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x91, 0x72, 0x7f, 0x8c, 0x2e, 0x04, 0x00, 0x00, +var fileDescriptor_8d1a1a84ff7267ed = []byte{ + // 487 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x3d, 0x6f, 0xd3, 0x40, + 0x18, 0xce, 0xa5, 0x4e, 0xe2, 0x5c, 0x1b, 0x08, 0xa7, 0xaa, 0xb2, 0x22, 0x64, 0x5b, 0x1e, 0x90, + 0x59, 0x6c, 0xa9, 0x1d, 0xd8, 0x5d, 0x06, 0x82, 0x40, 0x94, 0x6b, 0xd5, 0x81, 0x25, 0xba, 0xd8, + 0x87, 0x6d, 0xe1, 0xf8, 0x4e, 0xf6, 0x65, 0xe8, 0xc2, 0x6f, 0xe8, 0xef, 0xe0, 0x97, 0x74, 0xec, + 0x08, 0x4b, 0x40, 0xce, 0x1f, 0x41, 0x77, 0x4e, 0xec, 0xa8, 0x01, 0x16, 0x10, 0xcb, 0xe9, 0xfd, + 0x78, 0xee, 0x79, 0x1f, 0x3d, 0xaf, 0x5e, 0x68, 0x0b, 0x9a, 0x47, 0xb4, 0x58, 0xa4, 0xb9, 0xf0, + 0xc5, 0x0d, 0xa7, 0xa5, 0x1f, 0x92, 0x9c, 0xe5, 0x69, 0x48, 0x32, 0x8f, 0x17, 0x4c, 0x30, 0x34, + 0x6e, 0x11, 0x9e, 0x42, 0x4c, 0x8e, 0x63, 0x16, 0x33, 0xd5, 0xf4, 0x65, 0x54, 0xe3, 0x26, 0x4f, + 0xf7, 0x98, 0xd4, 0xbb, 0xe9, 0x5a, 0x31, 0x63, 0x71, 0x46, 0x7d, 0x95, 0xcd, 0x97, 0x1f, 0x7d, + 0x91, 0x2e, 0x68, 0x29, 0xc8, 0x82, 0xd7, 0x00, 0xe7, 0x33, 0x1c, 0x9f, 0x6f, 0x27, 0x07, 0x19, + 0x0b, 0x3f, 0x4d, 0x5f, 0x22, 0x04, 0xb5, 0x84, 0x94, 0x89, 0x01, 0x6c, 0xe0, 0x1e, 0x61, 0x15, + 0xa3, 0x6b, 0xf8, 0x98, 0x93, 0x42, 0xcc, 0x4a, 0x2a, 0x66, 0x09, 0x25, 0x11, 0x2d, 0x8c, 0xae, + 0x0d, 0xdc, 0xc3, 0x53, 0xd7, 0x7b, 0x28, 0xd4, 0x6b, 0x08, 0x2f, 0x48, 0x21, 0x2e, 0xa9, 0x78, + 0xa5, 0xf0, 0x81, 0x76, 0xb7, 0xb2, 0x3a, 0x78, 0xc4, 0x77, 0x8b, 0x4e, 0x00, 0x4f, 0x7e, 0x0d, + 0x47, 0xc7, 0xb0, 0x27, 0x98, 0x20, 0x99, 0x92, 0x31, 0xc2, 0x75, 0xd2, 0x68, 0xeb, 0xb6, 0xda, + 0x9c, 0x6f, 0x5d, 0xf8, 0xa4, 0x25, 0x29, 0x18, 0x67, 0x25, 0xc9, 0xd0, 0x19, 0xd4, 0xa4, 0x1c, + 0xf5, 0xfd, 0xd1, 0xa9, 0xb5, 0x2f, 0xf3, 0x32, 0x8d, 0x73, 0x1a, 0xbd, 0x2d, 0xe3, 0xab, 0x1b, + 0x4e, 0xb1, 0x02, 0xa3, 0x13, 0xd8, 0x4f, 0x68, 0x1a, 0x27, 0x42, 0x0d, 0x18, 0xe3, 0x4d, 0x26, + 0xc5, 0x14, 0x6c, 0x99, 0x47, 0xc6, 0x81, 0x2a, 0xd7, 0x09, 0x7a, 0x0e, 0x87, 0x9c, 0x65, 0xb3, + 0xba, 0xa3, 0xd9, 0xc0, 0x3d, 0x08, 0x8e, 0xaa, 0x95, 0xa5, 0x5f, 0xbc, 0x7b, 0x83, 0x65, 0x0d, + 0xeb, 0x9c, 0x65, 0x2a, 0x42, 0xaf, 0xa1, 0x3e, 0x97, 0xf6, 0xce, 0xd2, 0xc8, 0xe8, 0x29, 0xe3, + 0x9c, 0x3f, 0x18, 0xb7, 0xd9, 0x44, 0x70, 0x58, 0xad, 0xac, 0xc1, 0x26, 0xc1, 0x03, 0x45, 0x30, + 0x8d, 0x50, 0x00, 0x87, 0xcd, 0x1a, 0x8d, 0xbe, 0x22, 0x9b, 0x78, 0xf5, 0xa2, 0xbd, 0xed, 0xa2, + 0xbd, 0xab, 0x2d, 0x22, 0xd0, 0xa5, 0xef, 0xb7, 0xdf, 0x2d, 0x80, 0xdb, 0x6f, 0xe8, 0x19, 0xd4, + 0xc3, 0x84, 0xa4, 0xb9, 0xd4, 0x33, 0xb0, 0x81, 0x3b, 0xac, 0x67, 0x9d, 0xcb, 0x9a, 0x9c, 0xa5, + 0x9a, 0xd3, 0xc8, 0xf9, 0xd2, 0x85, 0xa3, 0x46, 0xd6, 0x35, 0x13, 0xf4, 0x7f, 0xf8, 0xba, 0x6b, + 0x96, 0xf6, 0x2f, 0xcd, 0xea, 0xfd, 0xbd, 0x59, 0xfd, 0xdf, 0x9b, 0x15, 0xbc, 0xbf, 0xab, 0x4c, + 0x70, 0x5f, 0x99, 0xe0, 0x47, 0x65, 0x82, 0xdb, 0xb5, 0xd9, 0xb9, 0x5f, 0x9b, 0x9d, 0xaf, 0x6b, + 0xb3, 0xf3, 0xe1, 0x45, 0x9c, 0x8a, 0x64, 0x39, 0xf7, 0x42, 0xb6, 0xf0, 0x77, 0x0f, 0xb6, 0x0d, + 0xeb, 0xc3, 0x7e, 0x78, 0xcc, 0xf3, 0xbe, 0xaa, 0x9f, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6d, + 0xdd, 0x12, 0x5d, 0x31, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { diff --git a/proto/types/canonical.proto b/proto/tendermint/types/canonical.proto similarity index 90% rename from proto/types/canonical.proto rename to proto/tendermint/types/canonical.proto index 4be38bc0e..e88fd6ffe 100644 --- a/proto/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/types/types.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/types/types.proto"; import "google/protobuf/timestamp.proto"; message CanonicalBlockID { diff --git a/proto/types/events.pb.go b/proto/tendermint/types/events.pb.go similarity index 91% rename from proto/types/events.pb.go rename to proto/tendermint/types/events.pb.go index 0b1a5ea99..1c49aef64 100644 --- a/proto/types/events.pb.go +++ b/proto/tendermint/types/events.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/events.proto +// source: tendermint/types/events.proto package types @@ -32,7 +32,7 @@ func (m *EventDataRoundState) Reset() { *m = EventDataRoundState{} } func (m *EventDataRoundState) String() string { return proto.CompactTextString(m) } func (*EventDataRoundState) ProtoMessage() {} func (*EventDataRoundState) Descriptor() ([]byte, []int) { - return fileDescriptor_1bb9bdae76a076d6, []int{0} + return fileDescriptor_72cfafd446dedf7c, []int{0} } func (m *EventDataRoundState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,22 +86,22 @@ func init() { proto.RegisterType((*EventDataRoundState)(nil), "tendermint.types.EventDataRoundState") } -func init() { proto.RegisterFile("proto/types/events.proto", fileDescriptor_1bb9bdae76a076d6) } +func init() { proto.RegisterFile("tendermint/types/events.proto", fileDescriptor_72cfafd446dedf7c) } -var fileDescriptor_1bb9bdae76a076d6 = []byte{ - // 186 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x03, - 0x0b, 0x09, 0x09, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x81, 0xa5, +var fileDescriptor_72cfafd446dedf7c = []byte{ + // 189 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, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x2d, 0x4b, + 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0x48, 0xeb, 0x81, 0xa5, 0x95, 0xc2, 0xb9, 0x84, 0x5d, 0x41, 0x2a, 0x5c, 0x12, 0x4b, 0x12, 0x83, 0xf2, 0x4b, 0xf3, 0x52, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xc4, 0xb8, 0xd8, 0x32, 0x52, 0x33, 0xd3, 0x33, 0x4a, 0x24, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xa0, 0x3c, 0x21, 0x11, 0x2e, 0xd6, 0x22, 0x90, 0x2a, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x08, 0x47, 0x48, 0x88, 0x8b, 0xa5, 0xb8, 0x24, 0xb5, 0x40, - 0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0x72, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, + 0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0x0a, 0x3c, 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, 0x9d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0x7d, 0x84, 0x7b, 0x90, 0x99, 0x48, 0xee, 0x4f, 0x62, 0x03, 0x73, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xee, 0x5d, 0x95, 0x24, 0xd5, 0x00, 0x00, 0x00, + 0xc6, 0x63, 0x39, 0x86, 0x28, 0xf3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, + 0x7d, 0x64, 0xe7, 0x22, 0x98, 0x60, 0xc7, 0xea, 0xa3, 0x7b, 0x25, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, + 0x08, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xe9, 0x14, 0x02, 0xe5, 0x00, 0x00, 0x00, } func (m *EventDataRoundState) Marshal() (dAtA []byte, err error) { diff --git a/proto/types/events.proto b/proto/tendermint/types/events.proto similarity index 64% rename from proto/types/events.proto rename to proto/tendermint/types/events.proto index 5b3300c8c..a1e5cc498 100644 --- a/proto/types/events.proto +++ b/proto/tendermint/types/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; message EventDataRoundState { int64 height = 1; diff --git a/proto/types/evidence.pb.go b/proto/tendermint/types/evidence.pb.go similarity index 92% rename from proto/types/evidence.pb.go rename to proto/tendermint/types/evidence.pb.go index 4624f7206..2853b0673 100644 --- a/proto/types/evidence.pb.go +++ b/proto/tendermint/types/evidence.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/evidence.proto +// source: tendermint/types/evidence.proto package types @@ -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" - keys "github.com/tendermint/tendermint/proto/crypto/keys" + keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ func (m *DuplicateVoteEvidence) Reset() { *m = DuplicateVoteEvidence{} } func (m *DuplicateVoteEvidence) String() string { return proto.CompactTextString(m) } func (*DuplicateVoteEvidence) ProtoMessage() {} func (*DuplicateVoteEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{0} + return fileDescriptor_6825fabc78e0a168, []int{0} } func (m *DuplicateVoteEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,7 +92,7 @@ func (m *PotentialAmnesiaEvidence) Reset() { *m = PotentialAmnesiaEviden func (m *PotentialAmnesiaEvidence) String() string { return proto.CompactTextString(m) } func (*PotentialAmnesiaEvidence) ProtoMessage() {} func (*PotentialAmnesiaEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{1} + return fileDescriptor_6825fabc78e0a168, []int{1} } func (m *PotentialAmnesiaEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -151,7 +151,7 @@ func (m *AmnesiaEvidence) Reset() { *m = AmnesiaEvidence{} } func (m *AmnesiaEvidence) String() string { return proto.CompactTextString(m) } func (*AmnesiaEvidence) ProtoMessage() {} func (*AmnesiaEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{2} + return fileDescriptor_6825fabc78e0a168, []int{2} } func (m *AmnesiaEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -205,7 +205,7 @@ func (m *MockEvidence) Reset() { *m = MockEvidence{} } func (m *MockEvidence) String() string { return proto.CompactTextString(m) } func (*MockEvidence) ProtoMessage() {} func (*MockEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{3} + return fileDescriptor_6825fabc78e0a168, []int{3} } func (m *MockEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -266,7 +266,7 @@ func (m *MockRandomEvidence) Reset() { *m = MockRandomEvidence{} } func (m *MockRandomEvidence) String() string { return proto.CompactTextString(m) } func (*MockRandomEvidence) ProtoMessage() {} func (*MockRandomEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{4} + return fileDescriptor_6825fabc78e0a168, []int{4} } func (m *MockRandomEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -332,7 +332,7 @@ func (m *ConflictingHeadersEvidence) Reset() { *m = ConflictingHeadersEv func (m *ConflictingHeadersEvidence) String() string { return proto.CompactTextString(m) } func (*ConflictingHeadersEvidence) ProtoMessage() {} func (*ConflictingHeadersEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{5} + return fileDescriptor_6825fabc78e0a168, []int{5} } func (m *ConflictingHeadersEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -385,7 +385,7 @@ func (m *LunaticValidatorEvidence) Reset() { *m = LunaticValidatorEviden func (m *LunaticValidatorEvidence) String() string { return proto.CompactTextString(m) } func (*LunaticValidatorEvidence) ProtoMessage() {} func (*LunaticValidatorEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{6} + return fileDescriptor_6825fabc78e0a168, []int{6} } func (m *LunaticValidatorEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -444,7 +444,7 @@ func (m *PhantomValidatorEvidence) Reset() { *m = PhantomValidatorEviden func (m *PhantomValidatorEvidence) String() string { return proto.CompactTextString(m) } func (*PhantomValidatorEvidence) ProtoMessage() {} func (*PhantomValidatorEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{7} + return fileDescriptor_6825fabc78e0a168, []int{7} } func (m *PhantomValidatorEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -504,7 +504,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{8} + return fileDescriptor_6825fabc78e0a168, []int{8} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -660,7 +660,7 @@ func (m *EvidenceData) Reset() { *m = EvidenceData{} } func (m *EvidenceData) String() string { return proto.CompactTextString(m) } func (*EvidenceData) ProtoMessage() {} func (*EvidenceData) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{9} + return fileDescriptor_6825fabc78e0a168, []int{9} } func (m *EvidenceData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -712,7 +712,7 @@ func (m *ProofOfLockChange) Reset() { *m = ProofOfLockChange{} } func (m *ProofOfLockChange) String() string { return proto.CompactTextString(m) } func (*ProofOfLockChange) ProtoMessage() {} func (*ProofOfLockChange) Descriptor() ([]byte, []int) { - return fileDescriptor_86495eef24aeacc0, []int{10} + return fileDescriptor_6825fabc78e0a168, []int{10} } func (m *ProofOfLockChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -769,68 +769,68 @@ func init() { proto.RegisterType((*ProofOfLockChange)(nil), "tendermint.types.ProofOfLockChange") } -func init() { proto.RegisterFile("proto/types/evidence.proto", fileDescriptor_86495eef24aeacc0) } - -var fileDescriptor_86495eef24aeacc0 = []byte{ - // 920 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x41, 0x6f, 0xdc, 0x44, - 0x18, 0xb5, 0xb3, 0x9b, 0x6d, 0xfa, 0x75, 0x4b, 0x82, 0xd5, 0x52, 0x6b, 0xa1, 0x9b, 0xd4, 0x20, - 0x5a, 0xaa, 0xe0, 0x6d, 0xc3, 0x01, 0x09, 0x71, 0xc9, 0xb6, 0xa9, 0xb6, 0x6a, 0x81, 0x6a, 0x82, - 0x0a, 0xe2, 0x62, 0x66, 0xed, 0x59, 0x7b, 0xba, 0xb6, 0xc7, 0xb2, 0xc7, 0x41, 0x96, 0xe0, 0x27, - 0x20, 0xf5, 0xde, 0x7f, 0x80, 0xc4, 0x8d, 0x1f, 0xd1, 0x63, 0xc5, 0x89, 0x13, 0xa0, 0xe4, 0x8f, - 0xa0, 0x99, 0xb1, 0xbd, 0x9b, 0x78, 0xdd, 0xc0, 0x05, 0xa9, 0x97, 0x68, 0xf3, 0xcd, 0xf7, 0xbd, - 0xf7, 0x66, 0xfc, 0xe6, 0xd9, 0x30, 0x48, 0x52, 0xc6, 0xd9, 0x88, 0x17, 0x09, 0xc9, 0x46, 0xe4, - 0x88, 0x7a, 0x24, 0x76, 0x89, 0x2d, 0x8b, 0xc6, 0x16, 0x27, 0xb1, 0x47, 0xd2, 0x88, 0xc6, 0xdc, - 0x96, 0x0d, 0x83, 0x0f, 0x79, 0x40, 0x53, 0xcf, 0x49, 0x70, 0xca, 0x8b, 0x91, 0x9a, 0xf4, 0x99, - 0xcf, 0x16, 0xbf, 0xd4, 0xe4, 0xe0, 0xda, 0x32, 0xaa, 0xfc, 0x5b, 0x2e, 0x6c, 0xfb, 0x8c, 0xf9, - 0x21, 0x51, 0xb3, 0xd3, 0x7c, 0x36, 0xe2, 0x34, 0x22, 0x19, 0xc7, 0x51, 0x52, 0x36, 0x5c, 0x57, - 0x93, 0x6e, 0x5a, 0x24, 0x9c, 0x8d, 0xe6, 0xa4, 0x38, 0x35, 0x6f, 0xe5, 0x70, 0xf5, 0x7e, 0x9e, - 0x84, 0xd4, 0xc5, 0x9c, 0x3c, 0x65, 0x9c, 0x1c, 0x94, 0x8a, 0x8d, 0x8f, 0xa1, 0x77, 0xc4, 0x38, - 0x71, 0xb0, 0xa9, 0xef, 0xe8, 0xb7, 0x2e, 0xed, 0xbd, 0x63, 0x9f, 0x15, 0x6f, 0x8b, 0x7e, 0xb4, - 0x2e, 0xba, 0xf6, 0xeb, 0xf6, 0xa9, 0xb9, 0x76, 0x7e, 0xfb, 0xd8, 0x7a, 0xa1, 0x83, 0xf9, 0x84, - 0x71, 0x12, 0x73, 0x8a, 0xc3, 0xfd, 0x28, 0x26, 0x19, 0xc5, 0xff, 0x0f, 0xb5, 0x71, 0x03, 0xfa, - 0x01, 0xa1, 0x7e, 0xc0, 0x1d, 0x79, 0x4c, 0x66, 0x67, 0x47, 0xbf, 0xd5, 0x41, 0x97, 0x54, 0xed, - 0x50, 0x94, 0xac, 0xdf, 0x74, 0xd8, 0x3c, 0x2b, 0x2a, 0x80, 0x41, 0x52, 0x09, 0x76, 0xb0, 0x5a, - 0x74, 0xaa, 0xe7, 0x5b, 0x0a, 0xbd, 0xdd, 0x64, 0x6e, 0xdb, 0x24, 0x32, 0x93, 0xb6, 0xed, 0x7f, - 0x0a, 0xdd, 0x84, 0x85, 0x6e, 0xb9, 0x9b, 0xf7, 0x57, 0x60, 0xa6, 0x8c, 0xcd, 0xbe, 0x9a, 0x3d, - 0x66, 0xee, 0xfc, 0x5e, 0x80, 0x63, 0x9f, 0x20, 0x39, 0x60, 0xfd, 0xaa, 0x43, 0xff, 0x0b, 0xe6, - 0xce, 0x6b, 0xa4, 0x9b, 0xb0, 0x59, 0x29, 0x74, 0xd4, 0xfe, 0xa4, 0xd0, 0x0e, 0x7a, 0xab, 0x2a, - 0x4f, 0x64, 0xd5, 0x78, 0x08, 0x97, 0xeb, 0x46, 0x61, 0xa0, 0x92, 0x7b, 0x60, 0x2b, 0x77, 0xd9, - 0x95, 0xbb, 0xec, 0xaf, 0x2b, 0x77, 0x8d, 0x37, 0x5e, 0xfe, 0xb9, 0xad, 0x3d, 0xff, 0x6b, 0x5b, - 0x47, 0xfd, 0x6a, 0x54, 0x2c, 0x1a, 0x1f, 0xc1, 0x56, 0x0d, 0x85, 0x3d, 0x2f, 0x25, 0x59, 0x26, - 0x8f, 0xb8, 0x8f, 0x6a, 0x2d, 0xfb, 0xaa, 0x6c, 0xfd, 0xae, 0x83, 0x21, 0xf4, 0x22, 0x1c, 0x7b, - 0x2c, 0x7a, 0x43, 0x54, 0x1b, 0xd7, 0x01, 0x52, 0x1c, 0x7b, 0xce, 0xb4, 0xe0, 0x24, 0x33, 0xbb, - 0xb2, 0xe9, 0xa2, 0xa8, 0x8c, 0x45, 0xc1, 0xfa, 0x11, 0x06, 0xf7, 0x58, 0x3c, 0x0b, 0xa9, 0xcb, - 0x69, 0xec, 0x4f, 0x08, 0xf6, 0x48, 0x9a, 0xd5, 0x7b, 0xb3, 0x61, 0x2d, 0xb8, 0x5b, 0xba, 0x65, - 0xd8, 0x7c, 0xb2, 0x87, 0xd4, 0x8f, 0x89, 0xa7, 0x86, 0xd0, 0x5a, 0x70, 0x57, 0xf6, 0xef, 0x95, - 0xfb, 0x3a, 0xbf, 0x7f, 0xcf, 0xfa, 0x45, 0x07, 0xf3, 0x71, 0x1e, 0x63, 0x4e, 0xdd, 0xa7, 0x38, - 0xa4, 0x1e, 0xe6, 0x2c, 0xad, 0xc9, 0xef, 0x40, 0x2f, 0x90, 0xad, 0xa5, 0x00, 0xb3, 0x09, 0x58, - 0x42, 0x95, 0x7d, 0xc6, 0x6d, 0xe8, 0x8a, 0x4b, 0x73, 0xce, 0xc5, 0x92, 0x3d, 0xc6, 0x1d, 0xb8, - 0x42, 0xe3, 0x23, 0x41, 0xea, 0xa8, 0x69, 0x67, 0x46, 0x49, 0xe8, 0xc9, 0x63, 0xbc, 0x88, 0x8c, - 0x72, 0x4d, 0x11, 0x3c, 0x10, 0x2b, 0xd6, 0xcf, 0x22, 0x04, 0x02, 0x1c, 0x73, 0x16, 0x35, 0xc5, - 0x56, 0xd4, 0xfa, 0xbf, 0xa0, 0x3e, 0x80, 0x9d, 0x10, 0x67, 0xbc, 0x74, 0x8b, 0x73, 0x54, 0x81, - 0x39, 0x3f, 0xe0, 0xcc, 0xa1, 0xb1, 0x93, 0x11, 0x2e, 0xb7, 0xd0, 0x41, 0xef, 0x8a, 0x3e, 0x65, - 0x9f, 0x9a, 0xf2, 0x1b, 0x9c, 0x3d, 0x8c, 0x0f, 0x09, 0xb7, 0x5e, 0xf4, 0x60, 0xa3, 0xe6, 0xc7, - 0x70, 0xcd, 0xab, 0x82, 0xd1, 0x91, 0xf9, 0x72, 0xe6, 0xb2, 0xdf, 0x6c, 0x4a, 0x5a, 0x99, 0xa4, - 0x13, 0x0d, 0x5d, 0xf5, 0x56, 0x46, 0x6c, 0x02, 0xef, 0xb9, 0x0b, 0xab, 0x94, 0xa7, 0x96, 0x2d, - 0x78, 0xd4, 0xa9, 0xef, 0x36, 0x79, 0xda, 0x0d, 0x36, 0xd1, 0xd0, 0xc0, 0x6d, 0xb7, 0xdf, 0x33, - 0x18, 0x84, 0xca, 0x1d, 0x4b, 0x87, 0x54, 0xf3, 0x75, 0xda, 0x42, 0xac, 0xcd, 0x51, 0x13, 0x0d, - 0x99, 0x61, 0x9b, 0xdb, 0x9e, 0xbd, 0x36, 0x30, 0xbb, 0xff, 0x35, 0x30, 0x05, 0x57, 0x6b, 0x64, - 0x7e, 0x09, 0x5b, 0x0d, 0x86, 0x75, 0xc9, 0x70, 0xa3, 0xc9, 0xd0, 0x04, 0xde, 0xc4, 0x67, 0xf0, - 0x84, 0x76, 0x65, 0xcc, 0x55, 0xe7, 0xd4, 0x6b, 0xd5, 0xde, 0x62, 0x66, 0xa9, 0xbd, 0xcd, 0xe8, - 0x07, 0x70, 0x39, 0x62, 0xee, 0x7c, 0x01, 0x7f, 0xa1, 0xed, 0xb6, 0x2f, 0x67, 0xfb, 0x44, 0x43, - 0xfd, 0x68, 0x39, 0xeb, 0xbf, 0x85, 0x2b, 0x12, 0x26, 0x95, 0x61, 0xba, 0x40, 0xdb, 0x90, 0x68, - 0x1f, 0xac, 0x46, 0x3b, 0x9d, 0xbc, 0x13, 0x0d, 0x19, 0x51, 0xa3, 0x3a, 0x5e, 0x87, 0x4e, 0x96, - 0x47, 0xd6, 0xf7, 0xd0, 0xaf, 0x4a, 0xf7, 0x31, 0xc7, 0xc6, 0xe7, 0xb0, 0xb1, 0x74, 0x23, 0x3a, - 0x32, 0x78, 0x1b, 0x24, 0x35, 0x48, 0x57, 0x04, 0x2f, 0xaa, 0x27, 0x0c, 0x03, 0xba, 0x01, 0xce, - 0x02, 0xe9, 0xf1, 0x3e, 0x92, 0xbf, 0xad, 0x9f, 0xe0, 0xed, 0xc6, 0xab, 0xcd, 0xd8, 0x05, 0xf9, - 0xde, 0xce, 0x4a, 0x8e, 0xd7, 0xbe, 0xdc, 0x33, 0xe3, 0x33, 0xb8, 0x90, 0xe4, 0x53, 0x67, 0x4e, - 0x8a, 0xf2, 0xf6, 0x9c, 0x7a, 0xfe, 0xea, 0x23, 0xc8, 0x16, 0x1f, 0x41, 0xf6, 0x93, 0x7c, 0x1a, - 0x52, 0xf7, 0x11, 0x29, 0x50, 0x2f, 0xc9, 0xa7, 0x8f, 0x48, 0x31, 0x7e, 0xf0, 0xf2, 0x78, 0xa8, - 0xbf, 0x3a, 0x1e, 0xea, 0x7f, 0x1f, 0x0f, 0xf5, 0xe7, 0x27, 0x43, 0xed, 0xd5, 0xc9, 0x50, 0xfb, - 0xe3, 0x64, 0xa8, 0x7d, 0xb7, 0xeb, 0x53, 0x1e, 0xe4, 0x53, 0xdb, 0x65, 0xd1, 0x68, 0x01, 0xb7, - 0xfc, 0x73, 0xe9, 0xf3, 0x6c, 0xda, 0x93, 0xff, 0x7c, 0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xf6, 0x76, 0x34, 0xd7, 0x0a, 0x0a, 0x00, 0x00, +func init() { proto.RegisterFile("tendermint/types/evidence.proto", fileDescriptor_6825fabc78e0a168) } + +var fileDescriptor_6825fabc78e0a168 = []byte{ + // 915 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x41, 0x8f, 0xdb, 0x44, + 0x18, 0xb5, 0x37, 0xd9, 0x74, 0xfb, 0x35, 0x65, 0x17, 0x6b, 0x0b, 0x56, 0x28, 0xd9, 0xad, 0x41, + 0x6a, 0xa9, 0x8a, 0xd3, 0x2e, 0x87, 0x4a, 0x88, 0xcb, 0xa6, 0x5d, 0x94, 0xaa, 0x05, 0xca, 0x2c, + 0x2a, 0x88, 0x8b, 0x99, 0xd8, 0x13, 0x7b, 0x1a, 0xdb, 0x63, 0xd9, 0xe3, 0xa0, 0x48, 0xf0, 0x13, + 0x90, 0x7a, 0xef, 0x3f, 0x40, 0xe2, 0xc6, 0x8f, 0xe8, 0xb1, 0xe2, 0xc4, 0x09, 0xd0, 0xee, 0x1f, + 0x41, 0x33, 0x1e, 0x3b, 0xd9, 0x38, 0xde, 0x85, 0x0b, 0x12, 0x97, 0xc8, 0xf9, 0xe6, 0xcd, 0xf7, + 0xde, 0x8c, 0xdf, 0x3c, 0x0f, 0xec, 0x71, 0x12, 0x7b, 0x24, 0x8d, 0x68, 0xcc, 0x07, 0x7c, 0x9e, + 0x90, 0x6c, 0x40, 0x66, 0xd4, 0x23, 0xb1, 0x4b, 0xec, 0x24, 0x65, 0x9c, 0x19, 0x3b, 0x0b, 0x80, + 0x2d, 0x01, 0xbd, 0x5d, 0x9f, 0xf9, 0x4c, 0x0e, 0x0e, 0xc4, 0x53, 0x81, 0xeb, 0xed, 0xf9, 0x8c, + 0xf9, 0x21, 0x19, 0xc8, 0x7f, 0xe3, 0x7c, 0x32, 0xe0, 0x34, 0x22, 0x19, 0xc7, 0x51, 0xa2, 0x00, + 0xd7, 0x6b, 0x4c, 0xf2, 0x57, 0x8d, 0x5a, 0x4b, 0xa3, 0x6e, 0x3a, 0x4f, 0x38, 0x1b, 0x4c, 0xc9, + 0xfc, 0x0c, 0xc6, 0xca, 0xe1, 0xda, 0xc3, 0x3c, 0x09, 0xa9, 0x8b, 0x39, 0x79, 0xc6, 0x38, 0x39, + 0x52, 0x4a, 0x8d, 0x0f, 0xa1, 0x33, 0x63, 0x9c, 0x38, 0xd8, 0xd4, 0xf7, 0xf5, 0x5b, 0x57, 0x0e, + 0xde, 0xb2, 0x57, 0x45, 0xdb, 0x02, 0x8f, 0x36, 0x05, 0xea, 0xb0, 0x82, 0x8f, 0xcd, 0x8d, 0x8b, + 0xe1, 0x43, 0xeb, 0xa5, 0x0e, 0xe6, 0x53, 0xc6, 0x49, 0xcc, 0x29, 0x0e, 0x0f, 0xa3, 0x98, 0x64, + 0x14, 0xff, 0x37, 0xd4, 0xc6, 0x0d, 0xe8, 0x06, 0x84, 0xfa, 0x01, 0x77, 0xe4, 0x4e, 0x9a, 0xad, + 0x7d, 0xfd, 0x56, 0x0b, 0x5d, 0x29, 0x6a, 0xc7, 0xa2, 0x64, 0xfd, 0xaa, 0xc3, 0xf6, 0xaa, 0xa8, + 0x00, 0x7a, 0x49, 0x29, 0xd8, 0xc1, 0xc5, 0xa0, 0x53, 0xbe, 0x57, 0x25, 0xf4, 0x76, 0x9d, 0xb9, + 0x69, 0x91, 0xc8, 0x4c, 0x9a, 0x96, 0x7f, 0x1f, 0xda, 0x09, 0x0b, 0x5d, 0xb5, 0x9a, 0xf7, 0xd6, + 0xf4, 0x4c, 0x19, 0x9b, 0x7c, 0x31, 0x79, 0xc2, 0xdc, 0xe9, 0x83, 0x00, 0xc7, 0x3e, 0x41, 0x72, + 0x82, 0xf5, 0x8b, 0x0e, 0xdd, 0xcf, 0x98, 0x3b, 0xad, 0x3a, 0xdd, 0x84, 0xed, 0x52, 0xa1, 0x53, + 0xac, 0x4f, 0x0a, 0x6d, 0xa1, 0x37, 0xca, 0xf2, 0x48, 0x56, 0x8d, 0x47, 0x70, 0xb5, 0x02, 0x0a, + 0x8f, 0x29, 0xee, 0x9e, 0x5d, 0x18, 0xd0, 0x2e, 0x0d, 0x68, 0x7f, 0x55, 0x1a, 0x70, 0xb8, 0xf5, + 0xea, 0x8f, 0x3d, 0xed, 0xc5, 0x9f, 0x7b, 0x3a, 0xea, 0x96, 0x53, 0xc5, 0xa0, 0xf1, 0x01, 0xec, + 0x54, 0xad, 0xb0, 0xe7, 0xa5, 0x24, 0xcb, 0xe4, 0x16, 0x77, 0x51, 0xa5, 0xe5, 0xb0, 0x28, 0x5b, + 0xbf, 0xe9, 0x60, 0x08, 0xbd, 0x08, 0xc7, 0x1e, 0x8b, 0xfe, 0x27, 0xaa, 0x8d, 0x77, 0x01, 0x52, + 0x1c, 0x7b, 0xce, 0x78, 0xce, 0x49, 0x66, 0xb6, 0x25, 0xe8, 0xb2, 0xa8, 0x0c, 0x45, 0xc1, 0xfa, + 0x01, 0x7a, 0x0f, 0x58, 0x3c, 0x09, 0xa9, 0xcb, 0x69, 0xec, 0x8f, 0x08, 0xf6, 0x48, 0x9a, 0x55, + 0x6b, 0xb3, 0x61, 0x23, 0xb8, 0xa7, 0xdc, 0xd2, 0xaf, 0xbf, 0xd9, 0x63, 0xea, 0xc7, 0xc4, 0x2b, + 0x26, 0xa1, 0x8d, 0xe0, 0x9e, 0xc4, 0x1f, 0xa8, 0x75, 0x5d, 0x8c, 0x3f, 0xb0, 0x7e, 0xd6, 0xc1, + 0x7c, 0x92, 0xc7, 0x98, 0x53, 0xf7, 0x19, 0x0e, 0xa9, 0x87, 0x39, 0x4b, 0x2b, 0xf2, 0xbb, 0xd0, + 0x09, 0x24, 0x54, 0x09, 0x30, 0xeb, 0x0d, 0x55, 0x2b, 0x85, 0x33, 0x6e, 0x43, 0x5b, 0x1c, 0x9a, + 0x0b, 0x0e, 0x96, 0xc4, 0x18, 0x77, 0x61, 0x97, 0xc6, 0x33, 0x41, 0xea, 0x14, 0xb3, 0x9d, 0x09, + 0x25, 0xa1, 0x27, 0xb7, 0xf1, 0x32, 0x32, 0xd4, 0x58, 0x41, 0xf0, 0xa9, 0x18, 0xb1, 0x7e, 0x12, + 0x21, 0x10, 0xe0, 0x98, 0xb3, 0xa8, 0x2e, 0xb6, 0xa4, 0xd6, 0xff, 0x01, 0xf5, 0x11, 0xec, 0x87, + 0x38, 0xe3, 0xca, 0x2d, 0xce, 0xac, 0x6c, 0xe6, 0x7c, 0x8f, 0x33, 0x87, 0xc6, 0x4e, 0x46, 0xb8, + 0x5c, 0x42, 0x0b, 0xbd, 0x23, 0x70, 0x85, 0x7d, 0x2a, 0xca, 0xaf, 0x71, 0xf6, 0x28, 0x3e, 0x26, + 0xdc, 0x7a, 0xd9, 0x81, 0xad, 0x8a, 0x1f, 0xc3, 0xdb, 0x5e, 0x19, 0x8c, 0x8e, 0xcc, 0x97, 0x95, + 0xc3, 0x7e, 0xb3, 0x2e, 0x69, 0x6d, 0x92, 0x8e, 0x34, 0x74, 0xcd, 0x5b, 0x1b, 0xb1, 0x09, 0x5c, + 0x77, 0x17, 0x56, 0x51, 0xbb, 0x96, 0x2d, 0x78, 0x8a, 0x5d, 0xbf, 0x53, 0xe7, 0x69, 0x36, 0xd8, + 0x48, 0x43, 0x3d, 0xb7, 0xd9, 0x7e, 0xcf, 0xa1, 0x17, 0x16, 0xee, 0x58, 0xda, 0xa4, 0x8a, 0xaf, + 0xd5, 0x14, 0x62, 0x4d, 0x8e, 0x1a, 0x69, 0xc8, 0x0c, 0x9b, 0xdc, 0xf6, 0xfc, 0xdc, 0xc0, 0x6c, + 0xff, 0xdb, 0xc0, 0x14, 0x5c, 0x8d, 0x91, 0xf9, 0x39, 0xec, 0xd4, 0x18, 0x36, 0x25, 0xc3, 0x8d, + 0x3a, 0x43, 0xbd, 0xf1, 0x36, 0x5e, 0xe9, 0x27, 0xb4, 0x17, 0xc6, 0x5c, 0xb7, 0x4f, 0x9d, 0x46, + 0xed, 0x0d, 0x66, 0x96, 0xda, 0x9b, 0x8c, 0x7e, 0x04, 0x57, 0x23, 0xe6, 0x4e, 0x17, 0xed, 0x2f, + 0x35, 0x9d, 0xf6, 0xe5, 0x6c, 0x1f, 0x69, 0xa8, 0x1b, 0x2d, 0x67, 0xfd, 0x37, 0xb0, 0x2b, 0xdb, + 0xa4, 0x32, 0x4c, 0x17, 0xdd, 0xb6, 0x64, 0xb7, 0xf7, 0xd7, 0x77, 0x3b, 0x9b, 0xbc, 0x23, 0x0d, + 0x19, 0x51, 0xad, 0x3a, 0xdc, 0x84, 0x56, 0x96, 0x47, 0xd6, 0x77, 0xd0, 0x2d, 0x4b, 0x0f, 0x31, + 0xc7, 0xc6, 0x27, 0xb0, 0xb5, 0x74, 0x22, 0x5a, 0x32, 0x78, 0x6b, 0x24, 0x55, 0x93, 0xb6, 0x08, + 0x5e, 0x54, 0xcd, 0x30, 0x0c, 0x68, 0x07, 0x38, 0x0b, 0xa4, 0xc7, 0xbb, 0x48, 0x3e, 0x5b, 0x3f, + 0xc2, 0x9b, 0xb5, 0x4f, 0x9b, 0x71, 0x07, 0xe4, 0x77, 0x3b, 0x53, 0x1c, 0xe7, 0x7e, 0xdc, 0x33, + 0xe3, 0x63, 0xb8, 0x94, 0xe4, 0x63, 0x67, 0x4a, 0xe6, 0xea, 0xf4, 0x9c, 0x79, 0xff, 0xc5, 0x25, + 0xc8, 0x16, 0x97, 0x20, 0xfb, 0x69, 0x3e, 0x0e, 0xa9, 0xfb, 0x98, 0xcc, 0x51, 0x27, 0xc9, 0xc7, + 0x8f, 0xc9, 0x7c, 0xf8, 0xe5, 0xab, 0x93, 0xbe, 0xfe, 0xfa, 0xa4, 0xaf, 0xff, 0x75, 0xd2, 0xd7, + 0x5f, 0x9c, 0xf6, 0xb5, 0xd7, 0xa7, 0x7d, 0xed, 0xf7, 0xd3, 0xbe, 0xf6, 0xed, 0x7d, 0x9f, 0xf2, + 0x20, 0x1f, 0xdb, 0x2e, 0x8b, 0x06, 0xcb, 0x37, 0xae, 0xc5, 0x63, 0x71, 0x75, 0x5b, 0xbd, 0x8d, + 0x8d, 0x3b, 0xb2, 0xfe, 0xd1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x30, 0x98, 0x2f, 0x5c, 0x12, + 0x0a, 0x00, 0x00, } func (m *DuplicateVoteEvidence) Marshal() (dAtA []byte, err error) { diff --git a/proto/types/evidence.proto b/proto/tendermint/types/evidence.proto similarity index 92% rename from proto/types/evidence.proto rename to proto/tendermint/types/evidence.proto index 4879700f6..e67ba6a6d 100644 --- a/proto/types/evidence.proto +++ b/proto/tendermint/types/evidence.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/types/types.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "proto/crypto/keys/types.proto"; +import "tendermint/types/types.proto"; +import "tendermint/crypto/keys/types.proto"; // DuplicateVoteEvidence contains evidence a validator signed two conflicting // votes. diff --git a/proto/types/params.pb.go b/proto/tendermint/types/params.pb.go similarity index 90% rename from proto/types/params.pb.go rename to proto/tendermint/types/params.pb.go index f995be4aa..37f0d52a5 100644 --- a/proto/types/params.pb.go +++ b/proto/tendermint/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/params.proto +// source: tendermint/types/params.proto package types @@ -39,7 +39,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_95a9f934fa6f056c, []int{0} + return fileDescriptor_e12598271a686f57, []int{0} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -104,7 +104,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_95a9f934fa6f056c, []int{1} + return fileDescriptor_e12598271a686f57, []int{1} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -182,7 +182,7 @@ func (m *EvidenceParams) Reset() { *m = EvidenceParams{} } func (m *EvidenceParams) String() string { return proto.CompactTextString(m) } func (*EvidenceParams) ProtoMessage() {} func (*EvidenceParams) Descriptor() ([]byte, []int) { - return fileDescriptor_95a9f934fa6f056c, []int{2} + return fileDescriptor_e12598271a686f57, []int{2} } func (m *EvidenceParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -249,7 +249,7 @@ func (m *ValidatorParams) Reset() { *m = ValidatorParams{} } func (m *ValidatorParams) String() string { return proto.CompactTextString(m) } func (*ValidatorParams) ProtoMessage() {} func (*ValidatorParams) Descriptor() ([]byte, []int) { - return fileDescriptor_95a9f934fa6f056c, []int{3} + return fileDescriptor_e12598271a686f57, []int{3} } func (m *ValidatorParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -297,7 +297,7 @@ func (m *HashedParams) Reset() { *m = HashedParams{} } func (m *HashedParams) String() string { return proto.CompactTextString(m) } func (*HashedParams) ProtoMessage() {} func (*HashedParams) Descriptor() ([]byte, []int) { - return fileDescriptor_95a9f934fa6f056c, []int{4} + return fileDescriptor_e12598271a686f57, []int{4} } func (m *HashedParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -348,44 +348,43 @@ func init() { proto.RegisterType((*HashedParams)(nil), "tendermint.types.HashedParams") } -func init() { proto.RegisterFile("proto/types/params.proto", fileDescriptor_95a9f934fa6f056c) } - -var fileDescriptor_95a9f934fa6f056c = []byte{ - // 534 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0xcd, 0x7c, 0xe9, 0x57, 0x92, 0x49, 0xd3, 0x44, 0xb3, 0xc1, 0x14, 0xe1, 0x04, 0x2f, 0xaa, - 0x4a, 0x54, 0x8e, 0x04, 0x2b, 0xd8, 0x20, 0x0c, 0x55, 0xf9, 0x51, 0xaa, 0xca, 0xaa, 0x58, 0x74, - 0x33, 0x1a, 0xc7, 0x53, 0x67, 0xd4, 0x8c, 0xc7, 0x9a, 0x9f, 0x2a, 0x79, 0x0b, 0x96, 0x2c, 0xbb, - 0xe4, 0x11, 0x78, 0x84, 0x2e, 0x2b, 0xb1, 0x80, 0x15, 0xa0, 0x64, 0xc3, 0x63, 0x20, 0x8f, 0x63, - 0x9c, 0xa4, 0xbb, 0x99, 0x7b, 0xce, 0xb9, 0x73, 0xee, 0x3d, 0x36, 0x74, 0x32, 0x29, 0xb4, 0x18, - 0xe8, 0x59, 0x46, 0xd5, 0x20, 0x23, 0x92, 0x70, 0xe5, 0xdb, 0x12, 0xea, 0x6a, 0x9a, 0xc6, 0x54, - 0x72, 0x96, 0x6a, 0xdf, 0xc2, 0x7b, 0xfb, 0x7a, 0xcc, 0x64, 0x8c, 0x33, 0x22, 0xf5, 0x6c, 0x50, - 0xe8, 0x12, 0x91, 0x88, 0xea, 0x54, 0x28, 0xf7, 0xdc, 0x44, 0x88, 0x64, 0x42, 0x0b, 0x4a, 0x64, - 0x2e, 0x06, 0xb1, 0x91, 0x44, 0x33, 0x91, 0x16, 0xb8, 0xf7, 0x1d, 0xc0, 0xce, 0x6b, 0x91, 0x2a, - 0x9a, 0x2a, 0xa3, 0x4e, 0xed, 0x9b, 0xe8, 0x39, 0xfc, 0x3f, 0x9a, 0x88, 0xd1, 0xa5, 0x03, 0xfa, - 0xe0, 0xa0, 0xf5, 0xf4, 0x91, 0xbf, 0xf9, 0xba, 0x1f, 0xe4, 0x70, 0xc1, 0x0e, 0xb6, 0x6e, 0x7e, - 0xf6, 0x6a, 0x61, 0xa1, 0x40, 0x01, 0x6c, 0xd0, 0x2b, 0x16, 0xd3, 0x74, 0x44, 0x9d, 0xff, 0xac, - 0xba, 0x7f, 0x57, 0x7d, 0xb4, 0x64, 0xac, 0x35, 0xf8, 0xa7, 0x43, 0x47, 0xb0, 0x79, 0x45, 0x26, - 0x2c, 0x26, 0x5a, 0x48, 0xa7, 0x6e, 0x9b, 0x3c, 0xbe, 0xdb, 0xe4, 0x63, 0x49, 0x59, 0xeb, 0x52, - 0x29, 0x3d, 0x0a, 0x5b, 0x2b, 0x36, 0xd1, 0x43, 0xd8, 0xe4, 0x64, 0x8a, 0xa3, 0x99, 0xa6, 0xca, - 0x0e, 0x56, 0x0f, 0x1b, 0x9c, 0x4c, 0x83, 0xfc, 0x8e, 0xee, 0xc3, 0x7b, 0x39, 0x98, 0x10, 0x65, - 0x5d, 0xd7, 0xc3, 0x6d, 0x4e, 0xa6, 0xc7, 0x44, 0xa1, 0x3e, 0xdc, 0xd1, 0x8c, 0x53, 0xcc, 0x84, - 0x26, 0x98, 0x2b, 0x6b, 0xa7, 0x1e, 0xc2, 0xbc, 0xf6, 0x4e, 0x68, 0x32, 0x54, 0xde, 0x37, 0x00, - 0x77, 0xd7, 0x07, 0x42, 0x4f, 0x20, 0xca, 0xbb, 0x91, 0x84, 0xe2, 0xd4, 0x70, 0x6c, 0x37, 0x53, - 0xbe, 0xd9, 0xe1, 0x64, 0xfa, 0x2a, 0xa1, 0x27, 0x86, 0x5b, 0x73, 0x0a, 0x0d, 0x61, 0xb7, 0x24, - 0x97, 0xd1, 0x2c, 0x37, 0xf7, 0xc0, 0x2f, 0xb2, 0xf3, 0xcb, 0xec, 0xfc, 0x37, 0x4b, 0x42, 0xd0, - 0xc8, 0x87, 0xfd, 0xfc, 0xab, 0x07, 0xc2, 0xdd, 0xa2, 0x5f, 0x89, 0x94, 0x93, 0xa4, 0x86, 0x5b, - 0xaf, 0x6d, 0x3b, 0xc9, 0x89, 0xe1, 0xe8, 0x10, 0xa2, 0x4c, 0x0a, 0x71, 0x81, 0xb5, 0x64, 0x64, - 0x82, 0x33, 0x2a, 0x99, 0x88, 0x9d, 0x2d, 0x6b, 0xaa, 0x6b, 0x91, 0xb3, 0x1c, 0x38, 0xb5, 0x75, - 0xef, 0x25, 0xec, 0x6c, 0x2c, 0x18, 0x79, 0xb0, 0x9d, 0x99, 0x08, 0x5f, 0xd2, 0x19, 0xb6, 0x09, - 0x38, 0xa0, 0x5f, 0x3f, 0x68, 0x86, 0xad, 0xcc, 0x44, 0x1f, 0xe8, 0xec, 0x2c, 0x2f, 0xbd, 0x68, - 0x7c, 0xbd, 0xee, 0x81, 0x3f, 0xd7, 0x3d, 0xe0, 0x9d, 0xc3, 0x9d, 0xb7, 0x44, 0x8d, 0x69, 0xbc, - 0x54, 0xef, 0xc3, 0x8e, 0xdd, 0x03, 0xde, 0x0c, 0xa1, 0x6d, 0xcb, 0xc3, 0x32, 0x09, 0x0f, 0xb6, - 0x2b, 0x5e, 0x95, 0x47, 0xab, 0x64, 0x1d, 0x13, 0x15, 0xbc, 0xff, 0x32, 0x77, 0xc1, 0xcd, 0xdc, - 0x05, 0xb7, 0x73, 0x17, 0xfc, 0x9e, 0xbb, 0xe0, 0xd3, 0xc2, 0xad, 0xdd, 0x2e, 0xdc, 0xda, 0x8f, - 0x85, 0x5b, 0x3b, 0x3f, 0x4c, 0x98, 0x1e, 0x9b, 0xc8, 0x1f, 0x09, 0x3e, 0xa8, 0xbe, 0x9a, 0xd5, - 0xe3, 0xca, 0x6f, 0x16, 0x6d, 0xdb, 0xcb, 0xb3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x5b, - 0x98, 0x09, 0x7c, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("tendermint/types/params.proto", fileDescriptor_e12598271a686f57) } + +var fileDescriptor_e12598271a686f57 = []byte{ + // 528 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x53, 0x41, 0x6f, 0xd3, 0x30, + 0x14, 0xae, 0xe9, 0x18, 0x9d, 0xbb, 0xae, 0x95, 0x85, 0x44, 0x18, 0x5a, 0x5a, 0x72, 0x40, 0x93, + 0x40, 0x89, 0x04, 0x07, 0x04, 0x17, 0x44, 0x60, 0x1a, 0x08, 0x75, 0x9a, 0xa2, 0xc1, 0x61, 0x17, + 0xcb, 0x69, 0xbc, 0x2c, 0x5a, 0x1d, 0x47, 0xb1, 0x3d, 0xb5, 0xff, 0x82, 0x23, 0xc7, 0x1d, 0xf9, + 0x09, 0xfc, 0x84, 0x1d, 0x27, 0x71, 0x80, 0x13, 0xa0, 0xf6, 0xc2, 0xcf, 0x40, 0x79, 0x69, 0xc8, + 0xda, 0xdd, 0xec, 0xf7, 0x7d, 0xef, 0xf3, 0xf7, 0xde, 0x27, 0xe3, 0x1d, 0xcd, 0xd3, 0x88, 0xe7, + 0x22, 0x49, 0xb5, 0xa7, 0xa7, 0x19, 0x57, 0x5e, 0xc6, 0x72, 0x26, 0x94, 0x9b, 0xe5, 0x52, 0x4b, + 0xd2, 0xab, 0x61, 0x17, 0xe0, 0xed, 0xbb, 0xb1, 0x8c, 0x25, 0x80, 0x5e, 0x71, 0x2a, 0x79, 0xdb, + 0x76, 0x2c, 0x65, 0x3c, 0xe6, 0x1e, 0xdc, 0x42, 0x73, 0xe2, 0x45, 0x26, 0x67, 0x3a, 0x91, 0x69, + 0x89, 0x3b, 0x3f, 0x10, 0xee, 0xbe, 0x91, 0xa9, 0xe2, 0xa9, 0x32, 0xea, 0x10, 0x5e, 0x20, 0x2f, + 0xf0, 0xed, 0x70, 0x2c, 0x47, 0x67, 0x16, 0x1a, 0xa0, 0xdd, 0xf6, 0xd3, 0x1d, 0x77, 0xf5, 0x2d, + 0xd7, 0x2f, 0xe0, 0x92, 0xed, 0xaf, 0x5d, 0xfe, 0xea, 0x37, 0x82, 0xb2, 0x83, 0xf8, 0xb8, 0xc5, + 0xcf, 0x93, 0x88, 0xa7, 0x23, 0x6e, 0xdd, 0x82, 0xee, 0xc1, 0xcd, 0xee, 0xbd, 0x05, 0x63, 0x49, + 0xe0, 0x7f, 0x1f, 0xd9, 0xc3, 0x1b, 0xe7, 0x6c, 0x9c, 0x44, 0x4c, 0xcb, 0xdc, 0x6a, 0x82, 0xc8, + 0xc3, 0x9b, 0x22, 0x9f, 0x2a, 0xca, 0x92, 0x4a, 0xdd, 0xe9, 0x70, 0xdc, 0xbe, 0x66, 0x93, 0x3c, + 0xc0, 0x1b, 0x82, 0x4d, 0x68, 0x38, 0xd5, 0x5c, 0xc1, 0x60, 0xcd, 0xa0, 0x25, 0xd8, 0xc4, 0x2f, + 0xee, 0xe4, 0x1e, 0xbe, 0x53, 0x80, 0x31, 0x53, 0xe0, 0xba, 0x19, 0xac, 0x0b, 0x36, 0xd9, 0x67, + 0x8a, 0x0c, 0xf0, 0xa6, 0x4e, 0x04, 0xa7, 0x89, 0xd4, 0x8c, 0x0a, 0x05, 0x76, 0x9a, 0x01, 0x2e, + 0x6a, 0xef, 0xa5, 0x66, 0x43, 0xe5, 0x7c, 0x47, 0x78, 0x6b, 0x79, 0x20, 0xf2, 0x18, 0x93, 0x42, + 0x8d, 0xc5, 0x9c, 0xa6, 0x46, 0x50, 0xd8, 0x4c, 0xf5, 0x66, 0x57, 0xb0, 0xc9, 0xeb, 0x98, 0x1f, + 0x18, 0x01, 0xe6, 0x14, 0x19, 0xe2, 0x5e, 0x45, 0xae, 0xa2, 0x59, 0x6c, 0xee, 0xbe, 0x5b, 0x66, + 0xe7, 0x56, 0xd9, 0xb9, 0x6f, 0x17, 0x04, 0xbf, 0x55, 0x0c, 0xfb, 0xe5, 0x77, 0x1f, 0x05, 0x5b, + 0xa5, 0x5e, 0x85, 0x54, 0x93, 0xa4, 0x46, 0x80, 0xd7, 0x0e, 0x4c, 0x72, 0x60, 0x04, 0x79, 0x82, + 0x49, 0x96, 0x4b, 0x79, 0x42, 0x75, 0x9e, 0xb0, 0x31, 0xcd, 0x78, 0x9e, 0xc8, 0xc8, 0x5a, 0x03, + 0x53, 0x3d, 0x40, 0x8e, 0x0a, 0xe0, 0x10, 0xea, 0xce, 0x2b, 0xdc, 0x5d, 0x59, 0x30, 0x71, 0x70, + 0x27, 0x33, 0x21, 0x3d, 0xe3, 0x53, 0x0a, 0x09, 0x58, 0x68, 0xd0, 0xdc, 0xdd, 0x08, 0xda, 0x99, + 0x09, 0x3f, 0xf0, 0xe9, 0x51, 0x51, 0x7a, 0xd9, 0xfa, 0x76, 0xd1, 0x47, 0x7f, 0x2f, 0xfa, 0xc8, + 0x39, 0xc6, 0x9b, 0xef, 0x98, 0x3a, 0xe5, 0xd1, 0xa2, 0xfb, 0x11, 0xee, 0xc2, 0x1e, 0xe8, 0x6a, + 0x08, 0x1d, 0x28, 0x0f, 0xab, 0x24, 0x1c, 0xdc, 0xa9, 0x79, 0x75, 0x1e, 0xed, 0x8a, 0xb5, 0xcf, + 0x94, 0xff, 0xf1, 0xeb, 0xcc, 0x46, 0x97, 0x33, 0x1b, 0x5d, 0xcd, 0x6c, 0xf4, 0x67, 0x66, 0xa3, + 0xcf, 0x73, 0xbb, 0x71, 0x35, 0xb7, 0x1b, 0x3f, 0xe7, 0x76, 0xe3, 0xf8, 0x79, 0x9c, 0xe8, 0x53, + 0x13, 0xba, 0x23, 0x29, 0xbc, 0xeb, 0x7f, 0xa8, 0x3e, 0x96, 0x9f, 0x64, 0xf5, 0x7f, 0x85, 0xeb, + 0x50, 0x7f, 0xf6, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x47, 0xb8, 0x4b, 0xd4, 0x7a, 0x03, 0x00, 0x00, } func (this *ConsensusParams) Equal(that interface{}) bool { diff --git a/proto/types/params.proto b/proto/tendermint/types/params.proto similarity index 95% rename from proto/types/params.proto rename to proto/tendermint/types/params.proto index c2115d0be..e8d8366a5 100644 --- a/proto/types/params.proto +++ b/proto/tendermint/types/params.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; option (gogoproto.equal_all) = true; diff --git a/proto/types/types.pb.go b/proto/tendermint/types/types.pb.go similarity index 91% rename from proto/types/types.pb.go rename to proto/tendermint/types/types.pb.go index 8728cbffc..a1c6e2e17 100644 --- a/proto/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/types.proto +// source: tendermint/types/types.proto package types @@ -9,9 +9,9 @@ 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/crypto/merkle" - bits "github.com/tendermint/tendermint/proto/libs/bits" - version "github.com/tendermint/tendermint/proto/version" + merkle "github.com/tendermint/tendermint/proto/tendermint/crypto/merkle" + bits "github.com/tendermint/tendermint/proto/tendermint/libs/bits" + version "github.com/tendermint/tendermint/proto/tendermint/version" io "io" math "math" math_bits "math/bits" @@ -59,7 +59,7 @@ func (x BlockIDFlag) String() string { } func (BlockIDFlag) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{0} + return fileDescriptor_d3a6e55e2345de56, []int{0} } // SignedMsgType is a type of signed message in the consensus. @@ -93,7 +93,7 @@ func (x SignedMsgType) String() string { } func (SignedMsgType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{1} + return fileDescriptor_d3a6e55e2345de56, []int{1} } // PartsetHeader @@ -106,7 +106,7 @@ func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} func (*PartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{0} + return fileDescriptor_d3a6e55e2345de56, []int{0} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +159,7 @@ func (m *Part) Reset() { *m = Part{} } func (m *Part) String() string { return proto.CompactTextString(m) } func (*Part) ProtoMessage() {} func (*Part) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{1} + return fileDescriptor_d3a6e55e2345de56, []int{1} } func (m *Part) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -219,7 +219,7 @@ func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} func (*BlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{2} + return fileDescriptor_d3a6e55e2345de56, []int{2} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,7 +289,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{3} + return fileDescriptor_d3a6e55e2345de56, []int{3} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -430,7 +430,7 @@ func (m *Data) Reset() { *m = Data{} } func (m *Data) String() string { return proto.CompactTextString(m) } func (*Data) ProtoMessage() {} func (*Data) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{4} + return fileDescriptor_d3a6e55e2345de56, []int{4} } func (m *Data) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -490,7 +490,7 @@ func (m *Vote) Reset() { *m = Vote{} } func (m *Vote) String() string { return proto.CompactTextString(m) } func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{5} + return fileDescriptor_d3a6e55e2345de56, []int{5} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -589,7 +589,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{6} + return fileDescriptor_d3a6e55e2345de56, []int{6} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -672,7 +672,7 @@ func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{7} + return fileDescriptor_d3a6e55e2345de56, []int{7} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -743,7 +743,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{8} + return fileDescriptor_d3a6e55e2345de56, []int{8} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -830,7 +830,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{9} + return fileDescriptor_d3a6e55e2345de56, []int{9} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -884,7 +884,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{10} + return fileDescriptor_d3a6e55e2345de56, []int{10} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -952,7 +952,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_ff06f8095857fb18, []int{11} + return fileDescriptor_d3a6e55e2345de56, []int{11} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1019,93 +1019,93 @@ func init() { proto.RegisterType((*TxProof)(nil), "tendermint.types.TxProof") } -func init() { proto.RegisterFile("proto/types/types.proto", fileDescriptor_ff06f8095857fb18) } - -var fileDescriptor_ff06f8095857fb18 = []byte{ - // 1314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1a, 0x47, - 0x14, 0xf7, 0xc2, 0x62, 0xe0, 0x01, 0x36, 0x5e, 0xb9, 0x09, 0xc1, 0x0d, 0xa6, 0x44, 0x49, 0x9d, - 0x34, 0x82, 0xc8, 0x51, 0xab, 0x56, 0x51, 0x0f, 0x60, 0x93, 0x04, 0xc5, 0xc6, 0x68, 0xa1, 0xa9, - 0xda, 0xcb, 0x6a, 0x61, 0x27, 0xb0, 0xca, 0xb2, 0xb3, 0xdd, 0x1d, 0x2c, 0x3b, 0x9f, 0xa0, 0xf2, - 0x29, 0xfd, 0x00, 0x3e, 0xb5, 0x95, 0x7a, 0xef, 0x17, 0xa8, 0x7a, 0xca, 0x31, 0xc7, 0x5e, 0x9a, - 0x56, 0x8e, 0x54, 0xf5, 0x63, 0x54, 0xf3, 0x66, 0x16, 0x16, 0xff, 0xe9, 0x9f, 0x28, 0xea, 0xc5, - 0x9e, 0x79, 0xef, 0xf7, 0xde, 0xcc, 0xfb, 0xcd, 0x6f, 0xe6, 0x2d, 0x70, 0xd9, 0xf3, 0x29, 0xa3, - 0x35, 0x76, 0xe8, 0x91, 0x40, 0xfc, 0xad, 0xa2, 0x45, 0xcb, 0x33, 0xe2, 0x5a, 0xc4, 0x1f, 0xdb, - 0x2e, 0xab, 0xa2, 0xbd, 0x78, 0x83, 0x8d, 0x6c, 0xdf, 0x32, 0x3c, 0xd3, 0x67, 0x87, 0x35, 0x11, - 0x36, 0xa4, 0x43, 0x3a, 0x1b, 0x89, 0xc8, 0xe2, 0xfa, 0x90, 0xd2, 0xa1, 0x43, 0x04, 0xa4, 0x3f, - 0x79, 0x52, 0x63, 0xf6, 0x98, 0x04, 0xcc, 0x1c, 0x7b, 0x12, 0xb0, 0x26, 0x42, 0x1c, 0xbb, 0x1f, - 0xd4, 0xfa, 0x36, 0x9b, 0x5b, 0xb7, 0xb8, 0x2e, 0x9c, 0x03, 0xff, 0xd0, 0x63, 0xb4, 0x36, 0x26, - 0xfe, 0x53, 0x87, 0xcc, 0x01, 0x64, 0xf4, 0x3e, 0xf1, 0x03, 0x9b, 0xba, 0xe1, 0x7f, 0xe1, 0xac, - 0x7c, 0x02, 0xb9, 0x8e, 0xe9, 0xb3, 0x2e, 0x61, 0x0f, 0x89, 0x69, 0x11, 0x5f, 0x5b, 0x85, 0x04, - 0xa3, 0xcc, 0x74, 0x0a, 0x4a, 0x59, 0xd9, 0xc8, 0xe9, 0x62, 0xa2, 0x69, 0xa0, 0x8e, 0xcc, 0x60, - 0x54, 0x88, 0x95, 0x95, 0x8d, 0xac, 0x8e, 0xe3, 0x0a, 0x05, 0x95, 0x87, 0xf2, 0x08, 0xdb, 0xb5, - 0xc8, 0x41, 0x18, 0x81, 0x13, 0x6e, 0xed, 0x1f, 0x32, 0x12, 0xc8, 0x10, 0x31, 0xd1, 0xee, 0x41, - 0xc2, 0xf3, 0x29, 0x7d, 0x52, 0x88, 0x97, 0x95, 0x8d, 0xcc, 0xe6, 0x7a, 0x35, 0x42, 0x9a, 0xa8, - 0xa0, 0x2a, 0x2a, 0xa8, 0x76, 0x38, 0xac, 0xa1, 0xbe, 0x78, 0xb5, 0xbe, 0xa0, 0x8b, 0x98, 0x8a, - 0x03, 0xc9, 0x86, 0x43, 0x07, 0x4f, 0x5b, 0xdb, 0xd3, 0xfd, 0x28, 0xb3, 0xfd, 0x68, 0xbb, 0xb0, - 0xcc, 0xa9, 0x36, 0x02, 0xc2, 0x8c, 0x11, 0x16, 0x83, 0x6b, 0x9f, 0x5a, 0x45, 0x30, 0x33, 0x57, - 0xb3, 0x5c, 0x25, 0xe7, 0x45, 0x8d, 0x95, 0x3f, 0x54, 0x58, 0x94, 0x9c, 0x7c, 0x0a, 0x49, 0xc9, - 0x1a, 0x2e, 0x98, 0xd9, 0xbc, 0x1a, 0xcd, 0x18, 0x12, 0xba, 0x45, 0xdd, 0x80, 0xb8, 0xc1, 0x24, - 0x90, 0xf9, 0xc2, 0x18, 0xed, 0x06, 0xa4, 0x06, 0x23, 0xd3, 0x76, 0x0d, 0xdb, 0xc2, 0x1d, 0xa5, - 0x1b, 0x99, 0x93, 0x57, 0xeb, 0xc9, 0x2d, 0x6e, 0x6b, 0x6d, 0xeb, 0x49, 0x74, 0xb6, 0x2c, 0xed, - 0x12, 0x2c, 0x8e, 0x88, 0x3d, 0x1c, 0x31, 0x64, 0x27, 0xae, 0xcb, 0x99, 0xf6, 0x31, 0xa8, 0x5c, - 0x11, 0x05, 0x15, 0xd7, 0x2e, 0x56, 0x85, 0x5c, 0xaa, 0xa1, 0x5c, 0xaa, 0xbd, 0x50, 0x2e, 0x8d, - 0x14, 0x5f, 0xf8, 0xf9, 0x6f, 0xeb, 0x8a, 0x8e, 0x11, 0xda, 0x16, 0xe4, 0x1c, 0x33, 0x60, 0x46, - 0x9f, 0xd3, 0xc6, 0x97, 0x4f, 0x60, 0x8a, 0x2b, 0x67, 0x09, 0x91, 0xc4, 0xca, 0xad, 0x67, 0x78, - 0x94, 0x30, 0x59, 0xda, 0x06, 0xe4, 0x31, 0xc9, 0x80, 0x8e, 0xc7, 0x36, 0x33, 0x90, 0xf7, 0x45, - 0xe4, 0x7d, 0x89, 0xdb, 0xb7, 0xd0, 0xfc, 0x90, 0x9f, 0xc0, 0x1a, 0xa4, 0x2d, 0x93, 0x99, 0x02, - 0x92, 0x44, 0x48, 0x8a, 0x1b, 0xd0, 0xf9, 0x3e, 0x2c, 0xef, 0x9b, 0x8e, 0x6d, 0x99, 0x8c, 0xfa, - 0x81, 0x80, 0xa4, 0x44, 0x96, 0x99, 0x19, 0x81, 0x77, 0x60, 0xd5, 0x25, 0x07, 0xcc, 0x38, 0x8d, - 0x4e, 0x23, 0x5a, 0xe3, 0xbe, 0xc7, 0xf3, 0x11, 0xd7, 0x61, 0x69, 0x10, 0x92, 0x2f, 0xb0, 0x80, - 0xd8, 0xdc, 0xd4, 0x8a, 0xb0, 0x2b, 0x90, 0x32, 0x3d, 0x4f, 0x00, 0x32, 0x08, 0x48, 0x9a, 0x9e, - 0x87, 0xae, 0x5b, 0xb0, 0x82, 0x35, 0xfa, 0x24, 0x98, 0x38, 0x4c, 0x26, 0xc9, 0x22, 0x66, 0x99, - 0x3b, 0x74, 0x61, 0x47, 0xec, 0x35, 0xc8, 0x91, 0x7d, 0xdb, 0x22, 0xee, 0x80, 0x08, 0x5c, 0x0e, - 0x71, 0xd9, 0xd0, 0x88, 0xa0, 0x9b, 0x90, 0xf7, 0x7c, 0xea, 0xd1, 0x80, 0xf8, 0x86, 0x69, 0x59, - 0x3e, 0x09, 0x82, 0xc2, 0x92, 0xc8, 0x17, 0xda, 0xeb, 0xc2, 0x5c, 0xb9, 0x0d, 0xea, 0xb6, 0xc9, - 0x4c, 0x2d, 0x0f, 0x71, 0x76, 0x10, 0x14, 0x94, 0x72, 0x7c, 0x23, 0xab, 0xf3, 0xe1, 0xb9, 0xb7, - 0xee, 0xcf, 0x18, 0xa8, 0x8f, 0x29, 0x23, 0xda, 0x5d, 0x50, 0xf9, 0xd1, 0xa1, 0x22, 0x97, 0xce, - 0xd3, 0x78, 0xd7, 0x1e, 0xba, 0xc4, 0xda, 0x0d, 0x86, 0xbd, 0x43, 0x8f, 0xe8, 0x08, 0x8e, 0x48, - 0x2c, 0x36, 0x27, 0xb1, 0x55, 0x48, 0xf8, 0x74, 0xe2, 0x5a, 0xa8, 0xbc, 0x84, 0x2e, 0x26, 0x5a, - 0x13, 0x52, 0x53, 0xe5, 0xa8, 0xff, 0xa4, 0x9c, 0x65, 0xae, 0x1c, 0xae, 0x6b, 0x69, 0xd0, 0x93, - 0x7d, 0x29, 0xa0, 0x06, 0xa4, 0xa7, 0x2f, 0x9a, 0x54, 0xe0, 0xbf, 0x13, 0xf1, 0x2c, 0x4c, 0xfb, - 0x00, 0x56, 0xa6, 0x7a, 0x98, 0x12, 0x2a, 0x54, 0x98, 0x9f, 0x3a, 0x24, 0xa3, 0x73, 0x52, 0x33, - 0xc4, 0xdb, 0x94, 0xc4, 0xba, 0x66, 0x52, 0x6b, 0xe1, 0x23, 0xf5, 0x2e, 0xa4, 0x03, 0x7b, 0xe8, - 0x9a, 0x6c, 0xe2, 0x13, 0xa9, 0xc6, 0x99, 0xa1, 0xf2, 0x4d, 0x0c, 0x16, 0x85, 0xba, 0x23, 0xbc, - 0x29, 0xe7, 0xf3, 0x16, 0xbb, 0x88, 0xb7, 0xf8, 0x9b, 0xf3, 0x56, 0x07, 0x98, 0x6e, 0x26, 0x28, - 0xa8, 0xe5, 0xf8, 0x46, 0x66, 0x73, 0xed, 0x6c, 0x22, 0xb1, 0xc5, 0xae, 0x3d, 0x94, 0x97, 0x37, - 0x12, 0x34, 0x55, 0x50, 0x22, 0xf2, 0x4e, 0xde, 0x83, 0x74, 0xdf, 0x66, 0x86, 0xe9, 0xfb, 0xe6, - 0x21, 0x52, 0x98, 0xd9, 0x2c, 0x45, 0xb3, 0xf2, 0x36, 0x53, 0xe5, 0x6d, 0xa6, 0xda, 0xb0, 0x59, - 0x9d, 0xa3, 0xf4, 0x54, 0x5f, 0x8e, 0x2a, 0xbf, 0x2a, 0x90, 0x9e, 0x2e, 0xa8, 0xd5, 0x21, 0x17, - 0x16, 0x6a, 0x3c, 0x71, 0xcc, 0xa1, 0x14, 0xe3, 0xd5, 0x0b, 0xab, 0xbd, 0xef, 0x98, 0x43, 0x3d, - 0x23, 0x0b, 0xe4, 0x93, 0xf3, 0x0f, 0x36, 0x76, 0xc1, 0xc1, 0xce, 0x29, 0x29, 0xfe, 0x66, 0x4a, - 0x9a, 0x3b, 0x73, 0xf5, 0xf4, 0x99, 0xff, 0x18, 0x83, 0x54, 0x07, 0x2f, 0xa8, 0xe9, 0xfc, 0x1f, - 0x57, 0x6c, 0x0d, 0xd2, 0x1e, 0x75, 0x0c, 0xe1, 0x51, 0xd1, 0x93, 0xf2, 0xa8, 0xa3, 0x9f, 0xd1, - 0x51, 0xe2, 0x2d, 0xdd, 0xbf, 0xc5, 0xb7, 0xc0, 0x5a, 0xf2, 0x34, 0x6b, 0x3e, 0x64, 0x05, 0x15, - 0xb2, 0x61, 0xde, 0xe1, 0x1c, 0x60, 0x07, 0x16, 0xfd, 0xb2, 0x70, 0x76, 0xdb, 0x02, 0xa9, 0x4b, - 0x1c, 0x8f, 0x10, 0xfd, 0x45, 0xf6, 0xec, 0xc2, 0x45, 0x3a, 0xd7, 0x25, 0xae, 0xf2, 0xb3, 0x02, - 0x69, 0x2c, 0x75, 0x97, 0x30, 0x73, 0x8e, 0x2a, 0xe5, 0xcd, 0xa9, 0xba, 0x0a, 0x20, 0xd2, 0x04, - 0xf6, 0x33, 0x22, 0x0f, 0x30, 0x8d, 0x96, 0xae, 0xfd, 0x8c, 0x68, 0x1f, 0x4d, 0xeb, 0x8a, 0xff, - 0x7d, 0x5d, 0xf2, 0x2a, 0x86, 0xd5, 0x5d, 0x86, 0xa4, 0x3b, 0x19, 0x1b, 0xfc, 0x79, 0x57, 0x85, - 0x28, 0xdc, 0xc9, 0xb8, 0x77, 0x10, 0x54, 0xbe, 0x82, 0x64, 0xef, 0x00, 0x3f, 0x75, 0xb8, 0x12, - 0x7c, 0x4a, 0x65, 0x7f, 0x15, 0xdf, 0x35, 0x29, 0x6e, 0xc0, 0x76, 0xa2, 0x81, 0xca, 0x1b, 0x69, - 0xd8, 0x09, 0xf8, 0x58, 0xfb, 0x10, 0x12, 0x9d, 0xff, 0xf0, 0x2d, 0xa5, 0x0b, 0xf4, 0xad, 0x9f, - 0x14, 0xc8, 0x44, 0x6e, 0xa3, 0x56, 0x84, 0x4b, 0x8d, 0x9d, 0xbd, 0xad, 0x47, 0xdb, 0x46, 0x6b, - 0xdb, 0xb8, 0xbf, 0x53, 0x7f, 0x60, 0x7c, 0xd6, 0x7e, 0xd4, 0xde, 0xfb, 0xbc, 0x9d, 0x5f, 0xd0, - 0x6a, 0xb0, 0x8a, 0xbe, 0xa9, 0xab, 0xde, 0xe8, 0x36, 0xdb, 0xbd, 0xbc, 0x52, 0x7c, 0xe7, 0xe8, - 0xb8, 0xbc, 0x12, 0x49, 0x53, 0xef, 0x07, 0xc4, 0x65, 0x67, 0x03, 0xb6, 0xf6, 0x76, 0x77, 0x5b, - 0xbd, 0x7c, 0xec, 0x4c, 0x80, 0x7c, 0x58, 0x6f, 0xc2, 0xca, 0x7c, 0x40, 0xbb, 0xb5, 0x93, 0x8f, - 0x17, 0xb5, 0xa3, 0xe3, 0xf2, 0x52, 0x04, 0xdd, 0xb6, 0x9d, 0x62, 0xea, 0xeb, 0x6f, 0x4b, 0x0b, - 0x3f, 0x7c, 0x57, 0x52, 0x6e, 0x7d, 0xaf, 0x40, 0x6e, 0xee, 0xea, 0x69, 0x6b, 0x70, 0xb9, 0xdb, - 0x7a, 0xd0, 0x6e, 0x6e, 0x1b, 0xbb, 0xdd, 0x07, 0x46, 0xef, 0x8b, 0x4e, 0x33, 0x52, 0xc5, 0x7b, - 0x90, 0xed, 0xe8, 0xcd, 0xc7, 0x7b, 0xbd, 0x26, 0x7a, 0xf2, 0x4a, 0x71, 0xf9, 0xe8, 0xb8, 0x9c, - 0xe9, 0xf8, 0x64, 0x9f, 0x32, 0x82, 0xf1, 0xd7, 0x61, 0xa9, 0xa3, 0x37, 0xc5, 0x66, 0x05, 0x28, - 0x56, 0x5c, 0x39, 0x3a, 0x2e, 0xe7, 0x3a, 0x3e, 0x11, 0x7a, 0x43, 0xd8, 0x35, 0xc8, 0x75, 0xf4, - 0xbd, 0xce, 0x5e, 0xb7, 0xbe, 0x23, 0x50, 0xe5, 0x62, 0xfe, 0xe8, 0xb8, 0x9c, 0x0d, 0x5f, 0x0c, - 0x0e, 0x9a, 0xed, 0xb3, 0x71, 0xff, 0xc5, 0x49, 0x49, 0x79, 0x79, 0x52, 0x52, 0x7e, 0x3f, 0x29, - 0x29, 0xcf, 0x5f, 0x97, 0x16, 0x5e, 0xbe, 0x2e, 0x2d, 0xfc, 0xf2, 0xba, 0xb4, 0xf0, 0xe5, 0xed, - 0xa1, 0xcd, 0x46, 0x93, 0x7e, 0x75, 0x40, 0xc7, 0xb5, 0xd9, 0xb1, 0x45, 0x87, 0x91, 0x9f, 0x19, - 0xfd, 0x45, 0x9c, 0xdc, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xec, 0xc5, 0xfd, 0xa2, 0x7c, 0x0c, - 0x00, 0x00, +func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } + +var fileDescriptor_d3a6e55e2345de56 = []byte{ + // 1315 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0x1a, 0x47, + 0x17, 0xf6, 0xc2, 0x62, 0xe0, 0x00, 0x36, 0x5e, 0xf9, 0x4d, 0x08, 0x4e, 0x30, 0x2f, 0x79, 0xf3, + 0xd6, 0x49, 0x2b, 0x88, 0x1c, 0xf5, 0x4b, 0x51, 0x2f, 0xc0, 0x26, 0x09, 0x8a, 0x8d, 0xe9, 0x42, + 0x53, 0xb5, 0x37, 0xab, 0x85, 0x9d, 0xc0, 0x2a, 0xcb, 0xce, 0x76, 0x77, 0xb0, 0xec, 0xfc, 0x82, + 0xca, 0x57, 0xe9, 0x0f, 0xf0, 0x55, 0x5b, 0xa9, 0xf7, 0xfd, 0x03, 0x55, 0xaf, 0x72, 0x99, 0xcb, + 0xde, 0x34, 0xad, 0x1c, 0xa9, 0xea, 0xcf, 0xa8, 0xe6, 0xcc, 0x2c, 0x2c, 0xfe, 0xe8, 0x47, 0x14, + 0xf5, 0xc6, 0x9e, 0x39, 0xe7, 0x39, 0x67, 0xe6, 0x3c, 0xf3, 0xcc, 0x1c, 0x16, 0xae, 0x32, 0xe2, + 0x5a, 0xc4, 0x1f, 0xdb, 0x2e, 0xab, 0xb1, 0x43, 0x8f, 0x04, 0xe2, 0x6f, 0xd5, 0xf3, 0x29, 0xa3, + 0x5a, 0x7e, 0xe6, 0xad, 0xa2, 0xbd, 0xb8, 0x3a, 0xa4, 0x43, 0x8a, 0xce, 0x1a, 0x1f, 0x09, 0x5c, + 0x71, 0x7d, 0x48, 0xe9, 0xd0, 0x21, 0x35, 0x9c, 0xf5, 0x27, 0x8f, 0x6b, 0xcc, 0x1e, 0x93, 0x80, + 0x99, 0x63, 0x4f, 0x02, 0xca, 0x91, 0x65, 0x1c, 0xbb, 0x1f, 0xd4, 0xfa, 0x36, 0x9b, 0x5b, 0xaa, + 0xf8, 0xbf, 0x08, 0x62, 0xe0, 0x1f, 0x7a, 0x8c, 0xd6, 0xc6, 0xc4, 0x7f, 0xe2, 0x90, 0x39, 0x54, + 0x34, 0xcf, 0x3e, 0xf1, 0x03, 0x9b, 0xba, 0xe1, 0x7f, 0x81, 0xa8, 0x7c, 0x08, 0xb9, 0x8e, 0xe9, + 0xb3, 0x2e, 0x61, 0x0f, 0x88, 0x69, 0x11, 0x5f, 0x5b, 0x85, 0x04, 0xa3, 0xcc, 0x74, 0x0a, 0x4a, + 0x59, 0xd9, 0xc8, 0xe9, 0x62, 0xa2, 0x69, 0xa0, 0x8e, 0xcc, 0x60, 0x54, 0x88, 0x95, 0x95, 0x8d, + 0xac, 0x8e, 0xe3, 0x0a, 0x05, 0x95, 0x87, 0xf2, 0x08, 0xdb, 0xb5, 0xc8, 0x41, 0x18, 0x81, 0x13, + 0x6e, 0xed, 0x1f, 0x32, 0x12, 0xc8, 0x10, 0x31, 0xd1, 0xee, 0x42, 0xc2, 0xf3, 0x29, 0x7d, 0x5c, + 0x88, 0x97, 0x95, 0x8d, 0xcc, 0xe6, 0x7a, 0x35, 0xc2, 0x98, 0x28, 0xa3, 0x2a, 0xca, 0xa8, 0x76, + 0x38, 0xac, 0xa1, 0x3e, 0x7f, 0xb9, 0xbe, 0xa0, 0x8b, 0x98, 0x8a, 0x03, 0xc9, 0x86, 0x43, 0x07, + 0x4f, 0x5a, 0xdb, 0xd3, 0xfd, 0x28, 0xb3, 0xfd, 0x68, 0xbb, 0xb0, 0xec, 0x99, 0x3e, 0x33, 0x02, + 0xc2, 0x8c, 0x11, 0x16, 0x83, 0x6b, 0x9f, 0x5a, 0x45, 0xd0, 0x33, 0x57, 0xb3, 0x5c, 0x25, 0xe7, + 0x45, 0x8d, 0x95, 0xdf, 0x54, 0x58, 0x94, 0x9c, 0x7c, 0x04, 0x49, 0xc9, 0x1a, 0x2e, 0x98, 0xd9, + 0xbc, 0x16, 0xcd, 0x18, 0x12, 0xba, 0x45, 0xdd, 0x80, 0xb8, 0xc1, 0x24, 0x90, 0xf9, 0xc2, 0x18, + 0xed, 0xff, 0x90, 0x1a, 0x8c, 0x4c, 0xdb, 0x35, 0x6c, 0x0b, 0x77, 0x94, 0x6e, 0x64, 0x4e, 0x5e, + 0xae, 0x27, 0xb7, 0xb8, 0xad, 0xb5, 0xad, 0x27, 0xd1, 0xd9, 0xb2, 0xb4, 0x4b, 0xb0, 0x38, 0x22, + 0xf6, 0x70, 0xc4, 0x90, 0x9d, 0xb8, 0x2e, 0x67, 0xda, 0x07, 0xa0, 0x72, 0x81, 0x14, 0x54, 0x5c, + 0xbb, 0x58, 0x15, 0xea, 0xa9, 0x86, 0xea, 0xa9, 0xf6, 0x42, 0xf5, 0x34, 0x52, 0x7c, 0xe1, 0x67, + 0xbf, 0xac, 0x2b, 0x3a, 0x46, 0x68, 0x5b, 0x90, 0x73, 0xcc, 0x80, 0x19, 0x7d, 0x4e, 0x1b, 0x5f, + 0x3e, 0x81, 0x29, 0xae, 0x9c, 0x25, 0x44, 0x12, 0x2b, 0xb7, 0x9e, 0xe1, 0x51, 0xc2, 0x64, 0x69, + 0x1b, 0x90, 0xc7, 0x24, 0x03, 0x3a, 0x1e, 0xdb, 0xcc, 0x40, 0xde, 0x17, 0x91, 0xf7, 0x25, 0x6e, + 0xdf, 0x42, 0xf3, 0x03, 0x7e, 0x02, 0x6b, 0x90, 0xb6, 0x4c, 0x66, 0x0a, 0x48, 0x12, 0x21, 0x29, + 0x6e, 0x40, 0xe7, 0x5b, 0xb0, 0xbc, 0x6f, 0x3a, 0xb6, 0x65, 0x32, 0xea, 0x07, 0x02, 0x92, 0x12, + 0x59, 0x66, 0x66, 0x04, 0xde, 0x86, 0x55, 0x97, 0x1c, 0x30, 0xe3, 0x34, 0x3a, 0x8d, 0x68, 0x8d, + 0xfb, 0x1e, 0xcd, 0x47, 0xdc, 0x80, 0xa5, 0x41, 0x48, 0xbe, 0xc0, 0x02, 0x62, 0x73, 0x53, 0x2b, + 0xc2, 0xae, 0x40, 0xca, 0xf4, 0x3c, 0x01, 0xc8, 0x20, 0x20, 0x69, 0x7a, 0x1e, 0xba, 0x6e, 0xc1, + 0x0a, 0xd6, 0xe8, 0x93, 0x60, 0xe2, 0x30, 0x99, 0x24, 0x8b, 0x98, 0x65, 0xee, 0xd0, 0x85, 0x1d, + 0xb1, 0xd7, 0x21, 0x47, 0xf6, 0x6d, 0x8b, 0xb8, 0x03, 0x22, 0x70, 0x39, 0xc4, 0x65, 0x43, 0x23, + 0x82, 0x6e, 0x42, 0xde, 0xf3, 0xa9, 0x47, 0x03, 0xe2, 0x1b, 0xa6, 0x65, 0xf9, 0x24, 0x08, 0x0a, + 0x4b, 0x22, 0x5f, 0x68, 0xaf, 0x0b, 0x73, 0xe5, 0x1d, 0x50, 0xb7, 0x4d, 0x66, 0x6a, 0x79, 0x88, + 0xb3, 0x83, 0xa0, 0xa0, 0x94, 0xe3, 0x1b, 0x59, 0x9d, 0x0f, 0xcf, 0xbd, 0x75, 0xbf, 0xc7, 0x40, + 0x7d, 0x44, 0x19, 0xd1, 0xee, 0x80, 0xca, 0x8f, 0x0e, 0x15, 0xb9, 0x74, 0x9e, 0xc6, 0xbb, 0xf6, + 0xd0, 0x25, 0xd6, 0x6e, 0x30, 0xec, 0x1d, 0x7a, 0x44, 0x47, 0x70, 0x44, 0x62, 0xb1, 0x39, 0x89, + 0xad, 0x42, 0xc2, 0xa7, 0x13, 0xd7, 0x42, 0xe5, 0x25, 0x74, 0x31, 0xd1, 0x9a, 0x90, 0x9a, 0x2a, + 0x47, 0xfd, 0x2b, 0xe5, 0x2c, 0x73, 0xe5, 0x70, 0x5d, 0x4b, 0x83, 0x9e, 0xec, 0x4b, 0x01, 0x35, + 0x20, 0x3d, 0x7d, 0xe0, 0xa4, 0x02, 0xff, 0x9e, 0x88, 0x67, 0x61, 0xda, 0xdb, 0xb0, 0x32, 0xd5, + 0xc3, 0x94, 0x50, 0xa1, 0xc2, 0xfc, 0xd4, 0x21, 0x19, 0x9d, 0x93, 0x9a, 0x21, 0xde, 0xa6, 0x24, + 0xd6, 0x35, 0x93, 0x5a, 0x0b, 0x1f, 0xa9, 0xab, 0x90, 0x0e, 0xec, 0xa1, 0x6b, 0xb2, 0x89, 0x4f, + 0xa4, 0x1a, 0x67, 0x86, 0xca, 0x57, 0x31, 0x58, 0x14, 0xea, 0x8e, 0xf0, 0xa6, 0x9c, 0xcf, 0x5b, + 0xec, 0x22, 0xde, 0xe2, 0xaf, 0xcf, 0x5b, 0x1d, 0x60, 0xba, 0x99, 0xa0, 0xa0, 0x96, 0xe3, 0x1b, + 0x99, 0xcd, 0xb5, 0xb3, 0x89, 0xc4, 0x16, 0xbb, 0xf6, 0x50, 0x5e, 0xde, 0x48, 0xd0, 0x54, 0x41, + 0x89, 0xc8, 0x3b, 0x79, 0x17, 0xd2, 0x7d, 0x9b, 0x19, 0xa6, 0xef, 0x9b, 0x87, 0x48, 0x61, 0x66, + 0xb3, 0x14, 0xcd, 0xca, 0x1b, 0x4e, 0x95, 0x37, 0x9c, 0x6a, 0xc3, 0x66, 0x75, 0x8e, 0xd2, 0x53, + 0x7d, 0x39, 0xaa, 0xfc, 0xac, 0x40, 0x7a, 0xba, 0xa0, 0x56, 0x87, 0x5c, 0x58, 0xa8, 0xf1, 0xd8, + 0x31, 0x87, 0x52, 0x8c, 0xd7, 0x2e, 0xac, 0xf6, 0x9e, 0x63, 0x0e, 0xf5, 0x8c, 0x2c, 0x90, 0x4f, + 0xce, 0x3f, 0xd8, 0xd8, 0x05, 0x07, 0x3b, 0xa7, 0xa4, 0xf8, 0xeb, 0x29, 0x69, 0xee, 0xcc, 0xd5, + 0xd3, 0x67, 0xfe, 0x7d, 0x0c, 0x52, 0x1d, 0xbc, 0xa0, 0xa6, 0xf3, 0x6f, 0x5c, 0xb1, 0x35, 0x48, + 0x7b, 0xd4, 0x31, 0x84, 0x47, 0x45, 0x4f, 0xca, 0xa3, 0x8e, 0x7e, 0x46, 0x47, 0x89, 0x37, 0x74, + 0xff, 0x16, 0xdf, 0x00, 0x6b, 0xc9, 0xd3, 0xac, 0xf9, 0x90, 0x15, 0x54, 0xc8, 0x86, 0x79, 0x9b, + 0x73, 0x80, 0x1d, 0x58, 0xf4, 0xcb, 0xc2, 0xd9, 0x6d, 0x0b, 0xa4, 0x2e, 0x71, 0x3c, 0x42, 0xf4, + 0x17, 0xd9, 0xb3, 0x0b, 0x17, 0xe9, 0x5c, 0x97, 0xb8, 0xca, 0x8f, 0x0a, 0xa4, 0xb1, 0xd4, 0x5d, + 0xc2, 0xcc, 0x39, 0xaa, 0x94, 0xd7, 0xa7, 0xea, 0x1a, 0x80, 0x48, 0x13, 0xd8, 0x4f, 0x89, 0x3c, + 0xc0, 0x34, 0x5a, 0xba, 0xf6, 0x53, 0xa2, 0xbd, 0x37, 0xad, 0x2b, 0xfe, 0xe7, 0x75, 0xc9, 0xab, + 0x18, 0x56, 0x77, 0x19, 0x92, 0xee, 0x64, 0x6c, 0xf0, 0xe7, 0x5d, 0x15, 0xa2, 0x70, 0x27, 0xe3, + 0xde, 0x41, 0x50, 0xf9, 0x02, 0x92, 0xbd, 0x03, 0xfc, 0xa9, 0xc3, 0x95, 0xe0, 0x53, 0x2a, 0xfb, + 0xab, 0xf8, 0x5d, 0x93, 0xe2, 0x06, 0x6c, 0x27, 0x1a, 0xa8, 0xbc, 0x91, 0x86, 0x9d, 0x80, 0x8f, + 0xb5, 0x77, 0x21, 0xd1, 0xf9, 0x07, 0xbf, 0xa5, 0x74, 0x81, 0xbe, 0xf5, 0x83, 0x02, 0x99, 0xc8, + 0x6d, 0xd4, 0x8a, 0x70, 0xa9, 0xb1, 0xb3, 0xb7, 0xf5, 0x70, 0xdb, 0x68, 0x6d, 0x1b, 0xf7, 0x76, + 0xea, 0xf7, 0x8d, 0x4f, 0xda, 0x0f, 0xdb, 0x7b, 0x9f, 0xb6, 0xf3, 0x0b, 0x5a, 0x0d, 0x56, 0xd1, + 0x37, 0x75, 0xd5, 0x1b, 0xdd, 0x66, 0xbb, 0x97, 0x57, 0x8a, 0xff, 0x39, 0x3a, 0x2e, 0xaf, 0x44, + 0xd2, 0xd4, 0xfb, 0x01, 0x71, 0xd9, 0xd9, 0x80, 0xad, 0xbd, 0xdd, 0xdd, 0x56, 0x2f, 0x1f, 0x3b, + 0x13, 0x20, 0x1f, 0xd6, 0x9b, 0xb0, 0x32, 0x1f, 0xd0, 0x6e, 0xed, 0xe4, 0xe3, 0x45, 0xed, 0xe8, + 0xb8, 0xbc, 0x14, 0x41, 0xb7, 0x6d, 0xa7, 0x98, 0xfa, 0xf2, 0xeb, 0xd2, 0xc2, 0x77, 0xdf, 0x94, + 0x94, 0x5b, 0xdf, 0x2a, 0x90, 0x9b, 0xbb, 0x7a, 0xda, 0x1a, 0x5c, 0xee, 0xb6, 0xee, 0xb7, 0x9b, + 0xdb, 0xc6, 0x6e, 0xf7, 0xbe, 0xd1, 0xfb, 0xac, 0xd3, 0x8c, 0x54, 0xf1, 0x5f, 0xc8, 0x76, 0xf4, + 0xe6, 0xa3, 0xbd, 0x5e, 0x13, 0x3d, 0x79, 0xa5, 0xb8, 0x7c, 0x74, 0x5c, 0xce, 0x74, 0x7c, 0xb2, + 0x4f, 0x19, 0xc1, 0xf8, 0x1b, 0xb0, 0xd4, 0xd1, 0x9b, 0x62, 0xb3, 0x02, 0x14, 0x2b, 0xae, 0x1c, + 0x1d, 0x97, 0x73, 0x1d, 0x9f, 0x08, 0xbd, 0x21, 0xec, 0x3a, 0xe4, 0x3a, 0xfa, 0x5e, 0x67, 0xaf, + 0x5b, 0xdf, 0x11, 0xa8, 0x72, 0x31, 0x7f, 0x74, 0x5c, 0xce, 0x86, 0x2f, 0x06, 0x07, 0xcd, 0xf6, + 0xd9, 0xf8, 0xf8, 0xf9, 0x49, 0x49, 0x79, 0x71, 0x52, 0x52, 0x7e, 0x3d, 0x29, 0x29, 0xcf, 0x5e, + 0x95, 0x16, 0x5e, 0xbc, 0x2a, 0x2d, 0xfc, 0xf4, 0xaa, 0xb4, 0xf0, 0xf9, 0xfb, 0x43, 0x9b, 0x8d, + 0x26, 0xfd, 0xea, 0x80, 0x8e, 0x6b, 0xd1, 0x4f, 0x8a, 0xd9, 0x50, 0x7c, 0x34, 0x9c, 0xfe, 0xdc, + 0xe8, 0x2f, 0xa2, 0xfd, 0xce, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x80, 0x8f, 0x45, 0xb8, 0x89, + 0x0c, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { diff --git a/proto/types/types.proto b/proto/tendermint/types/types.proto similarity index 95% rename from proto/types/types.proto rename to proto/tendermint/types/types.proto index 16fdcc225..87ee725b1 100644 --- a/proto/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "proto/libs/bits/types.proto"; -import "proto/crypto/merkle/types.proto"; -import "proto/version/version.proto"; +import "tendermint/libs/bits/types.proto"; +import "tendermint/crypto/merkle/types.proto"; +import "tendermint/version/version.proto"; // BlockIdFlag indicates which BlcokID the signature is for enum BlockIDFlag { diff --git a/proto/types/validator.pb.go b/proto/tendermint/types/validator.pb.go similarity index 88% rename from proto/types/validator.pb.go rename to proto/tendermint/types/validator.pb.go index e2803fb13..8fc0510cf 100644 --- a/proto/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/types/validator.proto +// source: tendermint/types/validator.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - keys "github.com/tendermint/tendermint/proto/crypto/keys" + keys "github.com/tendermint/tendermint/proto/tendermint/crypto/keys" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,7 @@ func (m *ValidatorSet) Reset() { *m = ValidatorSet{} } func (m *ValidatorSet) String() string { return proto.CompactTextString(m) } func (*ValidatorSet) ProtoMessage() {} func (*ValidatorSet) Descriptor() ([]byte, []int) { - return fileDescriptor_2e7c6b38c20e5406, []int{0} + return fileDescriptor_4e92274df03d3088, []int{0} } func (m *ValidatorSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -95,7 +95,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_2e7c6b38c20e5406, []int{1} + return fileDescriptor_4e92274df03d3088, []int{1} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -161,7 +161,7 @@ func (m *SimpleValidator) Reset() { *m = SimpleValidator{} } func (m *SimpleValidator) String() string { return proto.CompactTextString(m) } func (*SimpleValidator) ProtoMessage() {} func (*SimpleValidator) Descriptor() ([]byte, []int) { - return fileDescriptor_2e7c6b38c20e5406, []int{2} + return fileDescriptor_4e92274df03d3088, []int{2} } func (m *SimpleValidator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -210,34 +210,34 @@ func init() { proto.RegisterType((*SimpleValidator)(nil), "tendermint.types.SimpleValidator") } -func init() { proto.RegisterFile("proto/types/validator.proto", fileDescriptor_2e7c6b38c20e5406) } - -var fileDescriptor_2e7c6b38c20e5406 = []byte{ - // 376 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x6a, 0xea, 0x40, - 0x1c, 0xc5, 0x33, 0x2a, 0x7a, 0xef, 0x28, 0x5c, 0xef, 0xac, 0x82, 0xd2, 0x54, 0x5d, 0x14, 0xa1, - 0x92, 0x40, 0xbb, 0x28, 0xb4, 0x9b, 0xe2, 0xa2, 0x1b, 0x37, 0x12, 0xc1, 0x45, 0x37, 0x21, 0x31, - 0x43, 0x1c, 0x8c, 0xce, 0x30, 0x99, 0x58, 0xe6, 0x2d, 0xfa, 0x2c, 0xdd, 0xf4, 0x15, 0x5c, 0xba, - 0xec, 0xaa, 0x14, 0x7d, 0x91, 0x62, 0xc6, 0x7c, 0xd0, 0x0f, 0xda, 0xdd, 0xcc, 0x39, 0xff, 0x93, - 0xf3, 0xcb, 0x9f, 0x81, 0x6d, 0xc6, 0xa9, 0xa0, 0x96, 0x90, 0x0c, 0x47, 0xd6, 0xda, 0x0d, 0x89, - 0xef, 0x0a, 0xca, 0xcd, 0x44, 0x45, 0x4d, 0x81, 0x57, 0x3e, 0xe6, 0x4b, 0xb2, 0x12, 0x66, 0x32, - 0xd1, 0x3a, 0x13, 0x73, 0xc2, 0x7d, 0x87, 0xb9, 0x5c, 0x48, 0x4b, 0x45, 0x03, 0x1a, 0xd0, 0xfc, - 0xa4, 0x92, 0xad, 0x13, 0xa5, 0xcc, 0xb8, 0x64, 0x82, 0x5a, 0x0b, 0x2c, 0x23, 0x55, 0xa1, 0xec, - 0xde, 0x13, 0x80, 0x8d, 0x69, 0x5a, 0x36, 0xc1, 0x02, 0xdd, 0x40, 0x98, 0x95, 0x47, 0x3a, 0xe8, - 0x94, 0xfb, 0xf5, 0x8b, 0xb6, 0xf9, 0xb1, 0xde, 0xcc, 0x32, 0x76, 0x61, 0x1c, 0x5d, 0xc1, 0x3f, - 0x8c, 0x53, 0x46, 0x23, 0xcc, 0xf5, 0x52, 0x07, 0xfc, 0x14, 0xcd, 0x86, 0xd1, 0x00, 0x22, 0x41, - 0x85, 0x1b, 0x3a, 0x6b, 0x2a, 0xc8, 0x2a, 0x70, 0x18, 0x7d, 0xc0, 0x5c, 0x2f, 0x77, 0x40, 0xbf, - 0x6c, 0x37, 0x13, 0x67, 0x9a, 0x18, 0xe3, 0x83, 0xde, 0x7b, 0x06, 0xf0, 0x6f, 0xf6, 0x15, 0xa4, - 0xc3, 0x9a, 0xeb, 0xfb, 0x1c, 0x47, 0x07, 0x5c, 0xd0, 0x6f, 0xd8, 0xe9, 0x15, 0xdd, 0xc2, 0x1a, - 0x8b, 0x3d, 0x67, 0x81, 0xe5, 0x91, 0xa6, 0x5b, 0xa4, 0x51, 0x2b, 0x31, 0x0f, 0x2b, 0x31, 0xc7, - 0xb1, 0x17, 0x92, 0xd9, 0x08, 0xcb, 0x61, 0x65, 0xf3, 0x7a, 0xaa, 0xd9, 0x55, 0x16, 0x7b, 0x23, - 0x2c, 0x51, 0x17, 0x36, 0xbe, 0x20, 0xaa, 0xaf, 0x73, 0x18, 0x74, 0x0e, 0xff, 0xa7, 0xbf, 0xe1, - 0x30, 0x4e, 0x28, 0x27, 0x42, 0xea, 0x15, 0x45, 0x9e, 0x1a, 0xe3, 0xa3, 0xde, 0x63, 0xf0, 0xdf, - 0x84, 0x2c, 0x59, 0x88, 0x73, 0xfc, 0xeb, 0x1c, 0x12, 0xfc, 0x12, 0xf2, 0x5b, 0xbc, 0xd2, 0x27, - 0xbc, 0xe1, 0xdd, 0x66, 0x67, 0x80, 0xed, 0xce, 0x00, 0x6f, 0x3b, 0x03, 0x3c, 0xee, 0x0d, 0x6d, - 0xbb, 0x37, 0xb4, 0x97, 0xbd, 0xa1, 0xdd, 0x0f, 0x02, 0x22, 0xe6, 0xb1, 0x67, 0xce, 0xe8, 0xd2, - 0xca, 0x1b, 0x8b, 0xc7, 0xc2, 0x8b, 0xf4, 0xaa, 0xc9, 0xe5, 0xf2, 0x3d, 0x00, 0x00, 0xff, 0xff, - 0x1d, 0x26, 0xc3, 0xf5, 0xa7, 0x02, 0x00, 0x00, +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, } func (m *ValidatorSet) Marshal() (dAtA []byte, err error) { diff --git a/proto/types/validator.proto b/proto/tendermint/types/validator.proto similarity index 80% rename from proto/types/validator.proto rename to proto/tendermint/types/validator.proto index 9ee5e4a48..616d80d67 100644 --- a/proto/types/validator.proto +++ b/proto/tendermint/types/validator.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/types"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; -import "third_party/proto/gogoproto/gogo.proto"; -import "proto/crypto/keys/types.proto"; +import "gogoproto/gogo.proto"; +import "tendermint/crypto/keys/types.proto"; message ValidatorSet { repeated Validator validators = 1; diff --git a/proto/version/version.pb.go b/proto/tendermint/version/version.pb.go similarity index 88% rename from proto/version/version.pb.go rename to proto/tendermint/version/version.pb.go index 7696773fd..ddb5a19a3 100644 --- a/proto/version/version.pb.go +++ b/proto/tendermint/version/version.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/version/version.proto +// source: tendermint/version/version.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_14aa2353622f11e1, []int{0} + return fileDescriptor_e4aa62ad65b9e120, []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_14aa2353622f11e1, []int{1} + return fileDescriptor_e4aa62ad65b9e120, []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("proto/version/version.proto", fileDescriptor_14aa2353622f11e1) } +func init() { proto.RegisterFile("tendermint/version/version.proto", fileDescriptor_e4aa62ad65b9e120) } -var fileDescriptor_14aa2353622f11e1 = []byte{ - // 222 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x60, 0x51, 0x21, 0xa1, - 0x92, 0xd4, 0xbc, 0x94, 0xd4, 0xa2, 0xdc, 0xcc, 0xbc, 0x12, 0x3d, 0xa8, 0x8c, 0x94, 0x5a, 0x49, - 0x46, 0x66, 0x51, 0x4a, 0x7c, 0x41, 0x62, 0x51, 0x49, 0xa5, 0x3e, 0x44, 0x73, 0x7a, 0x7e, 0x7a, - 0x3e, 0x82, 0x05, 0xd1, 0xab, 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, 0xe4, 0x71, 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, 0x7a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, - 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0xaf, 0x21, 0x33, 0x51, 0x42, 0x23, 0x89, 0x0d, 0xcc, 0x35, - 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x42, 0x26, 0x61, 0x25, 0x01, 0x00, 0x00, +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, } func (this *Consensus) Equal(that interface{}) bool { diff --git a/proto/version/version.proto b/proto/tendermint/version/version.proto similarity index 82% rename from proto/version/version.proto rename to proto/tendermint/version/version.proto index 7e49e2e61..6061868bd 100644 --- a/proto/version/version.proto +++ b/proto/tendermint/version/version.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package tendermint.version; -option go_package = "github.com/tendermint/tendermint/proto/version"; +option go_package = "github.com/tendermint/tendermint/proto/tendermint/version"; -import "third_party/proto/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // App includes the protocol and software version for the application. // This information is included in ResponseInfo. The App.Protocol can be diff --git a/rpc/client/evidence_test.go b/rpc/client/evidence_test.go index 45738f5b5..f51e9b3f2 100644 --- a/rpc/client/evidence_test.go +++ b/rpc/client/evidence_test.go @@ -14,7 +14,7 @@ import ( cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/privval" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/rpc/client" rpctest "github.com/tendermint/tendermint/rpc/test" "github.com/tendermint/tendermint/types" diff --git a/rpc/core/blocks_test.go b/rpc/core/blocks_test.go index 2a5d783d0..8cc752ffc 100644 --- a/rpc/core/blocks_test.go +++ b/rpc/core/blocks_test.go @@ -10,7 +10,7 @@ import ( dbm "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" - tmstate "github.com/tendermint/tendermint/proto/state" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" ctypes "github.com/tendermint/tendermint/rpc/core/types" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" sm "github.com/tendermint/tendermint/state" diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index 7c63b3872..0327e6ee7 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/p2p" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index 3868ba142..3d568af38 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: proto/rpc/types.proto +// source: tendermint/rpc/grpc/types.proto package coregrpc @@ -34,7 +34,7 @@ func (m *RequestPing) Reset() { *m = RequestPing{} } func (m *RequestPing) String() string { return proto.CompactTextString(m) } func (*RequestPing) ProtoMessage() {} func (*RequestPing) Descriptor() ([]byte, []int) { - return fileDescriptor_f35ca15370f9307c, []int{0} + return fileDescriptor_0ffff5682c662b95, []int{0} } func (m *RequestPing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -71,7 +71,7 @@ func (m *RequestBroadcastTx) Reset() { *m = RequestBroadcastTx{} } func (m *RequestBroadcastTx) String() string { return proto.CompactTextString(m) } func (*RequestBroadcastTx) ProtoMessage() {} func (*RequestBroadcastTx) Descriptor() ([]byte, []int) { - return fileDescriptor_f35ca15370f9307c, []int{1} + return fileDescriptor_0ffff5682c662b95, []int{1} } func (m *RequestBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,7 +114,7 @@ func (m *ResponsePing) Reset() { *m = ResponsePing{} } func (m *ResponsePing) String() string { return proto.CompactTextString(m) } func (*ResponsePing) ProtoMessage() {} func (*ResponsePing) Descriptor() ([]byte, []int) { - return fileDescriptor_f35ca15370f9307c, []int{2} + return fileDescriptor_0ffff5682c662b95, []int{2} } func (m *ResponsePing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -152,7 +152,7 @@ func (m *ResponseBroadcastTx) Reset() { *m = ResponseBroadcastTx{} } func (m *ResponseBroadcastTx) String() string { return proto.CompactTextString(m) } func (*ResponseBroadcastTx) ProtoMessage() {} func (*ResponseBroadcastTx) Descriptor() ([]byte, []int) { - return fileDescriptor_f35ca15370f9307c, []int{3} + return fileDescriptor_0ffff5682c662b95, []int{3} } func (m *ResponseBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -202,31 +202,30 @@ func init() { proto.RegisterType((*ResponseBroadcastTx)(nil), "tendermint.rpc.grpc.ResponseBroadcastTx") } -func init() { proto.RegisterFile("proto/rpc/types.proto", fileDescriptor_f35ca15370f9307c) } - -var fileDescriptor_f35ca15370f9307c = []byte{ - // 321 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x28, 0xca, 0x2f, - 0xc9, 0xd7, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x03, 0xf3, 0x85, 0x84, - 0x4b, 0x52, 0xf3, 0x52, 0x52, 0x8b, 0x72, 0x33, 0xf3, 0x4a, 0xf4, 0x8a, 0x0a, 0x92, 0xf5, 0xd2, - 0x8b, 0x0a, 0x92, 0xa5, 0xc4, 0x20, 0x6a, 0x13, 0x93, 0x92, 0x33, 0x91, 0x15, 0x2b, 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, 0x1c, 0x07, 0x72, 0x8c, 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, 0xf0, 0xd2, 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, 0x98, - 0x86, 0xcc, 0x04, 0xa5, 0x10, 0x90, 0xc1, 0xd6, 0xc9, 0xf9, 0x45, 0xa9, 0x20, 0x46, 0x12, 0x1b, - 0x38, 0xf6, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x0b, 0x3a, 0xe3, 0x43, 0x02, 0x00, - 0x00, +func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } + +var fileDescriptor_0ffff5682c662b95 = []byte{ + // 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, 0x52, 0x48, 0xba, 0x12, 0x93, 0x92, 0x33, 0xc1, 0x04, 0x44, 0x83, + 0x12, 0x2f, 0x17, 0x77, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x49, 0x40, 0x66, 0x5e, 0xba, 0x92, + 0x0a, 0x97, 0x10, 0x94, 0xeb, 0x54, 0x94, 0x9f, 0x98, 0x92, 0x9c, 0x58, 0x5c, 0x12, 0x52, 0x21, + 0xc4, 0xc7, 0xc5, 0x54, 0x52, 0x21, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x13, 0xc4, 0x54, 0x52, 0xa1, + 0xc4, 0xc7, 0xc5, 0x13, 0x94, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x0a, 0xd6, 0x35, 0x95, 0x91, + 0x4b, 0x18, 0x26, 0x80, 0xac, 0xcf, 0x9a, 0x8b, 0x23, 0x39, 0x23, 0x35, 0x39, 0x3b, 0x1e, 0xaa, + 0x9b, 0xdb, 0x48, 0x41, 0x0f, 0xc9, 0x81, 0x60, 0x67, 0xc0, 0xf4, 0x39, 0x83, 0x14, 0x86, 0x54, + 0x04, 0xb1, 0x27, 0x43, 0x18, 0x42, 0x8e, 0x5c, 0x5c, 0x29, 0xa9, 0x39, 0x99, 0x65, 0xa9, 0x45, + 0x20, 0xed, 0x4c, 0x60, 0xed, 0x4a, 0x38, 0xb5, 0xbb, 0x40, 0x94, 0x86, 0x54, 0x04, 0x71, 0xa6, + 0xc0, 0x98, 0x46, 0x7b, 0x19, 0xb9, 0x78, 0xe0, 0xee, 0x71, 0x0c, 0xf0, 0x14, 0xf2, 0xe6, 0x62, + 0x01, 0x39, 0x58, 0x08, 0xc5, 0x19, 0xb0, 0x70, 0xd2, 0x43, 0x0a, 0x08, 0x29, 0x45, 0x1c, 0x2a, + 0x10, 0xbe, 0x16, 0x4a, 0xe0, 0xe2, 0x46, 0xf6, 0xac, 0x3a, 0x3e, 0x33, 0x91, 0x14, 0x4a, 0x69, + 0xe0, 0x35, 0x1a, 0x49, 0xa5, 0x93, 0xcf, 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, 0x19, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0xc5, 0x2e, + 0x96, 0xe4, 0x61, 0x9d, 0x9c, 0x5f, 0x94, 0x0a, 0x62, 0x24, 0xb1, 0x81, 0x63, 0xdc, 0x18, 0x10, + 0x00, 0x00, 0xff, 0xff, 0x95, 0x8e, 0xed, 0x45, 0x45, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -342,7 +341,7 @@ var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "proto/rpc/types.proto", + Metadata: "tendermint/rpc/grpc/types.proto", } func (m *RequestPing) Marshal() (dAtA []byte, err error) { diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 70a877960..b4a19429c 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -5,7 +5,8 @@ set -eo pipefail proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq) for dir in $proto_dirs; do protoc \ - -I. \ + -I "proto" \ + -I "third_party/proto" \ --gogofaster_out=\ Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\ Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,\ @@ -13,8 +14,9 @@ plugins=grpc,paths=source_relative:. \ $(find "${dir}" -maxdepth 1 -name '*.proto') done -cp -r proto/abci/types.pb.go ./abci/types -rm -rf proto/abci/types.pb.go +cp -r ./tendermint/* ./proto/* +rm -rf tendermint -cp -r proto/rpc/types.pb.go ./rpc/grpc -rm -rf proto/rpc/types.pb.go +mv ./proto/tendermint/abci/abci.pb.go ./abci/types + +mv ./proto/tendermint/rpc/grpc/types.pb.go ./rpc/grpc diff --git a/state/execution.go b/state/execution.go index 36e901202..c061d6dd8 100644 --- a/state/execution.go +++ b/state/execution.go @@ -12,8 +12,8 @@ import ( "github.com/tendermint/tendermint/libs/fail" "github.com/tendermint/tendermint/libs/log" mempl "github.com/tendermint/tendermint/mempool" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/types" ) diff --git a/state/execution_test.go b/state/execution_test.go index 9d1b4aea2..0fcfc86a9 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -14,7 +14,7 @@ import ( cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/mempool/mock" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/state/export_test.go b/state/export_test.go index 028d36419..25f41695c 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -4,8 +4,8 @@ import ( dbm "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/state/helpers_test.go b/state/helpers_test.go index 64b89cc4f..fb07e9113 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -11,8 +11,8 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" tmrand "github.com/tendermint/tendermint/libs/rand" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/state/state.go b/state/state.go index 00b807ee8..7ae5f812d 100644 --- a/state/state.go +++ b/state/state.go @@ -9,9 +9,9 @@ import ( "github.com/gogo/protobuf/proto" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" - tmversion "github.com/tendermint/tendermint/proto/version" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" "github.com/tendermint/tendermint/version" diff --git a/state/state_test.go b/state/state_test.go index b05ec19d9..541f6504a 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -19,8 +19,8 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" tmrand "github.com/tendermint/tendermint/libs/rand" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/state/store.go b/state/store.go index 16517317b..010607efd 100644 --- a/state/store.go +++ b/state/store.go @@ -10,8 +10,8 @@ import ( "github.com/tendermint/tendermint/crypto/merkle" tmmath "github.com/tendermint/tendermint/libs/math" tmos "github.com/tendermint/tendermint/libs/os" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/state/store_test.go b/state/store_test.go index 1086220c7..141fe7ad8 100644 --- a/state/store_test.go +++ b/state/store_test.go @@ -17,8 +17,8 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/merkle" tmrand "github.com/tendermint/tendermint/libs/rand" - tmstate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/state/validation_test.go b/state/validation_test.go index ba00a9035..5eb4b885d 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -10,14 +10,14 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/proto/version" + "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/libs/log" memmock "github.com/tendermint/tendermint/mempool/mock" - protostate "github.com/tendermint/tendermint/proto/state" - tmproto "github.com/tendermint/tendermint/proto/types" + protostate "github.com/tendermint/tendermint/proto/tendermint/state" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/state/mocks" "github.com/tendermint/tendermint/types" diff --git a/statesync/messages.go b/statesync/messages.go index 2f9312d23..afd106774 100644 --- a/statesync/messages.go +++ b/statesync/messages.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - ssproto "github.com/tendermint/tendermint/proto/statesync" + ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" ) const ( diff --git a/statesync/messages_test.go b/statesync/messages_test.go index cf7630e29..698db50ad 100644 --- a/statesync/messages_test.go +++ b/statesync/messages_test.go @@ -6,8 +6,8 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - ssproto "github.com/tendermint/tendermint/proto/statesync" - tmproto "github.com/tendermint/tendermint/proto/types" + ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func TestValidateMsg(t *testing.T) { diff --git a/statesync/reactor.go b/statesync/reactor.go index 4c09a008d..82c435fbb 100644 --- a/statesync/reactor.go +++ b/statesync/reactor.go @@ -7,7 +7,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/p2p" - ssproto "github.com/tendermint/tendermint/proto/statesync" + ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/statesync/reactor_test.go b/statesync/reactor_test.go index 03ed44009..f84ab8ff1 100644 --- a/statesync/reactor_test.go +++ b/statesync/reactor_test.go @@ -11,7 +11,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/p2p" p2pmocks "github.com/tendermint/tendermint/p2p/mocks" - ssproto "github.com/tendermint/tendermint/proto/statesync" + ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" proxymocks "github.com/tendermint/tendermint/proxy/mocks" ) diff --git a/statesync/stateprovider.go b/statesync/stateprovider.go index 268098e96..dfc8c15c5 100644 --- a/statesync/stateprovider.go +++ b/statesync/stateprovider.go @@ -14,7 +14,7 @@ import ( lighthttp "github.com/tendermint/tendermint/light/provider/http" lightrpc "github.com/tendermint/tendermint/light/rpc" lightdb "github.com/tendermint/tendermint/light/store/db" - tmstate "github.com/tendermint/tendermint/proto/state" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" rpchttp "github.com/tendermint/tendermint/rpc/client/http" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/statesync/syncer.go b/statesync/syncer.go index 6ebd4cb05..b2e8dc8c7 100644 --- a/statesync/syncer.go +++ b/statesync/syncer.go @@ -11,7 +11,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" - ssproto "github.com/tendermint/tendermint/proto/statesync" + ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/statesync/syncer_test.go b/statesync/syncer_test.go index 0b51a5e07..5012ddbec 100644 --- a/statesync/syncer_test.go +++ b/statesync/syncer_test.go @@ -14,9 +14,9 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/p2p" p2pmocks "github.com/tendermint/tendermint/p2p/mocks" - tmstate "github.com/tendermint/tendermint/proto/state" - ssproto "github.com/tendermint/tendermint/proto/statesync" - tmversion "github.com/tendermint/tendermint/proto/version" + tmstate "github.com/tendermint/tendermint/proto/tendermint/state" + ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" + tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/proxy" proxymocks "github.com/tendermint/tendermint/proxy/mocks" sm "github.com/tendermint/tendermint/state" diff --git a/store/store.go b/store/store.go index 252c2bdf6..6c94a9a51 100644 --- a/store/store.go +++ b/store/store.go @@ -8,8 +8,8 @@ import ( "github.com/gogo/protobuf/proto" dbm "github.com/tendermint/tm-db" - tmstore "github.com/tendermint/tendermint/proto/store" - tmproto "github.com/tendermint/tendermint/proto/types" + tmstore "github.com/tendermint/tendermint/proto/tendermint/store" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/store/store_test.go b/store/store_test.go index ec6b8552a..be6c070ed 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -18,7 +18,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" - tmstore "github.com/tendermint/tendermint/proto/store" + tmstore "github.com/tendermint/tendermint/proto/tendermint/store" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/tools/tm-signer-harness/internal/test_harness.go b/tools/tm-signer-harness/internal/test_harness.go index a50c96443..ab8d197b1 100644 --- a/tools/tm-signer-harness/internal/test_harness.go +++ b/tools/tm-signer-harness/internal/test_harness.go @@ -17,7 +17,7 @@ import ( "github.com/tendermint/tendermint/libs/log" tmnet "github.com/tendermint/tendermint/libs/net" tmos "github.com/tendermint/tendermint/libs/os" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" ) diff --git a/types/block.go b/types/block.go index a07235ace..a029bffae 100644 --- a/types/block.go +++ b/types/block.go @@ -17,8 +17,8 @@ import ( "github.com/tendermint/tendermint/libs/bits" tmbytes "github.com/tendermint/tendermint/libs/bytes" tmmath "github.com/tendermint/tendermint/libs/math" - tmproto "github.com/tendermint/tendermint/proto/types" - tmversion "github.com/tendermint/tendermint/proto/version" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmversion "github.com/tendermint/tendermint/proto/tendermint/version" ) const ( diff --git a/types/block_meta.go b/types/block_meta.go index a16176cd2..1ce262d9a 100644 --- a/types/block_meta.go +++ b/types/block_meta.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) // BlockMeta contains meta information. diff --git a/types/block_test.go b/types/block_test.go index afb5803d6..6f3a98244 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -21,8 +21,8 @@ import ( "github.com/tendermint/tendermint/libs/bits" "github.com/tendermint/tendermint/libs/bytes" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" - "github.com/tendermint/tendermint/proto/version" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/tendermint/tendermint/proto/tendermint/version" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/types/canonical.go b/types/canonical.go index 291580840..49d98405d 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -3,7 +3,7 @@ package types import ( "time" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/types/canonical_test.go b/types/canonical_test.go index 74a7ae569..53a8ea52f 100644 --- a/types/canonical_test.go +++ b/types/canonical_test.go @@ -6,7 +6,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func TestCanonicalizeBlockID(t *testing.T) { diff --git a/types/evidence.go b/types/evidence.go index 5164b3428..54446a7c7 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -13,7 +13,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" tmjson "github.com/tendermint/tendermint/libs/json" tmmath "github.com/tendermint/tendermint/libs/math" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( diff --git a/types/evidence_test.go b/types/evidence_test.go index d4b77de94..542865a49 100644 --- a/types/evidence_test.go +++ b/types/evidence_test.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/tmhash" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) type voteData struct { diff --git a/types/genesis.go b/types/genesis.go index d5924fe3e..44e485d70 100644 --- a/types/genesis.go +++ b/types/genesis.go @@ -12,7 +12,7 @@ import ( tmbytes "github.com/tendermint/tendermint/libs/bytes" tmjson "github.com/tendermint/tendermint/libs/json" tmos "github.com/tendermint/tendermint/libs/os" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/types/params.go b/types/params.go index 0dd4d9a83..1953ba8db 100644 --- a/types/params.go +++ b/types/params.go @@ -7,7 +7,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( diff --git a/types/params_test.go b/types/params_test.go index c5291ef73..39fd3951a 100644 --- a/types/params_test.go +++ b/types/params_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) var ( diff --git a/types/part_set.go b/types/part_set.go index d99812591..472391204 100644 --- a/types/part_set.go +++ b/types/part_set.go @@ -12,7 +12,7 @@ import ( tmbytes "github.com/tendermint/tendermint/libs/bytes" tmjson "github.com/tendermint/tendermint/libs/json" tmmath "github.com/tendermint/tendermint/libs/math" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) var ( diff --git a/types/priv_validator.go b/types/priv_validator.go index b3750a58d..394123164 100644 --- a/types/priv_validator.go +++ b/types/priv_validator.go @@ -7,7 +7,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) // PrivValidator defines the functionality of a local Tendermint validator diff --git a/types/proposal.go b/types/proposal.go index 4761816ae..45a781963 100644 --- a/types/proposal.go +++ b/types/proposal.go @@ -7,7 +7,7 @@ import ( tmbytes "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/protoio" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/types/proposal_test.go b/types/proposal_test.go index 68a6fda68..10b6bd192 100644 --- a/types/proposal_test.go +++ b/types/proposal_test.go @@ -12,7 +12,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/libs/protoio" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) var ( diff --git a/types/protobuf.go b/types/protobuf.go index a9935cea5..104faff30 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) //------------------------------------------------------- diff --git a/types/signed_msg_type.go b/types/signed_msg_type.go index c3b5a08d2..4ab5685a7 100644 --- a/types/signed_msg_type.go +++ b/types/signed_msg_type.go @@ -1,6 +1,6 @@ package types -import tmproto "github.com/tendermint/tendermint/proto/types" +import tmproto "github.com/tendermint/tendermint/proto/tendermint/types" // IsVoteTypeValid returns true if t is a valid vote type. func IsVoteTypeValid(t tmproto.SignedMsgType) bool { diff --git a/types/test_util.go b/types/test_util.go index 639987ebf..9ae263fb2 100644 --- a/types/test_util.go +++ b/types/test_util.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func MakeCommit(blockID BlockID, height int64, round int32, diff --git a/types/tx.go b/types/tx.go index 689a1aadd..55defb5b2 100644 --- a/types/tx.go +++ b/types/tx.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/crypto/merkle" "github.com/tendermint/tendermint/crypto/tmhash" tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) // Tx is an arbitrary byte array. diff --git a/types/tx_test.go b/types/tx_test.go index 8d04c8163..0ee308ced 100644 --- a/types/tx_test.go +++ b/types/tx_test.go @@ -9,7 +9,7 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" ctest "github.com/tendermint/tendermint/libs/test" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func makeTxs(cnt, size int) Txs { diff --git a/types/validator.go b/types/validator.go index 0d10253b7..948151a11 100644 --- a/types/validator.go +++ b/types/validator.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/crypto" ce "github.com/tendermint/tendermint/crypto/encoding" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) // Volatile state for each Validator diff --git a/types/validator_set.go b/types/validator_set.go index d34f3decc..219e67804 100644 --- a/types/validator_set.go +++ b/types/validator_set.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/crypto/merkle" tmmath "github.com/tendermint/tendermint/libs/math" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( diff --git a/types/validator_set_test.go b/types/validator_set_test.go index 73cb14191..d08c967f8 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -17,7 +17,7 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" tmmath "github.com/tendermint/tendermint/libs/math" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func TestValidatorSetBasic(t *testing.T) { diff --git a/types/vote.go b/types/vote.go index af33a421e..6a8b31736 100644 --- a/types/vote.go +++ b/types/vote.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/crypto" tmbytes "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/protoio" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( diff --git a/types/vote_set.go b/types/vote_set.go index f874dd5ab..5c0545900 100644 --- a/types/vote_set.go +++ b/types/vote_set.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/libs/bits" tmjson "github.com/tendermint/tendermint/libs/json" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( diff --git a/types/vote_set_test.go b/types/vote_set_test.go index de6419877..bfac1b935 100644 --- a/types/vote_set_test.go +++ b/types/vote_set_test.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/crypto" tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/types/vote_test.go b/types/vote_test.go index 57fb2c1f1..1ea3fa46a 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -13,7 +13,7 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/libs/protoio" - tmproto "github.com/tendermint/tendermint/proto/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func examplePrevote() *Vote {