Services Code Review Changes

Signed-off-by: Edward Wertz <edward@swirldslabs.com>
hashgraph · Feb 12, 2024 · 2f940bb · 2f940bb
1 parent c2ac301
commit 2f940bb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/HederaLifecyclesImplTest.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/HederaLifecyclesImplTest.java
@@ -44,11 +44,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
 
 @ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
 class HederaLifecyclesImplTest extends MerkleTestBase {
     @Mock
     private Hedera hedera;

diff --git a/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/merkle/AddresBookUtils.java b/hedera-node/hedera-app/src/test/java/com/hedera/node/app/state/merkle/AddresBookUtils.java
@@ -16,16 +16,13 @@
 
 package com.hedera.node.app.state.merkle;
 
-import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.swirlds.common.platform.NodeId;
 import com.swirlds.platform.crypto.SerializableX509Certificate;
 import com.swirlds.platform.system.Platform;
 import com.swirlds.platform.system.address.Address;
 import com.swirlds.platform.system.address.AddressBook;
-import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 import java.util.List;
 
@@ -35,10 +32,7 @@
 public class AddresBookUtils {
 
     public static AddressBook createPretendBookFrom(final Platform platform, final boolean withKeyDetails) {
-        final var pubKey = mock(PublicKey.class);
-        given(pubKey.getAlgorithm()).willReturn("EC");
         final var cert = mock(X509Certificate.class);
-        when(cert.getPublicKey()).thenReturn(pubKey);
         final var address1 = new Address(
                 platform.getSelfId(),
                 "",

diff --git a/...hedera-mono-service/src/test/java/com/hedera/node/app/service/mono/ServicesStateTest.java b/...hedera-mono-service/src/test/java/com/hedera/node/app/service/mono/ServicesStateTest.java
@@ -125,11 +125,8 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
 
 @ExtendWith({MockitoExtension.class, LogCaptureExtension.class})
-@MockitoSettings(strictness = Strictness.LENIENT)
 class ServicesStateTest extends ResponsibleVMapUser {
 
     private final String statesDir = "src/test/resources/states/";
@@ -933,7 +930,7 @@ void testGenesisState() {
         ClassLoaderHelper.loadClassPathDependencies();
         final var servicesState = tracked(new ServicesState());
         final var platform = createMockPlatformWithCrypto();
-        final var addressBook = createPretendBookFrom(platform, true);
+        final var addressBook = createPretendBookFrom(platform, true, true);
         given(platform.getAddressBook()).willReturn(addressBook);
         final var recordsRunningHashLeaf = new RecordsRunningHashLeaf();
         recordsRunningHashLeaf.setRunningHash(new RunningHash(EMPTY_HASH));
@@ -965,7 +962,7 @@ void updatesAddressBookWithZeroWeightOnGenesisStart() {
         final var node1 = new NodeId(1);
         given(platform.getSelfId()).willReturn(node0);
 
-        final var pretendAddressBook = createPretendBookFrom(platform, true);
+        final var pretendAddressBook = createPretendBookFrom(platform, true, false);
 
         final MerkleMap<EntityNum, MerkleStakingInfo> stakingMap = subject.getChild(StateChildIndices.STAKING_INFO);
         assertEquals(1, stakingMap.size());
@@ -989,7 +986,7 @@ void updatesAddressBookWithZeroWeightForNewNodes() {
 
         given(platform.getSelfId()).willReturn(node0);
 
-        final var pretendAddressBook = createPretendBookFrom(platform, true);
+        final var pretendAddressBook = createPretendBookFrom(platform, true, false);
         final MerkleMap<EntityNum, MerkleStakingInfo> stakingMap = subject.getChild(StateChildIndices.STAKING_INFO);
         assertEquals(1, stakingMap.size());
         assertEquals(0, stakingMap.get(EntityNum.fromLong(0L)).getWeight());
@@ -1016,7 +1013,7 @@ void updatesAddressBookWithNonZeroWeightsOnGenesisStartIfStakesExist() {
         final var node0 = new NodeId(0);
         final var node1 = new NodeId(1);
         given(platform.getSelfId()).willReturn(node0);
-        final var pretendAddressBook = createPretendBookFrom(platform, true);
+        final var pretendAddressBook = createPretendBookFrom(platform, true, false);
 
         final MerkleMap<EntityNum, MerkleStakingInfo> stakingMap = subject.getChild(StateChildIndices.STAKING_INFO);
         assertEquals(1, stakingMap.size());

diff --git a/...node/hedera-mono-service/src/testFixtures/java/com/hedera/test/utils/AddresBookUtils.java b/...node/hedera-mono-service/src/testFixtures/java/com/hedera/test/utils/AddresBookUtils.java
@@ -16,9 +16,7 @@
 
 package com.hedera.test.utils;
 
-import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.swirlds.common.platform.NodeId;
 import com.swirlds.platform.crypto.SerializableX509Certificate;
@@ -28,17 +26,20 @@
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 import java.util.List;
+import org.mockito.Mockito;
 
 /**
  * Utilities for constructing AddressBook needed for tests
  */
 public class AddresBookUtils {
 
-    public static AddressBook createPretendBookFrom(final Platform platform, final boolean withKeyDetails) {
-        final var pubKey = mock(PublicKey.class);
-        given(pubKey.getAlgorithm()).willReturn("EC");
+    public static AddressBook createPretendBookFrom(
+            final Platform platform, final boolean withKeyDetails, final boolean mockPublicKey) {
+        final var publicKey = mock(PublicKey.class);
         final var cert = mock(X509Certificate.class);
-        when(cert.getPublicKey()).thenReturn(pubKey);
+        if (mockPublicKey) {
+            Mockito.when(cert.getPublicKey()).thenReturn(publicKey);
+        }
         final var address1 = new Address(
                 platform.getSelfId(),
                 "",