From 819ae92f07b89a03f40adaee4f8c4ad82910aa1b Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Mon, 1 Jul 2024 15:43:17 +0200 Subject: [PATCH] octez: remove usage of encoding_with_legacy_attestation_name --- src/bin_node/node_replay_command.ml | 19 +++++---------- src/lib_mockup/local_services.ml | 33 ++++++++++++++++---------- src/lib_store/unix/test/alpha_utils.ml | 2 +- src/lib_validation/block_validation.ml | 20 ++++++---------- 4 files changed, 35 insertions(+), 39 deletions(-) diff --git a/src/bin_node/node_replay_command.ml b/src/bin_node/node_replay_command.ml index 246b15b077b6..e277f4657dd8 100644 --- a/src/bin_node/node_replay_command.ml +++ b/src/bin_node/node_replay_command.ml @@ -298,11 +298,9 @@ let replay_one_block strict main_chain_store validator_process block = (not (Bytes.equal expected_block_receipt_bytes block_metadata_bytes)) (fun () -> let to_json block = - Data_encoding.Json.construct - Proto.block_header_metadata_encoding_with_legacy_attestation_name + Data_encoding.Json.construct Proto.block_header_metadata_encoding @@ Data_encoding.Binary.of_bytes_exn - Proto - .block_header_metadata_encoding_with_legacy_attestation_name + Proto.block_header_metadata_encoding block in let exp = to_json expected_block_receipt_bytes in @@ -340,16 +338,11 @@ let replay_one_block strict main_chain_store validator_process block = in let to_json metadata_bytes = Data_encoding.Json.construct - Proto - .operation_data_and_receipt_encoding_with_legacy_attestation_name + Proto.operation_data_and_receipt_encoding Data_encoding.Binary. - ( of_bytes_exn - Proto.operation_data_encoding_with_legacy_attestation_name - op, - of_bytes_exn - Proto - .operation_receipt_encoding_with_legacy_attestation_name - metadata_bytes ) + ( of_bytes_exn Proto.operation_data_encoding op, + of_bytes_exn Proto.operation_receipt_encoding metadata_bytes + ) in let exp_json_opt, got_json_opt = match (exp_m, got_m) with diff --git a/src/lib_mockup/local_services.ml b/src/lib_mockup/local_services.ml index 10cbfc2c0e26..dc09abd3a3fe 100644 --- a/src/lib_mockup/local_services.ml +++ b/src/lib_mockup/local_services.ml @@ -252,15 +252,12 @@ module Make (E : MENV) = struct ~predecessor ~cache - let op_data_encoding = - E.Protocol.operation_data_encoding_with_legacy_attestation_name - let op_encoding = Data_encoding.( dynamic_size @@ obj2 (req "shell_header" Operation.shell_header_encoding) - (req "protocol_data" op_data_encoding)) + (req "protocol_data" E.Protocol.operation_data_encoding)) let ops_encoding = Data_encoding.Variable.list op_encoding @@ -343,7 +340,11 @@ module Make (E : MENV) = struct let op = {E.Protocol.shell = shell_header; protocol_data = operation_data} in - match Data_encoding.Binary.to_bytes op_data_encoding operation_data with + match + Data_encoding.Binary.to_bytes + E.Protocol.operation_data_encoding + operation_data + with | Error _ -> failwith "mockup pending_operations" | Ok proto -> let operation_hash = @@ -426,7 +427,9 @@ module Make (E : MENV) = struct let simulate_operation (state, preapply_result) op = let open Lwt_result_syntax in match - Data_encoding.Binary.to_bytes op_data_encoding op.E.Protocol.protocol_data + Data_encoding.Binary.to_bytes + E.Protocol.operation_data_encoding + op.E.Protocol.protocol_data with | Error _ -> failwith "mockup preapply_block: cannot deserialize operation" | Ok proto -> ( @@ -542,7 +545,9 @@ module Make (E : MENV) = struct let hash_protocol_operation op = match - Data_encoding.Binary.to_bytes op_data_encoding op.E.Protocol.protocol_data + Data_encoding.Binary.to_bytes + E.Protocol.operation_data_encoding + op.E.Protocol.protocol_data with | Error _ -> failwith "mockup preapply_operations: cannot deserialize operation" @@ -590,7 +595,9 @@ module Make (E : MENV) = struct | Error errs -> Tezos_rpc.Answer.fail errs))) let hash_op (shell, proto) = - let proto = Data_encoding.Binary.to_bytes_exn op_data_encoding proto in + let proto = + Data_encoding.Binary.to_bytes_exn E.Protocol.operation_data_encoding proto + in Operation.hash {shell; proto} let equal_op (a_shell_header, a_operation_data) @@ -635,7 +642,7 @@ module Make (E : MENV) = struct | Ok ({Operation.shell = shell_header; proto} as op) -> ( let operation_hash = Operation.hash op in let proto_op_opt = - Data_encoding.Binary.of_bytes op_data_encoding proto + Data_encoding.Binary.of_bytes E.Protocol.operation_data_encoding proto in match proto_op_opt with | Error _ -> Tezos_rpc.Answer.fail [Cannot_parse_op] @@ -671,7 +678,7 @@ module Make (E : MENV) = struct | Ok ({Operation.shell = shell_header; proto} as op) -> ( let operation_hash = Operation.hash op in let proto_op_opt = - Data_encoding.Binary.of_bytes op_data_encoding proto + Data_encoding.Binary.of_bytes E.Protocol.operation_data_encoding proto in match proto_op_opt with | Error _ -> Tezos_rpc.Answer.fail [Cannot_parse_op] @@ -728,7 +735,7 @@ module Make (E : MENV) = struct (List.fold_left_es (fun (proto_state, results) op -> match Data_encoding.Binary.of_bytes - op_data_encoding + E.Protocol.operation_data_encoding op.Operation.proto with | Error _ -> failwith "Cannot parse" @@ -794,7 +801,9 @@ module Make (E : MENV) = struct List.fold_left_es (fun map ((shell_header, operation_data) as v) -> match - Data_encoding.Binary.to_bytes op_data_encoding operation_data + Data_encoding.Binary.to_bytes + E.Protocol.operation_data_encoding + operation_data with | Error _ -> failwith "mockup inject block: byte encoding operation failed" diff --git a/src/lib_store/unix/test/alpha_utils.ml b/src/lib_store/unix/test/alpha_utils.ml index 09abf47dd71f..990242f0e3a6 100644 --- a/src/lib_store/unix/test/alpha_utils.ml +++ b/src/lib_store/unix/test/alpha_utils.ml @@ -602,7 +602,7 @@ let apply pred_resulting_ctxt chain_id ~policy ?(operations = empty_operations) in let block_header_metadata = Data_encoding.Binary.to_bytes_exn - Main.block_header_metadata_encoding_with_legacy_attestation_name + Main.block_header_metadata_encoding block_header_metadata in let payload_hash = diff --git a/src/lib_validation/block_validation.ml b/src/lib_validation/block_validation.ml index 09d4c14065e8..6e7880c6094c 100644 --- a/src/lib_validation/block_validation.ml +++ b/src/lib_validation/block_validation.ml @@ -476,7 +476,7 @@ module Make (Proto : Protocol_plugin.T) = struct List.map_es (fun {hash; operation; check_signature} -> match Data_encoding.Binary.of_bytes_opt - Proto.operation_data_encoding_with_legacy_attestation_name + Proto.operation_data_encoding operation.Operation.proto with | None -> @@ -518,7 +518,7 @@ module Make (Proto : Protocol_plugin.T) = struct let block_metadata = let metadata = Data_encoding.Binary.to_bytes_exn - Proto.block_header_metadata_encoding_with_legacy_attestation_name + Proto.block_header_metadata_encoding block_data in let metadata_hash_opt = @@ -537,14 +537,12 @@ module Make (Proto : Protocol_plugin.T) = struct serializable/deserializable *) let bytes = Data_encoding.Binary.to_bytes_exn - Proto - .operation_receipt_encoding_with_legacy_attestation_name + Proto.operation_receipt_encoding receipt in let _ = Data_encoding.Binary.of_bytes_exn - Proto - .operation_receipt_encoding_with_legacy_attestation_name + Proto.operation_receipt_encoding bytes in let metadata = @@ -944,10 +942,8 @@ module Make (Proto : Protocol_plugin.T) = struct match Data_encoding.Binary.( of_bytes_exn - Proto.operation_receipt_encoding_with_legacy_attestation_name - (to_bytes_exn - Proto.operation_receipt_encoding_with_legacy_attestation_name - receipt)) + Proto.operation_receipt_encoding + (to_bytes_exn Proto.operation_receipt_encoding receipt)) with | receipt -> Applied (pv, receipt) | exception exn -> @@ -970,9 +966,7 @@ module Make (Proto : Protocol_plugin.T) = struct | Some protocol_data -> return protocol_data let parse_unsafe (proto : bytes) : Proto.operation_data tzresult = - safe_binary_of_bytes - Proto.operation_data_encoding_with_legacy_attestation_name - proto + safe_binary_of_bytes Proto.operation_data_encoding proto let parse {hash; operation = raw; check_signature} = let open Result_syntax in -- GitLab