Change JKey methods to throw InvalidKeyException and add equals…

… and `hashCode` (hashgraph#7143) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
InternetOfPeers · Jun 16, 2023 · e9a4f7d · e9a4f7d
1 parent 0acfc23
commit e9a4f7d
Show file tree

Hide file tree

Showing 82 changed files with 1,039 additions and 686 deletions.
diff --git a/...edera-app/src/main/java/com/hedera/node/app/workflows/handle/AdaptedMonoProcessLogic.java b/...edera-app/src/main/java/com/hedera/node/app/workflows/handle/AdaptedMonoProcessLogic.java
@@ -38,13 +38,13 @@
 import com.swirlds.common.system.transaction.ConsensusTransaction;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.commons.codec.DecoderException;
 
 @Singleton
 public class AdaptedMonoProcessLogic implements ProcessLogic {
@@ -120,7 +120,7 @@ private List<TransactionSignature> extract(@Nullable final Collection<SignatureV
     private JKey mapToJKey(@NonNull final Key key) {
         try {
             return JKey.mapKey(key);
-        } catch (DecoderException e) {
+        } catch (InvalidKeyException e) {
             throw new IllegalArgumentException("Unable to map key", e);
         }
     }

diff --git a/...src/main/java/com/hedera/node/app/service/file/impl/codec/FileServiceStateTranslator.java b/...src/main/java/com/hedera/node/app/service/file/impl/codec/FileServiceStateTranslator.java
@@ -27,7 +27,7 @@
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import org.apache.commons.codec.DecoderException;
+import java.security.InvalidKeyException;
 
 /**
  * The class is used to convert a {@link com.hedera.node.app.service.mono.files.HFileMeta} content and metadata  to a {@link File} and vice versa during the migration process
@@ -82,7 +82,7 @@ public static File stateToPbj(
      */
     @NonNull
     public static FileMetadataAndContent pbjToState(
-            @NonNull FileID fileID, @NonNull ReadableFileStoreImpl readableFileStore) throws DecoderException {
+            @NonNull FileID fileID, @NonNull ReadableFileStoreImpl readableFileStore) throws InvalidKeyException {
         requireNonNull(fileID);
         requireNonNull(readableFileStore);
         final var optionalFile = readableFileStore.getFileLeaf(fileID);
@@ -95,7 +95,7 @@ public static FileMetadataAndContent pbjToState(
      * @return File and metadata pair object
      */
     @NonNull
-    public static FileMetadataAndContent pbjToState(@NonNull File file) throws DecoderException {
+    public static FileMetadataAndContent pbjToState(@NonNull File file) throws InvalidKeyException {
         requireNonNull(file);
         var keys = (file.hasKeys())
                 ? com.hedera.node.app.service.mono.legacy.core.jproto.JKey.convertKey(

diff --git a/...java/com/hedera/node/app/service/file/impl/test/codec/FileServiceStateTranslatorTest.java b/...java/com/hedera/node/app/service/file/impl/test/codec/FileServiceStateTranslatorTest.java
@@ -28,7 +28,7 @@
 import com.hedera.node.app.service.file.impl.test.FileTestBase;
 import com.hedera.node.app.service.mono.files.HFileMeta;
 import com.hedera.node.app.service.mono.utils.MiscUtils;
-import org.apache.commons.codec.DecoderException;
+import java.security.InvalidKeyException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +45,7 @@ public class FileServiceStateTranslatorTest extends FileTestBase {
     void setUp() {}
 
     @Test
-    void createFileMetadataAndContentFromFile() throws DecoderException {
+    void createFileMetadataAndContentFromFile() throws InvalidKeyException {
         final var existingFile = readableStore.getFileMetadata(fileId);
         assertFalse(existingFile.deleted());
 
@@ -69,7 +69,7 @@ void createFileMetadataAndContentFromFile() throws DecoderException {
     }
 
     @Test
-    void createFileMetadataAndContentFromFileWithEmptyKeysAndMemo() throws DecoderException {
+    void createFileMetadataAndContentFromFileWithEmptyKeysAndMemo() throws InvalidKeyException {
         final var existingFile = readableStore.getFileMetadata(fileId);
         assertFalse(existingFile.deleted());
 
@@ -101,7 +101,7 @@ void createFileMetadataAndContentFromFileWithEmptyKeysAndMemo() throws DecoderEx
     }
 
     @Test
-    void createFileMetadataAndContentFromFileWithEmptyConentForDeletedFile() throws DecoderException {
+    void createFileMetadataAndContentFromFileWithEmptyConentForDeletedFile() throws InvalidKeyException {
 
         final FileMetadataAndContent convertedFile = FileServiceStateTranslator.pbjToState(fileWithNoContent);
 
@@ -125,7 +125,7 @@ void createFileMetadataAndContentFromFileWithEmptyConentForDeletedFile() throws
     }
 
     @Test
-    void createFileMetadataAndContentFromReadableFileStore() throws DecoderException {
+    void createFileMetadataAndContentFromReadableFileStore() throws InvalidKeyException {
         final var existingFile = readableStore.getFileMetadata(fileId);
         assertFalse(existingFile.deleted());
 
@@ -200,7 +200,7 @@ void createFileFromFileIDAndHederaFs() {
         assertEquals(createFile(), convertedFile);
     }
 
-    private FileMetadataAndContent getExpectedMonoFileMetaAndContent() throws DecoderException {
+    private FileMetadataAndContent getExpectedMonoFileMetaAndContent() throws InvalidKeyException {
         var keys = com.hedera.node.app.service.mono.legacy.core.jproto.JKey.convertKey(
                 Key.newBuilder().keyList(file.keys()).build(), 1);
         com.hedera.node.app.service.mono.files.HFileMeta hFileMeta =
@@ -214,7 +214,7 @@ private FileMetadataAndContent getExpectedMonoFileMetaAndContentWithEmptyMemoAnd
         return new FileMetadataAndContent(file.contents().toByteArray(), hFileMeta);
     }
 
-    private FileMetadataAndContent getExpectedMonoFileMetaAndContentEmptyContent() throws DecoderException {
+    private FileMetadataAndContent getExpectedMonoFileMetaAndContentEmptyContent() throws InvalidKeyException {
         var keys = com.hedera.node.app.service.mono.legacy.core.jproto.JKey.convertKey(
                 Key.newBuilder().keyList(file.keys()).build(), 1);
         com.hedera.node.app.service.mono.files.HFileMeta hFileMeta =

diff --git a/hedera-node/hedera-mono-service/src/main/java/com/hedera/node/app/service/mono/Utils.java b/hedera-node/hedera-mono-service/src/main/java/com/hedera/node/app/service/mono/Utils.java
@@ -22,9 +22,9 @@
 import com.hedera.node.app.spi.key.HederaKey;
 import com.hederahashgraph.api.proto.java.Key;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import java.security.InvalidKeyException;
 import java.util.Optional;
 import java.util.Set;
-import org.apache.commons.codec.DecoderException;
 
 // This class should not exist. Right now we have code that needs to map from a JKey to a
 // HederaKey, but that should be an implementation detail handled somewhere in the token
@@ -45,7 +45,7 @@ public static Optional<HederaKey> asHederaKey(final Key key) {
                 return Optional.empty();
             }
             return Optional.of(fcKey);
-        } catch (DecoderException ignore) {
+        } catch (InvalidKeyException ignore) {
             return Optional.empty();
         }
     }
@@ -61,10 +61,11 @@ public static Optional<HederaKey> asHederaKey(@Nullable final com.hedera.hapi.no
                 return Optional.empty();
             }
             return Optional.of(fcKey);
-        } catch (DecoderException ignore) {
+        } catch (InvalidKeyException ignore) {
             return Optional.empty();
         }
     }
+
     /**
      * Converts a set of {@link com.hedera.hapi.node.base.Key} to a set of {@link HederaKey}
      *

diff --git a/...edera/node/app/service/mono/fees/calculation/consensus/txns/UpdateTopicResourceUsage.java b/...edera/node/app/service/mono/fees/calculation/consensus/txns/UpdateTopicResourceUsage.java
@@ -31,9 +31,9 @@
 import com.hederahashgraph.api.proto.java.TransactionBody;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import java.security.InvalidKeyException;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.commons.codec.DecoderException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -86,7 +86,7 @@ public FeeData usageGivenExplicit(
                         merkleTopic.hasAutoRenewAccountId(),
                         expiry,
                         txnBody.getConsensusUpdateTopic());
-            } catch (final DecoderException illegal) {
+            } catch (final InvalidKeyException illegal) {
                 log.warn("Usage estimation unexpectedly failed for {}!", txnBody, illegal);
                 throw new InvalidTxBodyException(illegal);
             }

diff --git a/...-service/src/main/java/com/hedera/node/app/service/mono/ledger/accounts/AliasManager.java b/...-service/src/main/java/com/hedera/node/app/service/mono/ledger/accounts/AliasManager.java
@@ -37,6 +37,7 @@
 import com.hederahashgraph.api.proto.java.Key;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import java.security.InvalidKeyException;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
@@ -45,7 +46,6 @@
 import java.util.function.UnaryOperator;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.commons.codec.DecoderException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hyperledger.besu.datatypes.Address;
@@ -183,7 +183,7 @@ public void rebuildAliasesMap(
                             numEOAliases.incrementAndGet();
                         }
                     } catch (final InvalidProtocolBufferException
-                            | DecoderException
+                            | InvalidKeyException
                             | IllegalArgumentException ignore) {
                         // any expected exception means no eth mapping
                     }
@@ -259,7 +259,7 @@ public static byte[] keyAliasToEVMAddress(final ByteString alias) {
             final Key key = Key.parseFrom(alias);
             final JKey jKey = JKey.mapKey(key);
             return tryAddressRecovery(jKey, ADDRESS_RECOVERY_FN);
-        } catch (InvalidProtocolBufferException | DecoderException | IllegalArgumentException ignore) {
+        } catch (InvalidProtocolBufferException | InvalidKeyException | IllegalArgumentException ignore) {
             // any expected exception means no eth mapping
             return null;
         }
@@ -274,7 +274,7 @@ public static byte[] keyAliasToEVMAddress(@NonNull final Bytes alias) {
             final Key key = Key.parseFrom(ret);
             final JKey jKey = JKey.mapKey(key);
             return tryAddressRecovery(jKey, ADDRESS_RECOVERY_FN);
-        } catch (InvalidProtocolBufferException | DecoderException | IllegalArgumentException ignore) {
+        } catch (InvalidProtocolBufferException | InvalidKeyException | IllegalArgumentException ignore) {
             // any expected exception means no eth mapping
             return null;
         }