Merge branch 'main' into timeout

Author: samliok

epoch.go

@@ -162,7 +162,7 @@ func (e *Epoch) HandleMessage(msg *Message, from NodeID) error {
 }
 
 func (e *Epoch) init() error {
-	e.oneTimeVerifier = &oneTimeVerifier{digests: make(map[Digest]verifiedResult)}
+	e.oneTimeVerifier = newOneTimeVerifier(e.Logger)
 	e.sched = NewScheduler(e.Logger)
 	e.monitor = NewMonitor(e.StartTime, e.Logger)
 	e.cancelWaitForBlockNotarization = func() {}

util.go

@@ -143,6 +143,14 @@ func SetRound(block VerifiedBlock, notarization *Notarization, fCert *Finalizati
 type oneTimeVerifier struct {
 	lock    sync.Mutex
 	digests map[Digest]verifiedResult
+	logger  Logger
+}
+
+func newOneTimeVerifier(logger Logger) *oneTimeVerifier {
+	return &oneTimeVerifier{
+		digests: make(map[Digest]verifiedResult),
+		logger:  logger,
+	}
 }
 
 func (otv *oneTimeVerifier) Wrap(block Block) Block {
@@ -181,6 +189,7 @@ func (block *oneTimeVerifiedBlock) Verify(ctx context.Context) (VerifiedBlock, e
 	}()
 
 	if result, exists := block.otv.digests[digest]; exists {
+		block.otv.logger.Warn("Attempted to verify an already verified block", zap.Uint64("round", header.Round))
 		return result.vb, result.err
 	}