Skip to content

Commit

Permalink
chore: umee v6 module (#2192)
Browse files Browse the repository at this point in the history
  • Loading branch information
@robert-zaremba
robert-zaremba authored Aug 10, 2023
1 parent 17a447e commit 43d0b74
Show file tree
Hide file tree
Showing 323 changed files with 688 additions and 688 deletions.
2 changes: 1 addition & 1 deletion ante/ante_test.go
View file
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/v5/app"
umeeapp "github.com/umee-network/umee/v6/app"
)

type IntegrationTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions ante/fee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"

appparams "github.com/umee-network/umee/v5/app/params"
leveragetypes "github.com/umee-network/umee/v5/x/leverage/types"
oracletypes "github.com/umee-network/umee/v5/x/oracle/types"
appparams "github.com/umee-network/umee/v6/app/params"
leveragetypes "github.com/umee-network/umee/v6/x/leverage/types"
oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
)

// MaxOracleGasUsage defines the maximum gas allowed for an oracle transaction.
Expand Down
8 changes: 4 additions & 4 deletions ante/fee_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
signing "github.com/cosmos/cosmos-sdk/x/auth/signing"

"github.com/umee-network/umee/v5/ante"
appparams "github.com/umee-network/umee/v5/app/params"
"github.com/umee-network/umee/v5/util/coin"
oracletypes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v6/ante"
appparams "github.com/umee-network/umee/v6/app/params"
"github.com/umee-network/umee/v6/util/coin"
oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
)

func (suite *IntegrationTestSuite) TestFeeAndPriority() {
Expand Down
2 changes: 1 addition & 1 deletion ante/fee_unit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
evidence "github.com/cosmos/cosmos-sdk/x/evidence/types"
"gotest.tools/v3/assert"

leverage "github.com/umee-network/umee/v5/x/leverage/types"
leverage "github.com/umee-network/umee/v6/x/leverage/types"
)

func TestPriority(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ante/spam_prevention.go
View file
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/v5/x/oracle/types"
oracletypes "github.com/umee-network/umee/v6/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
View file
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/v5/ante"
oracletypes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v6/ante"
oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
)

func (suite *IntegrationTestSuite) TestOracleSpam() {
Expand Down
54 changes: 27 additions & 27 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,35 +119,35 @@ import (
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

customante "github.com/umee-network/umee/v5/ante"
"github.com/umee-network/umee/v5/app/inflation"
appparams "github.com/umee-network/umee/v5/app/params"
"github.com/umee-network/umee/v5/swagger"
"github.com/umee-network/umee/v5/util/genmap"
"github.com/umee-network/umee/v5/x/incentive"
incentivekeeper "github.com/umee-network/umee/v5/x/incentive/keeper"
incentivemodule "github.com/umee-network/umee/v5/x/incentive/module"
"github.com/umee-network/umee/v5/x/leverage"
leveragekeeper "github.com/umee-network/umee/v5/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/v5/x/leverage/types"
"github.com/umee-network/umee/v5/x/oracle"
oraclekeeper "github.com/umee-network/umee/v5/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v5/x/ugov"
ugovkeeper "github.com/umee-network/umee/v5/x/ugov/keeper"
ugovmodule "github.com/umee-network/umee/v5/x/ugov/module"
customante "github.com/umee-network/umee/v6/ante"
"github.com/umee-network/umee/v6/app/inflation"
appparams "github.com/umee-network/umee/v6/app/params"
"github.com/umee-network/umee/v6/swagger"
"github.com/umee-network/umee/v6/util/genmap"
"github.com/umee-network/umee/v6/x/incentive"
incentivekeeper "github.com/umee-network/umee/v6/x/incentive/keeper"
incentivemodule "github.com/umee-network/umee/v6/x/incentive/module"
"github.com/umee-network/umee/v6/x/leverage"
leveragekeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/v6/x/leverage/types"
"github.com/umee-network/umee/v6/x/oracle"
oraclekeeper "github.com/umee-network/umee/v6/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
"github.com/umee-network/umee/v6/x/ugov"
ugovkeeper "github.com/umee-network/umee/v6/x/ugov/keeper"
ugovmodule "github.com/umee-network/umee/v6/x/ugov/module"

// umee ibc-transfer and quota for ibc-transfer
uwasm "github.com/umee-network/umee/v5/app/wasm"
"github.com/umee-network/umee/v5/x/uibc"
uibcmodule "github.com/umee-network/umee/v5/x/uibc/module"
uibcoracle "github.com/umee-network/umee/v5/x/uibc/oracle"
uibcquota "github.com/umee-network/umee/v5/x/uibc/quota"
uibcquotakeeper "github.com/umee-network/umee/v5/x/uibc/quota/keeper"

"github.com/umee-network/umee/v5/x/metoken"
metokenkeeper "github.com/umee-network/umee/v5/x/metoken/keeper"
metokenmodule "github.com/umee-network/umee/v5/x/metoken/module"
uwasm "github.com/umee-network/umee/v6/app/wasm"
"github.com/umee-network/umee/v6/x/uibc"
uibcmodule "github.com/umee-network/umee/v6/x/uibc/module"
uibcoracle "github.com/umee-network/umee/v6/x/uibc/oracle"
uibcquota "github.com/umee-network/umee/v6/x/uibc/quota"
uibcquotakeeper "github.com/umee-network/umee/v6/x/uibc/quota/keeper"

"github.com/umee-network/umee/v6/x/metoken"
metokenkeeper "github.com/umee-network/umee/v6/x/metoken/keeper"
metokenmodule "github.com/umee-network/umee/v6/x/metoken/module"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
sdkparams "github.com/cosmos/cosmos-sdk/simapp/params"
"github.com/cosmos/cosmos-sdk/std"
"github.com/umee-network/umee/v5/app/params"
"github.com/umee-network/umee/v6/app/params"
)

// MakeEncodingConfig returns the application's encoding configuration with all
Expand Down
6 changes: 3 additions & 3 deletions app/inflation/inflation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"

"github.com/umee-network/umee/v5/util"
"github.com/umee-network/umee/v5/util/bpmath"
"github.com/umee-network/umee/v5/x/ugov"
"github.com/umee-network/umee/v6/util"
"github.com/umee-network/umee/v6/util/bpmath"
"github.com/umee-network/umee/v6/x/ugov"
)

type Calculator struct {
Expand Down
16 changes: 8 additions & 8 deletions app/inflation/inflation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import (
"github.com/golang/mock/gomock"
"gotest.tools/v3/assert"

"github.com/umee-network/umee/v5/app/inflation"
mocks "github.com/umee-network/umee/v5/app/inflation/mocks"
appparams "github.com/umee-network/umee/v5/app/params"
"github.com/umee-network/umee/v5/tests/tsdk"
"github.com/umee-network/umee/v5/util/bpmath"
"github.com/umee-network/umee/v5/util/coin"
"github.com/umee-network/umee/v5/x/ugov"
ugovmocks "github.com/umee-network/umee/v5/x/ugov/mocks"
"github.com/umee-network/umee/v6/app/inflation"
mocks "github.com/umee-network/umee/v6/app/inflation/mocks"
appparams "github.com/umee-network/umee/v6/app/params"
"github.com/umee-network/umee/v6/tests/tsdk"
"github.com/umee-network/umee/v6/util/bpmath"
"github.com/umee-network/umee/v6/util/coin"
"github.com/umee-network/umee/v6/x/ugov"
ugovmocks "github.com/umee-network/umee/v6/x/ugov/mocks"
)

func TestAdjustInflation(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/staking"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

appparams "github.com/umee-network/umee/v5/app/params"
appparams "github.com/umee-network/umee/v6/app/params"
)

// Cosmos SDK module wrappers
Expand Down
8 changes: 4 additions & 4 deletions app/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
dbm "github.com/tendermint/tm-db"
"gotest.tools/v3/assert"

"github.com/umee-network/umee/v5/app/params"
"github.com/umee-network/umee/v5/x/leverage/fixtures"
leveragetypes "github.com/umee-network/umee/v5/x/leverage/types"
oracletypes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v6/app/params"
"github.com/umee-network/umee/v6/x/leverage/fixtures"
leveragetypes "github.com/umee-network/umee/v6/x/leverage/types"
oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
)

// DefaultConsensusParams defines the default Tendermint consensus params used
Expand Down
20 changes: 10 additions & 10 deletions app/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/umee-network/umee/v5/app/upgradev3"
"github.com/umee-network/umee/v5/app/upgradev3x3"
"github.com/umee-network/umee/v5/x/incentive"
leveragekeeper "github.com/umee-network/umee/v5/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/v5/x/leverage/types"

oraclekeeper "github.com/umee-network/umee/v5/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v5/x/ugov"
"github.com/umee-network/umee/v5/x/uibc"
"github.com/umee-network/umee/v6/app/upgradev3"
"github.com/umee-network/umee/v6/app/upgradev3x3"
"github.com/umee-network/umee/v6/x/incentive"
leveragekeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
leveragetypes "github.com/umee-network/umee/v6/x/leverage/types"

oraclekeeper "github.com/umee-network/umee/v6/x/oracle/keeper"
oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
"github.com/umee-network/umee/v6/x/ugov"
"github.com/umee-network/umee/v6/x/uibc"
)

// RegisterUpgradeHandlersregisters upgrade handlers.
Expand Down
2 changes: 1 addition & 1 deletion app/upgradev3x3/gov_legacy.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/upgradev3x3/migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
gov "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
"github.com/gogo/protobuf/proto"

"github.com/umee-network/umee/v5/x/leverage/types"
"github.com/umee-network/umee/v6/x/leverage/types"
)

// Implements Proposal Interface
Expand Down
12 changes: 6 additions & 6 deletions app/wasm/custom_plugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"

"github.com/umee-network/umee/v5/app/wasm/msg"
"github.com/umee-network/umee/v5/app/wasm/query"
inckeeper "github.com/umee-network/umee/v5/x/incentive/keeper"
leveragekeeper "github.com/umee-network/umee/v5/x/leverage/keeper"
metokenkeeper "github.com/umee-network/umee/v5/x/metoken/keeper"
oraclekeeper "github.com/umee-network/umee/v5/x/oracle/keeper"
"github.com/umee-network/umee/v6/app/wasm/msg"
"github.com/umee-network/umee/v6/app/wasm/query"
inckeeper "github.com/umee-network/umee/v6/x/incentive/keeper"
leveragekeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
metokenkeeper "github.com/umee-network/umee/v6/x/metoken/keeper"
oraclekeeper "github.com/umee-network/umee/v6/x/oracle/keeper"
)

// RegisterCustomPlugins expose the queries and msgs of native modules to wasm.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/msg/handler_leverage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gogo/protobuf/proto"

lvtypes "github.com/umee-network/umee/v5/x/leverage/types"
lvtypes "github.com/umee-network/umee/v6/x/leverage/types"
)

// HandleSupply handles the Supply value of an address.
Expand Down
4 changes: 2 additions & 2 deletions app/wasm/msg/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"

lvkeeper "github.com/umee-network/umee/v5/x/leverage/keeper"
lvtypes "github.com/umee-network/umee/v5/x/leverage/types"
lvkeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
lvtypes "github.com/umee-network/umee/v6/x/leverage/types"
)

// Plugin wraps the msg plugin with Messengers.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/msg/types.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package msg

import (
lvtypes "github.com/umee-network/umee/v5/x/leverage/types"
lvtypes "github.com/umee-network/umee/v6/x/leverage/types"
)

// UmeeMsg wraps all the messages availables for cosmwasm smartcontracts.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/query/handle_incentive.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/gogo/protobuf/proto"
"github.com/umee-network/umee/v5/x/incentive"
"github.com/umee-network/umee/v6/x/incentive"
)

// HandleLeverageParams handles the get the x/leverage module's parameters.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/query/handle_leverage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gogo/protobuf/proto"

lvtypes "github.com/umee-network/umee/v5/x/leverage/types"
lvtypes "github.com/umee-network/umee/v6/x/leverage/types"
)

// HandleLeverageParams handles the get the x/leverage module's parameters.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/query/handle_metoken.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/gogo/protobuf/proto"
"github.com/umee-network/umee/v5/x/metoken"
"github.com/umee-network/umee/v6/x/metoken"
)

// HandleMeTokenParams handles the get for x/metoken module's parameters.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/query/handle_oracle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/gogo/protobuf/proto"

octypes "github.com/umee-network/umee/v5/x/oracle/types"
octypes "github.com/umee-network/umee/v6/x/oracle/types"
)

// HandleFeederDelegation gets all the feeder delegation of a validator.
Expand Down
16 changes: 8 additions & 8 deletions app/wasm/query/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/gogo/protobuf/proto"

"github.com/umee-network/umee/v5/x/incentive"
inckeeper "github.com/umee-network/umee/v5/x/incentive/keeper"
lvkeeper "github.com/umee-network/umee/v5/x/leverage/keeper"
lvtypes "github.com/umee-network/umee/v5/x/leverage/types"
"github.com/umee-network/umee/v5/x/metoken"
metokenkeeper "github.com/umee-network/umee/v5/x/metoken/keeper"
ockeeper "github.com/umee-network/umee/v5/x/oracle/keeper"
ocpes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v6/x/incentive"
inckeeper "github.com/umee-network/umee/v6/x/incentive/keeper"
lvkeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
lvtypes "github.com/umee-network/umee/v6/x/leverage/types"
"github.com/umee-network/umee/v6/x/metoken"
metokenkeeper "github.com/umee-network/umee/v6/x/metoken/keeper"
ockeeper "github.com/umee-network/umee/v6/x/oracle/keeper"
ocpes "github.com/umee-network/umee/v6/x/oracle/types"
)

// Plugin wraps the query plugin with queriers.
Expand Down
2 changes: 1 addition & 1 deletion app/wasm/query/querier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
abci "github.com/tendermint/tendermint/abci/types"

// stargate client
"github.com/umee-network/umee/v5/client"
"github.com/umee-network/umee/v6/client"
)

// StargateQuerier dispatches whitelisted stargate queries
Expand Down
8 changes: 4 additions & 4 deletions app/wasm/query/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"

wasmvmtypes "github.com/CosmWasm/wasmvm/types"
"github.com/umee-network/umee/v5/x/incentive"
lvtypes "github.com/umee-network/umee/v5/x/leverage/types"
"github.com/umee-network/umee/v5/x/metoken"
octypes "github.com/umee-network/umee/v5/x/oracle/types"
"github.com/umee-network/umee/v6/x/incentive"
lvtypes "github.com/umee-network/umee/v6/x/leverage/types"
"github.com/umee-network/umee/v6/x/metoken"
octypes "github.com/umee-network/umee/v6/x/oracle/types"
)

// UmeeQuery wraps all the queries availables for cosmwasm smartcontracts.
Expand Down
12 changes: 6 additions & 6 deletions app/wasm/query/whitelist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"

"github.com/umee-network/umee/v5/x/incentive"
ltypes "github.com/umee-network/umee/v5/x/leverage/types"
"github.com/umee-network/umee/v5/x/metoken"
otypes "github.com/umee-network/umee/v5/x/oracle/types"
ugovtypes "github.com/umee-network/umee/v5/x/ugov"
uibctypes "github.com/umee-network/umee/v5/x/uibc"
"github.com/umee-network/umee/v6/x/incentive"
ltypes "github.com/umee-network/umee/v6/x/leverage/types"
"github.com/umee-network/umee/v6/x/metoken"
otypes "github.com/umee-network/umee/v6/x/oracle/types"
ugovtypes "github.com/umee-network/umee/v6/x/ugov"
uibctypes "github.com/umee-network/umee/v6/x/uibc"
)

// stargateWhitelist keeps whitelist and its deterministic
Expand Down
Loading

0 comments on commit 43d0b74

Please sign in to comment.