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.

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

chore: v2 module replace #754

Merged
merged 7 commits into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion ante/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
tmrand "github.com/tendermint/tendermint/libs/rand"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

umeeapp "github.com/umee-network/umee/app"
umeeapp "github.com/umee-network/umee/v2/app"
)

type IntegrationTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion ante/fee.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

oracletypes "github.com/umee-network/umee/x/oracle/types"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

// MaxOracleMsgGasUsage defines the maximum gas allowed for an oracle transaction.
Expand Down
4 changes: 2 additions & 2 deletions ante/fee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/umee-network/umee/ante"
oracletypes "github.com/umee-network/umee/x/oracle/types"
"github.com/umee-network/umee/v2/ante"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

func (suite *IntegrationTestSuite) TestMempoolFee() {
Expand Down
2 changes: 1 addition & 1 deletion ante/spam_prevention.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

oracletypes "github.com/umee-network/umee/x/oracle/types"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

// SpamPreventionDecorator defines a custom Umee AnteHandler decorator that is
Expand Down
4 changes: 2 additions & 2 deletions ante/spam_prevention_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/umee-network/umee/ante"
oracletypes "github.com/umee-network/umee/x/oracle/types"
"github.com/umee-network/umee/v2/ante"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

func (suite *IntegrationTestSuite) TestOracleSpam() {
Expand Down
26 changes: 13 additions & 13 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ import (
"github.com/osmosis-labs/bech32-ibc/x/bech32ibc"
bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"
customante "github.com/umee-network/umee/ante"
appparams "github.com/umee-network/umee/app/params"
"github.com/umee-network/umee/app/upgrades"
"github.com/umee-network/umee/app/upgrades/calypso"
uibctransfer "github.com/umee-network/umee/x/ibctransfer"
uibctransferkeeper "github.com/umee-network/umee/x/ibctransfer/keeper"
"github.com/umee-network/umee/x/leverage"
leverageclient "github.com/umee-network/umee/x/leverage/client"
leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/x/leverage/types"
"github.com/umee-network/umee/x/oracle"
oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/x/oracle/types"
customante "github.com/umee-network/umee/v2/ante"
appparams "github.com/umee-network/umee/v2/app/params"
"github.com/umee-network/umee/v2/app/upgrades"
"github.com/umee-network/umee/v2/app/upgrades/calypso"
uibctransfer "github.com/umee-network/umee/v2/x/ibctransfer"
uibctransferkeeper "github.com/umee-network/umee/v2/x/ibctransfer/keeper"
"github.com/umee-network/umee/v2/x/leverage"
leverageclient "github.com/umee-network/umee/v2/x/leverage/client"
leveragekeeper "github.com/umee-network/umee/v2/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
"github.com/umee-network/umee/v2/x/oracle"
oraclekeeper "github.com/umee-network/umee/v2/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/umee-network/umee/app/params"
"github.com/umee-network/umee/v2/app/params"
)

// MakeEncodingConfig returns the application's encoding configuration with all
Expand Down
4 changes: 2 additions & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
tmtypes "github.com/tendermint/tendermint/types"
dbm "github.com/tendermint/tm-db"

leveragetypes "github.com/umee-network/umee/x/leverage/types"
oracletypes "github.com/umee-network/umee/x/oracle/types"
leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

// DefaultConsensusParams defines the default Tendermint consensus params used
Expand Down
12 changes: 6 additions & 6 deletions app/upgrades/calypso/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
"github.com/umee-network/umee/x/leverage"
leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/x/leverage/types"
"github.com/umee-network/umee/x/oracle"
oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/x/oracle/types"
"github.com/umee-network/umee/v2/x/leverage"
leveragekeeper "github.com/umee-network/umee/v2/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
"github.com/umee-network/umee/v2/x/oracle"
oraclekeeper "github.com/umee-network/umee/v2/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

// GetCalypsoUpgradeHandler contains the handler for the Calypso upgrade. It setups the Bech32IBC, Leverage and Oracle
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
"github.com/umee-network/umee/app/upgrades/calypso"
leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
"github.com/umee-network/umee/v2/app/upgrades/calypso"
leveragekeeper "github.com/umee-network/umee/v2/x/leverage/keeper"
oraclekeeper "github.com/umee-network/umee/v2/x/oracle/keeper"
)

// RegisterUpgradeHandlers registers handlers for all upgrades
Expand Down
4 changes: 2 additions & 2 deletions cmd/umeed/cmd/app_creator.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/tendermint/tendermint/libs/log"
dbm "github.com/tendermint/tm-db"

umeeapp "github.com/umee-network/umee/app"
"github.com/umee-network/umee/app/params"
umeeapp "github.com/umee-network/umee/v2/app"
"github.com/umee-network/umee/v2/app/params"
)

type appCreator struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/umeed/cmd/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/cosmos/cosmos-sdk/version"
"github.com/spf13/cobra"

umeeapp "github.com/umee-network/umee/app"
umeeapp "github.com/umee-network/umee/v2/app"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/umeed/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/spf13/pflag"
tmcli "github.com/tendermint/tendermint/libs/cli"

umeeapp "github.com/umee-network/umee/app"
"github.com/umee-network/umee/app/params"
umeeapp "github.com/umee-network/umee/v2/app"
"github.com/umee-network/umee/v2/app/params"
)

// NewRootCmd returns the root command handler for the Umee daemon.
Expand Down
4 changes: 2 additions & 2 deletions cmd/umeed/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"

umeeapp "github.com/umee-network/umee/app"
"github.com/umee-network/umee/cmd/umeed/cmd"
umeeapp "github.com/umee-network/umee/v2/app"
"github.com/umee-network/umee/v2/cmd/umeed/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion contrib/scripts/protocgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ for dir in $proto_dirs; do
$(find "${dir}" -maxdepth 1 -name '*.proto')
done

cp -r ./github.com/umee-network/umee/* ./
cp -r ./github.com/umee-network/umee/v*/x/* x/
toteki marked this conversation as resolved.
Show resolved Hide resolved
rm -rf ./github.com
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/umee-network/umee
module github.com/umee-network/umee/v2

go 1.17

Expand Down Expand Up @@ -372,5 +372,6 @@ require (
replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/umee-network/umee/price-feeder => github.com/umee-network/umee/price-feeder v0.2.0
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
10 changes: 5 additions & 5 deletions price-feeder/cmd/price-feeder.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"github.com/spf13/cobra"
"golang.org/x/sync/errgroup"

"github.com/umee-network/umee/price-feeder/config"
"github.com/umee-network/umee/price-feeder/oracle"
"github.com/umee-network/umee/price-feeder/oracle/client"
v1 "github.com/umee-network/umee/price-feeder/router/v1"
"github.com/umee-network/umee/price-feeder/telemetry"
"github.com/umee-network/umee/v2/price-feeder/config"
"github.com/umee-network/umee/v2/price-feeder/oracle"
"github.com/umee-network/umee/v2/price-feeder/oracle/client"
v1 "github.com/umee-network/umee/v2/price-feeder/router/v1"
"github.com/umee-network/umee/v2/price-feeder/telemetry"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions price-feeder/oracle/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
rpchttp "github.com/tendermint/tendermint/rpc/client/http"
tmjsonclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"

umeeapp "github.com/umee-network/umee/app"
umeeparams "github.com/umee-network/umee/app/params"
"github.com/umee-network/umee/price-feeder/telemetry"
umeeapp "github.com/umee-network/umee/v2/app"
umeeparams "github.com/umee-network/umee/v2/app/params"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/oracle.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/umee-network/umee/price-feeder/oracle/types"
pfsync "github.com/umee-network/umee/price-feeder/pkg/sync"
"github.com/umee-network/umee/price-feeder/telemetry"
oracletypes "github.com/umee-network/umee/x/oracle/types"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

// We define tickerSleep as the minimum timeout between each oracle loop. We
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/oracle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/umee-network/umee/price-feeder/oracle/provider"
"github.com/umee-network/umee/price-feeder/oracle/types"

oracletypes "github.com/umee-network/umee/x/oracle/types"
oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
)

type mockProvider struct {
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/provider/binance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/rs/zerolog"
"github.com/stretchr/testify/require"
"github.com/umee-network/umee/price-feeder/oracle/types"
"github.com/umee-network/umee/v2/price-feeder/oracle/types"
)

func TestBinanceProvider_GetTickerPrices(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/provider/gate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/rs/zerolog"
"github.com/stretchr/testify/require"
"github.com/umee-network/umee/price-feeder/oracle/types"
"github.com/umee-network/umee/v2/price-feeder/oracle/types"
)

func TestGateProvider_GetTickerPrices(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/provider/kraken_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/rs/zerolog"
"github.com/stretchr/testify/require"
"github.com/umee-network/umee/price-feeder/oracle/types"
"github.com/umee-network/umee/v2/price-feeder/oracle/types"
)

func TestKrakenProvider_GetTickerPrices(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/provider/okx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/rs/zerolog"
"github.com/stretchr/testify/require"
"github.com/umee-network/umee/price-feeder/oracle/types"
"github.com/umee-network/umee/v2/price-feeder/oracle/types"
)

func TestOkxProvider_GetTickerPrices(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/oracle/provider/osmosis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"
"github.com/umee-network/umee/price-feeder/oracle/types"
"github.com/umee-network/umee/v2/price-feeder/oracle/types"
)

func TestOsmosisProvider_GetTickerPrices(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions price-feeder/router/v1/router_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/rs/zerolog"
"github.com/stretchr/testify/suite"

"github.com/umee-network/umee/price-feeder/config"
v1 "github.com/umee-network/umee/price-feeder/router/v1"
"github.com/umee-network/umee/price-feeder/telemetry"
"github.com/umee-network/umee/v2/price-feeder/config"
v1 "github.com/umee-network/umee/v2/price-feeder/router/v1"
"github.com/umee-network/umee/v2/price-feeder/telemetry"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/telemetry/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/armon/go-metrics"
"github.com/prometheus/common/expfmt"
"github.com/stretchr/testify/require"
"github.com/umee-network/umee/price-feeder/config"
"github.com/umee-network/umee/v2/price-feeder/config"
)

func TestMetrics_Disabled(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/leverage/v1beta1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "umee/leverage/v1beta1/leverage.proto";

option go_package = "github.com/umee-network/umee/x/leverage/types";
option go_package = "github.com/umee-network/umee/v2/x/leverage/types";

// GenesisState defines the x/leverage module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/leverage/v1beta1/gov.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package umeenetwork.umee.leverage.v1beta1;
import "gogoproto/gogo.proto";
import "umee/leverage/v1beta1/leverage.proto";

option go_package = "github.com/umee-network/umee/x/leverage/types";
option go_package = "github.com/umee-network/umee/v2/x/leverage/types";

// UpdateRegistryProposal defines a governance proposal type where the token
// registry can be updated in the Umee capital facility. Note, the registry
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/leverage/v1beta1/leverage.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package umeenetwork.umee.leverage.v1beta1;

import "gogoproto/gogo.proto";

option go_package = "github.com/umee-network/umee/x/leverage/types";
option go_package = "github.com/umee-network/umee/v2/x/leverage/types";

// Params defines the parameters for the leverage module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/leverage/v1beta1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "umee/leverage/v1beta1/leverage.proto";
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/umee-network/umee/x/leverage/types";
option go_package = "github.com/umee-network/umee/v2/x/leverage/types";

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

option go_package = "github.com/umee-network/umee/x/leverage/types";
option go_package = "github.com/umee-network/umee/v2/x/leverage/types";

// Msg defines the x/leverage module's Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/oracle/v1beta1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "umee/oracle/v1beta1/oracle.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/umee-network/umee/x/oracle/types";
option go_package = "github.com/umee-network/umee/v2/x/oracle/types";

// GenesisState defines the oracle module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/oracle/v1beta1/oracle.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package umeenetwork.umee.oracle.v1beta1;
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/umee-network/umee/x/oracle/types";
option go_package = "github.com/umee-network/umee/v2/x/oracle/types";

// Params defines the parameters for the oracle module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/oracle/v1beta1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "google/api/annotations.proto";
import "umee/oracle/v1beta1/oracle.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/umee-network/umee/x/oracle/types";
option go_package = "github.com/umee-network/umee/v2/x/oracle/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/oracle/v1beta1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package umeenetwork.umee.oracle.v1beta1;

import "gogoproto/gogo.proto";

option go_package = "github.com/umee-network/umee/x/oracle/types";
option go_package = "github.com/umee-network/umee/v2/x/oracle/types";

// Msg defines the oracle Msg service.
service Msg {
Expand Down
Loading