Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Versioned protobuf files #495

Merged
merged 26 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fdcca78
proto: Add versioned cometbft proto files
mzabaluev Apr 6, 2023
784f976
Regenerate *.pb.go in the api folder
mzabaluev Apr 6, 2023
5a5beff
Move and adapt supporting code alongside *.pb.go
mzabaluev Apr 6, 2023
b1c79f9
Remove go_package directives from tendermint protos
mzabaluev Apr 6, 2023
ba3c574
Update proto imports in production code
mzabaluev Apr 6, 2023
9cbf604
Update proto imports in tests and examples
mzabaluev Apr 6, 2023
136791f
Update links to proto files in docs
mzabaluev Apr 6, 2023
a7ad099
Changelog entry for #495
mzabaluev Apr 6, 2023
32504b8
Bump govulncheck to use go 1.20.3
mzabaluev Apr 6, 2023
b431f7b
Suppress golangci lints on generated code/names
mzabaluev Apr 14, 2023
2c93cf3
Fix gofmt and goimports lints
mzabaluev Apr 14, 2023
b329316
Suppress more var-naming lints
mzabaluev Apr 14, 2023
5bf54e4
Update go.sum
mzabaluev Apr 14, 2023
ea29676
abci: fix structural literal lints
mzabaluev Apr 14, 2023
899eccb
Remove newline after file //nolint suppressions
mzabaluev Apr 14, 2023
40613ee
Suppress stylecheck linter on *.pb.go files
mzabaluev Apr 14, 2023
f78b19d
Suppress revive,stylecheck lints on alias files
mzabaluev Apr 14, 2023
9d41fd8
Fix an indent-error-flow lint in tests
mzabaluev Apr 14, 2023
5ee443d
Suppress style lints on SignedMsgType consts
mzabaluev Apr 14, 2023
c9ac8db
Edit changelog for #495
mzabaluev Apr 18, 2023
cc351d5
proto: fix the formatting
mzabaluev Apr 18, 2023
2b47221
proto: remove blockchain/v1
mzabaluev Apr 18, 2023
d2c36a9
proto: flatten VersionParams into a single version
mzabaluev Apr 18, 2023
cdf4e80
Regenerate protos for flattened VersionParams
mzabaluev Apr 18, 2023
fd54d1d
Merge branch 'mikhail/proto-version-suffixes' of github.com:cometbft/…
mzabaluev Apr 18, 2023
57e8a81
Revert SignedMsgProto member const names
mzabaluev Apr 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove go_package directives from tendermint protos
  • Loading branch information
mzabaluev committed Apr 6, 2023
commit b1c79f9f150e1fe9624c2d627cf94b2377982e2b
2 changes: 0 additions & 2 deletions proto/tendermint/abci/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.abci;

option go_package = "github.com/cometbft/cometbft/abci/types";

// For more information on gogo.proto, see:
// https://github.com/cosmos/gogoproto/blob/master/extensions.md
import "tendermint/crypto/proof.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/blocksync/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.blocksync;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/blocksync";

import "tendermint/types/block.proto";
import "tendermint/types/types.proto";

Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/consensus/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.consensus;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/consensus";

import "gogoproto/gogo.proto";
import "tendermint/types/types.proto";
import "tendermint/libs/bits/types.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/consensus/wal.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.consensus;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/consensus";

import "gogoproto/gogo.proto";
import "tendermint/consensus/types.proto";
import "tendermint/types/events.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/crypto/keys.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.crypto;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/crypto";

import "gogoproto/gogo.proto";

// PublicKey defines the keys available for use with Validators
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/crypto/proof.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.crypto;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/crypto";

import "gogoproto/gogo.proto";

message Proof {
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/libs/bits/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.libs.bits;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/libs/bits";

message BitArray {
int64 bits = 1;
repeated uint64 elems = 2;
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/mempool/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.mempool;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/mempool";

message Txs {
repeated bytes txs = 1;
}
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/p2p/conn.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.p2p;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/p2p";

import "gogoproto/gogo.proto";
import "tendermint/crypto/keys.proto";

Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/p2p/pex.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.p2p;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/p2p";

import "tendermint/p2p/types.proto";
import "gogoproto/gogo.proto";

Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/p2p/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.p2p;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/p2p";

import "gogoproto/gogo.proto";

message NetAddress {
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/privval/types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import "tendermint/crypto/keys.proto";
import "tendermint/types/types.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/cometbft/cometbft/proto/tendermint/privval";

enum Errors {
ERRORS_UNKNOWN = 0;
ERRORS_UNEXPECTED_RESPONSE = 1;
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/state/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.state;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/state";

import "gogoproto/gogo.proto";
import "tendermint/abci/types.proto";
import "tendermint/types/types.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/statesync/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.statesync;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/statesync";

message Message {
oneof sum {
SnapshotsRequest snapshots_request = 1;
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/store/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.store;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/store";

message BlockStoreState {
int64 base = 1;
int64 height = 2;
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/block.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

import "gogoproto/gogo.proto";
import "tendermint/types/types.proto";
import "tendermint/types/evidence.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/canonical.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

import "gogoproto/gogo.proto";
import "tendermint/types/types.proto";
import "google/protobuf/timestamp.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/events.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

message EventDataRoundState {
int64 height = 1;
int32 round = 2;
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/evidence.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto";
import "tendermint/types/types.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/params.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

import "gogoproto/gogo.proto";
import "google/protobuf/duration.proto";

Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto";
import "tendermint/crypto/proof.proto";
Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/types/validator.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.types;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";

import "gogoproto/gogo.proto";
import "tendermint/crypto/keys.proto";

Expand Down
2 changes: 0 additions & 2 deletions proto/tendermint/version/types.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
syntax = "proto3";
package tendermint.version;

option go_package = "github.com/cometbft/cometbft/proto/tendermint/version";

import "gogoproto/gogo.proto";

// App includes the protocol and software version for the application.
Expand Down