From 94f74b09dcbe915051ab53e8a01c4194c3330bd8 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Thu, 3 Mar 2022 12:12:29 -0500 Subject: [PATCH] do not instrument intermediate protos --- proto/intermediate/abci/types.proto | 2 -- proto/intermediate/types/types.proto | 2 -- scripts/abci-gen.sh | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/proto/intermediate/abci/types.proto b/proto/intermediate/abci/types.proto index 69f2bfba4..93676d4cd 100644 --- a/proto/intermediate/abci/types.proto +++ b/proto/intermediate/abci/types.proto @@ -1,8 +1,6 @@ syntax = "proto3"; package tendermint.abci; -option go_package = "github.com/tendermint/tendermint/abci/types"; - // For more information on gogo.proto, see: // https://github.com/gogo/protobuf/blob/master/extensions.md import "tendermint/crypto/proof.proto"; diff --git a/proto/intermediate/types/types.proto b/proto/intermediate/types/types.proto index 459e3d222..b0fa22f59 100644 --- a/proto/intermediate/types/types.proto +++ b/proto/intermediate/types/types.proto @@ -1,8 +1,6 @@ syntax = "proto3"; package tendermint.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; - import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "tendermint/crypto/proof.proto"; diff --git a/scripts/abci-gen.sh b/scripts/abci-gen.sh index b1beb7b43..3e33f90d0 100755 --- a/scripts/abci-gen.sh +++ b/scripts/abci-gen.sh @@ -5,7 +5,7 @@ cp ./proto/intermediate/abci/types.proto ./proto/tendermint/abci/types.proto cp ./proto/intermediate/types/types.proto ./proto/tendermint/types/types.proto MODNAME="$(go list -m)" -find ./proto/tendermint -name '*.proto' -not -path "./proto/tendermint/abci/types.proto" \ +find ./proto/tendermint -name '*.proto' -not -path "./proto/tendermint/abci/types.proto" -not -path "./proto/intermediate" \ -exec sh ./scripts/protopackage.sh {} "$MODNAME" ';' sh ./scripts/protopackage.sh ./proto/tendermint/abci/types.proto $MODNAME "abci/types"