fix: v2 imports proto go_package option (#978)

* add v2 to proto files, adjust protocgen scripts * regen proto
cosmos · May 26, 2023 · 502d2d3 · 502d2d3
1 parent 9466b86
commit 502d2d3
Show file tree

Hide file tree

Showing 17 changed files with 457 additions and 453 deletions.
diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -3,7 +3,7 @@ package interchain_security.ccv.consumer.v1;
 
 import "interchain_security/ccv/v1/ccv.proto";
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types";
 
 import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";

diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.consumer.v1;
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types";
 
 import "interchain_security/ccv/v1/ccv.proto";
 import "interchain_security/ccv/consumer/v1/consumer.proto";

diff --git a/proto/interchain_security/ccv/consumer/v1/query.proto b/proto/interchain_security/ccv/consumer/v1/query.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package interchain_security.ccv.consumer.v1;
-option go_package = "github.com/cosmos/interchain-security/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types";
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";

diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
 
 import "gogoproto/gogo.proto";
 import "interchain_security/ccv/v1/ccv.proto";

diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";

diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
 
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";

diff --git a/proto/interchain_security/ccv/provider/v1/tx.proto b/proto/interchain_security/ccv/provider/v1/tx.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
 
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";

diff --git a/proto/interchain_security/ccv/v1/ccv.proto b/proto/interchain_security/ccv/v1/ccv.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.v1;
 
-option go_package = "github.com/cosmos/interchain-security/x/ccv/types";
+option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/types";
 
 import "cosmos/staking/v1beta1/staking.proto";
 

diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -16,7 +16,7 @@ done
 cd ..
 
 # move proto files to the right places
-cp -r github.com/cosmos/interchain-security/* ./
+cp -r github.com/cosmos/interchain-security/v2/* ./
 rm -rf github.com
 
 go mod tidy -compat=1.19
diff --git a/x/ccv/consumer/types/consumer.pb.go b/x/ccv/consumer/types/consumer.pb.go