Remove extra memo conditionals

trufflesuite · Oct 12, 2020 · f891db1 · f891db1
1 parent 95ed02e
commit f891db1
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/packages/abi-utils/lib/arbitrary.ts b/packages/abi-utils/lib/arbitrary.ts
@@ -231,20 +231,13 @@ const Type: fc.Memo<string> = fc.memo(n =>
       fc.oneof(Primitive(), ArrayFixed(n > 3 ? 3 : n), ArrayDynamic(n))
 );
 
-const ArrayFixed = fc.memo(n => {
-  const tuple =
-    n <= 1
-      ? fc.tuple(Primitive(), fc.integer(1, 256))
-      : fc.tuple(Type(), fc.integer(1, 256));
-
-  return tuple.map(([type, length]) => `${type}[${length}]`);
-});
-
-const ArrayDynamic = fc.memo(n => {
-  const item = n <= 1 ? Primitive() : Type();
+const ArrayFixed = fc.memo(n =>
+  fc
+    .tuple(Type(n - 1), fc.integer(1, 256))
+    .map(([type, length]) => `${type}[${length}]`)
+);
 
-  return item.map(type => `${type}[]`);
-});
+const ArrayDynamic = fc.memo(n => Type(n - 1).map(type => `${type}[]`));
 
 const reservedWords = new Set([
   "Error",