Merge branch 'corvo/refactor-snark-worker-2' into corvo/implement-work-partitioner-3

Author: glyh

src/lib/snark_work_lib/partitioned.ml

@@ -458,8 +458,9 @@ module Proof_with_metric = struct
 end
 
 let construct_selector_result
-    ~(instances : (Selector.Single.Spec.t * Proof_with_metric.t) One_or_two.t)
-    ~fee ~prover =
+    ~(instances :
+       (_ Work.Single.Spec.t * _ Proof_with_metric.Poly.t) One_or_two.t ) ~fee
+    ~prover =
   let proofs = One_or_two.map ~f:(fun (_, { proof; _ }) -> proof) instances in
   let metrics =
     One_or_two.map
@@ -476,7 +477,8 @@ let construct_selector_result
   in
 
   let instances = One_or_two.map ~f:(fun (single, _) -> single) instances in
-  ({ proofs; metrics; spec = { instances; fee }; prover } : Selector.Result.t)
+  ( { proofs; metrics; spec = ({ instances; fee } : _ Work.Spec.t); prover }
+    : _ Work.Result.t )
 
 module Result = struct
   module Poly = struct
@@ -542,6 +544,9 @@ module Result = struct
               None
       end
     end]
+
+    [%%define_locally
+    Stable.Latest.(to_spec, of_selector_result, to_selector_result)]
   end
 
   [%%versioned
@@ -550,53 +555,37 @@ module Result = struct
 
     module V1 = struct
       type t =
-        { data :
-            ( Transaction_witness.Stable.V2.t
-            , Transaction_snark.Zkapp_command_segment.Witness.Stable.V1.t
-            , Ledger_proof.Stable.V2.t
-            , Proof_with_metric.Stable.V1.t )
-            Spec.Poly.Stable.V1.t
-        ; prover : Signature_lib.Public_key.Compressed.Stable.V1.t
-        }
+        ( Transaction_witness.Stable.V2.t
+        , Transaction_snark.Zkapp_command_segment.Witness.Stable.V1.t
+        , Ledger_proof.Stable.V2.t
+        , Proof_with_metric.Stable.V1.t )
+        Poly.Stable.V1.t
 
       let to_latest = Fn.id
     end
   end]
 
   type t =
-    { data :
-        ( Transaction_witness.t
-        , Transaction_snark.Zkapp_command_segment.Witness.t
-        , Ledger_proof.Cached.t
-        , Proof_with_metric.t )
-        Spec.Poly.t
-    ; prover : Signature_lib.Public_key.Compressed.t
-    }
-
-  let read_all_proofs_from_disk ({ data; prover } : t) : Stable.Latest.t =
-    let data =
-      Spec.Poly.map ~f_witness:Transaction_witness.read_all_proofs_from_disk
-        ~f_zkapp_command_segment_witness:
-          Transaction_witness.Zkapp_command_segment_witness
-          .read_all_proofs_from_disk
-        ~f_proof:Ledger_proof.Cached.read_proof_from_disk
-        ~f_metric:Proof_with_metric.read_all_proofs_from_disk data
-    in
-
-    { data; prover }
+    ( Transaction_witness.t
+    , Transaction_snark.Zkapp_command_segment.Witness.t
+    , Ledger_proof.Cached.t
+    , Proof_with_metric.t )
+    Poly.t
 
-  let write_all_proofs_to_disk ~proof_cache_db
-      ({ data; prover } : Stable.Latest.t) : t =
-    let data =
-      Spec.Poly.map
-        ~f_witness:
-          (Transaction_witness.write_all_proofs_to_disk ~proof_cache_db)
-        ~f_zkapp_command_segment_witness:
-          (Transaction_witness.Zkapp_command_segment_witness
-           .write_all_proofs_to_disk ~proof_cache_db )
-        ~f_proof:(Ledger_proof.Cached.write_proof_to_disk ~proof_cache_db)
-        ~f_metric:(Proof_with_metric.write_all_proofs_to_disk ~proof_cache_db)
-        data
-    in
-    { data; prover }
+  let read_all_proofs_from_disk =
+    Spec.Poly.map ~f_witness:Transaction_witness.read_all_proofs_from_disk
+      ~f_zkapp_command_segment_witness:
+        Transaction_witness.Zkapp_command_segment_witness
+        .read_all_proofs_from_disk
+      ~f_proof:Ledger_proof.Cached.read_proof_from_disk
+      ~f_metric:Proof_with_metric.read_all_proofs_from_disk
+
+  let write_all_proofs_to_disk ~proof_cache_db =
+    Spec.Poly.map
+      ~f_witness:(Transaction_witness.write_all_proofs_to_disk ~proof_cache_db)
+      ~f_zkapp_command_segment_witness:
+        (Transaction_witness.Zkapp_command_segment_witness
+         .write_all_proofs_to_disk ~proof_cache_db )
+      ~f_proof:(Ledger_proof.Cached.write_proof_to_disk ~proof_cache_db)
+      ~f_metric:(Proof_with_metric.write_all_proofs_to_disk ~proof_cache_db)
 end