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.

Sign up for GitHub

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

fix: revert version bump to v5 #1847

Merged
merged 2 commits into from
May 2, 2024
Merged

fix: revert version bump to v5 #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ea6a90
revert bump version to 5
sainoe May 2, 2024
090b9e1
register migration
sainoe May 2, 2024
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
4 changes: 2 additions & 2 deletions app/consumer-democracy/ante/forbidden_proposals_ante_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
"github.com/cosmos/cosmos-sdk/x/params/types/proposal"

app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
"github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
app "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
"github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante"
)

// in SDKv47 parameter updates full params object is required
Expand Down
6 changes: 3 additions & 3 deletions app/consumer-democracy/ante_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

democracyante "github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
democracyante "github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante"
consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
16 changes: 8 additions & 8 deletions app/consumer-democracy/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ import (
"github.com/cometbft/cometbft/libs/log"
tmos "github.com/cometbft/cometbft/libs/os"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
consumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
ccvdistr "github.com/cosmos/interchain-security/v5/x/ccv/democracy/distribution"
ccvgov "github.com/cosmos/interchain-security/v5/x/ccv/democracy/governance"
ccvstaking "github.com/cosmos/interchain-security/v5/x/ccv/democracy/staking"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
consumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer"
consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
ccvdistr "github.com/cosmos/interchain-security/v4/x/ccv/democracy/distribution"
ccvgov "github.com/cosmos/interchain-security/v4/x/ccv/democracy/governance"
ccvstaking "github.com/cosmos/interchain-security/v4/x/ccv/democracy/staking"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions app/consumer-democracy/proposals_whitelisting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
ibctesting "github.com/cosmos/ibc-go/v7/testing"
"github.com/stretchr/testify/require"

appConsumer "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
appConsumer "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
)

func TestDemocracyGovernanceWhitelistingKeys(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante/disabled_modules_ante_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"

"github.com/cosmos/interchain-security/v5/app/consumer/ante"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
"github.com/cosmos/interchain-security/v4/app/consumer/ante"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
)

func TestDisabledModulesDecorator(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante/msg_filter_ante_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"

"github.com/cosmos/interchain-security/v5/app/consumer/ante"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
"github.com/cosmos/interchain-security/v4/app/consumer/ante"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
)

type consumerKeeper struct {
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/ante_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
10 changes: 5 additions & 5 deletions app/consumer/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ import (
"github.com/cometbft/cometbft/libs/log"
tmos "github.com/cometbft/cometbft/libs/os"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
ibcconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
ibcconsumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/consumer/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"

consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
"github.com/cosmos/interchain-security/v5/x/ccv/types"
consumerTypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
"github.com/cosmos/interchain-security/v4/x/ccv/types"
)

// The genesis state of the blockchain is represented here as a map of raw json
Expand Down
6 changes: 3 additions & 3 deletions app/consumer/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/x/auth/types"

app "github.com/cosmos/interchain-security/v5/app/consumer"
consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
app "github.com/cosmos/interchain-security/v4/app/consumer"
consumerTypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types"
)

const (
Expand Down
14 changes: 7 additions & 7 deletions app/provider/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ import (
"github.com/cometbft/cometbft/libs/log"
tmos "github.com/cometbft/cometbft/libs/os"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
"github.com/cosmos/interchain-security/v5/x/ccv/provider"
ibcprovider "github.com/cosmos/interchain-security/v5/x/ccv/provider"
ibcproviderclient "github.com/cosmos/interchain-security/v5/x/ccv/provider/client"
ibcproviderkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper"
providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
"github.com/cosmos/interchain-security/v4/x/ccv/provider"
ibcprovider "github.com/cosmos/interchain-security/v4/x/ccv/provider"
ibcproviderclient "github.com/cosmos/interchain-security/v4/x/ccv/provider/client"
ibcproviderkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper"
providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/sovereign/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ import (
"github.com/cometbft/cometbft/libs/log"
tmos "github.com/cometbft/cometbft/libs/os"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-cd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
"github.com/cometbft/cometbft/libs/log"

consumer "github.com/cosmos/interchain-security/v5/app/consumer"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
consumer "github.com/cosmos/interchain-security/v4/app/consumer"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-cd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v5/app/consumer"
appparams "github.com/cosmos/interchain-security/v5/app/params"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-cd/cmd"
app "github.com/cosmos/interchain-security/v4/app/consumer"
appparams "github.com/cosmos/interchain-security/v4/app/params"
"github.com/cosmos/interchain-security/v4/cmd/interchain-security-cd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-cdd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
"github.com/cometbft/cometbft/libs/log"

cdd "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
cdd "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-cdd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
appparams "github.com/cosmos/interchain-security/v5/app/params"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-cdd/cmd"
app "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
appparams "github.com/cosmos/interchain-security/v4/app/params"
"github.com/cosmos/interchain-security/v4/cmd/interchain-security-cdd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-pd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
"github.com/cometbft/cometbft/libs/log"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
providerApp "github.com/cosmos/interchain-security/v5/app/provider"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
providerApp "github.com/cosmos/interchain-security/v4/app/provider"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-pd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

appparams "github.com/cosmos/interchain-security/v5/app/params"
app "github.com/cosmos/interchain-security/v5/app/provider"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-pd/cmd"
appparams "github.com/cosmos/interchain-security/v4/app/params"
app "github.com/cosmos/interchain-security/v4/app/provider"
"github.com/cosmos/interchain-security/v4/cmd/interchain-security-pd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/interchain-security-sd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
"github.com/cometbft/cometbft/libs/log"

appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
sovereignApp "github.com/cosmos/interchain-security/v5/app/sovereign"
appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
sovereignApp "github.com/cosmos/interchain-security/v4/app/sovereign"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
6 changes: 3 additions & 3 deletions cmd/interchain-security-sd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

appparams "github.com/cosmos/interchain-security/v5/app/params"
app "github.com/cosmos/interchain-security/v5/app/sovereign"
"github.com/cosmos/interchain-security/v5/cmd/interchain-security-sd/cmd"
appparams "github.com/cosmos/interchain-security/v4/app/params"
app "github.com/cosmos/interchain-security/v4/app/sovereign"
"github.com/cosmos/interchain-security/v4/cmd/interchain-security-sd/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cosmos/interchain-security/v5
module github.com/cosmos/interchain-security/v4

go 1.21.1

Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/consumer.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package interchain_security.ccv.consumer.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types";

Check failure on line 4 in proto/interchain_security/ccv/consumer/v1/consumer.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" to "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types".

import "google/protobuf/any.proto";
import "gogoproto/gogo.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package interchain_security.ccv.consumer.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types";

Check failure on line 5 in proto/interchain_security/ccv/consumer/v1/genesis.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" to "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types".

import "interchain_security/ccv/v1/shared_consumer.proto";
import "ibc/lightclients/tendermint/v1/tendermint.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/consumer/v1/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package interchain_security.ccv.consumer.v1;
import "interchain_security/ccv/v1/shared_consumer.proto";
option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types";

Check failure on line 5 in proto/interchain_security/ccv/consumer/v1/query.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" to "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types".

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/provider/v1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package interchain_security.ccv.provider.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types";

Check failure on line 5 in proto/interchain_security/ccv/provider/v1/genesis.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" to "github.com/cosmos/interchain-security/v4/x/ccv/provider/types".

import "gogoproto/gogo.proto";
import "interchain_security/ccv/v1/shared_consumer.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/provider/v1/provider.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package interchain_security.ccv.provider.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types";

Check failure on line 5 in proto/interchain_security/ccv/provider/v1/provider.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" to "github.com/cosmos/interchain-security/v4/x/ccv/provider/types".

import "interchain_security/ccv/v1/wire.proto";
import "gogoproto/gogo.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/provider/v1/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package interchain_security.ccv.provider.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types";

Check failure on line 4 in proto/interchain_security/ccv/provider/v1/query.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" to "github.com/cosmos/interchain-security/v4/x/ccv/provider/types".

import "google/api/annotations.proto";
import "gogoproto/gogo.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/provider/v1/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package interchain_security.ccv.provider.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types";

Check failure on line 4 in proto/interchain_security/ccv/provider/v1/tx.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" to "github.com/cosmos/interchain-security/v4/x/ccv/provider/types".

import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/v1/shared_consumer.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package interchain_security.ccv.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/types";

Check failure on line 5 in proto/interchain_security/ccv/v1/shared_consumer.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/types" to "github.com/cosmos/interchain-security/v4/x/ccv/types".

import "tendermint/abci/types.proto";
import "ibc/lightclients/tendermint/v1/tendermint.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/interchain_security/ccv/v1/wire.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package interchain_security.ccv.v1;

option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/types";
option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/types";

Check failure on line 5 in proto/interchain_security/ccv/v1/wire.proto

View workflow job for this annotation

GitHub Actions / break-check 

File option "go_package" changed from "github.com/cosmos/interchain-security/v5/x/ccv/types" to "github.com/cosmos/interchain-security/v4/x/ccv/types".

import "cosmos/staking/v1beta1/staking.proto";

Expand Down
2 changes: 1 addition & 1 deletion scripts/protocgen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ done
cd ..

# move proto files to the right places
cp -r github.com/cosmos/interchain-security/v5/* ./
cp -r github.com/cosmos/interchain-security/v4/* ./
rm -rf github.com

6 changes: 3 additions & 3 deletions tests/e2e/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"github.com/tidwall/gjson"
"golang.org/x/mod/semver"

"github.com/cosmos/interchain-security/v5/x/ccv/provider/client"
"github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
"github.com/cosmos/interchain-security/v4/x/ccv/provider/client"
"github.com/cosmos/interchain-security/v4/x/ccv/provider/types"
ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
abci "github.com/cometbft/cometbft/abci/types"
tmtypes "github.com/cometbft/cometbft/types"

icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
ccv "github.com/cosmos/interchain-security/v5/x/ccv/types"
icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"
ccv "github.com/cosmos/interchain-security/v4/x/ccv/types"
)

// ChainType defines the type of chain (either provider or consumer)
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/democracy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"

icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
)

type ConsumerDemocracyTestSuite struct {
Expand Down
Loading
Loading