Refactor: reverted more changes

iotaledger · Dec 1, 2023 · 1e8e9dd · 1e8e9dd
1 parent 9c845ec
commit 1e8e9dd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/pkg/protocol/chain.go b/pkg/protocol/chain.go
@@ -157,6 +157,8 @@ func (c *Chain) DispatchBlock(block *model.Block, src peer.ID) (dispatched bool)
 func (c *Chain) Commitment(slot iotago.SlotIndex) (commitment *Commitment, exists bool) {
 	for currentChain := c; currentChain != nil; {
 		switch forkingPoint := currentChain.ForkingPoint.Get(); {
+		case forkingPoint == nil:
+			return nil, false
 		case forkingPoint.Slot() == slot:
 			return forkingPoint, true
 		case slot > forkingPoint.Slot():
@@ -335,6 +337,14 @@ func (c *Chain) deriveWarpSyncThreshold(latestSeenSlot reactive.ReadableVariable
 	}, latestSeenSlot))
 }
 
+func warpSyncThreshold(latestSeenSlot iotago.SlotIndex, minCommittableAge iotago.SlotIndex) iotago.SlotIndex {
+	if minCommittableAge < latestSeenSlot {
+		return latestSeenSlot - minCommittableAge + 1
+	}
+
+	return 0
+}
+
 // addCommitment adds the given commitment to this chain.
 func (c *Chain) addCommitment(newCommitment *Commitment) (shutdown func()) {
 	c.commitments.Set(newCommitment.Slot(), newCommitment)

diff --git a/pkg/protocol/commitment.go b/pkg/protocol/commitment.go
@@ -158,7 +158,7 @@ func (c *Commitment) initDerivedProperties() (shutdown func()) {
 	return lo.Batch(
 		// mark commitments that are marked as root as verified
 		c.IsCommitted.InheritFrom(c.IsRoot),
-		c.IsAboveLatestVerifiedCommitment.InheritFrom(c.IsRoot),
+		c.ReplayDroppedBlocks.InheritFrom(c.IsRoot),
 
 		// mark commitments that are marked as verified as attested, fully booked and committable
 		c.IsAttested.InheritFrom(c.IsCommitted),

diff --git a/pkg/testsuite/mock/node.go b/pkg/testsuite/mock/node.go
@@ -392,19 +392,19 @@ func (n *Node) attachEngineLogsWithName(failOnBlockFiltered bool, instance *engi
 	})
 
 	events.SpendDAG.SpenderCreated.Hook(func(conflictID iotago.TransactionID) {
-		instance.LogTrace("ConflictDAG.SpendCreated", "conflictID", conflictID)
+		instance.LogTrace("SpendDAG.SpenderCreated", "conflictID", conflictID)
 	})
 
 	events.SpendDAG.SpenderEvicted.Hook(func(conflictID iotago.TransactionID) {
-		instance.LogTrace("ConflictDAG.SpendEvicted", "conflictID", conflictID)
+		instance.LogTrace("SpendDAG.SpenderEvicted", "conflictID", conflictID)
 	})
 
 	events.SpendDAG.SpenderRejected.Hook(func(conflictID iotago.TransactionID) {
-		instance.LogTrace("ConflictDAG.SpendRejected", "conflictID", conflictID)
+		instance.LogTrace("SpendDAG.SpenderRejected", "conflictID", conflictID)
 	})
 
 	events.SpendDAG.SpenderAccepted.Hook(func(conflictID iotago.TransactionID) {
-		instance.LogTrace("ConflictDAG.SpendAccepted", "conflictID", conflictID)
+		instance.LogTrace("SpendDAG.SpenderAccepted", "conflictID", conflictID)
 	})
 
 	instance.Ledger.MemPool().OnSignedTransactionAttached(
@@ -525,10 +525,6 @@ func (n *Node) FilteredBlocks() []*postsolidfilter.BlockFilteredEvent {
 	return n.filteredBlockEvents
 }
 
-func (n *Node) MainEngineSwitchedCount() int {
-	return int(n.mainEngineSwitchedCount.Load())
-}
-
 func (n *Node) TransactionFailure(txID iotago.SignedTransactionID) (InvalidSignedTransactionEvent, bool) {
 	n.mutex.RLock()
 	defer n.mutex.RUnlock()
@@ -537,6 +533,10 @@ func (n *Node) TransactionFailure(txID iotago.SignedTransactionID) (InvalidSigne
 	return event, exists
 }
 
+func (n *Node) MainEngineSwitchedCount() int {
+	return int(n.mainEngineSwitchedCount.Load())
+}
+
 func (n *Node) AttachedBlocks() []*blocks.Block {
 	n.mutex.RLock()
 	defer n.mutex.RUnlock()

diff --git a/pkg/testsuite/storage_settings.go b/pkg/testsuite/storage_settings.go
@@ -68,8 +68,15 @@ func (t *TestSuite) AssertCommitmentSlotIndexExists(slot iotago.SlotIndex, nodes
 				return ierrors.Errorf("AssertCommitmentSlotIndexExists: %s: commitment at index %v not found", node.Name, slot)
 			}
 
+			// Make sure the main chain exists
+			mainChain := node.Protocol.Chains.Main.Get()
+			if mainChain == nil {
+				return ierrors.Errorf("AssertCommitmentSlotIndexExists: %s: main chain not found when checking for commitment at index %v", node.Name, slot)
+			}
+
 			// Make sure the commitment is also available in the ChainManager.
-			if node.Protocol.Chains.Main.Get().LatestCommitment.Get().ID().Slot() < slot {
+			latestCommitment := mainChain.LatestCommitment.Get()
+			if latestCommitment == nil || latestCommitment.ID().Slot() < slot {
 				return ierrors.Errorf("AssertCommitmentSlotIndexExists: %s: commitment at index %v not found in ChainManager", node.Name, slot)
 			}
 
@@ -126,8 +133,12 @@ func (t *TestSuite) AssertChainID(expectedChainID iotago.CommitmentID, nodes ...
 
 	for _, node := range nodes {
 		t.Eventually(func() error {
-			actualChainID := node.Protocol.Chains.Main.Get().ForkingPoint.Get().ID()
+			mainChain := node.Protocol.Chains.Main.Get()
+			if mainChain == nil {
+				return ierrors.Errorf("AssertChainID: %s: main chain not found", node.Name)
+			}
 
+			actualChainID := mainChain.ForkingPoint.Get().ID()
 			if expectedChainID != actualChainID {
 				fmt.Println(expectedChainID, actualChainID)