Revamped bump up jsoo and alcotest and dune

buildkite/src/Constants/ContainerImages.dhall

@@ -2,15 +2,20 @@
 -- NOTE: minaToolchain is the default image for various jobs, set to minaToolchainBullseye
 -- NOTE: minaToolchainBullseye is also used for building Ubuntu Focal packages in CI
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
-{
-  toolchainBase = "codaprotocol/ci-toolchain-base:v3",
-  minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:c3320cb0f75727d5f1e98c138dcf2c4cca29862413b4acfa529828793a650042",
-  minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:1e2feaebd47c330e990fe3c4e0681d16ad42bfa642937c4c5142793da06c890b",
-  minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:1e2feaebd47c330e990fe3c4e0681d16ad42bfa642937c4c5142793da06c890b",
-  minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:1e2feaebd47c330e990fe3c4e0681d16ad42bfa642937c4c5142793da06c890b",
-  delegationBackendToolchain = "gcr.io/o1labs-192920/delegation-backend-production@sha256:8ca5880845514ef56a36bf766a0f9de96e6200d61b51f80d9f684a0ec9c031f4",
-  elixirToolchain = "elixir:1.10-alpine",
-  nodeToolchain = "node:14.13.1-stretch-slim",
-  ubuntu2004 = "ubuntu:20.04",
-  xrefcheck = "serokell/xrefcheck@sha256:8fbb35a909abc353364f1bd3148614a1160ef3c111c0c4ae84e58fdf16019eeb"
+{ toolchainBase = "codaprotocol/ci-toolchain-base:v3"
+, minaToolchainBuster =
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:f4e8034792c6322fa0a93fa5d5ab1cdd4d97a51d21fa4ed286d3326878cd2f19"
+, minaToolchainBullseye =
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:05b7676b81288cec768fa9f913e127e45ede9c70f48615738a44b443dad44fce"
+, minaToolchainBookworm =
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:05b7676b81288cec768fa9f913e127e45ede9c70f48615738a44b443dad44fce"
+, minaToolchain =
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:05b7676b81288cec768fa9f913e127e45ede9c70f48615738a44b443dad44fce"
+, delegationBackendToolchain =
+    "gcr.io/o1labs-192920/delegation-backend-production@sha256:8ca5880845514ef56a36bf766a0f9de96e6200d61b51f80d9f684a0ec9c031f4"
+, elixirToolchain = "elixir:1.10-alpine"
+, nodeToolchain = "node:14.13.1-stretch-slim"
+, ubuntu2004 = "ubuntu:20.04"
+, xrefcheck =
+    "serokell/xrefcheck@sha256:8fbb35a909abc353364f1bd3148614a1160ef3c111c0c4ae84e58fdf16019eeb"
 }

opam.export

@@ -1,6 +1,7 @@
 opam-version: "2.0"
+compiler: ["ocaml-base-compiler.4.14.0"]
 roots: [
-  "alcotest.1.1.0"
+  "alcotest.1.7.0"
   "angstrom.0.15.0"
   "async_ssl.v0.14.0"
   "bignum.v0.14.0"
@@ -16,9 +17,9 @@ roots: [
   "graphql-cohttp.0.13.0"
   "graphql-lwt.0.13.0"
   "graphql_ppx.1.2.2"
-  "js_of_ocaml.4.0.0"
-  "js_of_ocaml-ppx.4.0.0"
-  "js_of_ocaml-toplevel.4.0.0"
+  "js_of_ocaml.5.4.0"
+  "js_of_ocaml-ppx.5.4.0"
+  "js_of_ocaml-toplevel.5.4.0"
   "lmdb.1.0"
   "menhir.20210419"
   "merlin.4.5-414"
@@ -41,7 +42,7 @@ roots: [
   "yojson.1.7.0"
 ]
 installed: [
-  "alcotest.1.1.0"
+  "alcotest.1.7.0"
   "angstrom.0.15.0"
   "asetmap.0.8.1"
   "astring.0.8.5"
@@ -74,7 +75,7 @@ installed: [
   "caqti-driver-postgresql.1.5.1"
   "charInfo_width.1.1.0"
   "check_opam_switch.~dev"
-  "cmdliner.1.0.3"
+  "cmdliner.1.2.0"
   "cohttp.5.0.0"
   "cohttp-async.5.0.0"
   "conduit.4.0.0"
@@ -101,36 +102,38 @@ installed: [
   "cstruct.6.0.1"
   "ctypes.0.17.1"
   "ctypes-foreign.0.4.0"
-  "digestif.0.9.0"
+  "digestif.1.1.4"
   "domain-name.0.3.0"
   "dot-merlin-reader.4.2"
-  "dune.3.3.1"
+  "dune.3.9.2"
   "dune-build-info.3.1.1"
   "dune-configurator.2.8.2"
   "dune-private-libs.2.6.2"
+  "duration.0.2.1"
   "easy-format.1.3.2"
   "either.1.0.0"
   "eqaf.0.9"
   "extlib.1.7.8"
   "fieldslib.v0.14.0"
   "fix.20201120"
-  "fmt.0.8.6"
+  "fmt.0.9.0"
   "fpath.0.7.3"
+  "gen.1.1"
   "graphql.0.13.0"
   "graphql-async.0.13.0"
   "graphql-cohttp.0.13.0"
   "graphql-lwt.0.13.0"
-  "graphql_parser.0.12.2"
+  "graphql_parser.0.14.0"
   "graphql_ppx.1.2.2"
   "incremental.v0.14.0"
   "integers.0.4.0"
   "ipaddr.5.0.1"
   "ipaddr-sexp.5.0.1"
   "jane-street-headers.v0.14.0"
-  "js_of_ocaml.4.0.0"
-  "js_of_ocaml-compiler.4.0.0"
-  "js_of_ocaml-ppx.4.0.0"
-  "js_of_ocaml-toplevel.4.0.0"
+  "js_of_ocaml.5.4.0"
+  "js_of_ocaml-compiler.5.4.0"
+  "js_of_ocaml-ppx.5.4.0"
+  "js_of_ocaml-toplevel.5.4.0"
   "jsonm.1.0.1"
   "jst-config.v0.14.1"
   "lambda-term.3.1.0"
@@ -150,8 +153,8 @@ installed: [
   "mew.0.1.0"
   "mew_vi.0.5.0"
   "minicli.5.0.2"
-  "mirage-crypto-ec.0.11.0"
   "mirage-crypto.0.11.0"
+  "mirage-crypto-ec.0.11.0"
   "mirage-crypto-rng.0.11.0"
   "mirage-crypto-rng-async.0.11.0"
   "mmap.1.1.0"
@@ -231,6 +234,7 @@ installed: [
   "result.1.5"
   "rpc_parallel.v0.14.0"
   "rresult.0.6.0"
+  "sedlex.2.5"
   "seq.base"
   "sexp_diff_kernel.v0.14.0"
   "sexplib.v0.14.0"

scripts/testone.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-# File assumes tat you are running the program at the program at the root directory of the coda repo
+# File assumes tat you are running the program at the program at the root directory of the mina repo
 
-if [[ "$#" -eq "0" ]]; then 
+if [[ "$#" -eq "0" ]]; then
     echo "This script needs at least one argument, TEST-FILE, to run"
     exit 1
 fi
@@ -22,9 +22,9 @@ DIRPATH=$(dirname "$TEST_FILE")
 LIBRARY_NAME=$(basename "$DIRPATH")
 
 TEST_RUNNER_PROG="$DIRPATH/.$LIBRARY_NAME.inline-tests/inline_test_runner_$LIBRARY_NAME.exe"
-if [[ "$#" -eq "1" ]]; then 
-    TEST_CASE="$TEST_FILE" 
-else 
+if [[ "$#" -eq "1" ]]; then
+    TEST_CASE="$TEST_FILE"
+else
     TEST_CASE="$TEST_FILE:$2"
 fi
 ( ulimit -s 65532 || true ) && \

src/app/logproc/logproc.ml

@@ -291,6 +291,6 @@ let () =
           , {|logproc -f '.message match /broadcast/ && .metadata.peer.host == "182.9.63.3" || .metadata.peer.discover_port == 8302|}
           ) ]
     in
-    Term.info ~version:"0.1" ~doc ~exits:Term.default_exits ~man "logproc"
+    Cmd.info ~version:"0.1" ~doc ~man "logproc"
   in
-  Term.(exit @@ eval (main_term, main_info))
+  Stdlib.exit @@ Cmd.eval @@ Cmd.v main_info main_term

src/lib/mina_metrics/prometheus_metrics/mina_metrics.ml

@@ -81,7 +81,7 @@ module TextFormat_0_0_4 = struct
       | None ->
           (label_names, label_values)
       | Some (label_name, label_value) ->
-          let label_value_str = Fmt.strf "%a" output_value label_value in
+          let label_value_str = Fmt.str "%a" output_value label_value in
           (label_name :: label_names, label_value_str :: label_values)
     in
     Fmt.pf f "%a%s%a %a@." MetricName.pp base ext

src/lib/pickles/pickles.ml

@@ -43,6 +43,7 @@ module Make_str (_ : Wire_types.Concrete) = struct
   module Cache_handle = Cache_handle
   module Step_main_inputs = Step_main_inputs
   module Step_verifier = Step_verifier
+  module Ro = Ro
 
   exception Return_digest = Compile.Return_digest
 

src/lib/pickles/pickles_intf.mli

@@ -15,6 +15,7 @@ module type S = sig
   module Types_map = Types_map
   module Step_verifier = Step_verifier
   module Common = Common
+  module Ro = Ro
 
   exception Return_digest of Md5.t
 

src/lib/pickles/ro.ml

@@ -3,9 +3,11 @@ open Backend
 open Import
 
 let bits_random_oracle =
-  let h = Digestif.blake2s 32 in
+  let module Blake2s = Digestif.Make_BLAKE2S (struct
+    let digest_size = 32
+  end) in
   fun ~length s ->
-    Digestif.digest_string h s |> Digestif.to_raw_string h |> String.to_list
+    Blake2s.digest_string s |> Blake2s.to_raw_string |> String.to_list
     |> List.concat_map ~f:(fun c ->
            let c = Char.to_int c in
            List.init 8 ~f:(fun i -> (c lsr i) land 1 = 1) )

src/lib/pickles/tests/dune

@@ -0,0 +1,3 @@
+(tests
+ (names test_ro)
+ (libraries alcotest core_kernel pickles))

src/lib/pickles/tests/test_ro.ml

@@ -0,0 +1,20 @@
+(* initially written to see the consistency between updates of digestif *)
+let test_bits_random_oracle_consistency_check () =
+  let s = "BitsRandomOracle" in
+  let exp_output_str =
+    "01000001101110001111111100011000011000100010100011010010110110010011101101101000001110001110100101010100001000001110101110111010"
+  in
+  let exp_output =
+    List.map (fun i -> i = '1') (List.of_seq (String.to_seq exp_output_str))
+  in
+  let output = Pickles.Ro.bits_random_oracle ~length:128 s in
+  assert (List.for_all2 Bool.equal exp_output output)
+
+let () =
+  let open Alcotest in
+  run "Pickles Random Oracle"
+    [ ( "bits_random_oracle"
+      , [ test_case "consistency_check" `Quick
+            test_bits_random_oracle_consistency_check
+        ] )
+    ]