Merge ac42119583 into ae7d1ad2a7

tests/e2e/e2e_upgrade_handler_test.go

@@ -8,10 +8,10 @@ import (
 func (suite *IntegrationTestSuite) TestUpgrade_PreciseBankReserveTransfer() {
 	suite.SkipIfUpgradeDisabled()
 
-	beforeUpgradeCtx := suite.ZgChain.Grpc.CtxAtHeight(suite.UpgradeHeight - 1)
-	afterUpgradeCtx := suite.ZgChain.Grpc.CtxAtHeight(suite.UpgradeHeight)
+	// 	beforeUpgradeCtx := suite.Kava.Grpc.CtxAtHeight(suite.UpgradeHeight - 1)
+	// 	afterUpgradeCtx := suite.Kava.Grpc.CtxAtHeight(suite.UpgradeHeight)
 
-	grpcClient := suite.ZgChain.Grpc
+	// 	grpcClient := suite.Kava.Grpc
 
 	// -----------------------------
 	// Get initial reserve balances

x/precisebank/types/fractional_balance_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	sdkmath "cosmossdk.io/math"
-	"github.com/0glabs/0g-chain/chaincfg"
+	"github.com/0glabs/0g-chain/app"
 	"github.com/0glabs/0g-chain/x/precisebank/types"
 	"github.com/stretchr/testify/require"
 )
@@ -74,7 +74,7 @@ func TestNewFractionalBalance(t *testing.T) {
 }
 
 func TestFractionalBalance_Validate(t *testing.T) {
-	chaincfg.SetSDKConfig()
+	app.SetSDKConfig()
 
 	tests := []struct {
 		name        string

x/precisebank/types/fractional_balances_test.go

@@ -7,14 +7,14 @@ import (
 	"testing"
 
 	sdkmath "cosmossdk.io/math"
-	"github.com/0glabs/0g-chain/chaincfg"
+	"github.com/0glabs/0g-chain/app"
 	"github.com/0glabs/0g-chain/x/precisebank/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 )
 
 func TestFractionalBalances_Validate(t *testing.T) {
-	chaincfg.SetSDKConfig()
+	app.SetSDKConfig()
 
 	tests := []struct {
 		name    string

x/precisebank/types/genesis_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	sdkmath "cosmossdk.io/math"
-	"github.com/0glabs/0g-chain/chaincfg"
+	"github.com/0glabs/0g-chain/app"
 	"github.com/0glabs/0g-chain/x/precisebank/testutil"
 	"github.com/0glabs/0g-chain/x/precisebank/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -12,7 +12,7 @@ import (
 )
 
 func TestGenesisStateValidate_Basic(t *testing.T) {
-	chaincfg.SetSDKConfig()
+	app.SetSDKConfig()
 
 	testCases := []struct {
 		name         string

x/pricefeed/keeper/keeper_test.go

@@ -12,8 +12,6 @@ import (
 	tmprototypes "github.com/cometbft/cometbft/proto/tendermint/types"
 
 	"github.com/0glabs/0g-chain/app"
-	"github.com/0glabs/0g-chain/x/pricefeed/keeper"
-	"github.com/0glabs/0g-chain/x/pricefeed/testutil"
 	"github.com/0glabs/0g-chain/x/pricefeed/types"
 )