Override Object methods in Federation. Make equals method different i…

…n StandardMultisig and ErpFederation to be consistent with hashCode
rsksmart · Sep 30, 2023 · f880a8d · f880a8d
1 parent d32cd4f
commit f880a8d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/peg/ErpFederation.java b/rskj-core/src/main/java/co/rsk/peg/ErpFederation.java
@@ -67,6 +67,20 @@ public int getNumberOfSignaturesRequired() {
         return Integer.parseInt(thresholdChunk.toString());
     }
 
+    @Override
+    public boolean equals(Object other){
+        if (this == other) {
+            return true;
+        }
+
+        if (other == null || this.getClass() != other.getClass()) {
+            return false;
+        }
+
+        ErpFederation otherFederation = (ErpFederation) other;
+        return this.getAddress() == otherFederation.getAddress();
+    }
+
     @Override
     public int hashCode() {
         // Can use java.util.Objects.hash since all of Instant, int and List<BtcECKey> have

diff --git a/rskj-core/src/main/java/co/rsk/peg/Federation.java b/rskj-core/src/main/java/co/rsk/peg/Federation.java
@@ -140,18 +140,9 @@ public String toString() {
         return String.format("Got federation with address %s", getAddress());
     }
 
-    public boolean equals(Object other){
-        if (this == other) {
-            return true;
-        }
-
-        if (other == null || this.getClass() != other.getClass()) {
-            return false;
-        }
-
-        Federation otherFederation = (Federation) other;
-        return this.getAddress() == otherFederation.getAddress();
-    }
+    @Override
+    public abstract boolean equals(Object other);
 
+    @Override
     public abstract int hashCode();
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/StandardMultisigFederation.java b/rskj-core/src/main/java/co/rsk/peg/StandardMultisigFederation.java
@@ -63,6 +63,20 @@ public int getNumberOfSignaturesRequired() {
         return Integer.parseInt(thresholdChunk.toString());
     }
 
+    @Override
+    public boolean equals(Object other){
+        if (this == other) {
+            return true;
+        }
+
+        if (other == null || this.getClass() != other.getClass()) {
+            return false;
+        }
+
+        StandardMultisigFederation otherFederation = (StandardMultisigFederation) other;
+        return this.getAddress() == otherFederation.getAddress();
+    }
+
     @Override
     public int hashCode() {
         // Can use java.util.Objects.hash since all of Instant, int and List<BtcECKey> have