fix : fix the conflicts

x/bond/client/testutil/grpc.go

@@ -2,8 +2,9 @@ package testutil
 
 import (
 	"fmt"
+
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
-	"github.com/cosmos/cosmos-sdk/types/rest"
+	"github.com/cosmos/cosmos-sdk/testutil/rest"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 	"github.com/tharsis/ethermint/x/bond/client/cli"
 	bondtypes "github.com/tharsis/ethermint/x/bond/types"

x/bond/client/testutil/query.go

@@ -89,7 +89,7 @@ func (s *IntegrationTestSuite) createAccountWithBalance(accountName string) {
 	info, _, err := val.ClientCtx.Keyring.NewMnemonic(accountName, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, hd.Secp256k1)
 	sr.NoError(err)
 
-	newAddr := sdk.AccAddress(info.GetPubKey().Address())
+	newAddr, _ := info.GetAddress()
 	_, err = banktestutil.MsgSendExec(
 		val.ClientCtx,
 		val.Address,