From 760ae7e2e9a902180b0e3c39476def05d73be918 Mon Sep 17 00:00:00 2001
From: Sylvain Ribstein <sylvain.ribstein@gmail.com>
Date: Tue, 21 Feb 2023 09:38:52 +0100
Subject: [PATCH 1/2] test: fix covalidity test

---
 .../integration/validate/generator_descriptors.ml  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml
index dff63be21aad..92a2e912867c 100644
--- a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml
@@ -617,9 +617,10 @@ let endorsement_descriptor =
         List.filter_map_es gen state.delegates);
   }
 
-let dal_slot_availibility ctxt delegate =
+(* TODO: #4917 remove direct dependency of the alpha_context. *)
+let dal_slot_availibility ctxt current_level delegate =
   let open Lwt_result_syntax in
-  let level = Alpha_context.Level.current ctxt in
+  let level = Alpha_context.Level.from_raw ctxt current_level in
   let* committee = Dal_apply.compute_committee ctxt level in
   match
     Environment.Signature.Public_key_hash.Map.find
@@ -630,8 +631,9 @@ let dal_slot_availibility ctxt delegate =
   | Some _interval ->
       (* The content of the attestation does not matter for covalidity. *)
       let attestation = Dal.Attestation.empty in
-      let level = Raw_level.succ level.Level.level in
-      return_some (Dal_attestation {attestor = delegate; attestation; level})
+      let next_level = Raw_level.succ current_level in
+      return_some
+        (Dal_attestation {attestor = delegate; attestation; level = next_level})
 
 let dal_attestation_descriptor =
   let open Lwt_result_syntax in
@@ -652,8 +654,10 @@ let dal_attestation_descriptor =
             let+ incr = Incremental.begin_construction state.block in
             Incremental.alpha_ctxt incr
           in
+          let*? current_level = Context.get_level (B state.block) in
           let* op =
-            dal_slot_availibility ctxt delegate >|= Environment.wrap_tzresult
+            dal_slot_availibility ctxt current_level delegate
+            >|= Environment.wrap_tzresult
           in
           return
             (op
-- 
GitLab


From 621235e6f4bb7b60ccf0843236bfcc125e82500b Mon Sep 17 00:00:00 2001
From: Sylvain Ribstein <sylvain.ribstein@gmail.com>
Date: Tue, 21 Feb 2023 14:40:26 +0100
Subject: [PATCH 2/2] test: rename function

---
 .../test/integration/validate/generator_descriptors.ml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml
index 92a2e912867c..6300c610dc8e 100644
--- a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml
@@ -618,7 +618,7 @@ let endorsement_descriptor =
   }
 
 (* TODO: #4917 remove direct dependency of the alpha_context. *)
-let dal_slot_availibility ctxt current_level delegate =
+let dal_attestation ctxt current_level delegate =
   let open Lwt_result_syntax in
   let level = Alpha_context.Level.from_raw ctxt current_level in
   let* committee = Dal_apply.compute_committee ctxt level in
@@ -656,7 +656,7 @@ let dal_attestation_descriptor =
           in
           let*? current_level = Context.get_level (B state.block) in
           let* op =
-            dal_slot_availibility ctxt current_level delegate
+            dal_attestation ctxt current_level delegate
             >|= Environment.wrap_tzresult
           in
           return
-- 
GitLab