Skip to content

Commit

Permalink
chore: update module path to v2 (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnletey
johnletey authored Oct 2, 2024
1 parent 1751c3d commit 0a224c2
Show file tree
Hide file tree
Showing 47 changed files with 297 additions and 296 deletions.
6 changes: 3 additions & 3 deletions e2e/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/ondoprotocol/usdy-noble/e2e
module github.com/ondoprotocol/usdy-noble/v2/e2e

go 1.21

require (
github.com/cosmos/cosmos-sdk v0.45.16
github.com/cosmos/ibc-go/v4 v4.6.0
github.com/gogo/protobuf v1.3.3
github.com/ondoprotocol/usdy-noble v1.0.0
github.com/ondoprotocol/usdy-noble/v2 v2.0.0
github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231026153934-334934f17a68
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.24.0
Expand Down Expand Up @@ -175,7 +175,7 @@ replace (
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// use local ondoprotocol/usdy-noble
github.com/ondoprotocol/usdy-noble => ../
github.com/ondoprotocol/usdy-noble/v2 => ../

// use noble compatible strangelove-ventures/interchaintest
github.com/strangelove-ventures/interchaintest/v4 => github.com/noble-assets/interchaintest/v4 v4.0.0-20240525124701-0c3cc84d04e2
Expand Down
6 changes: 3 additions & 3 deletions e2e/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/gogo/protobuf/jsonpb"
_ "github.com/ondoprotocol/usdy-noble/x/aura"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
_ "github.com/ondoprotocol/usdy-noble/v2/x/aura"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/ibc"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ondoprotocol/usdy-noble
module github.com/ondoprotocol/usdy-noble/v2

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/events.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package aura.blocklist.v1;

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";

// OwnershipTransferStarted is emitted whenever an ownership transfer is started.
message OwnershipTransferStarted {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/genesis.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package aura.blocklist.v1;

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";

message GenesisState {
// owner is the address that can control this submodule.
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package aura.blocklist.v1;
import "cosmos/base/query/v1beta1/pagination.proto";
import "google/api/annotations.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";

service Query {
rpc Owner(QueryOwner) returns (QueryOwnerResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package aura.blocklist.v1;

import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";

service Msg {
rpc TransferOwnership(MsgTransferOwnership) returns (MsgTransferOwnershipResponse);
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/events.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package aura.v1;

import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";

// Paused is emitted whenever the module is paused.
message Paused {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/genesis.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package aura.v1;
import "aura/blocklist/v1/genesis.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";

message GenesisState {
// blocklist_state is the genesis state of the blocklist submodule.
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "aura/v1/genesis.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";

service Query {
rpc Denom(aura.v1.QueryDenom) returns (aura.v1.QueryDenomResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package aura.v1;

import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";

service Msg {
rpc Burn(aura.v1.MsgBurn) returns (aura.v1.MsgBurnResponse);
Expand Down
2 changes: 1 addition & 1 deletion proto/generate.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ cd proto
buf generate --template buf.gen.gogo.yaml
cd ..

cp -r github.com/ondoprotocol/usdy-noble/* ./
cp -r github.com/ondoprotocol/usdy-noble/v2/* ./
rm -rf github.com
6 changes: 3 additions & 3 deletions simapp/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ import (
tmos "github.com/tendermint/tendermint/libs/os"
dbm "github.com/tendermint/tm-db"

"github.com/ondoprotocol/usdy-noble/x/aura"
aurakeeper "github.com/ondoprotocol/usdy-noble/x/aura/keeper"
auratypes "github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura"
aurakeeper "github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
auratypes "github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions simapp/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/ondoprotocol/usdy-noble/simapp
module github.com/ondoprotocol/usdy-noble/v2/simapp

go 1.21

require (
github.com/cosmos/cosmos-sdk v0.45.16
github.com/cosmos/ibc-go/v4 v4.6.0
github.com/ondoprotocol/usdy-noble v1.0.0
github.com/ondoprotocol/usdy-noble/v2 v2.0.0
github.com/spf13/cast v1.5.1
github.com/spf13/cobra v1.7.0
github.com/tendermint/tendermint v0.34.27
Expand Down Expand Up @@ -159,7 +159,7 @@ replace (
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// use local ondoprotocol/usdy-noble
github.com/ondoprotocol/usdy-noble => ../
github.com/ondoprotocol/usdy-noble/v2 => ../

// use cosmos compatible syndtr/goleveldb
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
Expand Down
2 changes: 1 addition & 1 deletion simapp/simd/cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
"github.com/ondoprotocol/usdy-noble/simapp"
"github.com/ondoprotocol/usdy-noble/v2/simapp"
"github.com/spf13/cast"
"github.com/spf13/cobra"
tmcli "github.com/tendermint/tendermint/libs/cli"
Expand Down
4 changes: 2 additions & 2 deletions simapp/simd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/simapp"
"github.com/ondoprotocol/usdy-noble/simapp/simd/cmd"
"github.com/ondoprotocol/usdy-noble/v2/simapp"
"github.com/ondoprotocol/usdy-noble/v2/simapp/simd/cmd"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions utils/mocks/aura.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

func AuraKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
Expand Down
2 changes: 1 addition & 1 deletion utils/mocks/bank.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

var _ types.BankKeeper = BankKeeper{}
Expand Down
2 changes: 1 addition & 1 deletion x/aura/client/cli/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/client/cli/query_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/client/cli/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/tx"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/client/cli/tx_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/tx"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions x/aura/genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package aura

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
)

func InitGenesis(ctx sdk.Context, k *keeper.Keeper, genesis types.GenesisState) {
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

type Keeper struct {
Expand Down
6 changes: 3 additions & 3 deletions x/aura/keeper/keeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
"github.com/ondoprotocol/usdy-noble/utils"
"github.com/ondoprotocol/usdy-noble/utils/mocks"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdkerrors "cosmossdk.io/errors"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

var _ types.MsgServer = &msgServer{}
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/msg_server_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
)

var _ blocklist.MsgServer = &blocklistMsgServer{}
Expand Down
8 changes: 4 additions & 4 deletions x/aura/keeper/msg_server_blocklist_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"testing"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/utils"
"github.com/ondoprotocol/usdy-noble/utils/mocks"
"github.com/ondoprotocol/usdy-noble/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/stretchr/testify/require"
)

Expand Down
8 changes: 4 additions & 4 deletions x/aura/keeper/msg_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"testing"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/utils"
"github.com/ondoprotocol/usdy-noble/utils/mocks"
"github.com/ondoprotocol/usdy-noble/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/query_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

var _ types.QueryServer = &queryServer{}
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/query_server_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errorstypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/query"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
)

var _ blocklist.QueryServer = &blocklistQueryServer{}
Expand Down
8 changes: 4 additions & 4 deletions x/aura/keeper/query_server_blocklist_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ondoprotocol/usdy-noble/utils"
"github.com/ondoprotocol/usdy-noble/utils/mocks"
"github.com/ondoprotocol/usdy-noble/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/stretchr/testify/require"
)

Expand Down
8 changes: 4 additions & 4 deletions x/aura/keeper/query_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ondoprotocol/usdy-noble/utils"
"github.com/ondoprotocol/usdy-noble/utils/mocks"
"github.com/ondoprotocol/usdy-noble/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

//
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/state_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
)

//
Expand Down
4 changes: 2 additions & 2 deletions x/aura/keeper/state_blocklist_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package keeper_test
import (
"testing"

"github.com/ondoprotocol/usdy-noble/utils"
"github.com/ondoprotocol/usdy-noble/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/stretchr/testify/require"
)

Expand Down
Loading

0 comments on commit 0a224c2

Please sign in to comment.