fix(test): fix cycle import

White-Whale-Defi-Platform · Jan 9, 2024 · 7bc2907 · 7bc2907
1 parent 6a01d49
commit 7bc2907
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 241 deletions.
diff --git a/app/app_test.go b/app/app_test.go
diff --git a/app/testing/mock.go → app/mock.go b/app/testing/mock.go → app/mock.go
@@ -1,4 +1,4 @@
-package helpers
+package app
 
 import (
 	"github.com/cometbft/cometbft/crypto"

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -1,9 +1,14 @@
 package app
 
 import (
-	"cosmossdk.io/simapp"
 	"encoding/json"
 	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"cosmossdk.io/simapp"
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	dbm "github.com/cometbft/cometbft-db"
@@ -36,10 +41,6 @@ import (
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	"github.com/stretchr/testify/require"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
 )
 
 // Get flags every time the simulator is run

diff --git a/app/test_access.go b/app/test_access.go
diff --git a/app/testing/test_helpers.go → app/test_helpers.go b/app/testing/test_helpers.go → app/test_helpers.go
@@ -1,10 +1,12 @@
-package helpers
+package app
 
 import (
 	"encoding/json"
+	"testing"
+	"time"
+
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
-	"github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app"
 	config "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/params"
 	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
@@ -25,8 +27,6 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"testing"
-	"time"
 )
 
 // SimAppChainID hardcoded chainID for simulation
@@ -39,7 +39,7 @@ var emptyWasmOpts []wasm.Option
 type KeeperTestHelper struct {
 	suite.Suite
 
-	App         *app.MigalooApp
+	App         *MigalooApp
 	Ctx         sdk.Context // ctx is deliver ctx
 	CheckCtx    sdk.Context
 	QueryHelper *baseapp.QueryServiceTestHelper
@@ -81,7 +81,7 @@ type EmptyAppOptions struct{}
 
 func (EmptyAppOptions) Get(_ string) interface{} { return nil }
 
-func SetupApp(t *testing.T) *app.MigalooApp {
+func SetupApp(t *testing.T) *MigalooApp {
 	t.Helper()
 
 	privVal := NewPV()
@@ -108,7 +108,7 @@ func SetupApp(t *testing.T) *app.MigalooApp {
 // that also act as delegators. For simplicity, each validator is bonded with a delegation
 // of one consensus engine unit in the default token of the app from first genesis
 // account. A Nop logger is set in app.
-func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *app.MigalooApp {
+func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *MigalooApp {
 	t.Helper()
 
 	migalooApp, genesisState := setup(true)
@@ -140,23 +140,23 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
 	return migalooApp
 }
 
-func setup(withGenesis bool, opts ...wasmkeeper.Option) (*app.MigalooApp, app.GenesisState) {
+func setup(withGenesis bool, opts ...wasmkeeper.Option) (*MigalooApp, GenesisState) {
 	db := dbm.NewMemDB()
-	migalooApp := app.NewMigalooApp(log.NewNopLogger(), db, nil, true, map[int64]bool{},
-		app.DefaultNodeHome, 5, app.MakeEncodingConfig(), EmptyBaseAppOptions{}, opts)
+	migalooApp := NewMigalooApp(log.NewNopLogger(), db, nil, true, map[int64]bool{},
+		DefaultNodeHome, 5, MakeEncodingConfig(), EmptyBaseAppOptions{}, opts)
 
 	if withGenesis {
-		return migalooApp, app.NewDefaultGenesisState()
+		return migalooApp, NewDefaultGenesisState()
 	}
 
-	return migalooApp, app.GenesisState{}
+	return migalooApp, GenesisState{}
 }
 
 func genesisStateWithValSet(t *testing.T,
-	app *app.MigalooApp, genesisState app.GenesisState,
+	app *MigalooApp, genesisState GenesisState,
 	valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount,
 	balances ...banktypes.Balance,
-) app.GenesisState {
+) GenesisState {
 	// set genesis accounts
 	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs)
 	genesisState[authtypes.ModuleName] = app.AppCodec().MustMarshalJSON(authGenesis)

diff --git a/x/feeburn/ante/utils_test.go b/x/feeburn/ante/utils_test.go
@@ -1,8 +1,8 @@
 package ante_test
 
 import (
+	apptesting "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app"
 	config "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/params"
-	apptesting "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/testing"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"

diff --git a/x/feeburn/keeper/keeper_test.go b/x/feeburn/keeper/keeper_test.go
@@ -1,8 +1,8 @@
 package keeper_test
 
 import (
+	apptesting "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app"
 	config "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/params"
-	apptesting "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/testing"
 	"github.com/cometbft/cometbft/crypto/ed25519"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"