06302 - processing merge conflicts

Signed-off-by: Edward Wertz <edward@swirldslabs.com>
hashgraph · May 12, 2023 · 7e6cb76 · 7e6cb76
1 parent 2240a48
commit 7e6cb76
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java
@@ -633,9 +633,9 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
 
         if (chatterConfig.useChatter()) {
             criticalQuorum = new CriticalQuorumImpl(
-                    metrics, selfId.getId(), initialAddressBook, false, chatterConfig.criticalQuorumSoftening());
+                    metrics, selfId.id(), initialAddressBook, false, chatterConfig.criticalQuorumSoftening());
         } else {
-            criticalQuorum = new CriticalQuorumImpl(metrics, selfId.getId(), initialAddressBook);
+            criticalQuorum = new CriticalQuorumImpl(metrics, selfId.id(), initialAddressBook);
         }
 
         final LoadedState loadedState = initializeLoadedStateFromSignedState(loadedSignedState);

diff --git a/...-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventMapper.java b/...-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventMapper.java
@@ -61,7 +61,7 @@ public EventMapper(@NonNull final Metrics metrics, @NonNull final NodeId selfId)
         mappings = new HashMap<>();
 
         metrics.getOrCreate(new FunctionGauge.Config<>(
-                        INFO_CATEGORY, "lastGen", Long.class, () -> getHighestGenerationNumber(selfId.getId()))
+                        INFO_CATEGORY, "lastGen", Long.class, () -> getHighestGenerationNumber(selfId.id()))
                 .withDescription("last event generation number by me")
                 .withFormat("%d"));
     }

diff --git a/...ds-platform-core/src/main/java/com/swirlds/platform/state/address/AddressBookMetrics.java b/...ds-platform-core/src/main/java/com/swirlds/platform/state/address/AddressBookMetrics.java
@@ -41,7 +41,7 @@ private AddressBookMetrics() {}
     public static void registerAddressBookMetrics(
             @NonNull final Metrics metrics, @NonNull final AddressBook addressBook, @NonNull final NodeId selfId) {
 
-        metrics.getOrCreate(new FunctionGauge.Config<>(INFO_CATEGORY, "memberID", Long.class, selfId::getId)
+        metrics.getOrCreate(new FunctionGauge.Config<>(INFO_CATEGORY, "memberID", Long.class, selfId::id)
                 .withUnit("node ID")
                 .withDescription("The node ID number of this member"));