1 files changed, 4 insertions, 40 deletions
diff --git a/pbt/ts/src/index.ts b/pbt/ts/src/index.ts
index c6fc73a..1e9b8c0 100644
--- a/pbt/ts/src/index.ts
+++ b/pbt/ts/src/index.ts
@@ -1,11 +1,6 @@
 import "dotenv/config";
 import Prando from 'prando';
-import { Gen, property } from "./property";
-
-let genint: Gen<number> = (rng: Prando) =>
-  (size: number) =>
-    rng.nextInt(-size, size);
-
+import { Gen, listOf, property, shrinklist, someInt } from "./property";
 
 function arrayEquals<A>(a: A[], b: A[]): boolean {
   return Array.isArray(a) &&
@@ -14,19 +9,6 @@ function arrayEquals<A>(a: A[], b: A[]): boolean {
     a.every((val, index) => val === b[index]);
 }
 
-function genlist<A>(gen: Gen<A>): Gen<A[]> {
-  return (rng: Prando) => {
-    let g = gen(rng);
-    return (size: number) => {
-      let result = [];
-      for (let i = 0; i < size; i++) {
-        result.push(g(size));
-      }
-      return result;
-    };
-  };
-}
-
 function reverse<A>(arr: A[]): A[] {
   let result = [];
   for (let i = arr.length - 1; i >= 0; i--) {
@@ -39,27 +21,9 @@ function reverse_is_self_inverse(arr: number[]): boolean {
   return arrayEquals(reverse(reverse(arr)), arr);
 }
 
-function shrinklist<A>(arr: A[]): A[][] {
-  let result = [];
-
-  let tail = arr.slice(1);
-  let keep1 = arr.slice();
-  keep1.splice(1, 1);
-  result.push(tail,keep1);
-
-  if (arr.length >3) {
-    let half = Math.floor(arr.length / 2);
-    let copy = arr.slice();
-    let secondHalf = copy.slice(half);
-    result.push(secondHalf);
-  }
-
-  return result;
-}
-
 function gen2lists<A>(gen: Gen<A>): Gen<[A[], A[]]> {
   return (rng: Prando) => {
-    let gl = genlist(gen)(rng);
+    let gl = listOf(gen)(rng);
     return (size: number) => {
       return [gl(size), gl(size)]
     };
@@ -84,10 +48,10 @@ function shrink2lists<A>([l1, l2]: [A[], A[]]): [A[], A[]][] {
 }
 
 let prop_reverse_with_two_lists =
-  property<[number[], number[]]>(reverse_with_two_lists, gen2lists(genint), shrink2lists);
+  property<[number[], number[]]>(reverse_with_two_lists, gen2lists(someInt), shrink2lists);
 
 let prop_reverse_is_self_inverse =
-  property(reverse_is_self_inverse, genlist(genint), shrinklist);
+  property(reverse_is_self_inverse, listOf(someInt), shrinklist);
 
 async function main() {
   let rng = new Prando(Math.random() * 1000);