Skip to content

Commit

Permalink
refactor: v6 module path (#389)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnletey authored Jul 9, 2024
1 parent 3f50386 commit 54de99d
Show file tree
Hide file tree
Showing 202 changed files with 533 additions and 532 deletions.
1 change: 1 addition & 0 deletions .changelog/unreleased/improvements/389-module-path.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Update module path for v6 release line. ([#389](https://github.com/noble-assets/noble/pull/389))
2 changes: 1 addition & 1 deletion app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
"github.com/noble-assets/forwarding/x/forwarding"
forwardingkeeper "github.com/noble-assets/forwarding/x/forwarding/keeper"
feeante "github.com/noble-assets/noble/v5/x/globalfee/ante"
feeante "github.com/noble-assets/noble/v6/x/globalfee/ante"
)

type HandlerOptions struct {
Expand Down
20 changes: 10 additions & 10 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ import (
"github.com/cosmos/cosmos-sdk/x/staking"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/noble-assets/noble/v5/app/upgrades/krypton"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v5/docs"
"github.com/noble-assets/noble/v5/x/globalfee"
tariff "github.com/noble-assets/noble/v5/x/tariff"
tariffkeeper "github.com/noble-assets/noble/v5/x/tariff/keeper"
tarifftypes "github.com/noble-assets/noble/v5/x/tariff/types"
tokenfactorymodule "github.com/noble-assets/noble/v5/x/tokenfactory"
tokenfactorymodulekeeper "github.com/noble-assets/noble/v5/x/tokenfactory/keeper"
tokenfactorymoduletypes "github.com/noble-assets/noble/v5/x/tokenfactory/types"
"github.com/noble-assets/noble/v6/app/upgrades/krypton"
"github.com/noble-assets/noble/v6/cmd"
"github.com/noble-assets/noble/v6/docs"
"github.com/noble-assets/noble/v6/x/globalfee"
tariff "github.com/noble-assets/noble/v6/x/tariff"
tariffkeeper "github.com/noble-assets/noble/v6/x/tariff/keeper"
tarifftypes "github.com/noble-assets/noble/v6/x/tariff/types"
tokenfactorymodule "github.com/noble-assets/noble/v6/x/tokenfactory"
tokenfactorymodulekeeper "github.com/noble-assets/noble/v6/x/tokenfactory/keeper"
tokenfactorymoduletypes "github.com/noble-assets/noble/v6/x/tokenfactory/types"

"github.com/circlefin/noble-cctp/x/cctp"
cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"
Expand Down
4 changes: 2 additions & 2 deletions app/simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"testing"

"github.com/noble-assets/noble/v5/app"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/app"
"github.com/noble-assets/noble/v6/cmd"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down
4 changes: 2 additions & 2 deletions cmd/nobled/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/noble-assets/noble/v5/app"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/app"
"github.com/noble-assets/noble/v6/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/noble-assets/noble/v5
module github.com/noble-assets/noble/v6

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion interchaintest/cctp_deposit_for_burn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ethereum/go-ethereum/common"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/cctp_deposit_for_burn_with_caller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ethereum/go-ethereum/common"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/cctp_receive_message_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/cctp_receive_message_with_caller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/cctp_replace_deposit_for_burn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ethereum/go-ethereum/common"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/cctp_roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/circlefin/noble-cctp/x/cctp/types"
"github.com/gogo/protobuf/jsonpb"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
"github.com/cosmos/cosmos-sdk/types"
"github.com/icza/dyno"
tokenfactorytypes "github.com/noble-assets/noble/v5/x/tokenfactory/types"
tokenfactorytypes "github.com/noble-assets/noble/v6/x/tokenfactory/types"
"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 interchaintest/globalfee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/testreporter"
Expand Down
4 changes: 2 additions & 2 deletions interchaintest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/gogo/protobuf v1.3.3
github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845
github.com/noble-assets/forwarding v1.1.0
github.com/noble-assets/noble/v5 v5.0.0
github.com/noble-assets/noble/v6 v6.0.0
github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231026153934-334934f17a68
github.com/strangelove-ventures/paramauthority v1.1.0
github.com/stretchr/testify v1.8.4
Expand Down Expand Up @@ -190,7 +190,7 @@ replace (
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// use local version of noble
github.com/noble-assets/noble/v5 => ./..
github.com/noble-assets/noble/v6 => ./..

// 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 interchaintest/paramauthority_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
"github.com/icza/dyno"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
"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 interchaintest/upgrade_noble-1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

tarifftypes "github.com/noble-assets/noble/v5/x/tariff/types"
tarifftypes "github.com/noble-assets/noble/v6/x/tariff/types"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/ibc"
"github.com/strangelove-ventures/interchaintest/v4/testutil"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/upgrade_radon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
sdk "github.com/cosmos/cosmos-sdk/types"
globalfeetypes "github.com/noble-assets/noble/v5/x/globalfee/types"
globalfeetypes "github.com/noble-assets/noble/v6/x/globalfee/types"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/ibc"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

sdkupgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v6/cmd"
interchaintest "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 proto/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ cd proto
buf generate
cd ..

cp -r github.com/noble-assets/noble/v5/* ./
cp -r github.com/noble-assets/noble/v6/* ./
rm -rf github.com
2 changes: 1 addition & 1 deletion proto/globalfee/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package noble.globalfee;
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/noble-assets/noble/v5/x/globalfee/types";
option go_package = "github.com/noble-assets/noble/v6/x/globalfee/types";

// GenesisState - initial state of module
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/globalfee/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "globalfee/genesis.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/noble-assets/noble/v5/x/globalfee/types";
option go_package = "github.com/noble-assets/noble/v6/x/globalfee/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/tariff/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package noble.tariff;
import "gogoproto/gogo.proto";
import "tariff/params.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tariff/types";
option go_package = "github.com/noble-assets/noble/v6/x/tariff/types";

// GenesisState defines the tariff module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/tariff/params.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package noble.tariff;

import "gogoproto/gogo.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tariff/types";
option go_package = "github.com/noble-assets/noble/v6/x/tariff/types";
option (gogoproto.equal_all) = true;

// Params defines the set of params for the distribution module.
Expand Down
2 changes: 1 addition & 1 deletion proto/tariff/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "tariff/params.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tariff/types";
option go_package = "github.com/noble-assets/noble/v6/x/tariff/types";

service Query {
rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/blacklisted.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message Blacklisted {
bytes addressBz = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/blacklister.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message Blacklister {
string address = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import "tokenfactory/paused.proto";
import "tokenfactory/pauser.proto";
// this line is used by starport scaffolding # genesis/proto/import

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

// GenesisState defines the tokenfactory module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/master_minter.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message MasterMinter {
string address = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/minter_controller.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message MinterController {
string minter = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/minters.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package noble.tokenfactory;
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message Minters {
string address = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/minting_denom.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message MintingDenom {
string denom = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/owner.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message Owner {
string address = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/params.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package noble.tokenfactory;

import "gogoproto/gogo.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

// Params defines the parameters for the module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/paused.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message Paused {
bool paused = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/pauser.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package noble.tokenfactory;

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

message Pauser {
string address = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "tokenfactory/params.proto";
import "tokenfactory/paused.proto";
import "tokenfactory/pauser.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/tokenfactory/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package noble.tokenfactory;
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/noble-assets/noble/v5/x/tokenfactory/types";
option go_package = "github.com/noble-assets/noble/v6/x/tokenfactory/types";

// Msg defines the Msg service.
service Msg {
Expand Down
4 changes: 2 additions & 2 deletions testutil/keeper/tokenfactory.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
"github.com/noble-assets/noble/v5/x/tokenfactory/keeper"
"github.com/noble-assets/noble/v5/x/tokenfactory/types"
"github.com/noble-assets/noble/v6/x/tokenfactory/keeper"
"github.com/noble-assets/noble/v6/x/tokenfactory/types"
"github.com/stretchr/testify/require"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand Down
6 changes: 3 additions & 3 deletions testutil/network/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/noble-assets/noble/v5/app"
"github.com/noble-assets/noble/v5/cmd"
"github.com/noble-assets/noble/v5/testutil/sample"
"github.com/noble-assets/noble/v6/app"
"github.com/noble-assets/noble/v6/cmd"
"github.com/noble-assets/noble/v6/testutil/sample"
paramauthoritytypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal"
paramauthorityupgradetypes "github.com/strangelove-ventures/paramauthority/x/upgrade/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/alias.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package globalfee

import (
"github.com/noble-assets/noble/v5/x/globalfee/types"
"github.com/noble-assets/noble/v6/x/globalfee/types"
)

const (
Expand Down
Loading

0 comments on commit 54de99d

Please sign in to comment.