Remove debug output

Signed-off-by: Michael Tinker <[email protected]>

Author: tinker-michaelj

hedera-node/hedera-app/src/main/java/com/hedera/node/app/history/impl/HistoryLibraryImpl.java

@@ -12,19 +12,13 @@
 import com.hedera.cryptography.wraps.WRAPSLibraryBridge;
 import com.hedera.node.app.history.HistoryLibrary;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import java.util.Arrays;
 import java.util.Set;
 import java.util.SplittableRandom;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.hiero.base.utility.CommonUtils;
 
 /**
  * Default implementation of the {@link HistoryLibrary}.
  */
 public class HistoryLibraryImpl implements HistoryLibrary {
-    private static final Logger logger = LogManager.getLogger(HistoryLibraryImpl.class);
-
     public static final SplittableRandom RANDOM = new SplittableRandom();
     public static final WRAPSLibraryBridge WRAPS = WRAPSLibraryBridge.getInstance();
 
@@ -129,45 +123,6 @@ public Proof constructGenesisWrapsProof(
         requireNonNull(aggregatedSignature);
         requireNonNull(signers);
         requireNonNull(addressBook);
-
-        final var prevSchnorrPublicKeys = addressBook.publicKeys();
-        final var prevWeights = addressBook.weights();
-        final var nextSchnorrPublicKeys = addressBook.publicKeys();
-        final var nextWeights = addressBook.weights();
-        final var mask = addressBook.signersMask(signers);
-        final var tssVerificationKey = GENESIS_WRAPS_METADATA;
-        logger.info(" genesisAddressBookHash == null ? {}", genesisAddressBookHash == null);
-        logger.info(" genesisAddressBookHash.length == 0 ? {}", genesisAddressBookHash.length == 0);
-        logger.info(" prevSchnorrPublicKeys == null ? {}", prevSchnorrPublicKeys == null);
-        logger.info(" prevWeights == null ? {}", prevWeights == null);
-        logger.info(" prevSchnorrPublicKeys.length == 0 ? {}", prevSchnorrPublicKeys.length == 0);
-        logger.info(
-                " prevSchnorrPublicKeys.length != prevWeights.length ? {}",
-                prevSchnorrPublicKeys.length != prevWeights.length);
-        logger.info(" !WRAPSLibraryBridge.validateWeightsSum(prevWeights) ? {}", !validateWeightsSum(prevWeights));
-        logger.info(" nextSchnorrPublicKeys == null ? {}", nextSchnorrPublicKeys == null);
-        logger.info(" nextWeights == null ? {}", nextWeights == null);
-        logger.info(" nextSchnorrPublicKeys.length == 0 ? {}", nextSchnorrPublicKeys.length == 0);
-        logger.info(
-                " nextSchnorrPublicKeys.length != nextWeights.length ? {}",
-                nextSchnorrPublicKeys.length != nextWeights.length);
-        logger.info(" !WRAPSLibraryBridge.validateWeightsSum(nextWeights) ? {}", !validateWeightsSum(nextWeights));
-        logger.info(" tssVerificationKey == null ? {}", tssVerificationKey == null);
-        logger.info(" tssVerificationKey.length == 0 ? {}", tssVerificationKey.length == 0);
-        logger.info(" aggregateSignature == null ? {}", aggregatedSignature == null);
-        logger.info(" aggregateSignature.length == 0 ? {}", aggregatedSignature.length == 0);
-        logger.info(" signers == null ? {}", mask == null);
-        logger.info(
-                " signers.length != prevSchnorrPublicKeys.length ? {}", mask.length != prevSchnorrPublicKeys.length);
-        logger.info(
-                " !WRAPSLibraryBridge.validateSchnorrPublicKeys(prevSchnorrPublicKeys) ? {}",
-                !validateSchnorrPublicKeys(prevSchnorrPublicKeys));
-        logger.info(
-                ") !WRAPSLibraryBridge.validateSchnorrPublicKeys(nextSchnorrPublicKeys) ? {}",
-                !validateSchnorrPublicKeys(nextSchnorrPublicKeys));
-        logger.info("Is proof supported? {}", WRAPSLibraryBridge.isProofSupported());
-        logger.info("Genesis hash: " + CommonUtils.hex(genesisAddressBookHash));
-        logger.info("Signers: " + Arrays.toString(mask));
         return WRAPS.constructWrapsProof(
                 genesisAddressBookHash,
                 addressBook.publicKeys(),

hedera-node/hedera-app/src/main/java/com/hedera/node/app/history/impl/WrapsHistoryProver.java

@@ -35,6 +35,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.security.SecureRandom;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.EnumMap;
@@ -571,7 +572,10 @@ yield new AggregatePhaseOutput(
                             }
                             final var isValid =
                                     historyLibrary.verifyAggregateSignature(message, publicKeysForR1(), signature);
-                            log.info("Aggregate signature is {}", isValid ? "valid" : "invalid");
+                            if (!isValid) {
+                                throw new IllegalStateException("Invalid aggregate signature using nodes "
+                                        + phaseMessages.get(R1).keySet());
+                            }
                             Proof proof;
                             if (!isWrapsExtensible(sourceProof)) {
                                 final long now = System.nanoTime();
@@ -581,9 +585,7 @@ yield new AggregatePhaseOutput(
                                         signature,
                                         phaseMessages.get(R1).keySet(),
                                         targetBook);
-                                log.info(
-                                        "Constructed genesis WRAPS proof in {}ms",
-                                        (System.nanoTime() - now) / 1_000_000);
+                                logElapsed("constructing genesis WRAPS proof", now);
                             } else {
                                 proof = new Proof(
                                         sourceProof.uncompressedWrapsProof().toByteArray(),
@@ -620,16 +622,19 @@ yield new AggregatePhaseOutput(
                                     targetMetadata.toByteArray(),
                                     effectiveSignature,
                                     effectiveSigners);
-                            log.info(
-                                    "Constructed incremental WRAPS proof in {}ms",
-                                    (System.nanoTime() - now) / 1_000_000);
+                            logElapsed("constructing incremental WRAPS proof", now);
                             yield new ProofPhaseOutput(proof.compressed(), proof.uncompressed());
                         }
                     }
                 },
                 executor);
     }
 
+    private void logElapsed(@NonNull final String event, final long startNs) {
+        final var duration = Duration.ofNanos(System.nanoTime() - startNs);
+        log.info("FINISHED {} - took {}m {}s", event, duration.toMinutes(), duration.toSecondsPart());
+    }
+
     private byte[][] publicKeysForR1() {
         return phaseMessages.get(R1).keySet().stream()
                 .map(nodeId -> proofKeys.get(nodeId).toByteArray())