From 4dabdfe6c99f5ff94bbbf8580b5d3549c271b54d Mon Sep 17 00:00:00 2001 From: Julien Tesson Date: Mon, 6 Mar 2023 12:38:53 +0100 Subject: [PATCH 1/3] proto/Plugin/RPC,Michelson: fix pretty printing of PUSH instr --- src/proto_alpha/lib_plugin/RPC.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml index ac07a4f1a423..5fa221aa4342 100644 --- a/src/proto_alpha/lib_plugin/RPC.ml +++ b/src/proto_alpha/lib_plugin/RPC.ml @@ -762,7 +762,7 @@ module Scripts = struct | IDrop _ -> pp_print_string fmt "DROP" | IDup _ -> pp_print_string fmt "DUP" | ISwap _ -> pp_print_string fmt "SWAP" - | IConst _ -> pp_print_string fmt "CONST" + | IConst _ -> pp_print_string fmt "PUSH" | ICons_pair _ -> pp_print_string fmt "PAIR" | ICar _ -> pp_print_string fmt "CAR" | ICdr _ -> pp_print_string fmt "CDR" -- GitLab From 1d46694e1f82334ae3d566335222254f1295633d Mon Sep 17 00:00:00 2001 From: Julien Tesson Date: Thu, 9 Mar 2023 08:44:33 +0100 Subject: [PATCH 2/3] Proto,Michelson: rename constructor IConst to IPush --- .../interpreter_benchmarks.ml | 17 ++++++++--------- .../lib_benchmarks_proto/interpreter_model.ml | 2 +- .../interpreter_workload.ml | 10 +++++----- src/proto_alpha/lib_plugin/RPC.ml | 2 +- .../lib_plugin/script_interpreter_logging.ml | 4 ++-- .../lib_protocol/michelson_v1_gas.ml | 2 +- .../lib_protocol/michelson_v1_gas.mli | 2 +- .../michelson_v1_gas_costs_generated.ml | 4 ++-- .../lib_protocol/script_interpreter.ml | 2 +- .../lib_protocol/script_interpreter_defs.ml | 8 ++++---- .../lib_protocol/script_ir_translator.ml | 8 ++++---- src/proto_alpha/lib_protocol/script_typed_ir.ml | 6 +++--- .../lib_protocol/script_typed_ir.mli | 2 +- .../lib_protocol/script_typed_ir_size.ml | 2 +- .../michelson/test_interpretation.ml | 5 ++--- .../michelson/test_script_typed_ir_size.ml | 6 +++--- 16 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml index 99b055bb6d80..f1ca84c30743 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_benchmarks.ml @@ -715,9 +715,9 @@ module Registration_section = struct let () = simple_benchmark ~amplification:100 - ~name:Interpreter_workload.N_IConst + ~name:Interpreter_workload.N_IPush ~stack_type:(unit @$ unit @$ bot) - ~kinstr:(IConst (dummy_loc, unit, (), halt)) + ~kinstr:(IPush (dummy_loc, unit, (), halt)) () (* deep stack manipulation *) @@ -2164,9 +2164,9 @@ module Registration_section = struct ILoop -> either - IHalt (false on top of stack) - - IConst false ; IHalt (true on top of stack) + - IPush false ; IHalt (true on top of stack) *) - let push_false = IConst (dummy_loc, bool, false, halt) in + let push_false = IPush (dummy_loc, bool, false, halt) in simple_benchmark ~name:Interpreter_workload.N_ILoop ~stack_type:(bool @$ bot) @@ -2190,7 +2190,7 @@ module Registration_section = struct (* IDip -> IHalt -> - IConst -> + IPush -> IHalt *) simple_benchmark @@ -2220,7 +2220,7 @@ module Registration_section = struct kaft = unit @$ bot; kinstr = IDrop - (dummy_loc, IDrop (dummy_loc, IConst (dummy_loc, unit, (), halt))); + (dummy_loc, IDrop (dummy_loc, IPush (dummy_loc, unit, (), halt))); } in LamRec (descr, Micheline.Int (dummy_loc, Z.zero)) @@ -2270,8 +2270,7 @@ module Registration_section = struct kaft = unit @$ bot; kinstr = IDrop - ( dummy_loc, - IDrop (dummy_loc, IConst (dummy_loc, unit, (), halt)) ); + (dummy_loc, IDrop (dummy_loc, IPush (dummy_loc, unit, (), halt))); } in LamRec (descr, Micheline.Int (dummy_loc, Z.zero)) @@ -3278,7 +3277,7 @@ module Registration_section = struct ~amplification:100 ~name:Interpreter_workload.N_KLoop_in ~cont_and_stack_sampler:(fun _cfg _rng_state -> - let cont = KLoop_in (IConst (dummy_loc, bool, false, halt), KNil) in + let cont = KLoop_in (IPush (dummy_loc, bool, false, halt), KNil) in let stack = (false, ((), eos)) in let stack_type = bool @$ unit @$ bot in fun () -> Ex_stack_and_cont {stack; cont; stack_type}) diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml index 29d4f8ac52bd..ca5ae08d5040 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_model.ml @@ -382,7 +382,7 @@ let ir_model instr_or_cont = match instr_or_cont with | Instr_name instr -> ( match instr with - | N_IDrop | N_IDup | N_ISwap | N_IConst | N_ICons_pair | N_ICar | N_ICdr + | N_IDrop | N_IDup | N_ISwap | N_IPush | N_ICons_pair | N_ICar | N_ICdr | N_ICons_some | N_ICons_none | N_IIf_none | N_IOpt_map | N_ILeft | N_IRight | N_IIf_left | N_ICons_list | N_INil | N_IIf_cons | N_IEmpty_set | N_IEmpty_map | N_IEmpty_big_map | N_IOr | N_IAnd | N_IXor diff --git a/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml b/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml index 2cd89fc61fff..76da169ca2eb 100644 --- a/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml +++ b/src/proto_alpha/lib_benchmarks_proto/interpreter_workload.ml @@ -44,7 +44,7 @@ type instruction_name = | N_IDrop | N_IDup | N_ISwap - | N_IConst + | N_IPush (* pairs *) | N_ICons_pair | N_ICar @@ -267,7 +267,7 @@ let string_of_instruction_name : instruction_name -> string = | N_IDrop -> "N_IDrop" | N_IDup -> "N_IDup" | N_ISwap -> "N_ISwap" - | N_IConst -> "N_IConst" + | N_IPush -> "N_IPush" | N_ICons_pair -> "N_ICons_pair" | N_ICar -> "N_ICar" | N_ICdr -> "N_ICdr" @@ -499,7 +499,7 @@ let all_instructions = N_IDrop; N_IDup; N_ISwap; - N_IConst; + N_IPush; N_ICons_pair; N_ICar; N_ICdr; @@ -752,7 +752,7 @@ module Instructions = struct let swap = ir_sized_step N_ISwap nullary - let const = ir_sized_step N_IConst nullary + let push = ir_sized_step N_IPush nullary let cons_pair = ir_sized_step N_ICons_pair nullary @@ -1222,7 +1222,7 @@ let extract_ir_sized_step : | IDrop (_, _), _ -> Instructions.drop | IDup (_, _), _ -> Instructions.dup | ISwap (_, _), _ -> Instructions.swap - | IConst (_, _, _, _), _ -> Instructions.const + | IPush (_, _, _, _), _ -> Instructions.push | ICons_pair (_, _), _ -> Instructions.cons_pair | ICar (_, _), _ -> Instructions.car | ICdr (_, _), _ -> Instructions.cdr diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml index 5fa221aa4342..41979ce3f2ee 100644 --- a/src/proto_alpha/lib_plugin/RPC.ml +++ b/src/proto_alpha/lib_plugin/RPC.ml @@ -762,7 +762,7 @@ module Scripts = struct | IDrop _ -> pp_print_string fmt "DROP" | IDup _ -> pp_print_string fmt "DUP" | ISwap _ -> pp_print_string fmt "SWAP" - | IConst _ -> pp_print_string fmt "PUSH" + | IPush _ -> pp_print_string fmt "PUSH" | ICons_pair _ -> pp_print_string fmt "PAIR" | ICar _ -> pp_print_string fmt "CAR" | ICdr _ -> pp_print_string fmt "CDR" diff --git a/src/proto_alpha/lib_plugin/script_interpreter_logging.ml b/src/proto_alpha/lib_plugin/script_interpreter_logging.ml index cde10aacc3f0..297f153d731f 100644 --- a/src/proto_alpha/lib_plugin/script_interpreter_logging.ml +++ b/src/proto_alpha/lib_plugin/script_interpreter_logging.ml @@ -173,14 +173,14 @@ module Stack_utils = struct continuation = k; reconstruct = (fun k -> ISwap (loc, k)); } - | IConst (loc, a, x, k), s -> + | IPush (loc, a, x, k), s -> let s = Item_t (a, s) in ok @@ Ex_split_kinstr { cont_init_stack = s; continuation = k; - reconstruct = (fun k -> IConst (loc, a, x, k)); + reconstruct = (fun k -> IPush (loc, a, x, k)); } | ICons_pair (loc, k), Item_t (a, Item_t (b, s)) -> pair_t dummy a b >|? fun (Ty_ex_c c) -> diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml index 28936be172b9..ba30f5b187ab 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml @@ -378,7 +378,7 @@ module Cost_of = struct let halt = atomic_step_cost cost_N_IHalt - let const = atomic_step_cost cost_N_IConst + let push = atomic_step_cost cost_N_IPush let empty_big_map = atomic_step_cost cost_N_IEmpty_big_map diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli index c7f58dafcc64..2426ad4554c2 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli @@ -300,7 +300,7 @@ module Cost_of : sig val halt : Gas.cost - val const : Gas.cost + val push : Gas.cost val empty_big_map : Gas.cost diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml index 18bbf827d12a..b0f59742a906 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml @@ -237,8 +237,8 @@ let cost_N_ICons_pair = S.safe_int 10 (* model N_ICons_some *) let cost_N_ICons_some = S.safe_int 10 -(* model N_IConst *) -let cost_N_IConst = S.safe_int 10 +(* model N_IPush *) +let cost_N_IPush = S.safe_int 10 (* model N_IContract *) let cost_N_IContract = S.safe_int 30 diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index a10944f798d4..343a7613aad3 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -654,7 +654,7 @@ module Raw = struct | ISwap (_, k) -> let top, stack = stack in (step [@ocaml.tailcall]) g gas k ks top (accu, stack) - | IConst (_, _ty, v, k) -> + | IPush (_, _ty, v, k) -> (step [@ocaml.tailcall]) g gas k ks v (accu, stack) (* options *) | ICons_some (_, k) -> diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml index 147ff3b332c1..94c1c0ce6f17 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml @@ -293,7 +293,7 @@ let cost_of_instr : type a s r f. (a, s, r, f) kinstr -> a -> s -> Gas.cost = | IDrop _ -> Interp_costs.drop | IDup _ -> Interp_costs.dup | ISwap _ -> Interp_costs.swap - | IConst _ -> Interp_costs.const + | IPush _ -> Interp_costs.push | ICons_some _ -> Interp_costs.cons_some | ICons_none _ -> Interp_costs.cons_none | IIf_none _ -> Interp_costs.if_none @@ -469,7 +469,7 @@ let rec kundip : fun w accu stack k -> match w with | KPrefix (loc, ty, w) -> - let k = IConst (loc, ty, accu, k) in + let k = IPush (loc, ty, accu, k) in let accu, stack = stack in kundip w accu stack k | KRest -> (accu, stack, k) @@ -514,7 +514,7 @@ let apply ctxt gas capture_ty capture lam = kbef = arg_stack_ty; kaft = descr.kaft; kinstr = - IConst + IPush ( descr.kloc, capture_ty, capture, @@ -553,7 +553,7 @@ let apply ctxt gas capture_ty capture lam = kbef = arg_stack_ty; kaft = descr.kaft; kinstr = - IConst + IPush ( descr.kloc, capture_ty, capture, diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 1dad55842a66..9f4e936118a7 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -2742,12 +2742,12 @@ and parse_instr : t d >>=? fun (v, ctxt) -> - let const = {apply = (fun k -> IConst (loc, t, v, k))} in - typed ctxt loc const (Item_t (t, stack)) + let push = {apply = (fun k -> IPush (loc, t, v, k))} in + typed ctxt loc push (Item_t (t, stack)) | Prim (loc, I_UNIT, [], annot), stack -> check_var_type_annot loc annot >>?= fun () -> - let const = {apply = (fun k -> IConst (loc, unit_t, (), k))} in - typed ctxt loc const (Item_t (unit_t, stack)) + let push = {apply = (fun k -> IPush (loc, unit_t, (), k))} in + typed ctxt loc push (Item_t (unit_t, stack)) (* options *) | Prim (loc, I_SOME, [], annot), Item_t (t, rest) -> check_var_type_annot loc annot >>?= fun () -> diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index d8fd30e9f32b..b3a520b392ae 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -468,7 +468,7 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = | ISwap : Script.location * ('b, 'a * ('c * 's), 'r, 'f) kinstr -> ('a, 'b * ('c * 's), 'r, 'f) kinstr - | IConst : + | IPush : Script.location * ('ty, _) ty * 'ty * ('ty, 'a * 's, 'r, 'f) kinstr -> ('a, 's, 'r, 'f) kinstr (* @@ -1569,7 +1569,7 @@ let kinstr_location : type a s b f. (a, s, b, f) kinstr -> Script.location = | IDrop (loc, _) -> loc | IDup (loc, _) -> loc | ISwap (loc, _) -> loc - | IConst (loc, _, _, _) -> loc + | IPush (loc, _, _, _) -> loc | ICons_pair (loc, _) -> loc | ICar (loc, _) -> loc | ICdr (loc, _) -> loc @@ -1972,7 +1972,7 @@ let kinstr_traverse i init f = | IDrop (_, k) -> (next [@ocaml.tailcall]) k | IDup (_, k) -> (next [@ocaml.tailcall]) k | ISwap (_, k) -> (next [@ocaml.tailcall]) k - | IConst (_, _, _, k) -> (next [@ocaml.tailcall]) k + | IPush (_, _, _, k) -> (next [@ocaml.tailcall]) k | ICons_pair (_, k) -> (next [@ocaml.tailcall]) k | ICar (_, k) -> (next [@ocaml.tailcall]) k | ICdr (_, k) -> (next [@ocaml.tailcall]) k diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.mli b/src/proto_alpha/lib_protocol/script_typed_ir.mli index e5e2e43c41ff..de71ae6f3d34 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.mli +++ b/src/proto_alpha/lib_protocol/script_typed_ir.mli @@ -445,7 +445,7 @@ and ('before_top, 'before, 'result_top, 'result) kinstr = | ISwap : Script.location * ('b, 'a * ('c * 's), 'r, 'f) kinstr -> ('a, 'b * ('c * 's), 'r, 'f) kinstr - | IConst : + | IPush : Script.location * ('ty, _) ty * 'ty * ('ty, 'a * 's, 'r, 'f) kinstr -> ('a, 's, 'r, 'f) kinstr (* diff --git a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml index 883dbf33c5a8..2730c1a2b5d8 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -426,7 +426,7 @@ and kinstr_size : | IDrop (loc, k) -> ret_succ_adding accu (base1 loc k) | IDup (loc, k) -> ret_succ_adding accu (base1 loc k) | ISwap (loc, k) -> ret_succ_adding accu (base1 loc k) - | IConst (loc, ty, x, k) -> + | IPush (loc, ty, x, k) -> let accu = ret_succ_adding accu (base1 loc k +! (word_size *? 2)) in (value_size [@ocaml.tailcall]) ~count_lambda_nodes diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_interpretation.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_interpretation.ml index 302eb4dcac7b..7db1844941ec 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_interpretation.ml +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_interpretation.ml @@ -130,8 +130,7 @@ let test_stack_overflow () = let enorme_et_seq n = let rec aux n acc = if n = 0 then acc - else - aux (n - 1) (IConst (dummy_loc, Bool_t, true, IDrop (dummy_loc, acc))) + else aux (n - 1) (IPush (dummy_loc, Bool_t, true, IDrop (dummy_loc, acc))) in aux n (IHalt dummy_loc) in @@ -166,7 +165,7 @@ let test_stack_overflow_in_lwt () = (n - 1) (IDup ( dummy_loc, - IConst + IPush ( dummy_loc, Unit_t, (), diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml index df632d047654..7c07edc87de8 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml @@ -711,7 +711,7 @@ let check_kinstr_size () = let halt () = IHalt loc in let drop () = IDrop (loc, halt ()) in let cdr = ICdr (loc, halt ()) in - let const ty v = IConst (loc, ty, v, halt ()) in + let push ty v = IPush (loc, ty, v, halt ()) in let unit_option_t () = WithExceptions.Result.get_ok ~loc:__LOC__ @@ option_t loc Unit_t in @@ -745,7 +745,7 @@ let check_kinstr_size () = Kinstr ("IDrop", drop ()); Kinstr ("IDup", IDup (loc, halt ())); Kinstr ("ISwap", ISwap (loc, halt ())); - Kinstr ("IConst", const String_t @@ str "tezos"); + Kinstr ("IPush", push String_t @@ str "tezos"); Kinstr ("ICons_pair", ICons_pair (loc, halt ())); Kinstr ("ICar", ICar (loc, halt ())); Kinstr ("ICdr", cdr); @@ -863,7 +863,7 @@ let check_kinstr_size () = branch_if_false = halt (); k = halt (); } ); - Kinstr ("ILoop", ILoop (loc, const Bool_t true, halt ())); + Kinstr ("ILoop", ILoop (loc, push Bool_t true, halt ())); Kinstr ("ILoop_left", ILoop_left (loc, INever loc, halt ())); Kinstr ("IDip", IDip (loc, halt (), None, halt ())); Kinstr ("IExec", IExec (loc, None, halt ())); -- GitLab From 307fda07501fe546bbf4fe4acd0054f2c2063dcd Mon Sep 17 00:00:00 2001 From: Julien Tesson Date: Thu, 9 Mar 2023 12:13:44 +0100 Subject: [PATCH 3/3] proto/tests,Michelson: updating regression test traces --- .../expected/test_logging.ml/accounts.out | 6 +- .../expected/test_logging.ml/auction.out | 4 +- .../test_logging.ml/big_map_union.out | 12 +- .../expected/test_logging.ml/comb-get.out | 24 +- .../expected/test_logging.ml/comb-set.out | 16 +- .../expected/test_logging.ml/conditionals.out | 8 +- .../expected/test_logging.ml/cps_fact.out | 20 +- .../expected/test_logging.ml/dipn.out | 22 +- .../expected/test_logging.ml/ediv.out | 6 +- .../expected/test_logging.ml/faucet.out | 12 +- .../expected/test_logging.ml/if.out | 4 +- .../test_logging.ml/insertion_sort.out | 348 +++++++++--------- .../test_logging.ml/list_map_block.out | 32 +- .../expected/test_logging.ml/packunpack.out | 4 +- .../expected/test_logging.ml/pexec.out | 2 +- .../expected/test_logging.ml/reverse_loop.out | 20 +- .../test_logging.ml/spawn_identities.out | 152 ++++---- .../expected/test_logging.ml/ticket_split.out | 16 +- 18 files changed, 354 insertions(+), 354 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/accounts.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/accounts.out index b4fd9e3f86a4..ff82d9219dfb 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/accounts.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/accounts.out @@ -45,14 +45,14 @@ trace [ {} {} ] - control: KCons - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ {} {} ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ "[PUBLIC_KEY_HASH]" {} {} ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ "[PUBLIC_KEY_HASH]" {} {} ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out index a99be8ed6597..4b6dfefc1ebe 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/auction.out @@ -356,11 +356,11 @@ trace (Pair "[TIMESTAMP]" 100000000 "[PUBLIC_KEY_HASH]") ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 55 + - log/PUSH (exit) @ location: 55 [ 50000000 "[PUBLIC_KEY_HASH]" (Pair "[TIMESTAMP]" 100000000 "[PUBLIC_KEY_HASH]") ] - - CONST (entry) @ location: 59 + - PUSH (entry) @ location: 59 [ 50000000 "[PUBLIC_KEY_HASH]" (Pair "[TIMESTAMP]" 100000000 "[PUBLIC_KEY_HASH]") ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/big_map_union.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/big_map_union.out index b02f28c5d6a3..d3d7a2bfc45c 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/big_map_union.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/big_map_union.out @@ -87,12 +87,12 @@ trace 12 { Elt "123" 123 } Unit ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ "string" 12 { Elt "123" 123 } Unit ] - - CONST (entry) @ location: 29 + - PUSH (entry) @ location: 29 [ "string" 12 { Elt "123" 123 } @@ -235,12 +235,12 @@ trace 99 { Elt "123" 123 ; Elt "string" 12 } Unit ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ "abc" 99 { Elt "123" 123 ; Elt "string" 12 } Unit ] - - CONST (entry) @ location: 29 + - PUSH (entry) @ location: 29 [ "abc" 99 { Elt "123" 123 ; Elt "string" 12 } @@ -383,12 +383,12 @@ trace 3 { Elt "123" 123 ; Elt "abc" 99 ; Elt "string" 12 } Unit ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ "def" 3 { Elt "123" 123 ; Elt "abc" 99 ; Elt "string" 12 } Unit ] - - CONST (entry) @ location: 29 + - PUSH (entry) @ location: 29 [ "def" 3 { Elt "123" 123 ; Elt "abc" 99 ; Elt "string" 12 } diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out index f2940342da88..9bba705816e2 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-get.out @@ -14,10 +14,10 @@ trace - CAR (entry) @ location: 13 [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 13 + - log/PUSH (exit) @ location: 13 [ 1 (Pair 1 4 2 Unit) ] - - CONST (entry) @ location: 14 + - PUSH (entry) @ location: 14 [ 1 (Pair 1 4 2 Unit) ] - log/COMPARE (exit) @ location: 14 @@ -55,10 +55,10 @@ trace - GET (entry) @ location: 28 [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 28 + - log/PUSH (exit) @ location: 28 [ 1 (Pair 1 4 2 Unit) ] - - CONST (entry) @ location: 30 + - PUSH (entry) @ location: 30 [ 1 (Pair 1 4 2 Unit) ] - log/COMPARE (exit) @ location: 30 @@ -96,10 +96,10 @@ trace - GET (entry) @ location: 44 [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 44 + - log/PUSH (exit) @ location: 44 [ 4 (Pair 1 4 2 Unit) ] - - CONST (entry) @ location: 46 + - PUSH (entry) @ location: 46 [ 4 (Pair 1 4 2 Unit) ] - log/COMPARE (exit) @ location: 46 @@ -137,10 +137,10 @@ trace - GET (entry) @ location: 60 [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 60 + - log/PUSH (exit) @ location: 60 [ 2 (Pair 1 4 2 Unit) ] - - CONST (entry) @ location: 62 + - PUSH (entry) @ location: 62 [ 2 (Pair 1 4 2 Unit) ] - log/COMPARE (exit) @ location: 62 @@ -178,10 +178,10 @@ trace - GET (entry) @ location: 76 [ (Pair 1 4 2 Unit) (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 76 + - log/PUSH (exit) @ location: 76 [ Unit (Pair 1 4 2 Unit) ] - - CONST (entry) @ location: 78 + - PUSH (entry) @ location: 78 [ Unit (Pair 1 4 2 Unit) ] - log/COMPARE (exit) @ location: 78 @@ -213,9 +213,9 @@ trace [ (Pair 1 4 2 Unit) ] - DROP (entry) @ location: 89 [ (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 89 + - log/PUSH (exit) @ location: 89 [ ] - - CONST (entry) @ location: 90 + - PUSH (entry) @ location: 90 [ ] - log/NIL (exit) @ location: 90 [ Unit ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out index 24ca4d9dbdd4..f9f1eab6ed02 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/comb-set.out @@ -4,9 +4,9 @@ trace [ (Pair Unit 1 4 2 Unit) ] - CDR (entry) @ location: 11 [ (Pair Unit 1 4 2 Unit) ] - - log/CONST (exit) @ location: 11 + - log/PUSH (exit) @ location: 11 [ (Pair 1 4 2 Unit) ] - - CONST (entry) @ location: 12 + - PUSH (entry) @ location: 12 [ (Pair 1 4 2 Unit) ] - log/UPDATE (exit) @ location: 12 [ 2 @@ -14,9 +14,9 @@ trace - UPDATE (entry) @ location: 15 [ 2 (Pair 1 4 2 Unit) ] - - log/CONST (exit) @ location: 15 + - log/PUSH (exit) @ location: 15 [ (Pair 2 4 2 Unit) ] - - CONST (entry) @ location: 17 + - PUSH (entry) @ location: 17 [ (Pair 2 4 2 Unit) ] - log/UPDATE (exit) @ location: 17 [ 12 @@ -24,9 +24,9 @@ trace - UPDATE (entry) @ location: 20 [ 12 (Pair 2 4 2 Unit) ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ (Pair 2 12 2 Unit) ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ (Pair 2 12 2 Unit) ] - log/UPDATE (exit) @ location: 22 [ 8 @@ -34,9 +34,9 @@ trace - UPDATE (entry) @ location: 25 [ 8 (Pair 2 12 2 Unit) ] - - log/CONST (exit) @ location: 25 + - log/PUSH (exit) @ location: 25 [ (Pair 2 12 8 Unit) ] - - CONST (entry) @ location: 27 + - PUSH (entry) @ location: 27 [ (Pair 2 12 8 Unit) ] - log/UPDATE (exit) @ location: 27 [ Unit diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/conditionals.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/conditionals.out index 9fdfb3eb56d0..cdf6a97298a5 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/conditionals.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/conditionals.out @@ -12,9 +12,9 @@ trace [ (Some 23) ] - IF_NONE (entry) @ location: 14 [ (Some 23) ] - - log/CONST (exit) @ location: 14 + - log/PUSH (exit) @ location: 14 [ 23 ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ 23 ] - log/COMPARE (exit) @ location: 20 [ 0 @@ -30,9 +30,9 @@ trace [ False ] - IF (entry) @ location: 26 [ False ] - - log/CONST (exit) @ location: 26 + - log/PUSH (exit) @ location: 26 [ ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ ] - log/[halt] (exit) @ location: 32 [ "" ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/cps_fact.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/cps_fact.out index 93e98cd385c9..aba8d782b457 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/cps_fact.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/cps_fact.out @@ -50,9 +50,9 @@ trace [ 60 ] - DROP (entry) @ location: 19 [ 60 ] - - log/CONST (exit) @ location: 19 + - log/PUSH (exit) @ location: 19 [ ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ ] - log/[halt] (exit) @ location: 20 [ 1 ] @@ -71,11 +71,11 @@ trace - DUP (entry) @ location: 23 [ 2 1 ] - - log/CONST (exit) @ location: 23 + - log/PUSH (exit) @ location: 23 [ 2 2 1 ] - - CONST (entry) @ location: 24 + - PUSH (entry) @ location: 24 [ 2 2 1 ] @@ -105,10 +105,10 @@ trace [ False 2 1 ] - - log/CONST (exit) @ location: 30 + - log/PUSH (exit) @ location: 30 [ 2 1 ] - - CONST (entry) @ location: 37 + - PUSH (entry) @ location: 37 [ 2 1 ] - log/SWAP (exit) @ location: 37 @@ -153,10 +153,10 @@ trace [ 1 1 1 ] - - log/CONST (exit) @ location: 50 + - log/PUSH (exit) @ location: 50 [ 1 1 ] - - CONST (entry) @ location: 52 + - PUSH (entry) @ location: 52 [ 1 1 ] - log/ADD (exit) @ location: 52 @@ -199,9 +199,9 @@ trace [ ] - SELF (entry) @ location: 62 [ ] - - log/CONST (exit) @ location: 62 + - log/PUSH (exit) @ location: 62 [ "[CONTRACT_HASH]" ] - - CONST (entry) @ location: 63 + - PUSH (entry) @ location: 63 [ "[CONTRACT_HASH]" ] - log/[halt] (exit) @ location: 63 [ 0 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/dipn.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/dipn.out index 7c1d6266512d..45246f777c92 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/dipn.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/dipn.out @@ -44,48 +44,48 @@ trace 2 3 4 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ ] - - CONST (entry) @ location: 23 + - PUSH (entry) @ location: 23 [ ] - log/[halt] (exit) @ location: 23 [ 6 ] - [halt] (entry) @ location: 23 [ 6 ] - control: KCons - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ 6 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 4 6 ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ 4 6 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 3 4 6 ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ 3 4 6 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 2 3 4 6 ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ 2 3 4 6 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 1 2 3 4 6 ] - - CONST (entry) @ location: 20 + - PUSH (entry) @ location: 20 [ 1 2 3 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ediv.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ediv.out index 7e21f457ff17..a951089c45ca 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ediv.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ediv.out @@ -217,12 +217,12 @@ trace - [halt] (entry) @ location: 52 [ (Pair (Some (Pair 11 6)) (Some (Pair 11 6))) ] - control: KCons - - CONST (entry) @ location: 49 + - PUSH (entry) @ location: 49 [ (Pair (Some (Pair 11 6)) (Some (Pair 11 6))) ] - - log/CONST (exit) @ location: 49 + - log/PUSH (exit) @ location: 49 [ (Some (Pair 11 6)) (Pair (Some (Pair 11 6)) (Some (Pair 11 6))) ] - - CONST (entry) @ location: 49 + - PUSH (entry) @ location: 49 [ (Some (Pair 11 6)) (Pair (Some (Pair 11 6)) (Some (Pair 11 6))) ] - log/log/log/DIP (exit) @ location: 49 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out index 0eaf15b7b456..702128601876 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/faucet.out @@ -10,10 +10,10 @@ trace - SWAP (entry) @ location: 8 [ "[PUBLIC_KEY_HASH]" "[TIMESTAMP]" ] - - log/CONST (exit) @ location: 8 + - log/PUSH (exit) @ location: 8 [ "[TIMESTAMP]" "[PUBLIC_KEY_HASH]" ] - - CONST (entry) @ location: 9 + - PUSH (entry) @ location: 9 [ "[TIMESTAMP]" "[PUBLIC_KEY_HASH]" ] - log/ADD (exit) @ location: 9 @@ -59,14 +59,14 @@ trace [ "[PUBLIC_KEY_HASH]" ] - IMPLICIT_ACCOUNT (entry) @ location: 24 [ "[PUBLIC_KEY_HASH]" ] - - log/CONST (exit) @ location: 24 + - log/PUSH (exit) @ location: 24 [ "[PUBLIC_KEY_HASH]" ] - - CONST (entry) @ location: 25 + - PUSH (entry) @ location: 25 [ "[PUBLIC_KEY_HASH]" ] - - log/CONST (exit) @ location: 25 + - log/PUSH (exit) @ location: 25 [ 1000000 "[PUBLIC_KEY_HASH]" ] - - CONST (entry) @ location: 28 + - PUSH (entry) @ location: 28 [ 1000000 "[PUBLIC_KEY_HASH]" ] - log/TRANSFER_TOKENS (exit) @ location: 28 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/if.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/if.out index 9e050efcb084..ab18612e58e6 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/if.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/if.out @@ -8,9 +8,9 @@ trace [ True ] - IF (entry) @ location: 9 [ True ] - - log/CONST (exit) @ location: 9 + - log/PUSH (exit) @ location: 9 [ ] - - CONST (entry) @ location: 11 + - PUSH (entry) @ location: 11 [ ] - log/[halt] (exit) @ location: 11 [ True ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/insertion_sort.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/insertion_sort.out index 540a00937e1d..d9dc483d4589 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/insertion_sort.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/insertion_sort.out @@ -42,23 +42,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 8 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 8 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ {} 8 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ {} 8 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ {} 8 {} ] @@ -87,11 +87,11 @@ trace - NIL (entry) @ location: 61 [ 8 {} ] - - log/CONST (exit) @ location: 61 + - log/PUSH (exit) @ location: 61 [ {} 8 {} ] - - CONST (entry) @ location: 63 + - PUSH (entry) @ location: 63 [ {} 8 {} ] @@ -174,23 +174,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 3 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 3 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 8 } 3 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 8 } 3 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 8 } 3 {} ] @@ -266,16 +266,16 @@ trace 3 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 3 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 8 3 3 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 8 3 3 @@ -392,11 +392,11 @@ trace {} 3 {} ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 8 } 3 {} ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 8 } 3 {} ] @@ -490,23 +490,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 2 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 2 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 3 ; 8 } 2 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 3 ; 8 } 2 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 3 ; 8 } 2 {} ] @@ -582,16 +582,16 @@ trace 2 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 2 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 3 2 2 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 2 2 @@ -708,11 +708,11 @@ trace { 8 } 2 {} ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 3 ; 8 } 2 {} ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 3 ; 8 } 2 {} ] @@ -806,23 +806,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 7 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 7 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 8 } 7 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 8 } 7 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 2 ; 3 ; 8 } 7 {} ] @@ -898,16 +898,16 @@ trace 7 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 7 7 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 2 7 7 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 7 7 @@ -1050,11 +1050,11 @@ trace { 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 3 ; 8 } 7 { 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 3 ; 8 } 7 { 2 } ] @@ -1152,16 +1152,16 @@ trace 7 { 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 7 7 { 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 3 7 7 { 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 7 7 @@ -1304,11 +1304,11 @@ trace { 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 8 } 7 { 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 8 } 7 { 3 ; 2 } ] @@ -1406,16 +1406,16 @@ trace 7 { 3 ; 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 7 7 { 3 ; 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 8 7 7 { 3 ; 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 8 7 7 @@ -1532,11 +1532,11 @@ trace {} 7 { 3 ; 2 } ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 8 } 7 { 3 ; 2 } ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 8 } 7 { 3 ; 2 } ] @@ -1652,23 +1652,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 6 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 6 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 7 ; 8 } 6 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 7 ; 8 } 6 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 2 ; 3 ; 7 ; 8 } 6 {} ] @@ -1744,16 +1744,16 @@ trace 6 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 6 6 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 2 6 6 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 6 6 @@ -1896,11 +1896,11 @@ trace { 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 3 ; 7 ; 8 } 6 { 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 3 ; 7 ; 8 } 6 { 2 } ] @@ -1998,16 +1998,16 @@ trace 6 { 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 6 6 { 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 3 6 6 { 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 6 6 @@ -2150,11 +2150,11 @@ trace { 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 7 ; 8 } 6 { 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 7 ; 8 } 6 { 3 ; 2 } ] @@ -2252,16 +2252,16 @@ trace 6 { 3 ; 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 6 6 { 3 ; 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 7 6 6 { 3 ; 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 7 6 6 @@ -2378,11 +2378,11 @@ trace { 8 } 6 { 3 ; 2 } ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 7 ; 8 } 6 { 3 ; 2 } ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 7 ; 8 } 6 { 3 ; 2 } ] @@ -2498,23 +2498,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 9 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 9 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 6 ; 7 ; 8 } 9 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 6 ; 7 ; 8 } 9 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 2 ; 3 ; 6 ; 7 ; 8 } 9 {} ] @@ -2590,16 +2590,16 @@ trace 9 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 9 9 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 2 9 9 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 9 9 @@ -2742,11 +2742,11 @@ trace { 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 3 ; 6 ; 7 ; 8 } 9 { 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 3 ; 6 ; 7 ; 8 } 9 { 2 } ] @@ -2844,16 +2844,16 @@ trace 9 { 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 9 9 { 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 3 9 9 { 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 9 9 @@ -2996,11 +2996,11 @@ trace { 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 6 ; 7 ; 8 } 9 { 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 6 ; 7 ; 8 } 9 { 3 ; 2 } ] @@ -3098,16 +3098,16 @@ trace 9 { 3 ; 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 9 9 { 3 ; 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 6 9 9 { 3 ; 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 6 9 9 @@ -3250,11 +3250,11 @@ trace { 6 ; 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 7 ; 8 } 9 { 6 ; 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 7 ; 8 } 9 { 6 ; 3 ; 2 } ] @@ -3352,16 +3352,16 @@ trace 9 { 6 ; 3 ; 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 9 9 { 6 ; 3 ; 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 7 9 9 { 6 ; 3 ; 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 7 9 9 @@ -3504,11 +3504,11 @@ trace { 7 ; 6 ; 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 8 } 9 { 7 ; 6 ; 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 8 } 9 { 7 ; 6 ; 3 ; 2 } ] @@ -3606,16 +3606,16 @@ trace 9 { 7 ; 6 ; 3 ; 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 9 9 { 7 ; 6 ; 3 ; 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 8 9 9 { 7 ; 6 ; 3 ; 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 8 9 9 @@ -3758,11 +3758,11 @@ trace { 8 ; 7 ; 6 ; 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ {} 9 { 8 ; 7 ; 6 ; 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ {} 9 { 8 ; 7 ; 6 ; 3 ; 2 } ] @@ -3813,11 +3813,11 @@ trace - NIL (entry) @ location: 61 [ 9 { 8 ; 7 ; 6 ; 3 ; 2 } ] - - log/CONST (exit) @ location: 61 + - log/PUSH (exit) @ location: 61 [ {} 9 { 8 ; 7 ; 6 ; 3 ; 2 } ] - - CONST (entry) @ location: 63 + - PUSH (entry) @ location: 63 [ {} 9 { 8 ; 7 ; 6 ; 3 ; 2 } ] @@ -3955,23 +3955,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 5 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 5 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 6 ; 7 ; 8 ; 9 } 5 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 6 ; 7 ; 8 ; 9 } 5 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 2 ; 3 ; 6 ; 7 ; 8 ; 9 } 5 {} ] @@ -4047,16 +4047,16 @@ trace 5 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 5 5 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 2 5 5 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 5 5 @@ -4199,11 +4199,11 @@ trace { 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 3 ; 6 ; 7 ; 8 ; 9 } 5 { 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 3 ; 6 ; 7 ; 8 ; 9 } 5 { 2 } ] @@ -4301,16 +4301,16 @@ trace 5 { 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 5 5 { 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 3 5 5 { 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 5 5 @@ -4453,11 +4453,11 @@ trace { 3 ; 2 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 6 ; 7 ; 8 ; 9 } 5 { 3 ; 2 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 6 ; 7 ; 8 ; 9 } 5 { 3 ; 2 } ] @@ -4555,16 +4555,16 @@ trace 5 { 3 ; 2 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 5 5 { 3 ; 2 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 6 5 5 { 3 ; 2 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 6 5 5 @@ -4681,11 +4681,11 @@ trace { 7 ; 8 ; 9 } 5 { 3 ; 2 } ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 6 ; 7 ; 8 ; 9 } 5 { 3 ; 2 } ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 6 ; 7 ; 8 ; 9 } 5 { 3 ; 2 } ] @@ -4801,23 +4801,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 1 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 1 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 1 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 1 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 1 {} ] @@ -4893,16 +4893,16 @@ trace 1 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 1 1 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 2 1 1 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 1 1 @@ -5019,11 +5019,11 @@ trace { 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 1 {} ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 1 {} ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 1 {} ] @@ -5117,23 +5117,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 4 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 4 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 1 ; 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 1 ; 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 1 ; 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 {} ] @@ -5209,16 +5209,16 @@ trace 4 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 4 4 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 1 4 4 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 1 4 4 @@ -5361,11 +5361,11 @@ trace { 1 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 { 1 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 2 ; 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 { 1 } ] @@ -5463,16 +5463,16 @@ trace 4 { 1 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 4 4 { 1 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 2 4 4 { 1 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 2 4 4 @@ -5615,11 +5615,11 @@ trace { 2 ; 1 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 { 2 ; 1 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 3 ; 5 ; 6 ; 7 ; 8 ; 9 } 4 { 2 ; 1 } ] @@ -5717,16 +5717,16 @@ trace 4 { 2 ; 1 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 4 4 { 2 ; 1 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 3 4 4 { 2 ; 1 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 3 4 4 @@ -5869,11 +5869,11 @@ trace { 3 ; 2 ; 1 } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 45 + - log/PUSH (exit) @ location: 45 [ { 5 ; 6 ; 7 ; 8 ; 9 } 4 { 3 ; 2 ; 1 } ] - - CONST (entry) @ location: 51 + - PUSH (entry) @ location: 51 [ { 5 ; 6 ; 7 ; 8 ; 9 } 4 { 3 ; 2 ; 1 } ] @@ -5971,16 +5971,16 @@ trace 4 { 3 ; 2 ; 1 } ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 4 4 { 3 ; 2 ; 1 } ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 5 4 4 { 3 ; 2 ; 1 } ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 5 4 4 @@ -6097,11 +6097,11 @@ trace { 6 ; 7 ; 8 ; 9 } 4 { 3 ; 2 ; 1 } ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 5 ; 6 ; 7 ; 8 ; 9 } 4 { 3 ; 2 ; 1 } ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 5 ; 6 ; 7 ; 8 ; 9 } 4 { 3 ; 2 ; 1 } ] @@ -6228,23 +6228,23 @@ trace - [halt] (entry) @ location: 19 [ {} ] - control: KCons - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ 0 {} ] - - CONST (entry) @ location: 16 + - PUSH (entry) @ location: 16 [ 0 {} ] - - log/log/log/CONST (exit) @ location: 16 + - log/log/log/PUSH (exit) @ location: 16 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 } 0 {} ] - - log/CONST (exit) @ location: 16 + - log/PUSH (exit) @ location: 16 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 } 0 {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 } 0 {} ] @@ -6320,16 +6320,16 @@ trace 0 {} ] - control: KCons - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 0 0 {} ] - - log/CONST (exit) @ location: 32 + - log/PUSH (exit) @ location: 32 [ 1 0 0 {} ] - - CONST (entry) @ location: 32 + - PUSH (entry) @ location: 32 [ 1 0 0 @@ -6446,11 +6446,11 @@ trace { 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 } 0 {} ] - - log/CONST (exit) @ location: 56 + - log/PUSH (exit) @ location: 56 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 } 0 {} ] - - CONST (entry) @ location: 57 + - PUSH (entry) @ location: 57 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 } 0 {} ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/list_map_block.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/list_map_block.out index 5a58e884b133..202f29541787 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/list_map_block.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/list_map_block.out @@ -4,9 +4,9 @@ trace [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 } {}) ] - CAR (entry) @ location: 9 [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 } {}) ] - - log/CONST (exit) @ location: 9 + - log/PUSH (exit) @ location: 9 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 } ] - - CONST (entry) @ location: 10 + - PUSH (entry) @ location: 10 [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 } ] - log/SWAP (exit) @ location: 10 [ 0 @@ -53,9 +53,9 @@ trace - DIP (entry) @ location: 20 [ 1 0 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 0 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 0 ] - log/ADD (exit) @ location: 22 [ 1 @@ -109,9 +109,9 @@ trace - DIP (entry) @ location: 20 [ 3 1 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 1 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 1 ] - log/ADD (exit) @ location: 22 [ 1 @@ -165,9 +165,9 @@ trace - DIP (entry) @ location: 20 [ 5 2 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 2 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 2 ] - log/ADD (exit) @ location: 22 [ 1 @@ -221,9 +221,9 @@ trace - DIP (entry) @ location: 20 [ 7 3 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 3 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 3 ] - log/ADD (exit) @ location: 22 [ 1 @@ -277,9 +277,9 @@ trace - DIP (entry) @ location: 20 [ 9 4 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 4 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 4 ] - log/ADD (exit) @ location: 22 [ 1 @@ -333,9 +333,9 @@ trace - DIP (entry) @ location: 20 [ 11 5 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 5 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 5 ] - log/ADD (exit) @ location: 22 [ 1 @@ -389,9 +389,9 @@ trace - DIP (entry) @ location: 20 [ 13 6 ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 6 ] - - CONST (entry) @ location: 22 + - PUSH (entry) @ location: 22 [ 6 ] - log/ADD (exit) @ location: 22 [ 1 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out index ec990956eaab..0246417e2aa9 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/packunpack.out @@ -82,9 +82,9 @@ trace [ (Pair (Pair "abc" { 1 ; 2 ; 3 }) { 4 ; 5 ; 6 }) ] - DROP (entry) @ location: 46 [ (Pair (Pair "abc" { 1 ; 2 ; 3 }) { 4 ; 5 ; 6 }) ] - - log/CONST (exit) @ location: 46 + - log/PUSH (exit) @ location: 46 [ ] - - CONST (entry) @ location: 47 + - PUSH (entry) @ location: 47 [ ] - log/NIL (exit) @ location: 47 [ Unit ] diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/pexec.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/pexec.out index 1ed039697338..067af7c55351 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/pexec.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/pexec.out @@ -42,7 +42,7 @@ trace - EXEC (entry) @ location: 20 [ 7 { PUSH nat 77 ; PAIR ; { UNPAIR ; ADD } } ] - - CONST (entry) @ location: 12 + - PUSH (entry) @ location: 12 [ 7 ] - log/PAIR (exit) @ location: 12 [ 77 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/reverse_loop.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/reverse_loop.out index a0b9a50d4ffd..76ea2381bed3 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/reverse_loop.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/reverse_loop.out @@ -14,10 +14,10 @@ trace - SWAP (entry) @ location: 12 [ {} { "abc" ; "def" ; "ghi" } ] - - log/CONST (exit) @ location: 12 + - log/PUSH (exit) @ location: 12 [ { "abc" ; "def" ; "ghi" } {} ] - - CONST (entry) @ location: 13 + - PUSH (entry) @ location: 13 [ { "abc" ; "def" ; "ghi" } {} ] - log/LOOP (exit) @ location: 13 @@ -63,10 +63,10 @@ trace [ { "abc" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 21 + - log/PUSH (exit) @ location: 21 [ { "def" ; "ghi" } { "abc" } ] - - CONST (entry) @ location: 24 + - PUSH (entry) @ location: 24 [ { "def" ; "ghi" } { "abc" } ] - log/[halt] (exit) @ location: 24 @@ -121,10 +121,10 @@ trace [ { "def" ; "abc" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 21 + - log/PUSH (exit) @ location: 21 [ { "ghi" } { "def" ; "abc" } ] - - CONST (entry) @ location: 24 + - PUSH (entry) @ location: 24 [ { "ghi" } { "def" ; "abc" } ] - log/[halt] (exit) @ location: 24 @@ -179,10 +179,10 @@ trace [ { "ghi" ; "def" ; "abc" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 21 + - log/PUSH (exit) @ location: 21 [ {} { "ghi" ; "def" ; "abc" } ] - - CONST (entry) @ location: 24 + - PUSH (entry) @ location: 24 [ {} { "ghi" ; "def" ; "abc" } ] - log/[halt] (exit) @ location: 24 @@ -213,10 +213,10 @@ trace [ { "ghi" ; "def" ; "abc" } ] - NIL (entry) @ location: 28 [ { "ghi" ; "def" ; "abc" } ] - - log/CONST (exit) @ location: 28 + - log/PUSH (exit) @ location: 28 [ {} { "ghi" ; "def" ; "abc" } ] - - CONST (entry) @ location: 30 + - PUSH (entry) @ location: 30 [ {} { "ghi" ; "def" ; "abc" } ] - log/[halt] (exit) @ location: 30 diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/spawn_identities.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/spawn_identities.out index 84eeea523a6a..9f1a07749f23 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/spawn_identities.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/spawn_identities.out @@ -32,11 +32,11 @@ trace {} ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 10 + - log/PUSH (exit) @ location: 10 [ 7 {} {} ] - - CONST (entry) @ location: 15 + - PUSH (entry) @ location: 15 [ 7 {} {} ] @@ -59,12 +59,12 @@ trace [ 7 {} {} ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 7 7 {} {} ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 7 7 {} @@ -101,11 +101,11 @@ trace 7 {} {} ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 7 {} {} ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 7 {} {} ] @@ -137,20 +137,20 @@ trace [ 6 {} {} ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 6 {} {} ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 6 {} {} ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 6 {} {} ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 6 {} @@ -307,11 +307,11 @@ trace { "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] @@ -345,12 +345,12 @@ trace [ 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 6 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 6 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } @@ -387,11 +387,11 @@ trace 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 6 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] @@ -423,20 +423,20 @@ trace [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } @@ -611,13 +611,13 @@ trace "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } @@ -665,14 +665,14 @@ trace 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 5 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 5 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -723,13 +723,13 @@ trace 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 5 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } @@ -775,26 +775,26 @@ trace 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000002c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 } { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1031,7 +1031,7 @@ trace "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1039,7 +1039,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1101,7 +1101,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 4 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1110,7 +1110,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 4 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1175,7 +1175,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1183,7 +1183,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 4 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1243,7 +1243,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1251,7 +1251,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000102c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1259,7 +1259,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1268,7 +1268,7 @@ trace { "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1567,7 +1567,7 @@ trace "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1577,7 +1577,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1653,7 +1653,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 3 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1664,7 +1664,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 3 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1743,7 +1743,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1753,7 +1753,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 3 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1827,7 +1827,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1837,7 +1837,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000202c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1847,7 +1847,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -1858,7 +1858,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2219,7 +2219,7 @@ trace "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2231,7 +2231,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2321,7 +2321,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 2 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2334,7 +2334,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 2 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2427,7 +2427,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2439,7 +2439,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 2 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2527,7 +2527,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2539,7 +2539,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000302c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2551,7 +2551,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2564,7 +2564,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -2987,7 +2987,7 @@ trace "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3001,7 +3001,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3105,7 +3105,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 1 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3120,7 +3120,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 1 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3227,7 +3227,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3241,7 +3241,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 33 + - PUSH (entry) @ location: 33 [ 1 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3343,7 +3343,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 38 + - log/PUSH (exit) @ location: 38 [ 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3357,7 +3357,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 39 + - PUSH (entry) @ location: 39 [ 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000402c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3371,7 +3371,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 39 + - log/PUSH (exit) @ location: 39 [ "init" 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3386,7 +3386,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 42 + - PUSH (entry) @ location: 42 [ "init" 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3871,7 +3871,7 @@ trace "[CONTRACT_HASH]" } ] - control: KUndip - control: KCons - - log/CONST (exit) @ location: 67 + - log/PUSH (exit) @ location: 67 [ 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000602c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -3887,7 +3887,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 73 + - PUSH (entry) @ location: 73 [ 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000602c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -4005,7 +4005,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 20 + - log/PUSH (exit) @ location: 20 [ 0 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000602c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -4022,7 +4022,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 21 + - PUSH (entry) @ location: 21 [ 0 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000602c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -4143,7 +4143,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - log/CONST (exit) @ location: 27 + - log/PUSH (exit) @ location: 27 [ 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000602c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; @@ -4159,7 +4159,7 @@ trace "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" ; "[CONTRACT_HASH]" } ] - - CONST (entry) @ location: 29 + - PUSH (entry) @ location: 29 [ 0 { 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000602c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; 0x014828e9aa0b3e6e970da0515b5c5d8ccf5028758900000502c096b102000000001c02000000170500036805010368050202000000080316053d036d0342000000090100000004696e6974 ; diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out index 5728c0fad975..52f6e5de51a3 100644 --- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out +++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out @@ -4,9 +4,9 @@ trace [ (Pair (Pair "[CONTRACT_HASH]" 17 3) Unit) ] - CAR (entry) @ location: 8 [ (Pair (Pair "[CONTRACT_HASH]" 17 3) Unit) ] - - log/CONST (exit) @ location: 8 + - log/PUSH (exit) @ location: 8 [ (Pair "[CONTRACT_HASH]" 17 3) ] - - CONST (entry) @ location: 9 + - PUSH (entry) @ location: 9 [ (Pair "[CONTRACT_HASH]" 17 3) ] - log/SWAP (exit) @ location: 9 [ (Pair 1 2) @@ -61,11 +61,11 @@ trace [ (Pair 17 1) (Pair "[CONTRACT_HASH]" 17 1) (Pair "[CONTRACT_HASH]" 17 2) ] - - log/CONST (exit) @ location: 29 + - log/PUSH (exit) @ location: 29 [ 1 (Pair "[CONTRACT_HASH]" 17 1) (Pair "[CONTRACT_HASH]" 17 2) ] - - CONST (entry) @ location: 30 + - PUSH (entry) @ location: 30 [ 1 (Pair "[CONTRACT_HASH]" 17 1) (Pair "[CONTRACT_HASH]" 17 2) ] @@ -124,10 +124,10 @@ trace - CDR (entry) @ location: 47 [ (Pair 17 2) (Pair "[CONTRACT_HASH]" 17 2) ] - - log/CONST (exit) @ location: 47 + - log/PUSH (exit) @ location: 47 [ 2 (Pair "[CONTRACT_HASH]" 17 2) ] - - CONST (entry) @ location: 48 + - PUSH (entry) @ location: 48 [ 2 (Pair "[CONTRACT_HASH]" 17 2) ] - log/COMPARE (exit) @ location: 48 @@ -159,9 +159,9 @@ trace [ (Pair "[CONTRACT_HASH]" 17 2) ] - DROP (entry) @ location: 61 [ (Pair "[CONTRACT_HASH]" 17 2) ] - - log/CONST (exit) @ location: 61 + - log/PUSH (exit) @ location: 61 [ ] - - CONST (entry) @ location: 62 + - PUSH (entry) @ location: 62 [ ] - log/NIL (exit) @ location: 62 [ Unit ] -- GitLab