fix downtime recorded twice

x/downtime/keeper/keeper.go

@@ -231,14 +231,19 @@ func (k Keeper) GarbageCollectDowntimes(ctx sdk.Context) {
 }
 
 func (k Keeper) BeginBlock(ctx sdk.Context) {
+	// this ensures that no matter the outcome, we will
+	// reset the last block time to the current block time.
+	defer func() {
+		k.SetLastBlockTime(ctx, ctx.BlockTime())
+	}()
+
 	k.GarbageCollectDowntimes(ctx)
 	// we fetch the last block time
 	lastBlockTime, ok := k.GetLastBlockTime(ctx)
 	// if no last block time is known then it means that
 	// this is the first time we're recording a block time,
 	// so we just store the current block time and exit.
 	if !ok {
-		k.SetLastBlockTime(ctx, ctx.BlockTime())
 		return
 	}
 
@@ -248,10 +253,8 @@ func (k Keeper) BeginBlock(ctx sdk.Context) {
 	params := k.GetParams(ctx)
 	maxDowntimeDuration := params.DowntimeDuration
 	elapsedDuration := ctx.BlockTime().Sub(lastBlockTime)
+	// we didn't find any downtimes. So we exit.
 	if elapsedDuration < maxDowntimeDuration {
-		// if the current block time is less than the max downtime duration
-		// then we just store the current block time and exit.
-		k.SetLastBlockTime(ctx, ctx.BlockTime())
 		return
 	}
 	// if the current block time is greater than the max downtime duration

x/downtime/keeper/keeper_test.go

@@ -115,6 +115,12 @@ func TestBeginBlock(t *testing.T) {
 	require.True(t, hadDowntimes)
 	require.Equal(t, keeper.GetParams(ctx).DowntimeDuration, duration)
 
+	// move into next block, it shouldn't have downtimes.
+	ctx = nextBlock(ctx, 1*time.Second)
+	keeper.BeginBlock(ctx)
+	_, hadDowntimes = keeper.GetDowntime(ctx, uint64(ctx.BlockHeight()))
+	require.False(t, hadDowntimes)
+
 	// now check garbage collection
 	// we extend the downtime duration in order not to have another downtime
 	// since we're making time elapse by a lot in order to trigger garbage collection!
@@ -132,6 +138,12 @@ func TestBeginBlock(t *testing.T) {
 	require.False(t, iter.Valid())
 }
 
+func TestBeginBlock_DowntimeReset(t *testing.T) {
+	// we test that after a downtime the last block
+	// time is correctly reset.
+
+}
+
 func TestImportExportGenesis(t *testing.T) {
 	app, ctx := app.TestSetup()
 	keeper := app.DowntimeKeeper