test: re-enable vote inheritance and improve tests

atomone-hub · Feb 21, 2024 · e257af4 · e257af4
1 parent 4bd0d82
commit e257af4
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/x/gov/keeper/tally.go b/x/gov/keeper/tally.go
@@ -71,8 +71,6 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
 		return false
 	})
 
-	/* DISABLED on GovGen - Voting can only be done with your own stake
-
 	// iterate over the validators again to tally their voting power
 	for _, val := range currValidators {
 		if len(val.Vote) == 0 {
@@ -89,8 +87,6 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
 		totalVotingPower = totalVotingPower.Add(votingPower)
 	}
 
-	*/
-
 	tallyParams := keeper.GetTallyParams(ctx)
 	tallyResults = types.NewTallyResultFromMap(results)
 

diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go
@@ -281,7 +281,8 @@ func TestTallyDelgatorInherit(t *testing.T) {
 	app := govgenhelpers.SetupNoValset(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7})
+	valPowers := []int64{5, 6, 7}
+	addrs, vals := createValidators(t, ctx, app, valPowers)
 
 	delTokens := app.StakingKeeper.TokensFromConsensusPower(ctx, 30)
 	val3, found := app.StakingKeeper.GetValidator(ctx, vals[2])
@@ -307,16 +308,27 @@ func TestTallyDelgatorInherit(t *testing.T) {
 	require.True(t, ok)
 	passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)
 
-	require.False(t, passes)
+	require.True(t, passes)
 	require.False(t, burnDeposits)
-	require.False(t, tallyResults.Equals(types.EmptyTallyResult()))
+	valSelfDelegations := []sdk.Int{
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[0]),
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[1]),
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[2]),
+	}
+	require.Equal(t, tallyResults.String(), types.NewTallyResult(
+		valSelfDelegations[2].Add(delTokens),
+		sdk.ZeroInt(),
+		valSelfDelegations[0].Add(valSelfDelegations[1]),
+		sdk.ZeroInt(),
+	).String())
 }
 
 func TestTallyDelgatorMultipleOverride(t *testing.T) {
 	app := govgenhelpers.SetupNoValset(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7})
+	valPowers := []int64{5, 6, 7}
+	addrs, vals := createValidators(t, ctx, app, valPowers)
 
 	delTokens := app.StakingKeeper.TokensFromConsensusPower(ctx, 10)
 	val1, found := app.StakingKeeper.GetValidator(ctx, vals[0])
@@ -349,7 +361,17 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) {
 
 	require.False(t, passes)
 	require.False(t, burnDeposits)
-	require.False(t, tallyResults.Equals(types.EmptyTallyResult()))
+	valSelfDelegations := []sdk.Int{
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[0]),
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[1]),
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[2]),
+	}
+	require.Equal(t, tallyResults.String(), types.NewTallyResult(
+		valSelfDelegations[0].Add(valSelfDelegations[1]).Add(valSelfDelegations[2]),
+		sdk.ZeroInt(),
+		delTokens.Add(delTokens),
+		sdk.ZeroInt(),
+	).String())
 }
 
 // As validators can only vote with their own stake, delegators don't inherit votes from validators
@@ -358,9 +380,8 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) {
 	app := govgenhelpers.SetupNoValset(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	createValidators(t, ctx, app, []int64{25, 6, 7})
-
-	addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7})
+	valPowers := []int64{5, 6, 7}
+	addrs, vals := createValidators(t, ctx, app, valPowers)
 
 	delTokens := app.StakingKeeper.TokensFromConsensusPower(ctx, 10)
 	val2, found := app.StakingKeeper.GetValidator(ctx, vals[1])
@@ -390,9 +411,19 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) {
 	require.True(t, ok)
 	passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)
 
-	require.True(t, passes)
+	require.False(t, passes)
 	require.False(t, burnDeposits)
-	require.False(t, tallyResults.Equals(types.EmptyTallyResult()))
+	valSelfDelegations := []sdk.Int{
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[0]),
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[1]),
+		app.StakingKeeper.TokensFromConsensusPower(ctx, valPowers[2]),
+	}
+	require.Equal(t, tallyResults.String(), types.NewTallyResult(
+		valSelfDelegations[0],
+		sdk.ZeroInt(),
+		valSelfDelegations[1].Add(valSelfDelegations[2]).Add(delTokens).Add(delTokens),
+		sdk.ZeroInt(),
+	).String())
 }
 
 func TestTallyJailedValidator(t *testing.T) {