do not instrument intermediate protos

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";

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";

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"