feat: PR comments resolved.

Signed-off-by: Gaurav Goel <[email protected]>
torusresearch · Sep 12, 2024 · b261754 · b261754
1 parent 7a9b427
commit b261754
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/main/java/org/torusresearch/torusutils/helpers/IsNewKeyResponse.java b/src/main/java/org/torusresearch/torusutils/helpers/IsNewKeyResponse.java
@@ -1,20 +1,14 @@
 package org.torusresearch.torusutils.helpers;
 
+import org.jetbrains.annotations.NotNull;
+
 public class IsNewKeyResponse {
 
     public boolean isNewKey;
     public String publicKeyX;
 
-    public IsNewKeyResponse(boolean isNewKey, String publicKeyX) {
+    public IsNewKeyResponse(@NotNull boolean isNewKey, @NotNull String publicKeyX) {
         this.isNewKey = isNewKey;
         this.publicKeyX = publicKeyX;
     }
-
-    public boolean isNewKey() {
-        return isNewKey;
-    }
-
-    public String getPublicKeyX() {
-        return publicKeyX;
-    }
 }
diff --git a/src/main/java/org/torusresearch/torusutils/helpers/NodeUtils.java b/src/main/java/org/torusresearch/torusutils/helpers/NodeUtils.java
@@ -356,7 +356,9 @@ public static TorusKey retrieveOrImportShare(@NotNull String legacyMetadataHost,
         ArrayList<IsNewKeyResponse> isNewKeys = new ArrayList<>();
 
         for (ShareRequestResult item : shareResponses) {
-            isNewKeys.add(new IsNewKeyResponse(item.is_new_key, item.keys[0].public_key.getX()));
+            if (item.keys.length > 0 && item.keys[0] != null) {
+                isNewKeys.add(new IsNewKeyResponse(item.is_new_key, item.keys[0].public_key.getX()));
+            }
 
             if (item.session_token_sigs != null && item.session_token_sigs.length > 0) {
                 if (item.session_token_sig_metadata != null && item.session_token_sig_metadata.length > 0) {
@@ -445,7 +447,7 @@ public static TorusKey retrieveOrImportShare(@NotNull String legacyMetadataHost,
 
         boolean isNewKey = false;
         for (IsNewKeyResponse item : isNewKeys) {
-            if (item.isNewKey() && item.getPublicKeyX().equalsIgnoreCase(thresholdPublicKey.getX())) {
+            if (item.isNewKey && item.publicKeyX.equalsIgnoreCase(thresholdPublicKey.getX())) {
                 isNewKey = true;
             }
         }