refactor TupleType byteLength and byteLengthPacked;

add @FunctionalInterface annotation;
esaulpaugh · Jan 12, 2021 · 1539dff · 1539dff
1 parent 8767447
commit 1539dff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/src/main/java/com/esaulpaugh/headlong/abi/TupleType.java b/src/main/java/com/esaulpaugh/headlong/abi/TupleType.java
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.function.IntFunction;
 
 import static com.esaulpaugh.headlong.abi.Encoding.OFFSET_LENGTH_BYTES;
 
@@ -73,21 +74,11 @@ public int typeCode() {
     @Override
     int byteLength(Object value) {
         final Object[] elements = ((Tuple) value).elements;
-        int len = 0;
-        for (int i = 0; i < elementTypes.length; i++) {
+        return len((i) -> {
             ABIType<?> type = elementTypes[i];
             int byteLen = type.byteLength(elements[i]);
-            len += !type.dynamic ? byteLen : OFFSET_LENGTH_BYTES + byteLen;
-        }
-        return len;
-    }
-
-    private int staticByteLengthPacked() {
-        int len = 0;
-        for (ABIType<?> elementType : elementTypes) {
-            len += elementType.byteLengthPacked(null);
-        }
-        return len;
+            return type.dynamic ? OFFSET_LENGTH_BYTES + byteLen : byteLen;
+        });
     }
 
     /**
@@ -97,12 +88,16 @@ private int staticByteLengthPacked() {
     @Override
     public int byteLengthPacked(Object value) {
         if (value == null) {
-            return staticByteLengthPacked();
+            return len((i) -> elementTypes[i].byteLengthPacked(null));
         }
         final Object[] elements = ((Tuple) value).elements;
+        return len((i) -> elementTypes[i].byteLengthPacked(elements[i]));
+    }
+
+    private int len(IntFunction<Integer> elementCount) {
         int len = 0;
-        for (int i = 0; i < elementTypes.length; i++) {
-            len += elementTypes[i].byteLengthPacked(elements[i]);
+        for(int i = 0; i < elementTypes.length; i++) {
+            len += elementCount.apply(i);
         }
         return len;
     }
@@ -116,13 +111,11 @@ public int validate(final Object value) {
         if(elements.length == elementTypes.length) {
             int i = 0;
             try {
-                int len = 0;
-                for (; i < elementTypes.length; i++) {
-                    ABIType<?> type = elementTypes[i];
-                    int byteLen = type.validate(elements[i]);
-                    len += !type.dynamic ? byteLen : OFFSET_LENGTH_BYTES + byteLen;
-                }
-                return len;
+                return len((j) -> {
+                    ABIType<?> type = elementTypes[j];
+                    int byteLen = type.validate(elements[j]);
+                    return type.dynamic ? OFFSET_LENGTH_BYTES + byteLen : byteLen;
+                });
             } catch (NullPointerException | IllegalArgumentException e) {
                 throw new IllegalArgumentException("tuple index " + i + ": " + e.getMessage());
             }

diff --git a/src/main/java/com/esaulpaugh/headlong/rlp/Record.java b/src/main/java/com/esaulpaugh/headlong/rlp/Record.java
@@ -122,6 +122,7 @@ public interface Signer {
         byte[] sign(byte[] message, int off, int len);
     }
 
+    @FunctionalInterface
     public interface Verifier {
         void verify(byte[] signature, byte[] content) throws SignatureException;
     }