Unwrap DelegatingBytes32 and prevent Hash from wrapping other Hash in…

…stances (#1423)
PegaSysEng · May 9, 2019 · 0fdacbd · 0fdacbd
1 parent f7b9aee
commit 0fdacbd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java
@@ -41,6 +41,9 @@ public static Hash hash(final BytesValue value) {
   }
 
   public static Hash wrap(final Bytes32 bytes) {
+    if (bytes instanceof Hash) {
+      return (Hash) bytes;
+    }
     return new Hash(bytes);
   }
 

diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java b/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java
@@ -14,7 +14,15 @@
 
 public class DelegatingBytes32 extends BaseDelegatingBytesValue<Bytes32> implements Bytes32 {
   protected DelegatingBytes32(final Bytes32 wrapped) {
-    super(wrapped);
+    super(unwrap(wrapped));
+  }
+
+  // Make sure we don't end-up with giant chains of delegating through wrapping.
+  private static Bytes32 unwrap(final Bytes32 value) {
+    if (value instanceof DelegatingBytes32) {
+      return ((DelegatingBytes32) value).wrapped;
+    }
+    return value;
   }
 
   @Override