nits

vms/platformvm/block/builder/builder.go

@@ -61,7 +61,7 @@ type builder struct {
 	blkManager        blockexecutor.Manager
 
 	// This timer goes off when it is time for the next staker to add/leave
-	// the staking set. When it goes off, [maybeAdvanceTime()] is called,
+	// the staking set. When it goes off, [maybeIssueEmptyBlock()] is called,
 	// potentially triggering creation of a new block.
 	timer                    *timer.Timer
 	nextStakerChangeTimeLock sync.RWMutex
@@ -81,7 +81,7 @@ func New(
 		blkManager:        blkManager,
 	}
 
-	builder.timer = timer.NewTimer(builder.maybeAdvanceTime)
+	builder.timer = timer.NewTimer(builder.maybeIssueEmptyBlock)
 
 	go txExecutorBackend.Ctx.Log.RecoverAndPanic(builder.timer.Dispatch)
 	return builder
@@ -112,22 +112,11 @@ func (b *builder) BuildBlock(context.Context) (snowman.Block, error) {
 		return nil, fmt.Errorf("%w: %s", state.ErrMissingParentState, preferredID)
 	}
 
-	timestamp, timeWasCapped, nextStakerChangeTime, err := txexecutor.NextBlockTime(preferredState, b.txExecutorBackend.Clk)
+	timestamp, timeWasCapped, err := txexecutor.NextBlockTime(preferredState, b.txExecutorBackend.Clk)
 	if err != nil {
 		return nil, fmt.Errorf("could not calculate next staker change time: %w", err)
 	}
 
-	waitTime := nextStakerChangeTime.Sub(timestamp)
-	ctx.Log.Debug("setting next scheduled event",
-		zap.Time("nextEventTime", nextStakerChangeTime),
-		zap.Duration("timeUntil", waitTime),
-	)
-
-	b.nextStakerChangeTimeLock.Lock()
-	b.nextStakerChangeTime = nextStakerChangeTime
-	b.nextStakerChangeTimeLock.Unlock()
-	b.timer.SetTimeoutIn(waitTime)
-
 	statelessBlk, err := buildBlock(
 		b,
 		preferredID,
@@ -201,7 +190,7 @@ func (b *builder) ResetBlockTimer() {
 	b.timer.SetTimeoutIn(waitTime)
 }
 
-func (b *builder) maybeAdvanceTime() {
+func (b *builder) maybeIssueEmptyBlock() {
 	ctx := b.txExecutorBackend.Ctx
 
 	// Grabbing the lock here enforces that this function is not called mid-way
@@ -215,6 +204,7 @@ func (b *builder) maybeAdvanceTime() {
 	now := b.txExecutorBackend.Clk.Time()
 	if b.nextStakerChangeTime.After(now) {
 		// [nextStakerChangeTime] is in the future, no need to advance time.
+		b.ResetBlockTimer()
 		return
 	}
 

vms/platformvm/txs/executor/tx_mempool_verifier.go

@@ -109,7 +109,7 @@ func (v *MempoolTxVerifier) standardBaseState() (state.Diff, error) {
 		return nil, err
 	}
 
-	nextBlkTime, _, _, err := NextBlockTime(state, v.Clk)
+	nextBlkTime, _, err := NextBlockTime(state, v.Clk)
 	if err != nil {
 		return nil, err
 	}
@@ -124,7 +124,7 @@ func (v *MempoolTxVerifier) standardBaseState() (state.Diff, error) {
 	return state, nil
 }
 
-func NextBlockTime(state state.Chain, clk *mockable.Clock) (time.Time, bool, time.Time, error) {
+func NextBlockTime(state state.Chain, clk *mockable.Clock) (time.Time, bool, error) {
 	var (
 		timestamp  = clk.Time()
 		parentTime = state.GetTimestamp()
@@ -136,7 +136,7 @@ func NextBlockTime(state state.Chain, clk *mockable.Clock) (time.Time, bool, tim
 
 	nextStakerChangeTime, err := GetNextStakerChangeTime(state)
 	if err != nil {
-		return time.Time{}, false, time.Time{}, fmt.Errorf("failed getting next staker change time: %w", err)
+		return time.Time{}, false, fmt.Errorf("failed getting next staker change time: %w", err)
 	}
 
 	// timeWasCapped means that [timestamp] was reduced to [nextStakerChangeTime]
@@ -145,5 +145,5 @@ func NextBlockTime(state state.Chain, clk *mockable.Clock) (time.Time, bool, tim
 		timestamp = nextStakerChangeTime
 	}
 	// [timestamp] = min(max(now, parentTime), nextStakerChangeTime)
-	return timestamp, timeWasCapped, nextStakerChangeTime, nil
+	return timestamp, timeWasCapped, nil
 }