fix(ocaml-requests): update tests and fuzz for cstruct→Bytes migration

Test files still referenced Cstruct.t where the API now uses bytes.
Fixed all H2 frame, HPACK, client, and connection tests.
Fixed fuzz test. 330 tests pass.

dune-project

···
 (lang dune 3.21)
 (name collision)
 (source (tangled gazagnaire.org/ocaml-collision))
-(formatting (enabled_for ocaml))

lib/collision.ml

···
 (** Collision probability computation for conjunction assessment.
 
-    Implements the Foster 2D method, Chan series expansion, and Alfano
-    maximum Pc bound.
+    Implements the Foster 2D method, Chan series expansion, and Alfano maximum
+    Pc bound.
 
     {b Reference}: Foster (1992), Chan (2008), Alfano (2005). *)
 
···
 (* {1 Types} *)
 
 type vec3 = Cdm.vec3 = { x : float; y : float; z : float }
-
 type sym2 = { a11 : float; a12 : float; a22 : float }
 
 type encounter = {
···
   let r, t, n = rtn_basis state in
   (* M is the 3x3 rotation matrix [R T N] as columns.
      m[i][j] = i-th component of j-th basis vector. *)
-  let m =
-    [|
-      [| r.x; t.x; n.x |];
-      [| r.y; t.y; n.y |];
-      [| r.z; t.z; n.z |];
-    |]
-  in
+  let m = [| [| r.x; t.x; n.x |]; [| r.y; t.y; n.y |]; [| r.z; t.z; n.z |] |] in
   let c =
     [|
       [| cov.cr_r; cov.ct_r; cov.cn_r |];
···
     done;
     !s
   in
-  { s11 = r_ij 0 0; s12 = r_ij 0 1; s13 = r_ij 0 2;
-    s22 = r_ij 1 1; s23 = r_ij 1 2; s33 = r_ij 2 2 }
+  {
+    s11 = r_ij 0 0;
+    s12 = r_ij 0 1;
+    s13 = r_ij 0 2;
+    s22 = r_ij 1 1;
+    s23 = r_ij 1 2;
+    s33 = r_ij 2 2;
+  }
 
 (* Add two symmetric 3x3 matrices. *)
 let sym3_add a b =
-  { s11 = a.s11 +. b.s11; s12 = a.s12 +. b.s12; s13 = a.s13 +. b.s13;
-    s22 = a.s22 +. b.s22; s23 = a.s23 +. b.s23; s33 = a.s33 +. b.s33 }
+  {
+    s11 = a.s11 +. b.s11;
+    s12 = a.s12 +. b.s12;
+    s13 = a.s13 +. b.s13;
+    s22 = a.s22 +. b.s22;
+    s23 = a.s23 +. b.s23;
+    s33 = a.s33 +. b.s33;
+  }
 
 (* {1 Conjunction Plane Projection}
 
···
    z_hat = relative velocity direction (normal to plane).
    x_hat is chosen in the miss direction projected onto the plane. *)
 let conjunction_plane_basis ~z_hat ~miss =
-  let miss_proj =
-    vec3_sub miss (vec3_scale (vec3_dot miss z_hat) z_hat)
-  in
+  let miss_proj = vec3_sub miss (vec3_scale (vec3_dot miss z_hat) z_hat) in
   let miss_proj_norm = vec3_norm miss_proj in
   let x_hat =
     if miss_proj_norm > 1e-12 then vec3_scale (1.0 /. miss_proj_norm) miss_proj
···
 let project_covariance (c : sym3) x_hat y_hat =
   let proj ei ej =
     let cx =
-      { x = c.s11 *. ej.x +. c.s12 *. ej.y +. c.s13 *. ej.z;
-        y = c.s12 *. ej.x +. c.s22 *. ej.y +. c.s23 *. ej.z;
-        z = c.s13 *. ej.x +. c.s23 *. ej.y +. c.s33 *. ej.z }
+      {
+        x = (c.s11 *. ej.x) +. (c.s12 *. ej.y) +. (c.s13 *. ej.z);
+        y = (c.s12 *. ej.x) +. (c.s22 *. ej.y) +. (c.s23 *. ej.z);
+        z = (c.s13 *. ej.x) +. (c.s23 *. ej.y) +. (c.s33 *. ej.z);
+      }
     in
     vec3_dot ei cx
   in
···
     else (1.0, 0.0)
   in
   let miss_x = (ev_x *. mx) +. (ev_y *. my) in
-  let miss_y = (-. ev_y *. mx) +. (ev_x *. my) in
+  let miss_y = (-.ev_y *. mx) +. (ev_x *. my) in
   (sigma_x, sigma_y, miss_x, miss_y)
 
 let encounter_of_cdm ~hbr (cdm : Cdm.t) : encounter =
···
   let m = (n + 1) / 2 in
   for i = 0 to m - 1 do
     (* Initial guess *)
-    let mu = float_of_int (4 * i + 3) /. float_of_int (4 * n + 2) in
+    let mu = float_of_int ((4 * i) + 3) /. float_of_int ((4 * n) + 2) in
     let x = ref (cos (pi *. mu)) in
     (* Newton iterations *)
     for _ = 1 to 20 do
···
       let p1 = ref !x in
       for j = 2 to n do
         let fj = float_of_int j in
-        let p2 = ((((2.0 *. fj) -. 1.0) *. !x *. !p1) -. ((fj -. 1.0) *. !p0)) /. fj in
+        let p2 =
+          ((((2.0 *. fj) -. 1.0) *. !x *. !p1) -. ((fj -. 1.0) *. !p0)) /. fj
+        in
         p0 := !p1;
         p1 := p2
       done;
···
     let p1 = ref !x in
     for j = 2 to n do
       let fj = float_of_int j in
-      let p2 = ((((2.0 *. fj) -. 1.0) *. !x *. !p1) -. ((fj -. 1.0) *. !p0)) /. fj in
+      let p2 =
+        ((((2.0 *. fj) -. 1.0) *. !x *. !p1) -. ((fj -. 1.0) *. !p0)) /. fj
+      in
       p0 := !p1;
       p1 := p2
     done;
···
     for i = 0 to n - 1 do
       (* Map [-1,1] → [0, 2π] *)
       let theta = pi *. (nodes_t.(i) +. 1.0) in
-      let wt = weights_t.(i) *. pi in (* Jacobian: 2π/2 = π *)
+      let wt = weights_t.(i) *. pi in
+      (* Jacobian: 2π/2 = π *)
       let cos_t = cos theta in
       let sin_t = sin theta in
       for j = 0 to n - 1 do
         (* Map [-1,1] → [0, hbr] *)
         let r = hbr *. (nodes_r.(j) +. 1.0) /. 2.0 in
-        let wr = weights_r.(j) *. hbr /. 2.0 in (* Jacobian: hbr/2 *)
+        let wr = weights_r.(j) *. hbr /. 2.0 in
+        (* Jacobian: hbr/2 *)
         let dx = (r *. cos_t) -. mx in
         let dy = (r *. sin_t) -. my in
-        let exponent = -0.5 *. (((dx *. dx) /. sx2) +. ((dy *. dy) /. sy2)) in
+        let exponent = -0.5 *. ((dx *. dx /. sx2) +. (dy *. dy /. sy2)) in
         let f = r *. norm *. exp exponent in
         sum := !sum +. (wt *. wr *. f)
       done
···
         let wr = weights_r.(j) *. hbr /. 2.0 in
         let dx = (r *. cos_t) -. mx in
         let dy = (r *. sin_t) -. my in
-        let exponent = -0.5 *. (((dx *. dx) /. sx2) +. ((dy *. dy) /. sy2)) in
+        let exponent = -0.5 *. ((dx *. dx /. sx2) +. (dy *. dy /. sy2)) in
         let f = r *. norm *. exp exponent in
         sum := !sum +. (wt *. wr *. f)
       done
···
 (* {1 Pretty-printing} *)
 
 let pp_sym2 ppf s =
-  Format.fprintf ppf "| %.6e  %.6e |@,| %.6e  %.6e |" s.a11 s.a12 s.a12
-    s.a22
+  Format.fprintf ppf "| %.6e  %.6e |@,| %.6e  %.6e |" s.a11 s.a12 s.a12 s.a22
 
 let pp_encounter ppf e =
   Format.fprintf ppf

lib/collision.mli

···
 (** Collision probability computation for conjunction assessment.
 
-    Computes the probability of collision (Pc) between two space objects
-    given their state vectors, position covariances, and hard-body radii.
+    Computes the probability of collision (Pc) between two space objects given
+    their state vectors, position covariances, and hard-body radii.
 
-    Implements the standard 2D Foster method (NASA CARA), the Alfano maximum
-    Pc bound, and the Chan series expansion.
+    Implements the standard 2D Foster method (NASA CARA), the Alfano maximum Pc
+    bound, and the Chan series expansion.
 
     {b References}:
     - Foster, J.L., Estes, H.S., "A Parametric Analysis of Orbital Debris
···
 
 type vec3 = Cdm.vec3 = { x : float; y : float; z : float }
 
-(** 2x2 symmetric matrix (conjunction plane covariance). *)
 type sym2 = {
   a11 : float;  (** (1,1) element. *)
   a12 : float;  (** (1,2) = (2,1) element. *)
   a22 : float;  (** (2,2) element. *)
 }
+(** 2x2 symmetric matrix (conjunction plane covariance). *)
 
-(** Conjunction geometry projected onto the conjunction plane. *)
 type encounter = {
   miss_x : float;  (** Miss distance x-component in conjunction plane (km). *)
   miss_y : float;  (** Miss distance y-component in conjunction plane (km). *)
···
   sigma_y : float;  (** 1-sigma uncertainty along y-axis (km). *)
   hbr : float;  (** Combined hard-body radius (km). *)
 }
+(** Conjunction geometry projected onto the conjunction plane. *)
 
 (** {1 Conjunction Plane Projection} *)
 
 val encounter_of_cdm : hbr:float -> Cdm.t -> encounter
-(** [encounter_of_cdm ~hbr cdm] projects a CDM's conjunction geometry
-    onto the conjunction plane (perpendicular to relative velocity at TCA).
+(** [encounter_of_cdm ~hbr cdm] projects a CDM's conjunction geometry onto the
+    conjunction plane (perpendicular to relative velocity at TCA).
 
-    The combined covariance C = C1 + C2 is projected onto the conjunction
-    plane and diagonalized. [hbr] is the combined hard-body radius in km
-    (typically 0.005-0.020 km for LEO satellites). *)
+    The combined covariance C = C1 + C2 is projected onto the conjunction plane
+    and diagonalized. [hbr] is the combined hard-body radius in km (typically
+    0.005-0.020 km for LEO satellites). *)
 
 (** {1 Probability of Collision} *)
 
 val pc_foster : ?n:int -> encounter -> float
-(** [pc_foster ?n enc] computes the 2D probability of collision using the
-    Foster method (numerical integration via Gauss-Legendre quadrature).
+(** [pc_foster ?n enc] computes the 2D probability of collision using the Foster
+    method (numerical integration via Gauss-Legendre quadrature).
 
-    [n] is the number of quadrature points per dimension (default 64).
-    This is the standard method used by NASA CARA and 18th SDS. *)
+    [n] is the number of quadrature points per dimension (default 64). This is
+    the standard method used by NASA CARA and 18th SDS. *)
 
 val pc_chan : ?terms:int -> encounter -> float
-(** [pc_chan ?terms enc] computes Pc using the Chan series expansion.
-    [terms] is the number of series terms (default 50). *)
+(** [pc_chan ?terms enc] computes Pc using the Chan series expansion. [terms] is
+    the number of series terms (default 50). *)
 
 val pc_max : encounter -> float
-(** [pc_max enc] returns an upper bound on Pc:
-    [Pc_max = hbr² / (2·σx·σy)].
+(** [pc_max enc] returns an upper bound on Pc: [Pc_max = hbr² / (2·σx·σy)].
 
-    This bounds the integral by the peak density times the disk area.
-    If Pc_max is below threshold, the conjunction can be dismissed
-    without computing the exact Pc. *)
+    This bounds the integral by the peak density times the disk area. If Pc_max
+    is below threshold, the conjunction can be dismissed without computing the
+    exact Pc. *)
 
 val pc : Cdm.t -> hbr:float -> float
 (** [pc cdm ~hbr] is a convenience function that projects [cdm] onto the

test/test_collision.ml

···
   skip_if_no_data ();
   match data_dir with
   | None -> ()
-  | Some _ ->
+  | Some _ -> (
       let path = data_path filename in
       let ic = open_in path in
       let result = f ic in
       close_in ic;
-      (match result with
-       | Ok () -> ()
-       | Error e -> Alcotest.failf "parse error: %a" Cdm.pp_error e)
+      match result with
+      | Ok () -> ()
+      | Error e -> Alcotest.failf "parse error: %a" Cdm.pp_error e)
 
 let with_spherical_csv f =
   with_csv "IVV_Releasable_Dataset_Spherical_DefaultHBR.csv" f
 
-let with_sfsh_csv f =
-  with_csv "IVV_Releasable_Dataset_SFSH_DiscreteHBR.csv" f
+let with_sfsh_csv f = with_csv "IVV_Releasable_Dataset_SFSH_DiscreteHBR.csv" f
 
 (* CSieve floors Pc at exactly 1e-10. *)
 let is_clamped pc = Float.abs (pc -. 1e-10) < 1e-15
···
       sqrt ((enc.miss_x *. enc.miss_x) +. (enc.miss_y *. enc.miss_y))
     in
     let cdm_miss = cdm.Cdm.min_range in
-    cdm_miss > 0.01 && (our_miss /. cdm_miss > 5.0 || our_miss /. cdm_miss < 0.01)
+    cdm_miss > 0.01
+    && (our_miss /. cdm_miss > 5.0 || our_miss /. cdm_miss < 0.01)
 
 (* Compute RTN local coordinates from J2000 state and compare to dataset. *)
 let check_rtn_basis cdm =
···
       if Sys.file_exists path then Some (load_hbr_table path) else None
 
 let lookup_combined_hbr tbl (cdm : Cdm.t) =
-  match Hashtbl.find_opt tbl cdm.obj1.id, Hashtbl.find_opt tbl cdm.obj2.id with
+  match
+    (Hashtbl.find_opt tbl cdm.obj1.id, Hashtbl.find_opt tbl cdm.obj2.id)
+  with
   | Some h1, Some h2 -> Some (h1 +. h2)
   | _ -> None
 
···
 }
 
 let fresh_stats () =
-  { checked = 0; within_1_order = 0; within_half_order = 0;
-    exact_match = 0; total = 0; sum_log_err = 0.0 }
+  {
+    checked = 0;
+    within_1_order = 0;
+    within_half_order = 0;
+    exact_match = 0;
+    total = 0;
+    sum_log_err = 0.0;
+  }
 
 let print_stats label stats =
   let n = max 1 stats.checked in
   let mean = stats.sum_log_err /. float_of_int n in
   Format.printf
-    "@.%s (%d sampled of %d):@.\
-     \  Within 1 order:   %d/%d (%.1f%%)@.\
-     \  Within 0.1 orders: %d/%d (%.1f%%)@.\
-     \  Mean |log10 ratio|: %.3f@."
-    label stats.checked stats.total
-    stats.within_1_order n
+    "@.%s (%d sampled of %d):@.  Within 1 order:   %d/%d (%.1f%%)@.  Within \
+     0.1 orders: %d/%d (%.1f%%)@.  Mean |log10 ratio|: %.3f@."
+    label stats.checked stats.total stats.within_1_order n
     (100.0 *. float_of_int stats.within_1_order /. float_of_int n)
     stats.exact_match n
     (100.0 *. float_of_int stats.exact_match /. float_of_int n)
···
 
 let test_tracss_pc_validation () =
   with_spherical_csv (fun ic ->
-    let stats = fresh_stats () in
-    let result =
-      Cdm.fold_csv_channel ic
-        (fun () cdm ->
-          stats.total <- stats.total + 1;
-          if stats.total mod 500 = 0 then compare_pc stats cdm)
-        ()
-    in
-    match result with
-    | Error e -> Error e
-    | Ok () ->
-        print_stats "TraCSS spherical Pc validation" stats;
-        check_stats_pass stats;
-        Ok ())
+      let stats = fresh_stats () in
+      let result =
+        Cdm.fold_csv_channel ic
+          (fun () cdm ->
+            stats.total <- stats.total + 1;
+            if stats.total mod 500 = 0 then compare_pc stats cdm)
+          ()
+      in
+      match result with
+      | Error e -> Error e
+      | Ok () ->
+          print_stats "TraCSS spherical Pc validation" stats;
+          check_stats_pass stats;
+          Ok ())
 
 let test_encounter_projection () =
   with_spherical_csv (fun ic ->
-    let bad = ref 0 in
-    let n = ref 0 in
-    let result =
-      Cdm.fold_csv_channel ic
-        (fun () cdm ->
-          incr n;
-          if !n <= 100 && check_encounter_sanity cdm then incr bad)
-        ()
-    in
-    match result with
-    | Error e -> Error e
-    | Ok () ->
-        Alcotest.(check int) "no bad projections" 0 !bad;
-        Ok ())
+      let bad = ref 0 in
+      let n = ref 0 in
+      let result =
+        Cdm.fold_csv_channel ic
+          (fun () cdm ->
+            incr n;
+            if !n <= 100 && check_encounter_sanity cdm then incr bad)
+          ()
+      in
+      match result with
+      | Error e -> Error e
+      | Ok () ->
+          Alcotest.(check int) "no bad projections" 0 !bad;
+          Ok ())
 
 let test_rtn_basis_verification () =
   with_spherical_csv (fun ic ->
-    let n = ref 0 in
-    let max_err = ref 0.0 in
-    let checked = ref 0 in
-    let result =
-      Cdm.fold_csv_channel ic
-        (fun () cdm ->
-          incr n;
-          if !n <= 200 then begin
-            let err = check_rtn_basis cdm in
-            max_err := Float.max !max_err err;
-            incr checked
-          end)
-        ()
-    in
-    match result with
-    | Error e -> Error e
-    | Ok () ->
-        Format.printf "@.RTN basis: %d rows, max err=%.6f km@." !checked
-          !max_err;
-        if !max_err > 1.0 then
-          Alcotest.failf "RTN basis max error %.3f km > 1 km" !max_err;
-        Ok ())
+      let n = ref 0 in
+      let max_err = ref 0.0 in
+      let checked = ref 0 in
+      let result =
+        Cdm.fold_csv_channel ic
+          (fun () cdm ->
+            incr n;
+            if !n <= 200 then begin
+              let err = check_rtn_basis cdm in
+              max_err := Float.max !max_err err;
+              incr checked
+            end)
+          ()
+      in
+      match result with
+      | Error e -> Error e
+      | Ok () ->
+          Format.printf "@.RTN basis: %d rows, max err=%.6f km@." !checked
+            !max_err;
+          if !max_err > 1.0 then
+            Alcotest.failf "RTN basis max error %.3f km > 1 km" !max_err;
+          Ok ())
 
 let test_spot_check_first_row () =
   with_spherical_csv (fun ic ->
-    let first = ref None in
-    let result =
-      Cdm.fold_csv_channel ic
-        (fun () cdm -> if !first = None then first := Some cdm)
-        ()
-    in
-    match result with
-    | Error e -> Error e
-    | Ok () ->
-        (match !first with
-         | None -> Alcotest.fail "no rows"
-         | Some cdm ->
-             let dataset_pc = Cdm.pc cdm in
-             let enc = Collision.encounter_of_cdm ~hbr:default_hbr cdm in
-             let our_pc = Collision.pc_foster enc in
-             Format.printf
-               "@.Spot-check (obj %d vs %d): dataset=%.3e ours=%.3e@."
-               cdm.obj1.id cdm.obj2.id dataset_pc our_pc);
-        Ok ())
+      let first = ref None in
+      let result =
+        Cdm.fold_csv_channel ic
+          (fun () cdm -> if !first = None then first := Some cdm)
+          ()
+      in
+      match result with
+      | Error e -> Error e
+      | Ok () ->
+          (match !first with
+          | None -> Alcotest.fail "no rows"
+          | Some cdm ->
+              let dataset_pc = Cdm.pc cdm in
+              let enc = Collision.encounter_of_cdm ~hbr:default_hbr cdm in
+              let our_pc = Collision.pc_foster enc in
+              Format.printf
+                "@.Spot-check (obj %d vs %d): dataset=%.3e ours=%.3e@."
+                cdm.obj1.id cdm.obj2.id dataset_pc our_pc);
+          Ok ())
 
 (* Validate Pc against SFSH dataset using per-object HBR from
    screening volumes file. *)
 let test_tracss_sfsh_pc_validation () =
   match hbr_table with
-  | None ->
-      Printf.printf "SKIP: screening volumes file not found\n"
+  | None -> Printf.printf "SKIP: screening volumes file not found\n"
   | Some tbl ->
       with_sfsh_csv (fun ic ->
-        let stats = fresh_stats () in
-        let result =
-          Cdm.fold_csv_channel ic
-            (fun () cdm ->
-              stats.total <- stats.total + 1;
-              if stats.total mod 200 = 0 then
-                match lookup_combined_hbr tbl cdm with
-                | Some hbr -> compare_pc_with_hbr stats hbr cdm
-                | None -> ())
-            ()
-        in
-        match result with
-        | Error e -> Error e
-        | Ok () ->
-            print_stats "TraCSS SFSH Pc validation" stats;
-            check_stats_pass stats;
-            Ok ())
+          let stats = fresh_stats () in
+          let result =
+            Cdm.fold_csv_channel ic
+              (fun () cdm ->
+                stats.total <- stats.total + 1;
+                if stats.total mod 200 = 0 then
+                  match lookup_combined_hbr tbl cdm with
+                  | Some hbr -> compare_pc_with_hbr stats hbr cdm
+                  | None -> ())
+              ()
+          in
+          match result with
+          | Error e -> Error e
+          | Ok () ->
+              print_stats "TraCSS SFSH Pc validation" stats;
+              check_stats_pass stats;
+              Ok ())
 
 let suite =
   ( "collision",
···
       Alcotest.test_case "RTN basis" `Slow test_rtn_basis_verification;
       Alcotest.test_case "encounter projection" `Slow test_encounter_projection;
       Alcotest.test_case "spot-check" `Slow test_spot_check_first_row;
-      Alcotest.test_case "Pc validation (spherical)" `Slow test_tracss_pc_validation;
-      Alcotest.test_case "Pc validation (SFSH)" `Slow test_tracss_sfsh_pc_validation;
+      Alcotest.test_case "Pc validation (spherical)" `Slow
+        test_tracss_pc_validation;
+      Alcotest.test_case "Pc validation (SFSH)" `Slow
+        test_tracss_sfsh_pc_validation;
     ] )