Skip to content

Commit

Permalink
Merge pull request #126 from hard-nett/v2.0.0-rc2
Browse files Browse the repository at this point in the history 
update-proto,testing utils, change to v2
  • Loading branch information
@hard-nett
hard-nett authored Sep 17, 2023
2 parents 961a4ca + 674bdd6 commit 8fd213b
Show file tree
Hide file tree
Showing 127 changed files with 2,350 additions and 3,427 deletions.
8 changes: 4 additions & 4 deletions app/ante.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
"github.com/cosmos/ibc-go/v7/modules/core/keeper"

feeshareante "github.com/terpnetwork/terp-core/x/feeshare/ante"
feesharekeeper "github.com/terpnetwork/terp-core/x/feeshare/keeper"
globalfeeante "github.com/terpnetwork/terp-core/x/globalfee/ante"
globalfeekeeper "github.com/terpnetwork/terp-core/x/globalfee/keeper"
feeshareante "github.com/terpnetwork/terp-core/v2/x/feeshare/ante"
feesharekeeper "github.com/terpnetwork/terp-core/v2/x/feeshare/keeper"
globalfeeante "github.com/terpnetwork/terp-core/v2/x/globalfee/ante"
globalfeekeeper "github.com/terpnetwork/terp-core/v2/x/globalfee/keeper"

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
Expand Down
32 changes: 21 additions & 11 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ import (
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
ibcmock "github.com/cosmos/ibc-go/v7/testing/mock"

"github.com/terpnetwork/terp-core/x/feeshare"
feesharekeeper "github.com/terpnetwork/terp-core/x/feeshare/keeper"
feesharetypes "github.com/terpnetwork/terp-core/x/feeshare/types"
"github.com/terpnetwork/terp-core/x/globalfee"
globalfeekeeper "github.com/terpnetwork/terp-core/x/globalfee/keeper"
globalfeetypes "github.com/terpnetwork/terp-core/x/globalfee/types"
"github.com/terpnetwork/terp-core/v2/x/feeshare"
feesharekeeper "github.com/terpnetwork/terp-core/v2/x/feeshare/keeper"
feesharetypes "github.com/terpnetwork/terp-core/v2/x/feeshare/types"
"github.com/terpnetwork/terp-core/v2/x/globalfee"
globalfeekeeper "github.com/terpnetwork/terp-core/v2/x/globalfee/keeper"
globalfeetypes "github.com/terpnetwork/terp-core/v2/x/globalfee/types"

ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7"
ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper"
Expand All @@ -145,22 +145,22 @@ import (
icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v7/keeper"
icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types"

"github.com/terpnetwork/terp-core/x/tokenfactory/bindings"
"github.com/terpnetwork/terp-core/v2/x/tokenfactory/bindings"

"github.com/spf13/cast"

govclient "github.com/cosmos/cosmos-sdk/x/gov/client"

v2 "github.com/terpnetwork/terp-core/app/upgrades/v2"
v2 "github.com/terpnetwork/terp-core/v2/app/upgrades/v2"

"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

// token factory
"github.com/terpnetwork/terp-core/x/tokenfactory"
tokenfactorykeeper "github.com/terpnetwork/terp-core/x/tokenfactory/keeper"
tokenfactorytypes "github.com/terpnetwork/terp-core/x/tokenfactory/types"
"github.com/terpnetwork/terp-core/v2/x/tokenfactory"
tokenfactorykeeper "github.com/terpnetwork/terp-core/v2/x/tokenfactory/keeper"
tokenfactorytypes "github.com/terpnetwork/terp-core/v2/x/tokenfactory/types"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik" // statik for swagger UI support
Expand Down Expand Up @@ -1372,6 +1372,16 @@ func (app *TerpApp) GetChainBondDenom() string {
return d
}

// ModuleAccountAddrs returns all the app's module account addresses.
func (app *TerpApp) ModuleAccountAddrs() map[string]bool {
modAccAddrs := make(map[string]bool)
for acc := range GetMaccPerms() {
modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true
}

return modAccAddrs
}

// initParamsKeeper init params keeper and its subspaces
func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper {
paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey)
Expand Down
85 changes: 0 additions & 85 deletions app/app_test.go
View file

This file was deleted.

4 changes: 2 additions & 2 deletions app/apptesting/test_suite.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/terpnetwork/terp-core/app"
appparams "github.com/terpnetwork/terp-core/app/params"
"github.com/terpnetwork/terp-core/v2/app"
appparams "github.com/terpnetwork/terp-core/v2/app/params"
)

type KeeperTestHelper struct {
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 (
"github.com/cosmos/cosmos-sdk/std"

"github.com/terpnetwork/terp-core/app/params"
"github.com/terpnetwork/terp-core/v2/app/params"
)

// MakeEncodingConfig creates a new EncodingConfig with all modules registered
Expand Down
Loading

0 comments on commit 8fd213b

Please sign in to comment.