Update proto files & definitions in accordance with ADR023 (#6413)
* consolidate proto files into single directory, turn on PACKAGE_DIRECTORY_MATCH linting * add third_party root for third party proto files * move ibc proto files to top level folder, rename .proto files to types.proto as before * update protocgen script, and run code generation * move vesting proto definition to cosmos namespace, rename from types.proto in alignment with buf.build naming conventions * update Makefile so proto dependencies are set with new structure when updated * add comment for sed usage in makefile * remove unused aliases of proto generated types * add settings.json instructions to contributing.md for including protobuf paths Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Aaron Craelius <aaron@regen.network>
This commit is contained in:
co-authored by
Federico Kunze
Aaron Craelius
parent
fe9356ddb8
commit
4e73e0f817
+1
-1
@@ -32,7 +32,7 @@ syntax = "proto3";
|
||||
|
||||
package google.protobuf;
|
||||
|
||||
import "third_party/proto/gogoproto/gogo.proto";
|
||||
import "gogoproto/gogo.proto";
|
||||
|
||||
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
|
||||
option go_package = "types";
|
||||
|
||||
+3
-3
@@ -4,9 +4,9 @@ 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 "third_party/proto/gogoproto/gogo.proto";
|
||||
import "third_party/proto/tendermint/crypto/merkle/merkle.proto";
|
||||
import "third_party/proto/tendermint/libs/kv/types.proto";
|
||||
import "gogoproto/gogo.proto";
|
||||
import "tendermint/crypto/merkle/merkle.proto";
|
||||
import "tendermint/libs/kv/types.proto";
|
||||
import "google/protobuf/timestamp.proto";
|
||||
import "google/protobuf/duration.proto";
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ option go_package = "github.com/tendermint/tendermint/crypto/merkle";
|
||||
|
||||
// For more information on gogo.proto, see:
|
||||
// https://github.com/gogo/protobuf/blob/master/extensions.md
|
||||
import "third_party/proto/gogoproto/gogo.proto";
|
||||
import "gogoproto/gogo.proto";
|
||||
|
||||
option (gogoproto.marshaler_all) = true;
|
||||
option (gogoproto.unmarshaler_all) = true;
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ syntax = "proto3";
|
||||
package tendermint.libs.kv;
|
||||
option go_package = "github.com/tendermint/tendermint/libs/kv";
|
||||
|
||||
import "third_party/proto/gogoproto/gogo.proto";
|
||||
import "gogoproto/gogo.proto";
|
||||
|
||||
option (gogoproto.marshaler_all) = true;
|
||||
option (gogoproto.unmarshaler_all) = true;
|
||||
|
||||
Reference in New Issue
Block a user