fix : fix the conflicts

x/auction/client/testutil/common.go

@@ -61,9 +61,12 @@ func (s *IntegrationTestSuite) createAccountWithBalance(accountName string, acco
 	info, _, err := val.ClientCtx.Keyring.NewMnemonic(accountName, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, hd.EthSecp256k1)
 	sr.NoError(err)
 
-	val.ClientCtx.Keyring.SavePubKey(accountName, info.GetPubKey(), hd.EthSecp256k1Type)
+	pubKey, err := info.GetPubKey()
+	sr.NoError(err)
 
-	newAddr := sdk.AccAddress(info.GetPubKey().Address())
+	val.ClientCtx.Keyring.SaveOfflineKey(accountName, pubKey)
+
+	newAddr, _ := info.GetAddress()
 	_, err = banktestutil.MsgSendExec(
 		val.ClientCtx,
 		val.Address,

x/auction/client/testutil/grpc.go

@@ -3,7 +3,7 @@ package testutil
 import (
 	"fmt"
 
-	"github.com/cosmos/cosmos-sdk/types/rest"
+	"github.com/cosmos/cosmos-sdk/testutil/rest"
 	auctiontypes "github.com/tharsis/ethermint/x/auction/types"
 )
 

x/auction/keeper/keeper.go

@@ -7,12 +7,12 @@ import (
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	params "github.com/cosmos/cosmos-sdk/x/params/types"
-
 	"github.com/tharsis/ethermint/x/auction/types"
 
 	wnsUtils "github.com/tharsis/ethermint/utils"
@@ -43,7 +43,7 @@ type Keeper struct {
 	// Track auction usage in other cosmos-sdk modules (more like a usage tracker).
 	usageKeepers []types.AuctionUsageKeeper
 
-	storeKey sdk.StoreKey // Unexposed key to access store from sdk.Context
+	storeKey storetypes.StoreKey // Unexposed key to access store from sdk.Context
 
 	cdc codec.BinaryCodec // The wire codec for binary encoding/decoding.
 
@@ -58,7 +58,7 @@ type AuctionClientKeeper interface {
 }
 
 // NewKeeper creates new instances of the auction Keeper
-func NewKeeper(accountKeeper auth.AccountKeeper, bankKeeper bank.Keeper, storeKey sdk.StoreKey, cdc codec.BinaryCodec, ps params.Subspace) Keeper {
+func NewKeeper(accountKeeper auth.AccountKeeper, bankKeeper bank.Keeper, storeKey storetypes.StoreKey, cdc codec.BinaryCodec, ps params.Subspace) Keeper {
 	if !ps.HasKeyTable() {
 		ps = ps.WithKeyTable(types.ParamKeyTable())
 	}