Update fuzz to support new stdlib.

.github/workflows/continuous-integration.yml

@@ -23,9 +23,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: aiken-lang/setup-aiken@v1
-        with:
-          version: v1.0.29-alpha
+      - name: 🧰 Install Aiken
+        run: cargo install --verbose --git https://github.com/aiken-lang/aiken.git
       - run: aiken fmt --check
       - run: aiken check -D
       - run: aiken build

aiken.toml

@@ -1,5 +1,5 @@
 name = "aiken-lang/fuzz"
-version = "1.0.0"
+version = "2.0.0"
 license = "Apache-2.0"
 description = "A library for writing Aiken's fuzzers."
 
@@ -10,5 +10,5 @@ platform = "github"
 
 [[dependencies]]
 name = "aiken-lang/stdlib"
-version = "1.9.0"
+version = "main"
 source = "github"

lib/aiken/fuzz.ak

@@ -1,5 +1,5 @@
 use aiken/builtin
-use aiken/list
+use aiken/collection/list
 use aiken/math
 use aiken/option
 
@@ -270,7 +270,7 @@ pub fn set_between(fuzzer: Fuzzer<a>, min: Int, max: Int) -> Fuzzer<List<a>> {
       } else {
         log2(max - min)
       },
-      nub(100, fuzzer),
+      nub(100, fuzzer, _),
       min,
       max,
       0,
@@ -280,17 +280,15 @@ pub fn set_between(fuzzer: Fuzzer<a>, min: Int, max: Int) -> Fuzzer<List<a>> {
 }
 
 /// Construct a fuzzer that returns values not present in a given list.
-fn nub(n: Int, fuzzer: Fuzzer<a>) -> fn(List<a>) -> Fuzzer<a> {
-  fn(st) {
-    if n <= 0 {
-      fail @"gave up trying to find unique values: the fuzzer did not yield any *new* value after many tries!"
+fn nub(n: Int, fuzzer: Fuzzer<a>, st: List<a>) -> Fuzzer<a> {
+  if n <= 0 {
+    fail @"gave up trying to find unique values: the fuzzer did not yield any *new* value after many tries!"
+  } else {
+    let a <- and_then(fuzzer)
+    if list.has(st, a) {
+      nub(n - 1, fuzzer, st)
     } else {
-      let a <- and_then(fuzzer)
-      if list.has(st, a) {
-        nub(n - 1, fuzzer)(st)
-      } else {
-        constant(a)
-      }
+      constant(a)
     }
   }
 }

lib/aiken/fuzz.test.ak

@@ -1,11 +1,11 @@
-use aiken/bytearray
+use aiken/collection/list
 use aiken/fuzz.{
-  and_then, bool, int, int_between, label, list, list_between, list_with_elem,
-  map, one_of, set, set_between, sublist, such_that,
+  and_then, bool, int, int_between, label, list_between, list_with_elem, map,
+  one_of, set, set_between, sublist, such_that,
 }
-use aiken/list
 use aiken/math
-use aiken/string
+use aiken/primitive/bytearray
+use aiken/primitive/string
 
 test prop_int_distribution(n via int()) {
   label(
@@ -118,7 +118,7 @@ test prop_list_with_elem(xs via list_with_elem(int())) {
 }
 
 fn list_with_sublist() -> Fuzzer<(List<Int>, List<Int>)> {
-  let xs <- and_then(list(int()))
+  let xs <- and_then(fuzz.list(int()))
   let sub <- map(sublist(xs))
   (xs, sub)
 }