feat: Remove getOtherId (#12465)

Signed-off-by: Austin Littley <[email protected]>

Author: litt3

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/EventStringBuilder.java

@@ -102,7 +102,15 @@ public EventStringBuilder appendOtherParent() {
             return this;
         }
         sb.append(" op");
-        appendShortEvent(unhashedData.getOtherId(), hashedData.getOtherParentGen(), hashedData.getOtherParentHash());
+
+        final NodeId otherParentId;
+        if (hashedData.hasOtherParent()) {
+            otherParentId = hashedData.getOtherParents().getFirst().getCreator();
+        } else {
+            otherParentId = null;
+        }
+
+        appendShortEvent(otherParentId, hashedData.getOtherParentGen(), hashedData.getOtherParentHash());
         return this;
     }
 

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/internal/EventImpl.java

@@ -521,13 +521,6 @@ public Instant getConsensusTimestamp() {
         return consensusData.getConsensusTimestamp();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    @Nullable
-    public NodeId getOtherId() {
-        return baseEvent.getUnhashedData().getOtherId();
-    }
-
     /** {@inheritDoc} */
     @Override
     public long getGeneration() {

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/events/BaseEventUnhashedData.java

@@ -156,16 +156,6 @@ public int getMinimumSupportedVersion() {
         return ClassVersion.ORIGINAL;
     }
 
-    /**
-     * Get the other parent's NodeId
-     *
-     * @return the other parent's NodeId
-     */
-    @Nullable
-    public NodeId getOtherId() {
-        return otherId;
-    }
-
     /**
      * Get the signature
      *

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/events/PlatformEvent.java

@@ -18,7 +18,6 @@
 
 import com.swirlds.common.crypto.Hash;
 import com.swirlds.common.platform.NodeId;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import java.time.Instant;
 
 /**
@@ -62,14 +61,6 @@ public interface PlatformEvent extends ConsensusEvent {
      */
     Instant getConsensusTimestamp();
 
-    /**
-     * Node ID of the otherParent. null if otherParent doesn't exist.
-     *
-     * @return Other parent event's ID
-     */
-    @Nullable
-    NodeId getOtherId();
-
     /**
      * This event's parent event. null if none exists.
      *

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/components/appcomm/LatestCompleteStateNotifierTests.java

@@ -17,6 +17,7 @@
 package com.swirlds.platform.components.appcomm;
 
 import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals;
+import static com.swirlds.common.test.fixtures.junit.tags.TestQualifierTags.TIMING_SENSITIVE;
 import static com.swirlds.common.threading.manager.AdHocThreadManager.getStaticThreadManager;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,11 +33,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 /**
  * Basic sanity check tests for the {@link DefaultLatestCompleteStateNotifier} class
  */
+@Tag(TIMING_SENSITIVE)
 public class LatestCompleteStateNotifierTests {
 
     @Test

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/orphan/OrphanBufferTests.java

@@ -158,7 +158,6 @@ private static GossipEvent createGossipEvent(
                 .thenReturn(otherParent == null ? Collections.emptyList() : Collections.singletonList(otherParent));
 
         final BaseEventUnhashedData unhashedData = mock(BaseEventUnhashedData.class);
-        when(unhashedData.getOtherId()).thenReturn(otherParent.getCreator());
 
         final GossipEvent event = mock(GossipEvent.class);
         when(event.getHashedData()).thenReturn(hashedData);

platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/consensus/GraphGeneratorTests.java

@@ -182,7 +182,18 @@ protected void verifyExpectedOtherParentRatio(
 
         int count = 0;
         for (final IndexedEvent event : events) {
-            if (Objects.equals(event.getOtherId(), nodeId)) {
+            final NodeId otherParentId;
+            if (event.getBaseEvent().getHashedData().getOtherParents().isEmpty()) {
+                otherParentId = null;
+            } else {
+                otherParentId = event.getBaseEvent()
+                        .getHashedData()
+                        .getOtherParents()
+                        .getFirst()
+                        .getCreator();
+            }
+
+            if (Objects.equals(otherParentId, nodeId)) {
                 count++;
             }
         }

platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/event/tipset/TipsetEventCreatorTests.java

@@ -616,7 +616,13 @@ void zeroWeightNodeTest(final boolean advancingClock, final boolean useBirthRoun
                 }
                 atLeastOneEventCreated = true;
 
-                final NodeId otherId = event.getUnhashedData().getOtherId();
+                final NodeId otherId;
+                if (event.getHashedData().hasOtherParent()) {
+                    otherId = event.getHashedData().getOtherParents().getFirst().getCreator();
+                } else {
+                    otherId = null;
+                }
+
                 if (otherId != null && otherId.equals(zeroWeightNode)) {
                     zeroWeightNodeOtherParentCount++;
                 }
@@ -707,7 +713,13 @@ void zeroWeightSlowNodeTest(final boolean advancingClock, final boolean useBirth
                 }
                 atLeastOneEventCreated = true;
 
-                final NodeId otherId = event.getUnhashedData().getOtherId();
+                final NodeId otherId;
+                if (event.getHashedData().hasOtherParent()) {
+                    otherId = event.getHashedData().getOtherParents().getFirst().getCreator();
+                } else {
+                    otherId = null;
+                }
+
                 if (otherId != null && otherId.equals(zeroWeightNode)) {
                     zeroWeightNodeOtherParentCount++;
                 }
@@ -885,7 +897,13 @@ void frozenEventCreationBug() {
         // Create an event from one of the other nodes that was updated in the previous snapshot,
         // but has not been updated in the current snapshot.
 
-        final NodeId otherParentId = eventA2.getUnhashedData().getOtherId();
+        final NodeId otherParentId;
+        if (eventA2.getHashedData().hasOtherParent()) {
+            otherParentId = eventA2.getHashedData().getOtherParents().getFirst().getCreator();
+        } else {
+            otherParentId = null;
+        }
+
         final GossipEvent legalOtherParent = createTestEvent(random, otherParentId, 0, nodeA, 0);
 
         eventCreator.registerEvent(legalOtherParent);