Merge branch 'params-upgrade' into cosmos-v0.47-upgrade

x/emissions/abci.go

@@ -81,8 +81,7 @@ func DistributeObserverRewards(
 		return err
 	}
 
-	maturityBlocks := params.BallotMaturityBlocks
-	list, found := keeper.GetObserverKeeper().GetBallotList(ctx, ctx.BlockHeight()-maturityBlocks)
+	list, found := keeper.GetObserverKeeper().GetMaturedBallots(ctx, params.BallotMaturityBlocks)
 	ballotIdentifiers := []string{}
 	if found {
 		ballotIdentifiers = list.BallotsIndexList

x/emissions/types/expected_keepers.go

@@ -14,7 +14,7 @@ type AccountKeeper interface {
 
 type ObserverKeeper interface {
 	GetBallot(ctx sdk.Context, index string) (val observertypes.Ballot, found bool)
-	GetBallotList(ctx sdk.Context, height int64) (val observertypes.BallotListForHeight, found bool)
+	GetMaturedBallots(ctx sdk.Context, maturityBlocks int64) (val observertypes.BallotListForHeight, found bool)
 }
 
 // BankKeeper defines the expected interface needed to retrieve account balances.

x/observer/keeper/ballot.go

@@ -39,6 +39,10 @@ func (k Keeper) GetBallotList(ctx sdk.Context, height int64) (val types.BallotLi
 	return val, true
 }
 
+func (k Keeper) GetMaturedBallots(ctx sdk.Context, maturityBlocks int64) (val types.BallotListForHeight, found bool) {
+	return k.GetBallotList(ctx, ctx.BlockHeight()-maturityBlocks)
+}
+
 func (k Keeper) GetAllBallots(ctx sdk.Context) (voters []*types.Ballot) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.VoterKey))
 	iterator := sdk.KVStorePrefixIterator(store, []byte{})

x/observer/keeper/ballot_test.go

@@ -74,6 +74,29 @@ func TestKeeper_GetBallotList(t *testing.T) {
 	require.Equal(t, identifier, list.BallotsIndexList[0])
 }
 
+func TestKeeper_GetMaturedBallots(t *testing.T) {
+	k, ctx, _, _ := keepertest.ObserverKeeper(t)
+	identifier := sample.ZetaIndex(t)
+	b := &types.Ballot{
+		Index:                "",
+		BallotIdentifier:     identifier,
+		VoterList:            nil,
+		ObservationType:      0,
+		BallotThreshold:      sdk.Dec{},
+		BallotStatus:         0,
+		BallotCreationHeight: 1,
+	}
+	ctx = ctx.WithBlockHeight(2)
+	_, found := k.GetMaturedBallots(ctx, 1)
+	require.False(t, found)
+
+	k.AddBallotToList(ctx, *b)
+	list, found := k.GetMaturedBallots(ctx, 1)
+	require.True(t, found)
+	require.Equal(t, 1, len(list.BallotsIndexList))
+	require.Equal(t, identifier, list.BallotsIndexList[0])
+}
+
 func TestKeeper_GetAllBallots(t *testing.T) {
 	k, ctx, _, _ := keepertest.ObserverKeeper(t)
 	identifier := sample.ZetaIndex(t)