Merge branch 'master' into gov_split_vote_weighted_vote

x/gov/common_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/crypto"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -71,7 +71,7 @@ func SortByteArrays(src [][]byte) [][]byte {
 const contextKeyBadProposal = "contextKeyBadProposal"
 
 var (
-	pubkeys = []crypto.PubKey{
+	pubkeys = []cryptotypes.PubKey{
 		ed25519.GenPrivKey().PubKey(),
 		ed25519.GenPrivKey().PubKey(),
 		ed25519.GenPrivKey().PubKey(),

x/gov/keeper/tally_test.go

@@ -410,9 +410,9 @@ func TestTallyJailedValidator(t *testing.T) {
 
 	_ = staking.EndBlocker(ctx, app.StakingKeeper)
 
-	consKey, err := val2.TmConsPubKey()
+	consAddr, err := val2.GetConsAddr()
 	require.NoError(t, err)
-	app.StakingKeeper.Jail(ctx, sdk.ConsAddress(consKey.Address()))
+	app.StakingKeeper.Jail(ctx, sdk.ConsAddress(consAddr.Bytes()))
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)