Do not fan-out event to TipSelection and Notarization, but call them …

…sequentially.
iotaledger · Nov 21, 2023 · bd8a3e1 · bd8a3e1
1 parent 42ab4fd
commit bd8a3e1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/pkg/protocol/engine/engine.go b/pkg/protocol/engine/engine.go
@@ -437,6 +437,7 @@ func (e *Engine) acceptanceHandler() {
 		e.Ledger.TrackBlock(block)
 		e.SybilProtection.TrackBlock(block)
 		e.UpgradeOrchestrator.TrackValidationBlock(block)
+		e.TipSelection.SetAcceptanceTime(block.IssuingTime())
 
 		e.Events.AcceptedBlockProcessed.Trigger(block)
 	}, event.WithWorkerPool(wp))

diff --git a/pkg/protocol/engine/tipselection/v1/provider.go b/pkg/protocol/engine/tipselection/v1/provider.go
@@ -8,7 +8,6 @@ import (
 	"github.com/iotaledger/hive.go/runtime/module"
 	"github.com/iotaledger/hive.go/runtime/options"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine"
-	"github.com/iotaledger/iota-core/pkg/protocol/engine/blocks"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine/tipmanager"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine/tipselection"
 	iotago "github.com/iotaledger/iota.go/v4"
@@ -23,10 +22,6 @@ func NewProvider(opts ...options.Option[TipSelection]) module.Provider[*engine.E
 			// wait for submodules to be constructed (so all of their properties are available)
 			module.OnAllConstructed(func() {
 				t.Construct(e.TipManager, e.Ledger.ConflictDAG(), e.Ledger.MemPool().TransactionMetadata, func() iotago.BlockIDs { return lo.Keys(e.EvictionState.ActiveRootBlocks()) }, DynamicLivenessThreshold(e.SybilProtection.SeatManager().OnlineCommittee().Size))
-
-				e.Events.AcceptedBlockProcessed.Hook(func(block *blocks.Block) {
-					t.SetAcceptanceTime(block.IssuingTime())
-				})
 			}, e.TipManager, e.Ledger, e.SybilProtection)
 		})