From a74c33510916c264eea06391a19e3230db37d9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?=
 <francois.thire@nomadic-labs.com>
Date: Sun, 15 Dec 2024 14:26:37 +0100
Subject: [PATCH 1/2] Tezt/Tezos: Query string for metadata for operations RPC

---
 tezt/lib_tezos/RPC.ml  | 14 +++++++++-----
 tezt/lib_tezos/RPC.mli |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tezt/lib_tezos/RPC.ml b/tezt/lib_tezos/RPC.ml
index b5b71c2c9b81..7f147eb5b016 100644
--- a/tezt/lib_tezos/RPC.ml
+++ b/tezt/lib_tezos/RPC.ml
@@ -449,16 +449,18 @@ let get_chain_block_header_protocol_data ?(chain = "main") ?(block = "head")
     Fun.id
 
 let get_chain_block_operations ?(chain = "main") ?(block = "head") ?version
-    ?(force_metadata = false) () =
+    ?(force_metadata = false) ?(metadata = true) () =
   let query_string =
     Query_arg.opt "version" Fun.id version
-    @ if force_metadata then [("force_metadata", "")] else []
+    @
+    if force_metadata then [("force_metadata", "")]
+    else [] @ if metadata then [] else [("metadata", "never")]
   in
   make ~query_string GET ["chains"; chain; "blocks"; block; "operations"] Fun.id
 
 let get_chain_block_operations_validation_pass ?(chain = "main")
-    ?(block = "head") ?version ?(force_metadata = false) ?operation_offset
-    ~validation_pass () =
+    ?(block = "head") ?version ?(force_metadata = false) ?(metadata = true)
+    ?operation_offset ~validation_pass () =
   let path =
     [
       "chains";
@@ -472,7 +474,9 @@ let get_chain_block_operations_validation_pass ?(chain = "main")
   in
   let query_string =
     Query_arg.opt "version" Fun.id version
-    @ if force_metadata then [("force_metadata", "")] else []
+    @
+    if force_metadata then [("force_metadata", "")]
+    else [] @ if metadata then [] else [("metadata", "never")]
   in
   make ~query_string GET path Fun.id
 
diff --git a/tezt/lib_tezos/RPC.mli b/tezt/lib_tezos/RPC.mli
index 3c7f2e478a5b..f2e907da5e79 100644
--- a/tezt/lib_tezos/RPC.mli
+++ b/tezt/lib_tezos/RPC.mli
@@ -442,6 +442,7 @@ val get_chain_block_operations :
   ?block:string ->
   ?version:string ->
   ?force_metadata:bool ->
+  ?metadata:bool ->
   unit ->
   JSON.t t
 
@@ -460,6 +461,7 @@ val get_chain_block_operations_validation_pass :
   ?block:string ->
   ?version:string ->
   ?force_metadata:bool ->
+  ?metadata:bool ->
   ?operation_offset:int ->
   validation_pass:int ->
   unit ->
-- 
GitLab


From b2c72bbad674497bca7a8a6b6300cccade41baff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?=
 <francois.thire@nomadic-labs.com>
Date: Sun, 15 Dec 2024 17:41:52 +0100
Subject: [PATCH 2/2] Tezt/Cloud: Ensure the orchestrator do not get large
 metadata

---
 tezt/tests/cloud/dal.ml   | 7 ++++---
 tezt/tests/cloud/tezos.ml | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tezt/tests/cloud/dal.ml b/tezt/tests/cloud/dal.ml
index e101ab45bb6e..d581cdca57ee 100644
--- a/tezt/tests/cloud/dal.ml
+++ b/tezt/tests/cloud/dal.ml
@@ -790,10 +790,11 @@ let update_ratio_attested_commitments_per_baker t per_level_info metrics =
                      | None -> (* No attestation in block *) 0
                      | Some (Some z) when n = 0 ->
                          if z = Z.zero then (* No slot were published. *) 100
-                         else
-                           Test.fail
+                         else (
+                           Log.error
                              "Wow wow wait! It seems an invariant is broken. \
-                              Either on the test side, or on the DAL node side"
+                              Either on the test side, or on the DAL node side" ;
+                           100)
                      | Some (Some z) ->
                          (* Attestation with DAL payload *)
                          if n = 0 then 100 else Z.popcount z * 100 / n
diff --git a/tezt/tests/cloud/tezos.ml b/tezt/tests/cloud/tezos.ml
index 93ffdebc40a4..937cb8fd5f4c 100644
--- a/tezt/tests/cloud/tezos.ml
+++ b/tezt/tests/cloud/tezos.ml
@@ -21,6 +21,7 @@ module Node = struct
       let rpc_port = Agent.next_available_port agent in
       let net_port = Agent.next_available_port agent in
       let metrics_port = Agent.next_available_port agent in
+      let arguments = Metadata_size_limit (Some 10_000) :: arguments in
       create
         ?data_dir
         ?name
@@ -39,6 +40,7 @@ module Node = struct
       let rpc_port = Agent.next_available_port agent in
       let net_port = Agent.next_available_port agent in
       let metrics_port = Agent.next_available_port agent in
+      let arguments = Metadata_size_limit (Some 10_000) :: arguments in
       init
         ?name
         ?data_dir
-- 
GitLab