next receives Deadline-type timeouts

algorand · Aug 16, 2023 · bb94590 · bb94590
1 parent 0a3fbea
commit bb94590
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/agreement/demux.go b/agreement/demux.go
@@ -19,7 +19,6 @@ package agreement
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/logging"
@@ -190,7 +189,7 @@ func (d *demux) verifyBundle(ctx context.Context, m message, r round, p period,
 // next blocks until it observes an external input event of interest for the state machine.
 //
 // If ok is false, there are no more events so the agreement service should quit.
-func (d *demux) next(s *Service, deadline Deadline, fastDeadline time.Duration, currentRound round) (e externalEvent, ok bool) {
+func (d *demux) next(s *Service, deadline Deadline, fastDeadline Deadline, currentRound round) (e externalEvent, ok bool) {
 	defer func() {
 		if !ok {
 			return
@@ -251,7 +250,7 @@ func (d *demux) next(s *Service, deadline Deadline, fastDeadline time.Duration,
 
 	ledgerNextRoundCh := s.Ledger.Wait(nextRound)
 	deadlineCh := s.Clock.TimeoutAt(deadline.Duration, deadline.Type)
-	fastDeadlineCh := s.Clock.TimeoutAt(fastDeadline, TimeoutFastRecovery)
+	fastDeadlineCh := s.Clock.TimeoutAt(fastDeadline.Duration, fastDeadline.Type)
 
 	d.UpdateEventsQueue(eventQueueDemux, 0)
 	d.monitor.dec(demuxCoserviceType)

diff --git a/agreement/demux_test.go b/agreement/demux_test.go
@@ -675,7 +675,7 @@ func (t *demuxTester) TestUsecase(testcase demuxTestUsecase) bool {
 		close(s.quit)
 	}
 
-	e, ok := dmx.next(s, Deadline{Duration: time.Second, Type: TimeoutDeadline}, fastTimeoutChTime, 300)
+	e, ok := dmx.next(s, Deadline{Duration: time.Second, Type: TimeoutDeadline}, Deadline{Duration: fastTimeoutChTime, Type: TimeoutFastRecovery}, 300)
 
 	if !assert.Equal(t, testcase.ok, ok) {
 		return false

diff --git a/agreement/service.go b/agreement/service.go
@@ -19,7 +19,6 @@ package agreement
 //go:generate dbgen -i agree.sql -p agreement -n agree -o agreeInstall.go -h ../scripts/LICENSE_HEADER
 import (
 	"context"
-	"time"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/logging"
@@ -81,7 +80,7 @@ type parameters Parameters
 // externalDemuxSignals used to syncronize the external signals that goes to the demux with the main loop.
 type externalDemuxSignals struct {
 	Deadline             Deadline
-	FastRecoveryDeadline time.Duration
+	FastRecoveryDeadline Deadline
 	CurrentRound         round
 }
 
@@ -242,7 +241,8 @@ func (s *Service) mainLoop(input <-chan externalEvent, output chan<- []action, r
 
 	for {
 		output <- a
-		ready <- externalDemuxSignals{Deadline: status.Deadline, FastRecoveryDeadline: status.FastRecoveryDeadline, CurrentRound: status.Round}
+		fastRecoveryDeadline := Deadline{Duration: status.FastRecoveryDeadline, Type: TimeoutFastRecovery}
+		ready <- externalDemuxSignals{Deadline: status.Deadline, FastRecoveryDeadline: fastRecoveryDeadline, CurrentRound: status.Round}
 		e, ok := <-input
 		if !ok {
 			break