From 88e3a22fc41288e6f9aec1610f3bf5a982881040 Mon Sep 17 00:00:00 2001
From: Jonathan Gimeno <jgimeno@gmail.com>
Date: Mon, 2 Mar 2020 16:47:06 +0100
Subject: [PATCH] migrate TestTallyOnlyValidatorsAllYes to simapp

---
 x/gov/keeper/common_test.go    |  4 +++-
 x/gov/keeper/old_tally_test.go | 24 ------------------------
 x/gov/keeper/tally_test.go     | 32 +++++++++++++++++++++++++++++---
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/x/gov/keeper/common_test.go b/x/gov/keeper/common_test.go
index bf21f71c47..81b859973f 100644
--- a/x/gov/keeper/common_test.go
+++ b/x/gov/keeper/common_test.go
@@ -23,7 +23,7 @@ func ProposalEqual(proposalA types.Proposal, proposalB types.Proposal) bool {
 		types.ModuleCdc.MustMarshalBinaryBare(proposalB))
 }
 
-func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) {
+func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sdk.AccAddress, []sdk.ValAddress) {
 	addrs := simapp.AddTestAddrsIncremental(app, ctx, 3, sdk.NewInt(10000000))
 	valAddrs := simapp.ConvertAddrsToValAddrs(addrs)
 	pks := simapp.CreateTestPubKeys(3)
@@ -56,4 +56,6 @@ func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) {
 	_, _ = app.StakingKeeper.Delegate(ctx, addrs[2], sdk.TokensFromConsensusPower(powers[2]), sdk.Unbonded, val3, true)
 
 	_ = staking.EndBlocker(ctx, app.StakingKeeper)
+
+	return addrs, valAddrs
 }
diff --git a/x/gov/keeper/old_tally_test.go b/x/gov/keeper/old_tally_test.go
index 2fe3b1f89a..05c0439709 100644
--- a/x/gov/keeper/old_tally_test.go
+++ b/x/gov/keeper/old_tally_test.go
@@ -10,30 +10,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
-func TestTallyOnlyValidatorsAllYes(t *testing.T) {
-	ctx, _, _, keeper, sk, _ := createTestInput(t, false, 100)
-	createValidators(ctx, sk, []int64{5, 5, 5})
-
-	tp := TestProposal
-	proposal, err := keeper.SubmitProposal(ctx, tp)
-	require.NoError(t, err)
-	proposalID := proposal.ProposalID
-	proposal.Status = types.StatusVotingPeriod
-	keeper.SetProposal(ctx, proposal)
-
-	require.NoError(t, keeper.AddVote(ctx, proposalID, valAccAddr1, types.OptionYes))
-	require.NoError(t, keeper.AddVote(ctx, proposalID, valAccAddr2, types.OptionYes))
-	require.NoError(t, keeper.AddVote(ctx, proposalID, valAccAddr3, types.OptionYes))
-
-	proposal, ok := keeper.GetProposal(ctx, proposalID)
-	require.True(t, ok)
-	passes, burnDeposits, tallyResults := keeper.Tally(ctx, proposal)
-
-	require.True(t, passes)
-	require.False(t, burnDeposits)
-	require.False(t, tallyResults.Equals(types.EmptyTallyResult()))
-}
-
 func TestTallyOnlyValidators51No(t *testing.T) {
 	ctx, _, _, keeper, sk, _ := createTestInput(t, false, 100)
 	createValidators(ctx, sk, []int64{5, 6, 0})
diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go
index a72a3908e1..9f607df8d1 100644
--- a/x/gov/keeper/tally_test.go
+++ b/x/gov/keeper/tally_test.go
@@ -3,13 +3,12 @@ package keeper_test
 import (
 	"testing"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/cosmos/cosmos-sdk/simapp"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
@@ -59,3 +58,30 @@ func TestTallyNoQuorum(t *testing.T) {
 	require.False(t, passes)
 	require.True(t, burnDeposits)
 }
+
+func TestTallyOnlyValidatorsAllYes(t *testing.T) {
+	app := simapp.Setup(false)
+	ctx := app.BaseApp.NewContext(false, abci.Header{})
+
+	addrs, _ := createValidators(ctx, app, []int64{5, 5, 5})
+	valAccAddr1, valAccAddr2, valAccAddr3 := addrs[0], addrs[1], addrs[2]
+
+	tp := TestProposal
+	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
+	require.NoError(t, err)
+	proposalID := proposal.ProposalID
+	proposal.Status = types.StatusVotingPeriod
+	app.GovKeeper.SetProposal(ctx, proposal)
+
+	require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddr1, types.OptionYes))
+	require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddr2, types.OptionYes))
+	require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddr3, types.OptionYes))
+
+	proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
+	require.True(t, ok)
+	passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)
+
+	require.True(t, passes)
+	require.False(t, burnDeposits)
+	require.False(t, tallyResults.Equals(types.EmptyTallyResult()))
+}