From e24734f72e313da7b560f40e5aba905aff3b4357 Mon Sep 17 00:00:00 2001
From: Jonathan Gimeno <jgimeno@gmail.com>
Date: Mon, 2 Mar 2020 16:41:41 +0100
Subject: [PATCH] migrate TestTallyNoQuorum to use simapp

---
 x/gov/keeper/old_tally_test.go | 21 ---------------------
 x/gov/keeper/tally_test.go     | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/x/gov/keeper/old_tally_test.go b/x/gov/keeper/old_tally_test.go
index e81e848744..2fe3b1f89a 100644
--- a/x/gov/keeper/old_tally_test.go
+++ b/x/gov/keeper/old_tally_test.go
@@ -10,27 +10,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
-func TestTallyNoQuorum(t *testing.T) {
-	ctx, _, _, keeper, sk, _ := createTestInput(t, false, 100)
-	createValidators(ctx, sk, []int64{2, 5, 0})
-
-	tp := TestProposal
-	proposal, err := keeper.SubmitProposal(ctx, tp)
-	require.NoError(t, err)
-	proposalID := proposal.ProposalID
-	proposal.Status = types.StatusVotingPeriod
-	keeper.SetProposal(ctx, proposal)
-
-	err = keeper.AddVote(ctx, proposalID, TestAddrs[0], types.OptionYes)
-	require.Nil(t, err)
-
-	proposal, ok := keeper.GetProposal(ctx, proposalID)
-	require.True(t, ok)
-	passes, burnDeposits, _ := keeper.Tally(ctx, proposal)
-	require.False(t, passes)
-	require.True(t, burnDeposits)
-}
-
 func TestTallyOnlyValidatorsAllYes(t *testing.T) {
 	ctx, _, _, keeper, sk, _ := createTestInput(t, false, 100)
 	createValidators(ctx, sk, []int64{5, 5, 5})
diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go
index f86871b550..a72a3908e1 100644
--- a/x/gov/keeper/tally_test.go
+++ b/x/gov/keeper/tally_test.go
@@ -3,6 +3,8 @@ package keeper_test
 import (
 	"testing"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/stretchr/testify/require"
@@ -32,3 +34,28 @@ func TestTallyNoOneVotes(t *testing.T) {
 	require.True(t, burnDeposits)
 	require.True(t, tallyResults.Equals(types.EmptyTallyResult()))
 }
+
+func TestTallyNoQuorum(t *testing.T) {
+	app := simapp.Setup(false)
+	ctx := app.BaseApp.NewContext(false, abci.Header{})
+
+	createValidators(ctx, app, []int64{2, 5, 0})
+
+	addrs := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.NewInt(10000000))
+
+	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)
+
+	err = app.GovKeeper.AddVote(ctx, proposalID, addrs[0], types.OptionYes)
+	require.Nil(t, err)
+
+	proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
+	require.True(t, ok)
+	passes, burnDeposits, _ := app.GovKeeper.Tally(ctx, proposal)
+	require.False(t, passes)
+	require.True(t, burnDeposits)
+}