From f02972bb8a56d1f55040c7182ae2be362b4c239c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Sat, 21 Apr 2018 11:31:16 +0200 Subject: [PATCH] Alpha: use `Apply_operation_result` as operation metadata --- src/proto_alpha/lib_protocol/src/main.ml | 9 +++++---- src/proto_alpha/lib_protocol/src/main.mli | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/proto_alpha/lib_protocol/src/main.ml b/src/proto_alpha/lib_protocol/src/main.ml index 4a964c1df..182a56a0e 100644 --- a/src/proto_alpha/lib_protocol/src/main.ml +++ b/src/proto_alpha/lib_protocol/src/main.ml @@ -28,8 +28,9 @@ type operation = Alpha_context.Operation.t = { let operation_data_encoding = Alpha_context.Operation.protocol_data_encoding -type operation_metadata = unit -let operation_metadata_encoding = Data_encoding.unit +type operation_metadata = Apply_operation_result.operation_result +let operation_metadata_encoding = + Data_encoding.(obj1 (req "metadata" Apply_operation_result.encoding)) let acceptable_passes = Alpha_context.Operation.acceptable_passes @@ -128,9 +129,9 @@ let apply_operation ({ mode ; ctxt ; op_count ; _ } as data) operation = | Full_construction { predecessor ; _ } -> predecessor in Apply.apply_operation ctxt Optimized predecessor - (Alpha_context.Operation.hash operation) operation >>=? fun (ctxt, _) -> + (Alpha_context.Operation.hash operation) operation >>=? fun (ctxt, result) -> let op_count = op_count + 1 in - return ({ data with ctxt ; op_count }, ()) + return ({ data with ctxt ; op_count }, result) let finalize_block { mode ; ctxt ; op_count ; deposit = _ } = match mode with diff --git a/src/proto_alpha/lib_protocol/src/main.mli b/src/proto_alpha/lib_protocol/src/main.mli index eadc0f786..a83ba1854 100644 --- a/src/proto_alpha/lib_protocol/src/main.mli +++ b/src/proto_alpha/lib_protocol/src/main.mli @@ -34,5 +34,6 @@ include Updater.PROTOCOL with type block_header_data = Alpha_context.Block_heade and type block_header_metadata = Alpha_context.Block_header.metadata and type block_header = Alpha_context.Block_header.t and type operation_data = Alpha_context.Operation.protocol_data + and type operation_metadata = Apply_operation_result.operation_result and type operation = Alpha_context.operation and type validation_state := validation_state