From 389b064795cbc55b9434a5bc8617b59c03226da3 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 09:47:18 +0100 Subject: [PATCH 01/35] Proto/Michelson: remove var_annot from stack_ty The `Item_t` constructor loses its last parameter --- .../lib_benchmark/michelson_samplers.ml | 2 +- src/proto_alpha/lib_benchmark/type_helpers.ml | 2 +- .../lib_benchmarks_proto/michelson_types.ml | 2 +- src/proto_alpha/lib_plugin/plugin.ml | 4 +- .../lib_protocol/script_interpreter.ml | 8 +- .../lib_protocol/script_interpreter_defs.ml | 6 +- .../lib_protocol/script_ir_translator.ml | 1229 ++++++++--------- .../lib_protocol/script_typed_ir.ml | 8 +- .../lib_protocol/script_typed_ir.mli | 4 +- .../lib_protocol/script_typed_ir_size.ml | 26 +- .../lib_protocol/test/test_interpretation.ml | 6 +- .../lib_protocol/test/test_typechecking.ml | 4 +- 12 files changed, 598 insertions(+), 703 deletions(-) diff --git a/src/proto_alpha/lib_benchmark/michelson_samplers.ml b/src/proto_alpha/lib_benchmark/michelson_samplers.ml index de8979d2abe2..3a6103d3dc5a 100644 --- a/src/proto_alpha/lib_benchmark/michelson_samplers.ml +++ b/src/proto_alpha/lib_benchmark/michelson_samplers.ml @@ -717,7 +717,7 @@ end) let open Script_typed_ir in fun stack_ty -> match stack_ty with - | Item_t (ty, tl, _) -> + | Item_t (ty, tl) -> let* elt = value ty in let* tl = stack tl in return ((elt, tl) : a * b) diff --git a/src/proto_alpha/lib_benchmark/type_helpers.ml b/src/proto_alpha/lib_benchmark/type_helpers.ml index eea9a26d70ef..989ee7782901 100644 --- a/src/proto_alpha/lib_benchmark/type_helpers.ml +++ b/src/proto_alpha/lib_benchmark/type_helpers.ml @@ -68,7 +68,7 @@ let rec michelson_type_list_to_ex_stack_ty | Ex_ty ty -> ( let ex_stack_ty = michelson_type_list_to_ex_stack_ty tl ctxt in match ex_stack_ty with - | Ex_stack_ty tl -> Ex_stack_ty (Item_t (ty, tl, None)))) + | Ex_stack_ty tl -> Ex_stack_ty (Item_t (ty, tl)))) let base_type_to_michelson_type (typ : Type.Base.t) = let typ = Mikhailsky.map_var (fun _ -> Mikhailsky.unit_ty) typ in diff --git a/src/proto_alpha/lib_benchmarks_proto/michelson_types.ml b/src/proto_alpha/lib_benchmarks_proto/michelson_types.ml index 047097c932e2..0a2ce6030fe1 100644 --- a/src/proto_alpha/lib_benchmarks_proto/michelson_types.ml +++ b/src/proto_alpha/lib_benchmarks_proto/michelson_types.ml @@ -28,7 +28,7 @@ open Script_typed_ir [@@@ocaml.warning "-32"] -let ( @$ ) x y = Item_t (x, y, None) +let ( @$ ) x y = Item_t (x, y) let bot = Bot_t diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 68a74f1c83b1..9bf9ab9b1a9e 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -1484,7 +1484,7 @@ module RPC = struct (a, s) Script_typed_ir.stack_ty * (a * s) -> (Script.expr * string option) list tzresult Lwt.t = function | (Bot_t, (EmptyCell, EmptyCell)) -> return_nil - | (Item_t (ty, rest_ty, annot), (v, rest)) -> + | (Item_t (ty, rest_ty), (v, rest)) -> Script_ir_translator.unparse_data ctxt Unparsing_mode.unparsing_mode @@ -1493,7 +1493,7 @@ module RPC = struct >>=? fun (data, _ctxt) -> unparse_stack (rest_ty, rest) >|=? fun rest -> let annot = - match Script_ir_annot.unparse_var_annot annot with + match Script_ir_annot.unparse_var_annot None with | [] -> None | [a] -> Some a | _ -> assert false diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index 72247a79db88..dd156b88f547 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -1065,8 +1065,8 @@ and step : type a s b t r f. (a, s, b, t, r, f) step_type = | Lam ( { kloc; - kaft = Item_t (aft_ty, Bot_t, _); - kbef = Item_t (bef_ty, Bot_t, _); + kaft = Item_t (aft_ty, Bot_t); + kbef = Item_t (bef_ty, Bot_t); kinstr; }, _script_view ) -> ( @@ -1100,8 +1100,8 @@ and step : type a s b t r f. (a, s, b, t, r, f) step_type = | Ok (Eq, Eq) -> ( let kkinfo = kinfo_of_kinstr k in match kkinfo.kstack_ty with - | Item_t (_, s, a) -> - let kstack_ty = Item_t (output_ty, s, a) in + | Item_t (_, s) -> + let kstack_ty = Item_t (output_ty, s) in let kkinfo = {kkinfo with kstack_ty} in let ks = KCons (ICons_some (kkinfo, k), ks) in (step [@ocaml.tailcall]) diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml index 0aacd527bc73..bcafd60fcf2c 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml @@ -456,14 +456,14 @@ let rec kundip : formal argument to [v]. The type of [v] is represented by [ty]. *) let apply ctxt gas capture_ty capture lam = let (Lam (descr, expr)) = lam in - let (Item_t (full_arg_ty, _, _)) = descr.kbef in + let (Item_t (full_arg_ty, _)) = descr.kbef in let ctxt = update_context gas ctxt in unparse_data ctxt Optimized capture_ty capture >>=? fun (const_expr, ctxt) -> let loc = Micheline.dummy_location in unparse_ty ~loc ctxt capture_ty >>?= fun (ty_expr, ctxt) -> match full_arg_ty with | Pair_t ((capture_ty, _, _), (arg_ty, _, _), _) -> - let arg_stack_ty = Item_t (arg_ty, Bot_t, None) in + let arg_stack_ty = Item_t (arg_ty, Bot_t) in let full_descr = { kloc = descr.kloc; @@ -474,7 +474,7 @@ let apply ctxt gas capture_ty capture lam = let kinfo_pair = { iloc = descr.kloc; - kstack_ty = Item_t (capture_ty, arg_stack_ty, None); + kstack_ty = Item_t (capture_ty, arg_stack_ty); } in IConst (kinfo_const, capture, ICons_pair (kinfo_pair, descr.kinstr))); diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 00934361d828..494d62763f38 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -399,10 +399,10 @@ let[@coq_axiom_with_reason "gadt"] rec comparable_ty_of_ty : let rec unparse_stack_uncarbonated : type a s. (a, s) stack_ty -> (Script.expr * Script.annot) list = function | Bot_t -> [] - | Item_t (ty, rest, annot) -> + | Item_t (ty, rest) -> let uty = unparse_ty_uncarbonated ~loc:() ty in let urest = unparse_stack_uncarbonated rest in - (strip_locations uty, unparse_var_annot annot) :: urest + (strip_locations uty, unparse_var_annot None) :: urest let serialize_stack_for_error ctxt stack_ty = match Gas.level ctxt with @@ -1130,16 +1130,15 @@ let merge_stacks : fun ctxt lvl stack1 stack2 -> match (stack1, stack2) with | (Bot_t, Bot_t) -> ok (Eq, Bot_t, ctxt) - | (Item_t (ty1, rest1, annot1), Item_t (ty2, rest2, annot2)) -> + | (Item_t (ty1, rest1), Item_t (ty2, rest2)) -> Gas_monad.run ctxt @@ merge_types ~error_details:Informative ~legacy loc ty1 ty2 |> record_trace (Bad_stack_item lvl) >>? fun (eq_ty, ctxt) -> eq_ty >>? fun (Eq, ty) -> help ctxt (lvl + 1) rest1 rest2 >|? fun (Eq, rest, ctxt) -> - let annot = merge_var_annot annot1 annot2 in ( (Eq : ((ta, ts) stack_ty, (tb, tu) stack_ty) eq), - Item_t (ty, rest, annot), + Item_t (ty, rest), ctxt ) | (_, _) -> error Bad_stack_length in @@ -1876,7 +1875,6 @@ type (_, _) dig_proof_argument = | Dig_proof_argument : ('x, 'a * 's, 'a, 's, 'b, 't, 'c, 'u) stack_prefix_preservation_witness * 'x ty - * var_annot option * ('c, 'u) stack_ty -> ('b, 't) dig_proof_argument @@ -2872,7 +2870,7 @@ and parse_view_returning : ctxt ~legacy view_code - (Item_t (pair_ty, Bot_t, None)) + (Item_t (pair_ty, Bot_t)) >>=? fun (judgement, ctxt) -> Lwt.return @@ @@ -2880,19 +2878,18 @@ and parse_view_returning : | Failed {descr} -> let cur_view' = Ex_view - (Lam - (close_descr (descr (Item_t (output_ty', Bot_t, None))), view_code)) + (Lam (close_descr (descr (Item_t (output_ty', Bot_t))), view_code)) in ok (cur_view', ctxt) | Typed ({loc; aft; _} as descr) -> ( let ill_type_view loc stack_ty () = let actual = serialize_stack_for_error ctxt stack_ty in - let expected_stack = Item_t (output_ty', Bot_t, None) in + let expected_stack = Item_t (output_ty', Bot_t) in let expected = serialize_stack_for_error ctxt expected_stack in Ill_typed_view {loc; actual; expected} in match aft with - | Item_t (ty, Bot_t, _) -> + | Item_t (ty, Bot_t) -> record_trace_eval (ill_type_view loc aft : unit -> _) ( ty_eq ~legacy ctxt loc ty output_ty' >|? fun (Eq, ctxt) -> @@ -2931,7 +2928,7 @@ and[@coq_axiom_with_reason "gadt"] parse_returning : tc_context ctxt ~legacy - (arg, arg_annot) + (arg, _arg_annot) ret script_instr -> parse_instr @@ -2941,10 +2938,9 @@ and[@coq_axiom_with_reason "gadt"] parse_returning : ~legacy ~stack_depth:(stack_depth + 1) script_instr - (Item_t (arg, Bot_t, arg_annot)) + (Item_t (arg, Bot_t)) >>=? function - | (Typed ({loc; aft = Item_t (ty, Bot_t, _) as stack_ty; _} as descr), ctxt) - -> + | (Typed ({loc; aft = Item_t (ty, Bot_t) as stack_ty; _} as descr), ctxt) -> Lwt.return @@ record_trace_eval (fun () -> @@ -2960,7 +2956,7 @@ and[@coq_axiom_with_reason "gadt"] parse_returning : fail @@ Bad_return (loc, stack_ty, ret) | (Failed {descr}, ctxt) -> return - ( (Lam (close_descr (descr (Item_t (ret, Bot_t, None))), script_instr) + ( (Lam (close_descr (descr (Item_t (ret, Bot_t))), script_instr) : (arg, ret) lambda), ctxt ) @@ -3022,7 +3018,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in match (script_instr, stack_ty) with (* stack ops *) - | (Prim (loc, I_DROP, [], annot), Item_t (_, rest, _)) -> + | (Prim (loc, I_DROP, [], annot), Item_t (_, rest)) -> (error_unexpected_annot loc annot >>?= fun () -> typed ctxt loc {apply = (fun kinfo k -> IDrop (kinfo, k))} rest : ((a, s) judgement * context) tzresult Lwt.t) @@ -3035,7 +3031,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : fun n stk -> match (Compare.Int.(n = 0), stk) with | (true, rest) -> ok @@ Dropn_proof_argument (KRest, rest) - | (false, Item_t (_, rest, _)) -> + | (false, Item_t (_, rest)) -> make_proof_argument (n - 1) rest >|? fun (Dropn_proof_argument (n', stack_after_drops)) -> let kinfo = {iloc = loc; kstack_ty = rest} in @@ -3053,8 +3049,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* Technically, the arities 0 and 1 are allowed but the error only mentions 1. However, DROP is equivalent to DROP 1 so hinting at an arity of 1 makes sense. *) fail (Invalid_arity (loc, I_DROP, 1, List.length l)) - | (Prim (loc, I_DUP, [], annot), Item_t (v, rest, stack_annot)) -> - parse_var_annot loc annot ~default:stack_annot >>?= fun annot -> + | (Prim (loc, I_DUP, [], annot), Item_t (v, rest)) -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> record_trace_eval (fun () -> let t = serialize_ty_for_error v in @@ -3062,17 +3058,17 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (check_dupable_ty ctxt loc v) >>?= fun ctxt -> let dup = {apply = (fun kinfo k -> IDup (kinfo, k))} in - typed ctxt loc dup (Item_t (v, Item_t (v, rest, stack_annot), annot)) + typed ctxt loc dup (Item_t (v, Item_t (v, rest))) | (Prim (loc, I_DUP, [n], v_annot), stack_ty) -> - parse_var_annot loc v_annot >>?= fun annot -> + parse_var_annot loc v_annot >>?= fun _annot -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a * s) dup_n_proof_argument tzresult = fun n (stack_ty : (a, s) stack_ty) -> match (n, stack_ty) with - | (1, Item_t (hd_ty, _, _)) -> + | (1, Item_t (hd_ty, _)) -> ok @@ Dup_n_proof_argument (Dup_n_zero, hd_ty) - | (n, Item_t (_, tl_ty, _)) -> + | (n, Item_t (_, tl_ty)) -> make_proof_argument (n - 1) tl_ty >|? fun (Dup_n_proof_argument (dup_n_witness, b_ty)) -> Dup_n_proof_argument (Dup_n_succ dup_n_witness, b_ty) @@ -3093,21 +3089,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (check_dupable_ty ctxt loc after_ty) >>?= fun ctxt -> let dupn = {apply = (fun kinfo k -> IDup_n (kinfo, n, witness, k))} in - typed ctxt loc dupn (Item_t (after_ty, stack_ty, annot)) + typed ctxt loc dupn (Item_t (after_ty, stack_ty)) | (Prim (loc, I_DIG, [n], result_annot), stack) -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a, s) dig_proof_argument tzresult = fun n stk -> match (Compare.Int.(n = 0), stk) with - | (true, Item_t (v, rest, annot)) -> - ok @@ Dig_proof_argument (KRest, v, annot, rest) - | (false, Item_t (v, rest, annot)) -> + | (true, Item_t (v, rest)) -> ok @@ Dig_proof_argument (KRest, v, rest) + | (false, Item_t (v, rest)) -> make_proof_argument (n - 1) rest - >|? fun (Dig_proof_argument (n', x, xv, aft')) -> + >|? fun (Dig_proof_argument (n', x, aft')) -> let kinfo = {iloc = loc; kstack_ty = aft'} in - Dig_proof_argument - (KPrefix (kinfo, n'), x, xv, Item_t (v, aft', annot)) + Dig_proof_argument (KPrefix (kinfo, n'), x, Item_t (v, aft')) | (_, _) -> let whole_stack = serialize_stack_for_error ctxt stack in error (Bad_stack (loc, I_DIG, 3, whole_stack)) @@ -3115,38 +3109,34 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_uint10 n >>?= fun n -> Gas.consume ctxt (Typecheck_costs.proof_argument n) >>?= fun ctxt -> error_unexpected_annot loc result_annot >>?= fun () -> - make_proof_argument n stack - >>?= fun (Dig_proof_argument (n', x, stack_annot, aft)) -> + make_proof_argument n stack >>?= fun (Dig_proof_argument (n', x, aft)) -> let dig = {apply = (fun kinfo k -> IDig (kinfo, n, n', k))} in - typed ctxt loc dig (Item_t (x, aft, stack_annot)) + typed ctxt loc dig (Item_t (x, aft)) | (Prim (loc, I_DIG, (([] | _ :: _ :: _) as l), _), _) -> fail (Invalid_arity (loc, I_DIG, 1, List.length l)) - | (Prim (loc, I_DUG, [n], result_annot), Item_t (x, whole_stack, stack_annot)) - -> + | (Prim (loc, I_DUG, [n], result_annot), Item_t (x, whole_stack)) -> parse_uint10 n >>?= fun whole_n -> Gas.consume ctxt (Typecheck_costs.proof_argument whole_n) >>?= fun ctxt -> let rec make_proof_argument : type a s x. int -> x ty -> - var_annot option -> (a, s) stack_ty -> (a, s, x) dug_proof_argument tzresult = - fun n x stack_annot stk -> + fun n x stk -> match (Compare.Int.(n = 0), stk) with - | (true, rest) -> - ok @@ Dug_proof_argument (KRest, Item_t (x, rest, stack_annot)) - | (false, Item_t (v, rest, annot)) -> - make_proof_argument (n - 1) x stack_annot rest + | (true, rest) -> ok @@ Dug_proof_argument (KRest, Item_t (x, rest)) + | (false, Item_t (v, rest)) -> + make_proof_argument (n - 1) x rest >|? fun (Dug_proof_argument (n', aft')) -> let kinfo = {iloc = loc; kstack_ty = aft'} in - Dug_proof_argument (KPrefix (kinfo, n'), Item_t (v, aft', annot)) + Dug_proof_argument (KPrefix (kinfo, n'), Item_t (v, aft')) | (_, _) -> let whole_stack = serialize_stack_for_error ctxt whole_stack in error (Bad_stack (loc, I_DUG, whole_n, whole_stack)) in error_unexpected_annot loc result_annot >>?= fun () -> - make_proof_argument whole_n x stack_annot whole_stack + make_proof_argument whole_n x whole_stack >>?= fun (Dug_proof_argument (n', aft)) -> let dug = {apply = (fun kinfo k -> IDug (kinfo, whole_n, n', k))} in typed ctxt loc dug aft @@ -3157,14 +3147,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : error (Bad_stack (loc, I_DUG, 1, stack)) ) | (Prim (loc, I_DUG, (([] | _ :: _ :: _) as l), _), _) -> fail (Invalid_arity (loc, I_DUG, 1, List.length l)) - | ( Prim (loc, I_SWAP, [], annot), - Item_t (v, Item_t (w, rest, stack_annot), cur_top_annot) ) -> + | (Prim (loc, I_SWAP, [], annot), Item_t (v, Item_t (w, rest))) -> error_unexpected_annot loc annot >>?= fun () -> let swap = {apply = (fun kinfo k -> ISwap (kinfo, k))} in - let stack_ty = Item_t (w, Item_t (v, rest, cur_top_annot), stack_annot) in + let stack_ty = Item_t (w, Item_t (v, rest)) in typed ctxt loc swap stack_ty | (Prim (loc, I_PUSH, [t; d], annot), stack) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> parse_packable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> parse_data @@ -3177,42 +3166,41 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : d >>=? fun (v, ctxt) -> let const = {apply = (fun kinfo k -> IConst (kinfo, v, k))} in - typed ctxt loc const (Item_t (t, stack, annot)) + typed ctxt loc const (Item_t (t, stack)) | (Prim (loc, I_UNIT, [], annot), stack) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> let const = {apply = (fun kinfo k -> IConst (kinfo, (), k))} in - typed ctxt loc const (Item_t (unit_t ~annot:ty_name, stack, annot)) + typed ctxt loc const (Item_t (unit_t ~annot:ty_name, stack)) (* options *) - | (Prim (loc, I_SOME, [], annot), Item_t (t, rest, _)) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + | (Prim (loc, I_SOME, [], annot), Item_t (t, rest)) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> let cons_some = {apply = (fun kinfo k -> ICons_some (kinfo, k))} in option_t loc t ~annot:ty_name >>?= fun ty -> - typed ctxt loc cons_some (Item_t (ty, rest, annot)) + typed ctxt loc cons_some (Item_t (ty, rest)) | (Prim (loc, I_NONE, [t], annot), stack) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> let cons_none = {apply = (fun kinfo k -> ICons_none (kinfo, k))} in option_t loc t ~annot:ty_name >>?= fun ty -> - let stack_ty = Item_t (ty, stack, annot) in + let stack_ty = Item_t (ty, stack) in typed ctxt loc cons_none stack_ty - | (Prim (loc, I_MAP, [body], annot), Item_t (Option_t (t, _), rest, opt_annot)) - -> ( + | (Prim (loc, I_MAP, [body], annot), Item_t (Option_t (t, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_type_annot loc annot >>?= fun (ret_annot, opt_ty_name) -> - let elt_annot = gen_access_annot opt_annot default_some_annot in + parse_var_type_annot loc annot >>?= fun (_ret_annot, opt_ty_name) -> + let _elt_annot = gen_access_annot None default_some_annot in non_terminal_recursion ?type_logger ~legacy tc_context ctxt body - (Item_t (t, rest, elt_annot)) + (Item_t (t, rest)) >>=? fun (judgement, ctxt) -> Lwt.return @@ match judgement with - | Typed ({loc; aft = Item_t (ret, aft_rest, _aft_annot); _} as kibody) -> + | Typed ({loc; aft = Item_t (ret, aft_rest); _} as kibody) -> let invalid_map_body () = let aft = serialize_stack_for_error ctxt kibody.aft in Invalid_map_body (loc, aft) @@ -3222,10 +3210,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( merge_stacks ~legacy loc ctxt 1 aft_rest rest >>? fun (Eq, rest, ctxt) -> option_t loc ret ~annot:opt_ty_name >>? fun opt_ty -> - let final_stack = Item_t (opt_ty, rest, ret_annot) in - let hinfo = - {iloc = loc; kstack_ty = Item_t (ret, aft_rest, ret_annot)} - in + let final_stack = Item_t (opt_ty, rest) in + let hinfo = {iloc = loc; kstack_ty = Item_t (ret, aft_rest)} in let cinfo = kinfo_of_descr kibody in let body = kibody.instr.apply cinfo (IHalt hinfo) in let apply kinfo k = IOpt_map {kinfo; body; k} in @@ -3235,14 +3221,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : error (Invalid_map_body (loc, aft)) | Failed _ -> error (Invalid_map_block_fail loc)) | ( Prim (loc, I_IF_NONE, [bt; bf], annot), - (Item_t (Option_t (t, _), rest, option_annot) as bef) ) -> + (Item_t (Option_t (t, _), rest) as bef) ) -> check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let annot = gen_access_annot option_annot default_some_annot in + let _annot = gen_access_annot None default_some_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy bt rest >>=? fun (btr, ctxt) -> - let stack_ty = Item_t (t, rest, annot) in + let stack_ty = Item_t (t, rest) in non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf stack_ty >>=? fun (bfr, ctxt) -> let branch ibt ibf = @@ -3262,36 +3248,34 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in Lwt.return @@ merge_branches ~legacy ctxt loc btr bfr {branch} (* pairs *) - | ( Prim (loc, I_PAIR, [], annot), - Item_t (a, Item_t (b, rest, snd_annot), fst_annot) ) -> + | (Prim (loc, I_PAIR, [], annot), Item_t (a, Item_t (b, rest))) -> parse_constr_annot loc annot - ~if_special_first:(var_to_field_annot fst_annot) - ~if_special_second:(var_to_field_annot snd_annot) - >>?= fun (annot, ty_name, l_field, r_field) -> - pair_t loc (a, l_field, fst_annot) (b, r_field, snd_annot) ~annot:ty_name + ~if_special_first:(var_to_field_annot None) + ~if_special_second:(var_to_field_annot None) + >>?= fun (_annot, ty_name, l_field, r_field) -> + pair_t loc (a, l_field, None) (b, r_field, None) ~annot:ty_name >>?= fun ty -> - let stack_ty = Item_t (ty, rest, annot) in + let stack_ty = Item_t (ty, rest) in let cons_pair = {apply = (fun kinfo k -> ICons_pair (kinfo, k))} in typed ctxt loc cons_pair stack_ty | (Prim (loc, I_PAIR, [n], annot), stack_ty) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a * s) comb_proof_argument tzresult = fun n stack_ty -> match (n, stack_ty) with - | (1, Item_t (a_ty, tl_ty, _a_annot_opt)) -> - ok (Comb_proof_argument (Comb_one, Item_t (a_ty, tl_ty, annot))) - | (n, Item_t (a_ty, tl_ty, _prop_annot_opt)) -> + | (1, Item_t (a_ty, tl_ty)) -> + ok (Comb_proof_argument (Comb_one, Item_t (a_ty, tl_ty))) + | (n, Item_t (a_ty, tl_ty)) -> make_proof_argument (n - 1) tl_ty - >>? fun (Comb_proof_argument - (comb_witness, Item_t (b_ty, tl_ty', annot))) -> + >>? fun (Comb_proof_argument (comb_witness, Item_t (b_ty, tl_ty'))) + -> pair_t loc (a_ty, None, None) (b_ty, None, None) ~annot:None >|? fun pair_t -> - Comb_proof_argument - (Comb_succ comb_witness, Item_t (pair_t, tl_ty', annot)) + Comb_proof_argument (Comb_succ comb_witness, Item_t (pair_t, tl_ty')) | _ -> let whole_stack = serialize_stack_for_error ctxt stack_ty in error (Bad_stack (loc, I_PAIR, 1, whole_stack)) @@ -3311,21 +3295,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : int -> (a, s) stack_ty -> (a * s) uncomb_proof_argument tzresult = fun n stack_ty -> match (n, stack_ty) with - | (1, Item_t (a_ty, tl_ty, annot)) -> - ok @@ Uncomb_proof_argument (Uncomb_one, Item_t (a_ty, tl_ty, annot)) - | ( n, - Item_t - ( Pair_t ((a_ty, field_opt, _), (b_ty, b_field_opt, _), _), - tl_ty, - _ ) ) -> - let b_annot = Script_ir_annot.field_to_var_annot b_field_opt in - make_proof_argument (n - 1) (Item_t (b_ty, tl_ty, b_annot)) + | (1, Item_t (a_ty, tl_ty)) -> + ok @@ Uncomb_proof_argument (Uncomb_one, Item_t (a_ty, tl_ty)) + | (n, Item_t (Pair_t ((a_ty, _, _), (b_ty, _, _), _), tl_ty)) -> + make_proof_argument (n - 1) (Item_t (b_ty, tl_ty)) >|? fun (Uncomb_proof_argument (uncomb_witness, after_ty)) -> Uncomb_proof_argument - ( Uncomb_succ uncomb_witness, - Item_t - (a_ty, after_ty, Script_ir_annot.field_to_var_annot field_opt) - ) + (Uncomb_succ uncomb_witness, Item_t (a_ty, after_ty)) | _ -> let whole_stack = serialize_stack_for_error ctxt stack_ty in error (Bad_stack (loc, I_UNPAIR, 1, whole_stack)) @@ -3338,8 +3314,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>?= fun (Uncomb_proof_argument (witness, after_ty)) -> let uncomb = {apply = (fun kinfo k -> IUncomb (kinfo, n, witness, k))} in typed ctxt loc uncomb after_ty - | (Prim (loc, I_GET, [n], annot), Item_t (comb_ty, rest_ty, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_GET, [n], annot), Item_t (comb_ty, rest_ty)) -> + parse_var_annot loc annot >>?= fun _annot -> let rec make_proof_argument : type b. int -> b ty -> b comb_get_proof_argument tzresult = fun n ty -> @@ -3361,14 +3337,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Gas.consume ctxt (Typecheck_costs.proof_argument n) >>?= fun ctxt -> make_proof_argument n comb_ty >>?= fun (Comb_get_proof_argument (witness, ty')) -> - let after_stack_ty = Item_t (ty', rest_ty, annot) in + let after_stack_ty = Item_t (ty', rest_ty) in let comb_get = {apply = (fun kinfo k -> IComb_get (kinfo, n, witness, k))} in typed ctxt loc comb_get after_stack_ty | ( Prim (loc, I_UPDATE, [n], annot), - Item_t (value_ty, Item_t (comb_ty, rest_ty, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (value_ty, Item_t (comb_ty, rest_ty)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let rec make_proof_argument : type value before. int -> @@ -3396,7 +3372,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Gas.consume ctxt (Typecheck_costs.proof_argument n) >>?= fun ctxt -> make_proof_argument n value_ty comb_ty >>?= fun (Comb_set_proof_argument (witness, after_ty)) -> - let after_stack_ty = Item_t (after_ty, rest_ty, annot) in + let after_stack_ty = Item_t (after_ty, rest_ty) in let comb_set = {apply = (fun kinfo k -> IComb_set (kinfo, n, witness, k))} in @@ -3407,87 +3383,75 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( (a, expected_field_annot_a, a_annot), (b, expected_field_annot_b, b_annot), _ ), - rest, - pair_annot ) ) -> + rest ) ) -> parse_unpair_annot loc annot - ~pair_annot + ~pair_annot:None ~value_annot_car:a_annot ~value_annot_cdr:b_annot ~field_name_car:expected_field_annot_a ~field_name_cdr:expected_field_annot_b - >>?= fun (annot_a, annot_b, field_a, field_b) -> + >>?= fun (_annot_a, _annot_b, field_a, field_b) -> check_correct_field field_a expected_field_annot_a >>?= fun () -> check_correct_field field_b expected_field_annot_b >>?= fun () -> let unpair = {apply = (fun kinfo k -> IUnpair (kinfo, k))} in - typed ctxt loc unpair (Item_t (a, Item_t (b, rest, annot_b), annot_a)) + typed ctxt loc unpair (Item_t (a, Item_t (b, rest))) | ( Prim (loc, I_CAR, [], annot), - Item_t - (Pair_t ((a, expected_field_annot, a_annot), _, _), rest, pair_annot) ) - -> + Item_t (Pair_t ((a, expected_field_annot, a_annot), _, _), rest) ) -> parse_destr_annot loc annot - ~pair_annot + ~pair_annot:None ~value_annot:a_annot ~field_name:expected_field_annot ~default_accessor:default_car_annot - >>?= fun (annot, field_annot) -> + >>?= fun (_annot, field_annot) -> check_correct_field field_annot expected_field_annot >>?= fun () -> let car = {apply = (fun kinfo k -> ICar (kinfo, k))} in - typed ctxt loc car (Item_t (a, rest, annot)) + typed ctxt loc car (Item_t (a, rest)) | ( Prim (loc, I_CDR, [], annot), - Item_t - (Pair_t (_, (b, expected_field_annot, b_annot), _), rest, pair_annot) ) - -> + Item_t (Pair_t (_, (b, expected_field_annot, b_annot), _), rest) ) -> parse_destr_annot loc annot - ~pair_annot + ~pair_annot:None ~value_annot:b_annot ~field_name:expected_field_annot ~default_accessor:default_cdr_annot - >>?= fun (annot, field_annot) -> + >>?= fun (_annot, field_annot) -> check_correct_field field_annot expected_field_annot >>?= fun () -> let cdr = {apply = (fun kinfo k -> ICdr (kinfo, k))} in - typed ctxt loc cdr (Item_t (b, rest, annot)) + typed ctxt loc cdr (Item_t (b, rest)) (* unions *) - | (Prim (loc, I_LEFT, [tr], annot), Item_t (tl, rest, stack_annot)) -> + | (Prim (loc, I_LEFT, [tr], annot), Item_t (tl, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tr >>?= fun (Ex_ty tr, ctxt) -> - parse_constr_annot - loc - annot - ~if_special_first:(var_to_field_annot stack_annot) - >>?= fun (annot, tname, l_field, r_field) -> + parse_constr_annot loc annot ~if_special_first:(var_to_field_annot None) + >>?= fun (_annot, tname, l_field, r_field) -> let cons_left = {apply = (fun kinfo k -> ICons_left (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> - let stack_ty = Item_t (ty, rest, annot) in + let stack_ty = Item_t (ty, rest) in typed ctxt loc cons_left stack_ty - | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest, stack_annot)) -> + | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tl >>?= fun (Ex_ty tl, ctxt) -> - parse_constr_annot - loc - annot - ~if_special_second:(var_to_field_annot stack_annot) - >>?= fun (annot, tname, l_field, r_field) -> + parse_constr_annot loc annot ~if_special_second:(var_to_field_annot None) + >>?= fun (_annot, tname, l_field, r_field) -> let cons_right = {apply = (fun kinfo k -> ICons_right (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> - let stack_ty = Item_t (ty, rest, annot) in + let stack_ty = Item_t (ty, rest) in typed ctxt loc cons_right stack_ty | ( Prim (loc, I_IF_LEFT, [bt; bf], annot), - (Item_t (Union_t ((tl, l_field), (tr, r_field), _), rest, union_annot) as - bef) ) -> + (Item_t (Union_t ((tl, l_field), (tr, r_field), _), rest) as bef) ) -> check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let left_annot = - gen_access_annot union_annot l_field ~default:default_left_annot + let _left_annot = + gen_access_annot None l_field ~default:default_left_annot in - let right_annot = - gen_access_annot union_annot r_field ~default:default_right_annot + let _right_annot = + gen_access_annot None r_field ~default:default_right_annot in non_terminal_recursion ?type_logger @@ -3495,7 +3459,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ctxt ~legacy bt - (Item_t (tl, rest, left_annot)) + (Item_t (tl, rest)) >>=? fun (btr, ctxt) -> non_terminal_recursion ?type_logger @@ -3503,7 +3467,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ctxt ~legacy bf - (Item_t (tr, rest, right_annot)) + (Item_t (tr, rest)) >>=? fun (bfr, ctxt) -> let branch ibt ibf = let infobt = kinfo_of_descr ibt and infobf = kinfo_of_descr ibf in @@ -3524,31 +3488,31 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_NIL, [t], annot), stack) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> let nil = {apply = (fun kinfo k -> INil (kinfo, k))} in list_t loc t ~annot:ty_name >>?= fun ty -> - typed ctxt loc nil (Item_t (ty, stack, annot)) + typed ctxt loc nil (Item_t (ty, stack)) | ( Prim (loc, I_CONS, [], annot), - Item_t (tv, Item_t (List_t (t, ty_name), rest, _), _) ) -> + Item_t (tv, Item_t (List_t (t, ty_name), rest)) ) -> check_item_ty ctxt tv t loc I_CONS 1 2 >>?= fun (Eq, t, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let cons_list = {apply = (fun kinfo k -> ICons_list (kinfo, k))} in - (typed ctxt loc cons_list (Item_t (List_t (t, ty_name), rest, annot)) + (typed ctxt loc cons_list (Item_t (List_t (t, ty_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_IF_CONS, [bt; bf], annot), - (Item_t (List_t (t, ty_name), rest, list_annot) as bef) ) -> + (Item_t (List_t (t, ty_name), rest) as bef) ) -> check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let hd_annot = gen_access_annot list_annot default_hd_annot in - let tl_annot = gen_access_annot list_annot default_tl_annot in + let _hd_annot = gen_access_annot None default_hd_annot in + let _tl_annot = gen_access_annot None default_tl_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy bt - (Item_t (t, Item_t (List_t (t, ty_name), rest, tl_annot), hd_annot)) + (Item_t (t, Item_t (List_t (t, ty_name), rest))) >>=? fun (btr, ctxt) -> non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf rest >>=? fun (bfr, ctxt) -> @@ -3567,27 +3531,27 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : {loc; instr; bef; aft = ibt.aft} in Lwt.return @@ merge_branches ~legacy ctxt loc btr bfr {branch} - | (Prim (loc, I_SIZE, [], annot), Item_t (List_t _, rest, _)) -> - parse_var_type_annot loc annot >>?= fun (annot, tname) -> + | (Prim (loc, I_SIZE, [], annot), Item_t (List_t _, rest)) -> + parse_var_type_annot loc annot >>?= fun (_annot, tname) -> let list_size = {apply = (fun kinfo k -> IList_size (kinfo, k))} in - typed ctxt loc list_size (Item_t (nat_t ~annot:tname, rest, annot)) - | ( Prim (loc, I_MAP, [body], annot), - Item_t (List_t (elt, _), starting_rest, list_annot) ) -> ( + typed ctxt loc list_size (Item_t (nat_t ~annot:tname, rest)) + | (Prim (loc, I_MAP, [body], annot), Item_t (List_t (elt, _), starting_rest)) + -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_type_annot loc annot >>?= fun (ret_annot, list_ty_name) -> - let elt_annot = gen_access_annot list_annot default_elt_annot in + parse_var_type_annot loc annot >>?= fun (_ret_annot, list_ty_name) -> + let _elt_annot = gen_access_annot None default_elt_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy body - (Item_t (elt, starting_rest, elt_annot)) + (Item_t (elt, starting_rest)) >>=? fun (judgement, ctxt) -> Lwt.return @@ match judgement with - | Typed ({aft = Item_t (ret, rest, _); _} as kibody) -> + | Typed ({aft = Item_t (ret, rest); _} as kibody) -> let invalid_map_body () = let aft = serialize_stack_for_error ctxt kibody.aft in Invalid_map_body (loc, aft) @@ -3597,32 +3561,29 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( merge_stacks ~legacy loc ctxt 1 rest starting_rest >>? fun (Eq, rest, ctxt) -> let binfo = kinfo_of_descr kibody in - let hinfo = - {iloc = loc; kstack_ty = Item_t (ret, rest, ret_annot)} - in + let hinfo = {iloc = loc; kstack_ty = Item_t (ret, rest)} in let ibody = kibody.instr.apply binfo (IHalt hinfo) in let list_map = {apply = (fun kinfo k -> IList_map (kinfo, ibody, k))} in list_t loc ret ~annot:list_ty_name >>? fun ty -> - let stack = Item_t (ty, rest, ret_annot) in + let stack = Item_t (ty, rest) in typed_no_lwt ctxt loc list_map stack ) | Typed {aft; _} -> let aft = serialize_stack_for_error ctxt aft in error (Invalid_map_body (loc, aft)) | Failed _ -> error (Invalid_map_block_fail loc)) - | ( Prim (loc, I_ITER, [body], annot), - Item_t (List_t (elt, _), rest, list_annot) ) -> ( + | (Prim (loc, I_ITER, [body], annot), Item_t (List_t (elt, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let elt_annot = gen_access_annot list_annot default_elt_annot in + let _elt_annot = gen_access_annot None default_elt_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy body - (Item_t (elt, rest, elt_annot)) + (Item_t (elt, rest)) >>=? fun (judgement, ctxt) -> let mk_list_iter ibody = { @@ -3654,15 +3615,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_EMPTY_SET, [t], annot), rest) -> parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt t >>?= fun (Ex_comparable_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (annot, tname) -> + parse_var_type_annot loc annot >>?= fun (_annot, tname) -> let instr = {apply = (fun kinfo k -> IEmpty_set (kinfo, t, k))} in set_t loc t ~annot:tname >>?= fun ty -> - typed ctxt loc instr (Item_t (ty, rest, annot)) - | ( Prim (loc, I_ITER, [body], annot), - Item_t (Set_t (comp_elt, _), rest, set_annot) ) -> ( + typed ctxt loc instr (Item_t (ty, rest)) + | (Prim (loc, I_ITER, [body], annot), Item_t (Set_t (comp_elt, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let elt_annot = gen_access_annot set_annot default_elt_annot in + let _elt_annot = gen_access_annot None default_elt_annot in let elt = ty_of_comparable_ty comp_elt in non_terminal_recursion ?type_logger @@ -3670,7 +3630,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ctxt ~legacy body - (Item_t (elt, rest, elt_annot)) + (Item_t (elt, rest)) >>=? fun (judgement, ctxt) -> let mk_iset_iter ibody = { @@ -3698,44 +3658,40 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed_no_lwt ctxt loc (mk_iset_iter ibody) rest ) | Failed {descr} -> typed_no_lwt ctxt loc (mk_iset_iter (descr rest)) rest ) - | ( Prim (loc, I_MEM, [], annot), - Item_t (v, Item_t (Set_t (elt, _), rest, _), _) ) -> + | (Prim (loc, I_MEM, [], annot), Item_t (v, Item_t (Set_t (elt, _), rest))) -> let elt = ty_of_comparable_ty elt in - parse_var_type_annot loc annot >>?= fun (annot, tname) -> + parse_var_type_annot loc annot >>?= fun (_annot, tname) -> check_item_ty ctxt elt v loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> let instr = {apply = (fun kinfo k -> ISet_mem (kinfo, k))} in - (typed ctxt loc instr (Item_t (bool_t ~annot:tname, rest, annot)) + (typed ctxt loc instr (Item_t (bool_t ~annot:tname, rest)) : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_UPDATE, [], annot), - Item_t - ( v, - Item_t (Bool_t _, Item_t (Set_t (elt, tname), rest, set_annot), _), - _ ) ) -> + Item_t (v, Item_t (Bool_t _, Item_t (Set_t (elt, tname), rest))) ) -> check_item_ty ctxt (ty_of_comparable_ty elt) v loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot ~default:set_annot >>?= fun annot -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISet_update (kinfo, k))} in - (typed ctxt loc instr (Item_t (Set_t (elt, tname), rest, annot)) + (typed ctxt loc instr (Item_t (Set_t (elt, tname), rest)) : ((a, s) judgement * context) tzresult Lwt.t) - | (Prim (loc, I_SIZE, [], annot), Item_t (Set_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SIZE, [], annot), Item_t (Set_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISet_size (kinfo, k))} in - typed ctxt loc instr (Item_t (nat_t ~annot:None, rest, annot)) + typed ctxt loc instr (Item_t (nat_t ~annot:None, rest)) (* maps *) | (Prim (loc, I_EMPTY_MAP, [tk; tv], annot), stack) -> parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt tk >>?= fun (Ex_comparable_ty tk, ctxt) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tv >>?= fun (Ex_ty tv, ctxt) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> let instr = {apply = (fun kinfo k -> IEmpty_map (kinfo, tk, k))} in map_t loc tk tv ~annot:ty_name >>?= fun ty -> - typed ctxt loc instr (Item_t (ty, stack, annot)) + typed ctxt loc instr (Item_t (ty, stack)) | ( Prim (loc, I_MAP, [body], annot), - Item_t (Map_t (ck, elt, _), starting_rest, _map_annot) ) -> ( + Item_t (Map_t (ck, elt, _), starting_rest) ) -> ( let k = ty_of_comparable_ty ck in check_kind [Seq_kind] body >>?= fun () -> - parse_var_type_annot loc annot >>?= fun (ret_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_ret_annot, ty_name) -> let k_name = field_to_var_annot default_key_annot in let e_name = field_to_var_annot default_elt_annot in pair_t loc (k, None, k_name) (elt, None, e_name) ~annot:None @@ -3746,12 +3702,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ctxt ~legacy body - (Item_t (ty, starting_rest, None)) + (Item_t (ty, starting_rest)) >>=? fun (judgement, ctxt) -> Lwt.return @@ match judgement with - | Typed ({aft = Item_t (ret, rest, _); _} as ibody) -> + | Typed ({aft = Item_t (ret, rest); _} as ibody) -> let invalid_map_body () = let aft = serialize_stack_for_error ctxt ibody.aft in Invalid_map_body (loc, aft) @@ -3766,21 +3722,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (fun kinfo k -> let binfo = kinfo_of_descr ibody in let hinfo = - {iloc = loc; kstack_ty = Item_t (ret, rest, ret_annot)} + {iloc = loc; kstack_ty = Item_t (ret, rest)} in let ibody = ibody.instr.apply binfo (IHalt hinfo) in IMap_map (kinfo, ibody, k)); } in map_t loc ck ret ~annot:ty_name >>? fun ty -> - let stack = Item_t (ty, rest, ret_annot) in + let stack = Item_t (ty, rest) in typed_no_lwt ctxt loc instr stack ) | Typed {aft; _} -> let aft = serialize_stack_for_error ctxt aft in error (Invalid_map_body (loc, aft)) | Failed _ -> error (Invalid_map_block_fail loc)) | ( Prim (loc, I_ITER, [body], annot), - Item_t (Map_t (comp_elt, element_ty, _), rest, _map_annot) ) -> ( + Item_t (Map_t (comp_elt, element_ty, _), rest) ) -> ( check_kind [Seq_kind] body >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> let k_name = field_to_var_annot default_key_annot in @@ -3794,7 +3750,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ctxt ~legacy body - (Item_t (ty, rest, None)) + (Item_t (ty, rest)) >>=? fun (judgement, ctxt) -> let make_instr ibody = { @@ -3821,152 +3777,128 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>? fun (Eq, rest, ctxt) : ((a, s) judgement * context) tzresult -> typed_no_lwt ctxt loc (make_instr ibody) rest ) | Failed {descr} -> typed_no_lwt ctxt loc (make_instr (descr rest)) rest) - | ( Prim (loc, I_MEM, [], annot), - Item_t (vk, Item_t (Map_t (ck, _, _), rest, _), _) ) -> + | (Prim (loc, I_MEM, [], annot), Item_t (vk, Item_t (Map_t (ck, _, _), rest))) + -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMap_mem (kinfo, k))} in - (typed ctxt loc instr (Item_t (bool_t ~annot:None, rest, annot)) + (typed ctxt loc instr (Item_t (bool_t ~annot:None, rest)) : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_GET, [], annot), - Item_t (vk, Item_t (Map_t (ck, elt, _), rest, _), _) ) -> + Item_t (vk, Item_t (Map_t (ck, elt, _), rest)) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMap_get (kinfo, k))} in option_t loc elt ~annot:None >>?= fun ty : ((a, s) judgement * context) tzresult Lwt.t -> - typed ctxt loc instr (Item_t (ty, rest, annot)) + typed ctxt loc instr (Item_t (ty, rest)) | ( Prim (loc, I_UPDATE, [], annot), Item_t - ( vk, - Item_t - ( Option_t (vv, _), - Item_t (Map_t (ck, v, map_name), rest, map_annot), - _ ), - _ ) ) -> + (vk, Item_t (Option_t (vv, _), Item_t (Map_t (ck, v, map_name), rest))) + ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:map_annot >>?= fun annot -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMap_update (kinfo, k))} in - (typed ctxt loc instr (Item_t (Map_t (ck, v, map_name), rest, annot)) + (typed ctxt loc instr (Item_t (Map_t (ck, v, map_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_GET_AND_UPDATE, [], annot), Item_t ( vk, - Item_t - ( Option_t (vv, vname), - Item_t (Map_t (ck, v, map_name), rest, map_annot), - v_annot ), - _ ) ) -> + Item_t (Option_t (vv, vname), Item_t (Map_t (ck, v, map_name), rest)) + ) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:map_annot >>?= fun annot -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMap_get_and_update (kinfo, k))} in let stack = - Item_t - ( Option_t (vv, vname), - Item_t (Map_t (ck, v, map_name), rest, annot), - v_annot ) + Item_t (Option_t (vv, vname), Item_t (Map_t (ck, v, map_name), rest)) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) - | (Prim (loc, I_SIZE, [], annot), Item_t (Map_t (_, _, _), rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SIZE, [], annot), Item_t (Map_t (_, _, _), rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMap_size (kinfo, k))} in - typed ctxt loc instr (Item_t (nat_t ~annot:None, rest, annot)) + typed ctxt loc instr (Item_t (nat_t ~annot:None, rest)) (* big_map *) | (Prim (loc, I_EMPTY_BIG_MAP, [tk; tv], annot), stack) -> parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt tk >>?= fun (Ex_comparable_ty tk, ctxt) -> parse_big_map_value_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tv >>?= fun (Ex_ty tv, ctxt) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> let instr = {apply = (fun kinfo k -> IEmpty_big_map (kinfo, tk, tv, k))} in big_map_t loc tk tv ~annot:ty_name >>?= fun ty -> - let stack = Item_t (ty, stack, annot) in + let stack = Item_t (ty, stack) in typed ctxt loc instr stack | ( Prim (loc, I_MEM, [], annot), - Item_t (set_key, Item_t (Big_map_t (map_key, _, _), rest, _), _) ) -> + Item_t (set_key, Item_t (Big_map_t (map_key, _, _), rest)) ) -> let k = ty_of_comparable_ty map_key in check_item_ty ctxt set_key k loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBig_map_mem (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_GET, [], annot), - Item_t (vk, Item_t (Big_map_t (ck, elt, _), rest, _), _) ) -> + Item_t (vk, Item_t (Big_map_t (ck, elt, _), rest)) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBig_map_get (kinfo, k))} in option_t loc elt ~annot:None >>?= fun ty -> - let stack = Item_t (ty, rest, annot) in + let stack = Item_t (ty, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_UPDATE, [], annot), Item_t ( set_key, Item_t ( Option_t (set_value, _), - Item_t (Big_map_t (map_key, map_value, map_name), rest, map_annot), - _ ), - _ ) ) -> + Item_t (Big_map_t (map_key, map_value, map_name), rest) ) ) ) -> let k = ty_of_comparable_ty map_key in check_item_ty ctxt set_key k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt set_value map_value loc I_UPDATE 2 3 >>?= fun (Eq, map_value, ctxt) -> - parse_var_annot loc annot ~default:map_annot >>?= fun annot -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBig_map_update (kinfo, k))} in - let stack = - Item_t (Big_map_t (map_key, map_value, map_name), rest, annot) - in + let stack = Item_t (Big_map_t (map_key, map_value, map_name), rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_GET_AND_UPDATE, [], annot), Item_t ( vk, Item_t - ( Option_t (vv, vname), - Item_t (Big_map_t (ck, v, map_name), rest, map_annot), - v_annot ), - _ ) ) -> + (Option_t (vv, vname), Item_t (Big_map_t (ck, v, map_name), rest)) + ) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:map_annot >>?= fun annot -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBig_map_get_and_update (kinfo, k))} in let stack = - Item_t - ( Option_t (vv, vname), - Item_t (Big_map_t (ck, v, map_name), rest, annot), - v_annot ) + Item_t (Option_t (vv, vname), Item_t (Big_map_t (ck, v, map_name), rest)) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) (* Sapling *) | (Prim (loc, I_SAPLING_EMPTY_STATE, [memo_size], annot), rest) -> parse_memo_size memo_size >>?= fun memo_size -> parse_var_annot loc annot ~default:default_sapling_state_annot - >>?= fun annot -> + >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISapling_empty_state (kinfo, memo_size, k))} in - let stack = - Item_t (sapling_state_t ~memo_size ~annot:None, rest, annot) - in + let stack = Item_t (sapling_state_t ~memo_size ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_SAPLING_VERIFY_UPDATE, [], _), Item_t ( Sapling_transaction_t (transaction_memo_size, _), - Item_t - ( (Sapling_state_t (state_memo_size, _) as state_ty), - rest, - stack_annot ), - _ ) ) -> + Item_t ((Sapling_state_t (state_memo_size, _) as state_ty), rest) ) ) + -> merge_memo_sizes ~error_details:Informative state_memo_size @@ -3982,7 +3914,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~annot:None >>?= fun pair_ty -> option_t loc pair_ty ~annot:None >>?= fun ty -> - let stack = Item_t (ty, rest, stack_annot) in + let stack = Item_t (ty, rest) in typed ctxt loc instr stack (* control *) | (Seq (loc, []), stack) -> @@ -4012,7 +3944,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | Typed itl -> Typed (compose_descr loc ihd itl) in (judgement, ctxt)) - | (Prim (loc, I_IF, [bt; bf], annot), (Item_t (Bool_t _, rest, _) as bef)) -> + | (Prim (loc, I_IF, [bt; bf], annot), (Item_t (Bool_t _, rest) as bef)) -> check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> @@ -4035,8 +3967,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : {loc; instr; bef; aft = ibt.aft} in Lwt.return @@ merge_branches ~legacy ctxt loc btr bfr {branch} - | ( Prim (loc, I_LOOP, [body], annot), - (Item_t (Bool_t _, rest, _stack_annot) as stack) ) -> ( + | (Prim (loc, I_LOOP, [body], annot), (Item_t (Bool_t _, rest) as stack)) -> ( check_kind [Seq_kind] body >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> non_terminal_recursion ?type_logger tc_context ctxt ~legacy body rest @@ -4079,12 +4010,11 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in typed_no_lwt ctxt loc instr rest) | ( Prim (loc, I_LOOP_LEFT, [body], annot), - (Item_t (Union_t ((tl, l_field), (tr, _), _), rest, union_annot) as stack) - ) -> ( + (Item_t (Union_t ((tl, l_field), (tr, _), _), rest) as stack) ) -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_annot loc annot >>?= fun annot -> - let l_annot = - gen_access_annot union_annot l_field ~default:default_left_annot + parse_var_annot loc annot >>?= fun _annot -> + let _l_annot = + gen_access_annot None l_field ~default:default_left_annot in non_terminal_recursion ?type_logger @@ -4092,7 +4022,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ctxt ~legacy body - (Item_t (tl, rest, l_annot)) + (Item_t (tl, rest)) >>=? fun (judgement, ctxt) -> Lwt.return @@ @@ -4117,7 +4047,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ILoop_left (kinfo, ibody, k)); } in - let stack = Item_t (tr, rest, annot) in + let stack = Item_t (tr, rest) in typed_no_lwt ctxt loc instr stack ) | Failed {descr} -> let instr = @@ -4131,7 +4061,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ILoop_left (kinfo, ibody, k)); } in - let stack = Item_t (tr, rest, annot) in + let stack = Item_t (tr, rest) in typed_no_lwt ctxt loc instr stack) | (Prim (loc, I_LAMBDA, [arg; ret; code], annot), stack) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy arg @@ -4139,7 +4069,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ret >>?= fun (Ex_ty ret, ctxt) -> check_kind [Seq_kind] code >>?= fun () -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> parse_returning (Tc_context.add_lambda tc_context) ?type_logger @@ -4152,14 +4082,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>=? fun (lambda, ctxt) -> let instr = {apply = (fun kinfo k -> ILambda (kinfo, lambda, k))} in lambda_t loc arg ret ~annot:None >>?= fun ty -> - let stack = Item_t (ty, stack, annot) in + let stack = Item_t (ty, stack) in typed ctxt loc instr stack | ( Prim (loc, I_EXEC, [], annot), - Item_t (arg, Item_t (Lambda_t (param, ret, _), rest, _), _) ) -> + Item_t (arg, Item_t (Lambda_t (param, ret, _), rest)) ) -> check_item_ty ctxt arg param loc I_EXEC 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IExec (kinfo, k))} in - let stack = Item_t (ret, rest, annot) in + let stack = Item_t (ret, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, I_APPLY, [], annot), Item_t @@ -4170,13 +4100,11 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ((capture_ty, _, _), (arg_ty, _, _), {annot = lam_annot; _}), ret, _ ), - rest, - _ ), - _ ) ) -> + rest ) ) ) -> check_packable ~legacy:false loc capture_ty >>?= fun () -> check_item_ty ctxt capture capture_ty loc I_APPLY 1 2 >>?= fun (Eq, capture_ty, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IApply (kinfo, capture_ty, k))} in lambda_t loc arg_ty ret ~annot:lam_annot (* This cannot fail because the type [lambda 'arg 'ret] is always smaller than @@ -4184,9 +4112,9 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : would be a smart deconstructor to ensure this statically. *) >>?= fun res_ty -> - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) - | (Prim (loc, I_DIP, [code], annot), Item_t (v, rest, stack_annot)) -> ( + | (Prim (loc, I_DIP, [code], annot), Item_t (v, rest)) -> ( error_unexpected_annot loc annot >>?= fun () -> check_kind [Seq_kind] code >>?= fun () -> non_terminal_recursion ?type_logger tc_context ctxt ~legacy code rest @@ -4203,7 +4131,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : IDip (kinfo, b, k)); } in - let stack = Item_t (v, descr.aft, stack_annot) in + let stack = Item_t (v, descr.aft) in typed ctxt loc instr stack | Failed _ -> fail (Fail_not_in_tail_position loc)) | (Prim (loc, I_DIP, [n; code], result_annot), stack) -> @@ -4231,12 +4159,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (Dipn_proof_argument (KRest, ctxt, descr, descr.aft) : (a, s) dipn_proof_argument) | Failed _ -> error (Fail_not_in_tail_position loc)) - | (false, Item_t (v, rest, annot)) -> + | (false, Item_t (v, rest)) -> make_proof_argument (n - 1) rest >|=? fun (Dipn_proof_argument (n', ctxt, descr, aft')) -> let kinfo' = {iloc = loc; kstack_ty = aft'} in let w = KPrefix (kinfo', n') in - Dipn_proof_argument (w, ctxt, descr, Item_t (v, aft', annot)) + Dipn_proof_argument (w, ctxt, descr, Item_t (v, aft')) | (_, _) -> Lwt.return (let whole_stack = serialize_stack_for_error ctxt stack in @@ -4254,7 +4182,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* Technically, the arities 1 and 2 are allowed but the error only mentions 2. However, DIP {code} is equivalent to DIP 1 {code} so hinting at an arity of 2 makes sense. *) fail (Invalid_arity (loc, I_DIP, 2, List.length l)) - | (Prim (loc, I_FAILWITH, [], annot), Item_t (v, _rest, _)) -> + | (Prim (loc, I_FAILWITH, [], annot), Item_t (v, _rest)) -> Lwt.return ( error_unexpected_annot loc annot >>? fun () -> (if legacy then Result.return_unit @@ -4264,7 +4192,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let descr aft = {loc; instr; bef = stack_ty; aft} in log_stack loc stack_ty Bot_t ; (Failed {descr}, ctxt) ) - | (Prim (loc, I_NEVER, [], annot), Item_t (Never_t _, _rest, _)) -> + | (Prim (loc, I_NEVER, [], annot), Item_t (Never_t _, _rest)) -> Lwt.return ( error_unexpected_annot loc annot >|? fun () -> let instr = {apply = (fun kinfo _k -> INever kinfo)} in @@ -4273,437 +4201,430 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (Failed {descr}, ctxt) ) (* timestamp operations *) | ( Prim (loc, I_ADD, [], annot), - Item_t (Timestamp_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Timestamp_t tname, Item_t (Int_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAdd_timestamp_to_seconds (kinfo, k))} in - typed ctxt loc instr (Item_t (Timestamp_t tname, rest, annot)) + typed ctxt loc instr (Item_t (Timestamp_t tname, rest)) | ( Prim (loc, I_ADD, [], annot), - Item_t (Int_t _, Item_t (Timestamp_t tname, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Int_t _, Item_t (Timestamp_t tname, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAdd_seconds_to_timestamp (kinfo, k))} in - typed ctxt loc instr (Item_t (Timestamp_t tname, rest, annot)) + typed ctxt loc instr (Item_t (Timestamp_t tname, rest)) | ( Prim (loc, I_SUB, [], annot), - Item_t (Timestamp_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Timestamp_t tname, Item_t (Int_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISub_timestamp_seconds (kinfo, k))} in - let stack = Item_t (Timestamp_t tname, rest, annot) in + let stack = Item_t (Timestamp_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_SUB, [], annot), Item_t ( Timestamp_t {annot = tn1; size = _}, - Item_t (Timestamp_t {annot = tn2; size = _}, rest, _), - _ ) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Timestamp_t {annot = tn2; size = _}, rest) ) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_annot ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IDiff_timestamps (kinfo, k))} in - let stack = Item_t (int_t ~annot:tname, rest, annot) in + let stack = Item_t (int_t ~annot:tname, rest) in typed ctxt loc instr stack (* string operations *) | ( Prim (loc, I_CONCAT, [], annot), - Item_t (String_t tn1, Item_t (String_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (String_t tn1, Item_t (String_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IConcat_string_pair (kinfo, k))} in - typed ctxt loc instr (Item_t (String_t tname, rest, annot)) - | ( Prim (loc, I_CONCAT, [], annot), - Item_t (List_t (String_t tname, _), rest, list_annot) ) -> - parse_var_annot ~default:list_annot loc annot >>?= fun annot -> + typed ctxt loc instr (Item_t (String_t tname, rest)) + | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (String_t tname, _), rest)) + -> + parse_var_annot ~default:None loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IConcat_string (kinfo, k))} in - typed ctxt loc instr (Item_t (String_t tname, rest, annot)) + typed ctxt loc instr (Item_t (String_t tname, rest)) | ( Prim (loc, I_SLICE, [], annot), - Item_t - ( Nat_t _, - Item_t (Nat_t _, Item_t (String_t tname, rest, string_annot), _), - _ ) ) -> + Item_t (Nat_t _, Item_t (Nat_t _, Item_t (String_t tname, rest))) ) -> parse_var_annot - ~default:(gen_access_annot string_annot default_slice_annot) + ~default:(gen_access_annot None default_slice_annot) loc annot - >>?= fun annot -> + >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISlice_string (kinfo, k))} in - let stack = Item_t (option_string'_t tname, rest, annot) in + let stack = Item_t (option_string'_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_SIZE, [], annot), Item_t (String_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SIZE, [], annot), Item_t (String_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IString_size (kinfo, k))} in - let stack = Item_t (nat_t ~annot:None, rest, annot) in + let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack (* bytes operations *) | ( Prim (loc, I_CONCAT, [], annot), - Item_t (Bytes_t tn1, Item_t (Bytes_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bytes_t tn1, Item_t (Bytes_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IConcat_bytes_pair (kinfo, k))} in - let stack = Item_t (Bytes_t tname, rest, annot) in + let stack = Item_t (Bytes_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_CONCAT, [], annot), - Item_t (List_t (Bytes_t tname, _), rest, list_annot) ) -> - parse_var_annot ~default:list_annot loc annot >>?= fun annot -> + | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (Bytes_t tname, _), rest)) + -> + parse_var_annot ~default:None loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IConcat_bytes (kinfo, k))} in - let stack = Item_t (Bytes_t tname, rest, annot) in + let stack = Item_t (Bytes_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_SLICE, [], annot), - Item_t - ( Nat_t _, - Item_t (Nat_t _, Item_t (Bytes_t tname, rest, bytes_annot), _), - _ ) ) -> + Item_t (Nat_t _, Item_t (Nat_t _, Item_t (Bytes_t tname, rest))) ) -> parse_var_annot - ~default:(gen_access_annot bytes_annot default_slice_annot) + ~default:(gen_access_annot None default_slice_annot) loc annot - >>?= fun annot -> + >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} in - let stack = Item_t (option_bytes'_t tname, rest, annot) in + let stack = Item_t (option_bytes'_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_SIZE, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SIZE, [], annot), Item_t (Bytes_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBytes_size (kinfo, k))} in - let stack = Item_t (nat_t ~annot:None, rest, annot) in + let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack (* currency operations *) | ( Prim (loc, I_ADD, [], annot), - Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_tez (kinfo, k))} in - let stack = Item_t (Mutez_t tname, rest, annot) in + let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_SUB, [], annot), - Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> + Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> if legacy then - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_tez_legacy (kinfo, k))} in - let stack = Item_t (Mutez_t tname, rest, annot) in + let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack else fail (Deprecated_instruction I_SUB) | ( Prim (loc, I_SUB_MUTEZ, [], annot), - Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_tez (kinfo, k))} in - let stack = Item_t (option_mutez'_t tname, rest, annot) in + let stack = Item_t (option_mutez'_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Mutez_t tname, Item_t (Nat_t _, rest, _), _) ) -> + Item_t (Mutez_t tname, Item_t (Nat_t _, rest)) ) -> (* no type name check *) - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_teznat (kinfo, k))} in - let stack = Item_t (Mutez_t tname, rest, annot) in + let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t _, Item_t (Mutez_t tname, rest, _), _) ) -> + Item_t (Nat_t _, Item_t (Mutez_t tname, rest)) ) -> (* no type name check *) - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_nattez (kinfo, k))} in - let stack = Item_t (Mutez_t tname, rest, annot) in + let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack (* boolean operations *) - | ( Prim (loc, I_OR, [], annot), - Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_OR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IOr (kinfo, k))} in - let stack = Item_t (Bool_t tname, rest, annot) in + let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_AND, [], annot), - Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAnd (kinfo, k))} in - let stack = Item_t (Bool_t tname, rest, annot) in + let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_XOR, [], annot), - Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IXor (kinfo, k))} in - let stack = Item_t (Bool_t tname, rest, annot) in + let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NOT, [], annot), Item_t (Bool_t tname, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NOT, [], annot), Item_t (Bool_t tname, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INot (kinfo, k))} in - let stack = Item_t (Bool_t tname, rest, annot) in + let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack (* integer operations *) - | (Prim (loc, I_ABS, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_ABS, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAbs_int (kinfo, k))} in - let stack = Item_t (nat_t ~annot:None, rest, annot) in + let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest, int_annot)) -> - parse_var_annot loc annot ~default:int_annot >>?= fun annot -> + | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IIs_nat (kinfo, k))} in - let stack = Item_t (option_nat_t, rest, annot) in + let stack = Item_t (option_nat_t, rest) in typed ctxt loc instr stack - | (Prim (loc, I_INT, [], annot), Item_t (Nat_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_INT, [], annot), Item_t (Nat_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IInt_nat (kinfo, k))} in - let stack = Item_t (int_t ~annot:None, rest, annot) in + let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NEG, [], annot), Item_t (Int_t tname, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NEG, [], annot), Item_t (Int_t tname, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INeg (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NEG, [], annot), Item_t (Nat_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NEG, [], annot), Item_t (Nat_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INeg (kinfo, k))} in - let stack = Item_t (int_t ~annot:None, rest, annot) in + let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_ADD, [], annot), - Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_ADD, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_ADD, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_ADD, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_ADD, [], annot), - Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_ADD, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_ADD, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_ADD, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_SUB, [], annot), - Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SUB, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_SUB, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SUB, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_SUB, [], annot), - Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SUB, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_SUB, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SUB, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun _tname -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in - let stack = Item_t (int_t ~annot:None, rest, annot) in + let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_MUL, [], annot), - Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_MUL, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IMul_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_MUL, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_MUL, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_nat (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_MUL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IMul_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_EDIV, [], annot), - Item_t (Mutez_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Mutez_t tname, Item_t (Nat_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IEdiv_teznat (kinfo, k))} in - let stack = Item_t (option_pair_mutez'_mutez'_t tname, rest, annot) in + let stack = Item_t (option_pair_mutez'_mutez'_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_EDIV, [], annot), - Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_tez (kinfo, k))} in - let stack = Item_t (option_pair_nat_mutez'_t tname, rest, annot) in + let stack = Item_t (option_pair_nat_mutez'_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Int_t tn1, Item_t (Int_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_EDIV, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_int (kinfo, k))} in - let stack = Item_t (option_pair_int'_nat_t tname, rest, annot) in + let stack = Item_t (option_pair_int'_nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_EDIV, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IEdiv_int (kinfo, k))} in - let stack = Item_t (option_pair_int'_nat_t tname, rest, annot) in + let stack = Item_t (option_pair_int'_nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Nat_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_EDIV, [], annot), Item_t (Nat_t tname, Item_t (Int_t _, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IEdiv_nat (kinfo, k))} in - let stack = Item_t (option_pair_int_nat'_t tname, rest, annot) in + let stack = Item_t (option_pair_int_nat'_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_EDIV, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_nat (kinfo, k))} in - let stack = Item_t (option_pair_nat'_nat'_t tname, rest, annot) in + let stack = Item_t (option_pair_nat'_nat'_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_LSL, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_LSL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ILsl_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_LSR, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_LSR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ILsr_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_OR, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_OR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IOr_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_AND, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_AND, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAnd_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_AND, [], annot), - Item_t (Int_t _, Item_t (Nat_t tname, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_AND, [], annot), Item_t (Int_t _, Item_t (Nat_t tname, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAnd_int_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | ( Prim (loc, I_XOR, [], annot), - Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_XOR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) + -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IXor_nat (kinfo, k))} in - let stack = Item_t (Nat_t tname, rest, annot) in + let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NOT, [], annot), Item_t (Int_t tname, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NOT, [], annot), Item_t (Int_t tname, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INot_int (kinfo, k))} in - let stack = Item_t (Int_t tname, rest, annot) in + let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NOT, [], annot), Item_t (Nat_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NOT, [], annot), Item_t (Nat_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INot_int (kinfo, k))} in - let stack = Item_t (int_t ~annot:None, rest, annot) in + let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack (* comparison *) - | (Prim (loc, I_COMPARE, [], annot), Item_t (t1, Item_t (t2, rest, _), _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_COMPARE, [], annot), Item_t (t1, Item_t (t2, rest))) -> + parse_var_annot loc annot >>?= fun _annot -> check_item_ty ctxt t1 t2 loc I_COMPARE 1 2 >>?= fun (Eq, t, ctxt) -> comparable_ty_of_ty ctxt loc t >>?= fun (key, ctxt) -> let instr = {apply = (fun kinfo k -> ICompare (kinfo, key, k))} in - let stack = Item_t (int_t ~annot:None, rest, annot) in + let stack = Item_t (int_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) (* comparators *) - | (Prim (loc, I_EQ, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_EQ, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IEq (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NEQ, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NEQ, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INeq (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_LT, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_LT, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ILt (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_GT, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_GT, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IGt (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_LE, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_LE, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ILe (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_GE, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_GE, [], annot), Item_t (Int_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IGe (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack (* annotations *) - | (Prim (loc, I_CAST, [cast_t], annot), Item_t (t, stack, item_annot)) -> - parse_var_annot loc annot ~default:item_annot >>?= fun annot -> + | (Prim (loc, I_CAST, [cast_t], annot), Item_t (t, stack)) -> + parse_var_annot loc annot ~default:None >>?= fun _annot -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy cast_t >>?= fun (Ex_ty cast_t, ctxt) -> ty_eq ~legacy ctxt loc cast_t t >>?= fun (Eq, ctxt) -> let instr = {apply = (fun _ k -> k)} in - let stack = Item_t (cast_t, stack, annot) in + let stack = Item_t (cast_t, stack) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) - | (Prim (loc, I_RENAME, [], annot), Item_t (t, stack, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_RENAME, [], annot), Item_t (t, stack)) -> + parse_var_annot loc annot >>?= fun _annot -> (* can erase annot *) let instr = {apply = (fun _ k -> k)} in - let stack = Item_t (t, stack, annot) in + let stack = Item_t (t, stack) in typed ctxt loc instr stack (* packing *) - | (Prim (loc, I_PACK, [], annot), Item_t (t, rest, unpacked_annot)) -> + | (Prim (loc, I_PACK, [], annot), Item_t (t, rest)) -> check_packable ~legacy:true (* allow to pack contracts for hash/signature checks *) loc @@ -4712,38 +4633,35 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_var_annot loc annot - ~default:(gen_access_annot unpacked_annot default_pack_annot) - >>?= fun annot -> + ~default:(gen_access_annot None default_pack_annot) + >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IPack (kinfo, t, k))} in - let stack = Item_t (bytes_t ~annot:None, rest, annot) in + let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_UNPACK, [ty], annot), Item_t (Bytes_t _, rest, packed_annot)) - -> + | (Prim (loc, I_UNPACK, [ty], annot), Item_t (Bytes_t _, rest)) -> parse_packable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ty >>?= fun (Ex_ty t, ctxt) -> parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> option_t loc t ~annot:ty_name >>?= fun res_ty -> - let annot = + let _annot = default_annot annot - ~default:(gen_access_annot packed_annot default_unpack_annot) + ~default:(gen_access_annot None default_unpack_annot) in let instr = {apply = (fun kinfo k -> IUnpack (kinfo, t, k))} in - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack (* protocol *) - | ( Prim (loc, I_ADDRESS, [], annot), - Item_t (Contract_t _, rest, contract_annot) ) -> + | (Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest)) -> parse_var_annot loc annot - ~default:(gen_access_annot contract_annot default_addr_annot) - >>?= fun annot -> + ~default:(gen_access_annot None default_addr_annot) + >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAddress (kinfo, k))} in - let stack = Item_t (address_t ~annot:None, rest, annot) in + let stack = Item_t (address_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_CONTRACT, [ty], annot), Item_t (Address_t _, rest, addr_annot)) - -> + | (Prim (loc, I_CONTRACT, [ty], annot), Item_t (Address_t _, rest)) -> parse_parameter_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ty >>?= fun (Ex_ty t, ctxt) -> contract_t loc t ~annot:None >>?= fun contract_ty -> @@ -4751,17 +4669,17 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_entrypoint_annot loc annot - ~default:(gen_access_annot addr_annot default_contract_annot) - >>?= fun (annot, entrypoint) -> + ~default:(gen_access_annot None default_contract_annot) + >>?= fun (_annot, entrypoint) -> Script_ir_annot.field_annot_opt_to_entrypoint_strict ~loc entrypoint >>?= fun entrypoint -> let instr = {apply = (fun kinfo k -> IContract (kinfo, t, entrypoint, k))} in - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack | ( Prim (loc, I_VIEW, [name; output_ty], annot), - Item_t (input_ty, Item_t (Address_t _, rest, addr_annot), _) ) -> + Item_t (input_ty, Item_t (Address_t _, rest)) ) -> let output_ty_loc = location output_ty in parse_view_name ctxt name >>?= fun (name, ctxt) -> parse_view_output_ty ctxt ~stack_depth:0 ~legacy output_ty @@ -4770,8 +4688,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_var_annot loc annot - ~default:(gen_access_annot addr_annot default_contract_annot) - >>?= fun annot -> + ~default:(gen_access_annot None default_contract_annot) + >>?= fun _annot -> let instr = { apply = @@ -4779,39 +4697,36 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : IView (kinfo, View_signature {name; input_ty; output_ty}, k)); } in - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack | ( Prim (loc, (I_TRANSFER_TOKENS as prim), [], annot), - Item_t (p, Item_t (Mutez_t _, Item_t (Contract_t (cp, _), rest, _), _), _) - ) -> + Item_t (p, Item_t (Mutez_t _, Item_t (Contract_t (cp, _), rest))) ) -> Tc_context.check_not_in_view loc ~legacy tc_context prim >>?= fun () -> check_item_ty ctxt p cp loc prim 1 4 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ITransfer_tokens (kinfo, k))} in - let stack = Item_t (operation_t ~annot:None, rest, annot) in + let stack = Item_t (operation_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, (I_SET_DELEGATE as prim), [], annot), - Item_t (Option_t (Key_hash_t _, _), rest, _) ) -> + Item_t (Option_t (Key_hash_t _, _), rest) ) -> Tc_context.check_not_in_view loc ~legacy tc_context prim >>?= fun () -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISet_delegate (kinfo, k))} in - let stack = Item_t (operation_t ~annot:None, rest, annot) in + let stack = Item_t (operation_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (_, I_CREATE_ACCOUNT, _, _), _) -> fail (Deprecated_instruction I_CREATE_ACCOUNT) - | (Prim (loc, I_IMPLICIT_ACCOUNT, [], annot), Item_t (Key_hash_t _, rest, _)) - -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_IMPLICIT_ACCOUNT, [], annot), Item_t (Key_hash_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IImplicit_account (kinfo, k))} in - let stack = Item_t (contract_unit_t, rest, annot) in + let stack = Item_t (contract_unit_t, rest) in typed ctxt loc instr stack | ( Prim (loc, (I_CREATE_CONTRACT as prim), [(Seq _ as code)], annot), Item_t - ( Option_t (Key_hash_t _, _), - Item_t (Mutez_t _, Item_t (ginit, rest, _), _), - _ ) ) -> + (Option_t (Key_hash_t _, _), Item_t (Mutez_t _, Item_t (ginit, rest))) + ) -> Tc_context.check_not_in_view ~legacy loc tc_context prim >>?= fun () -> - parse_two_var_annot loc annot >>?= fun (op_annot, addr_annot) -> + parse_two_var_annot loc annot >>?= fun (_op_annot, _addr_annot) -> let canonical_code = Micheline.strip_locations code in parse_toplevel ctxt ~legacy canonical_code >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> @@ -4868,11 +4783,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ret_type_full code_field) >>=? fun ( (Lam - ( { - kbef = Item_t (arg, Bot_t, _); - kaft = Item_t (ret, Bot_t, _); - _; - }, + ( {kbef = Item_t (arg, Bot_t); kaft = Item_t (ret, Bot_t); _}, _ ) as lambda), ctxt ) -> let views_result = @@ -4892,63 +4803,61 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : } in let stack = - Item_t - ( operation_t ~annot:None, - Item_t (address_t ~annot:None, rest, addr_annot), - op_annot ) + Item_t (operation_t ~annot:None, Item_t (address_t ~annot:None, rest)) in typed ctxt loc instr stack | (Prim (loc, I_NOW, [], annot), stack) -> - parse_var_annot loc annot ~default:default_now_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_now_annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INow (kinfo, k))} in - let stack = Item_t (timestamp_t ~annot:None, stack, annot) in + let stack = Item_t (timestamp_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_AMOUNT, [], annot), stack) -> - parse_var_annot loc annot ~default:default_amount_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_amount_annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAmount (kinfo, k))} in - let stack = Item_t (mutez_t ~annot:None, stack, annot) in + let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_CHAIN_ID, [], annot), stack) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IChainId (kinfo, k))} in - let stack = Item_t (chain_id_t ~annot:None, stack, annot) in + let stack = Item_t (chain_id_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_BALANCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_balance_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_balance_annot + >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBalance (kinfo, k))} in - let stack = Item_t (mutez_t ~annot:None, stack, annot) in + let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_LEVEL, [], annot), stack) -> - parse_var_annot loc annot ~default:default_level_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_level_annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ILevel (kinfo, k))} in - let stack = Item_t (nat_t ~annot:None, stack, annot) in + let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack - | (Prim (loc, I_VOTING_POWER, [], annot), Item_t (Key_hash_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_VOTING_POWER, [], annot), Item_t (Key_hash_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IVoting_power (kinfo, k))} in - let stack = Item_t (nat_t ~annot:None, rest, annot) in + let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_TOTAL_VOTING_POWER, [], annot), stack) -> - parse_var_annot loc annot >>?= fun annot -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ITotal_voting_power (kinfo, k))} in - let stack = Item_t (nat_t ~annot:None, stack, annot) in + let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (_, I_STEPS_TO_QUOTA, _, _), _) -> fail (Deprecated_instruction I_STEPS_TO_QUOTA) | (Prim (loc, I_SOURCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_source_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_source_annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISource (kinfo, k))} in - let stack = Item_t (address_t ~annot:None, stack, annot) in + let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_SENDER, [], annot), stack) -> - parse_var_annot loc annot ~default:default_sender_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_sender_annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISender (kinfo, k))} in - let stack = Item_t (address_t ~annot:None, stack, annot) in + let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, (I_SELF as prim), [], annot), stack) -> Lwt.return ( parse_entrypoint_annot loc annot ~default:default_self_annot - >>? fun (annot, entrypoint) -> + >>? fun (_annot, entrypoint) -> (match entrypoint with | None -> Ok Entrypoint.default | Some (Field_annot annot) -> Entrypoint.of_annot_lax annot) @@ -4979,189 +4888,182 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (fun kinfo k -> ISelf (kinfo, param_type, entrypoint, k)); } in - let stack = Item_t (res_ty, stack, annot) in + let stack = Item_t (res_ty, stack) in typed_no_lwt ctxt loc instr stack ) | (Prim (loc, I_SELF_ADDRESS, [], annot), stack) -> - parse_var_annot loc annot ~default:default_self_annot >>?= fun annot -> + parse_var_annot loc annot ~default:default_self_annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISelf_address (kinfo, k))} in - let stack = Item_t (address_t ~annot:None, stack, annot) in + let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack (* cryptography *) - | (Prim (loc, I_HASH_KEY, [], annot), Item_t (Key_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_HASH_KEY, [], annot), Item_t (Key_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IHash_key (kinfo, k))} in - let stack = Item_t (key_hash_t ~annot:None, rest, annot) in + let stack = Item_t (key_hash_t ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_CHECK_SIGNATURE, [], annot), - Item_t (Key_t _, Item_t (Signature_t _, Item_t (Bytes_t _, rest, _), _), _) - ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Key_t _, Item_t (Signature_t _, Item_t (Bytes_t _, rest))) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ICheck_signature (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_BLAKE2B, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_BLAKE2B, [], annot), Item_t (Bytes_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IBlake2b (kinfo, k))} in - let stack = Item_t (bytes_t ~annot:None, rest, annot) in + let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_SHA256, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SHA256, [], annot), Item_t (Bytes_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISha256 (kinfo, k))} in - let stack = Item_t (bytes_t ~annot:None, rest, annot) in + let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_SHA512, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SHA512, [], annot), Item_t (Bytes_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISha512 (kinfo, k))} in - let stack = Item_t (bytes_t ~annot:None, rest, annot) in + let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_KECCAK, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_KECCAK, [], annot), Item_t (Bytes_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IKeccak (kinfo, k))} in - let stack = Item_t (bytes_t ~annot:None, rest, annot) in + let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_SHA3, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_SHA3, [], annot), Item_t (Bytes_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISha3 (kinfo, k))} in - let stack = Item_t (bytes_t ~annot:None, rest, annot) in + let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), - Item_t (Bls12_381_g1_t tn1, Item_t (Bls12_381_g1_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_g1_t tn1, Item_t (Bls12_381_g1_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_g1 (kinfo, k))} in - let stack = Item_t (Bls12_381_g1_t tname, rest, annot) in + let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), - Item_t (Bls12_381_g2_t tn1, Item_t (Bls12_381_g2_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_g2_t tn1, Item_t (Bls12_381_g2_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_g2 (kinfo, k))} in - let stack = Item_t (Bls12_381_g2_t tname, rest, annot) in + let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), - Item_t (Bls12_381_fr_t tn1, Item_t (Bls12_381_fr_t tn2, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_fr_t tn1, Item_t (Bls12_381_fr_t tn2, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_fr (kinfo, k))} in - let stack = Item_t (Bls12_381_fr_t tname, rest, annot) in + let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_g1_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_g1_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_g1 (kinfo, k))} in - let stack = Item_t (Bls12_381_g1_t tname, rest, annot) in + let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_g2_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_g2_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_g2 (kinfo, k))} in - let stack = Item_t (Bls12_381_g2_t tname, rest, annot) in + let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_fr_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_fr_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr (kinfo, k))} in - let stack = Item_t (Bls12_381_fr_t tname, rest, annot) in + let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest, _), _) - ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Nat_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} in - let stack = Item_t (bls12_381_fr_t ~annot:tname, rest, annot) in + let stack = Item_t (bls12_381_fr_t ~annot:tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Int_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest, _), _) - ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Int_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} in - let stack = Item_t (bls12_381_fr_t ~annot:tname, rest, annot) in + let stack = Item_t (bls12_381_fr_t ~annot:tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_fr_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_fr_t tname, Item_t (Int_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} in - let stack = Item_t (Bls12_381_fr_t tname, rest, annot) in + let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_fr_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Bls12_381_fr_t tname, Item_t (Nat_t _, rest)) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} in - let stack = Item_t (Bls12_381_fr_t tname, rest, annot) in + let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_INT, [], annot), Item_t (Bls12_381_fr_t _, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_INT, [], annot), Item_t (Bls12_381_fr_t _, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IInt_bls12_381_fr (kinfo, k))} in - let stack = Item_t (int_t ~annot:None, rest, annot) in + let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g1_t tname, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g1_t tname, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_g1 (kinfo, k))} in - let stack = Item_t (Bls12_381_g1_t tname, rest, annot) in + let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g2_t tname, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g2_t tname, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_g2 (kinfo, k))} in - let stack = Item_t (Bls12_381_g2_t tname, rest, annot) in + let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack - | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_fr_t tname, rest, _)) -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_fr_t tname, rest)) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_fr (kinfo, k))} in - let stack = Item_t (Bls12_381_fr_t tname, rest, annot) in + let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_PAIRING_CHECK, [], annot), Item_t ( List_t (Pair_t ((Bls12_381_g1_t _, _, _), (Bls12_381_g2_t _, _, _), _), _), - rest, - _ ) ) -> - parse_var_annot loc annot >>?= fun annot -> + rest ) ) -> + parse_var_annot loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IPairing_check_bls12_381 (kinfo, k))} in - let stack = Item_t (bool_t ~annot:None, rest, annot) in + let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack (* Tickets *) - | (Prim (loc, I_TICKET, [], annot), Item_t (t, Item_t (Nat_t _, rest, _), _)) - -> - parse_var_annot loc annot >>?= fun annot -> + | (Prim (loc, I_TICKET, [], annot), Item_t (t, Item_t (Nat_t _, rest))) -> + parse_var_annot loc annot >>?= fun _annot -> comparable_ty_of_ty ctxt loc t >>?= fun (ty, ctxt) -> ticket_t loc ty ~annot:None >>?= fun res_ty -> let instr = {apply = (fun kinfo k -> ITicket (kinfo, k))} in - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack | ( Prim (loc, I_READ_TICKET, [], annot), - (Item_t (Ticket_t (t, _), _, _) as full_stack) ) -> - parse_var_annot loc annot >>?= fun annot -> + (Item_t (Ticket_t (t, _), _) as full_stack) ) -> + parse_var_annot loc annot >>?= fun _annot -> let () = check_dupable_comparable_ty t in opened_ticket_type loc t >>?= fun opened_ticket_ty -> let result = ty_of_comparable_ty opened_ticket_ty in let instr = {apply = (fun kinfo k -> IRead_ticket (kinfo, k))} in - let stack = Item_t (result, full_stack, annot) in + let stack = Item_t (result, full_stack) in typed ctxt loc instr stack | ( Prim (loc, I_SPLIT_TICKET, [], annot), Item_t ( (Ticket_t (t, _) as ticket_t), - Item_t - (Pair_t ((Nat_t _, fa_a, a_a), (Nat_t _, fa_b, a_b), _), rest, _), - _ ) ) -> - parse_var_annot loc annot >>?= fun annot -> + Item_t (Pair_t ((Nat_t _, fa_a, a_a), (Nat_t _, fa_b, a_b), _), rest) + ) ) -> + parse_var_annot loc annot >>?= fun _annot -> let () = check_dupable_comparable_ty t in pair_t loc (ticket_t, fa_a, a_a) (ticket_t, fa_b, a_b) ~annot:None >>?= fun pair_tickets_ty -> option_t loc pair_tickets_ty ~annot:None >>?= fun res_ty -> let instr = {apply = (fun kinfo k -> ISplit_ticket (kinfo, k))} in - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack | ( Prim (loc, I_JOIN_TICKETS, [], annot), Item_t ( Pair_t (((Ticket_t _ as ty_a), _, _), ((Ticket_t _ as ty_b), _, _), _), - rest, - _ ) ) -> ( - parse_var_annot loc annot >>?= fun annot -> + rest ) ) -> ( + parse_var_annot loc annot >>?= fun _annot -> Gas_monad.run ctxt @@ merge_types ~legacy ~error_details:Informative loc ty_a ty_b >>?= fun (eq_ty, ctxt) -> @@ -5172,7 +5074,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let instr = {apply = (fun kinfo k -> IJoin_tickets (kinfo, contents_ty, k))} in - let stack = Item_t (res_ty, rest, annot) in + let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack | _ -> (* TODO: https://gitlab.com/tezos/tezos/-/issues/1962 @@ -5180,10 +5082,9 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : assert false) (* Timelocks *) | ( Prim (loc, I_OPEN_CHEST, [], _), - Item_t (Chest_key_t _, Item_t (Chest_t _, Item_t (Nat_t _, rest, _), _), _) - ) -> + Item_t (Chest_key_t _, Item_t (Chest_t _, Item_t (Nat_t _, rest))) ) -> let instr = {apply = (fun kinfo k -> IOpen_chest (kinfo, k))} in - typed ctxt loc instr (Item_t (union_bytes_bool_t, rest, None)) + typed ctxt loc instr (Item_t (union_bytes_bool_t, rest)) (* Primitive parsing errors *) | ( Prim ( loc, @@ -5230,7 +5131,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | I_LSL | I_LSR | I_CONCAT | I_PAIRING_CHECK ) as name), [], _ ), - Item_t (ta, Item_t (tb, _, _), _) ) -> + Item_t (ta, Item_t (tb, _)) ) -> let ta = serialize_ty_for_error ta in let tb = serialize_ty_for_error tb in fail (Undefined_binop (loc, name, ta, tb)) @@ -5243,7 +5144,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | I_CONCAT ) as name), [], _ ), - Item_t (t, _, _) ) -> + Item_t (t, _) ) -> let t = serialize_ty_for_error t in fail (Undefined_unop (loc, name, t)) | (Prim (loc, ((I_UPDATE | I_SLICE | I_OPEN_CHEST) as name), [], _), stack) -> diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index 734936c2e4cb..debf68612863 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -1178,9 +1178,7 @@ and 'ty ty = | Chest_t : Timelock.chest ty_metadata -> Timelock.chest ty and ('top_ty, 'resty) stack_ty = - | Item_t : - 'ty ty * ('ty2, 'rest) stack_ty * var_annot option - -> ('ty, 'ty2 * 'rest) stack_ty + | Item_t : 'ty ty * ('ty2, 'rest) stack_ty -> ('ty, 'ty2 * 'rest) stack_ty | Bot_t : (empty_cell, empty_cell) stack_ty and ('key, 'value) big_map = { @@ -2093,7 +2091,7 @@ let stack_ty_traverse (type a t) (sty : (a, t) stack_ty) init f = fun accu sty -> match sty with | Bot_t -> f.apply accu sty - | Item_t (_, sty', _) -> aux (f.apply accu sty) sty' + | Item_t (_, sty') -> aux (f.apply accu sty) sty' in aux init sty @@ -2213,4 +2211,4 @@ let value_traverse (type t) (ty : (t ty, t comparable_ty) union) (x : t) init f [@@coq_axiom_with_reason "local mutually recursive definition not handled"] let stack_top_ty : type a b s. (a, b * s) stack_ty -> a ty = function - | Item_t (ty, _, _) -> ty + | Item_t (ty, _) -> ty diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.mli b/src/proto_alpha/lib_protocol/script_typed_ir.mli index 4582c952e656..1a29beb60559 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.mli +++ b/src/proto_alpha/lib_protocol/script_typed_ir.mli @@ -1285,9 +1285,7 @@ and 'ty ty = | Chest_t : Timelock.chest ty_metadata -> Timelock.chest ty and ('top_ty, 'resty) stack_ty = - | Item_t : - 'ty ty * ('ty2, 'rest) stack_ty * var_annot option - -> ('ty, 'ty2 * 'rest) stack_ty + | Item_t : 'ty ty * ('ty2, 'rest) stack_ty -> ('ty, 'ty2 * 'rest) stack_ty | Bot_t : (empty_cell, empty_cell) stack_ty and ('key, 'value) big_map = { 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 8956411d673d..73da8322ac69 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -109,7 +109,7 @@ let stack_ty_size s = fun accu s -> match s with | Bot_t -> ret_succ accu - | Item_t (ty, _, _annot) -> ret_succ_adding (accu ++ ty_size ty) h3w + | Item_t (ty, _) -> ret_succ_adding (accu ++ ty_size ty) h3w in stack_ty_traverse s zero {apply} @@ -670,42 +670,42 @@ let rec kinstr_extra_size : type a s r f. (a, s, r, f) kinstr -> nodes_and_size to create a type that is embedded in the IR. *) | IJoin_tickets (_, _, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | ITicket (_, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IRead_ticket (_, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | ICons_list (_, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IMap_update (_, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IMap_get_and_update (_, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IBig_map_get_and_update (_, k) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr k in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IApply (_, ty, _) -> ty_size ty | ICompare (_, ty, _) -> comparable_ty_size ty | IList_iter (_, body, _) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr body in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IList_map (_, body, _) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr body in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | ISet_iter (_, body, _) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr body in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IMap_map (_, body, _) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr body in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | IMap_iter (_, body, _) -> ( let kinfo = Script_typed_ir.kinfo_of_kinstr body in - match kinfo.kstack_ty with Item_t (ty, _, _) -> ty_size ty) + match kinfo.kstack_ty with Item_t (ty, _) -> ty_size ty) | ILambda (_, lambda, _) -> lambda_extra_size lambda | ICreate_contract {lambda; _} -> lambda_extra_size lambda | _ -> zero diff --git a/src/proto_alpha/lib_protocol/test/test_interpretation.ml b/src/proto_alpha/lib_protocol/test/test_interpretation.ml index 5fce6966082b..19807c3f9b1d 100644 --- a/src/proto_alpha/lib_protocol/test/test_interpretation.ml +++ b/src/proto_alpha/lib_protocol/test/test_interpretation.ml @@ -102,9 +102,7 @@ let test_stack_overflow () = let stack = Bot_t in let descr kinstr = {kloc = 0; kbef = stack; kaft = stack; kinstr} in let kinfo = {iloc = -1; kstack_ty = stack} in - let kinfo' = - {iloc = -1; kstack_ty = Item_t (bool_t ~annot:None, stack, None)} - in + let kinfo' = {iloc = -1; kstack_ty = Item_t (bool_t ~annot:None, stack)} in let enorme_et_seq n = let rec aux n acc = if n = 0 then acc @@ -132,7 +130,7 @@ let test_stack_overflow_in_lwt () = Gas.update_remaining_operation_gas ctxt Saturation_repr.saturated in let stack = Bot_t in - let item ty s = Item_t (ty, s, None) in + let item ty s = Item_t (ty, s) in let unit_t = unit_t ~annot:None in let unit_k = unit_key ~annot:None in let bool_t = bool_t ~annot:None in diff --git a/src/proto_alpha/lib_protocol/test/test_typechecking.ml b/src/proto_alpha/lib_protocol/test/test_typechecking.ml index 7f2f15455ee7..99bddbb74eff 100644 --- a/src/proto_alpha/lib_protocol/test/test_typechecking.ml +++ b/src/proto_alpha/lib_protocol/test/test_typechecking.ml @@ -872,7 +872,7 @@ let test_contract_not_packable () = ctxt ~legacy:false (Prim (0, I_UNPACK, [Prim (0, T_unit, [], [])], [])) - (Item_t (Script_typed_ir.bytes_t ~annot:None, Bot_t, None)) + (Item_t (Script_typed_ir.bytes_t ~annot:None, Bot_t)) >>= function | Ok _ -> return_unit | Error _ -> Alcotest.failf "Could not parse UNPACK unit") @@ -883,7 +883,7 @@ let test_contract_not_packable () = ctxt ~legacy:false (Prim (0, I_UNPACK, [contract_unit], [])) - (Item_t (Script_typed_ir.bytes_t ~annot:None, Bot_t, None)) + (Item_t (Script_typed_ir.bytes_t ~annot:None, Bot_t)) >>= function | Ok _ -> Alcotest.failf -- GitLab From e309a1f990999d390088fdf4886692ee2e674f58 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 10:19:51 +0100 Subject: [PATCH 02/35] Proto/Michelson: remove some unused annots `gen_access_annot` and `default_annot` cannot fail --- .../lib_protocol/script_ir_translator.ml | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 494d62763f38..66f1129bd5a9 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3188,7 +3188,6 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_MAP, [body], annot), Item_t (Option_t (t, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> parse_var_type_annot loc annot >>?= fun (_ret_annot, opt_ty_name) -> - let _elt_annot = gen_access_annot None default_some_annot in non_terminal_recursion ?type_logger ~legacy @@ -3225,7 +3224,6 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let _annot = gen_access_annot None default_some_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy bt rest >>=? fun (btr, ctxt) -> let stack_ty = Item_t (t, rest) in @@ -3443,16 +3441,10 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack_ty = Item_t (ty, rest) in typed ctxt loc cons_right stack_ty | ( Prim (loc, I_IF_LEFT, [bt; bf], annot), - (Item_t (Union_t ((tl, l_field), (tr, r_field), _), rest) as bef) ) -> + (Item_t (Union_t ((tl, _l_field), (tr, _r_field), _), rest) as bef) ) -> check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let _left_annot = - gen_access_annot None l_field ~default:default_left_annot - in - let _right_annot = - gen_access_annot None r_field ~default:default_right_annot - in non_terminal_recursion ?type_logger tc_context @@ -3504,8 +3496,6 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_kind [Seq_kind] bt >>?= fun () -> check_kind [Seq_kind] bf >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let _hd_annot = gen_access_annot None default_hd_annot in - let _tl_annot = gen_access_annot None default_tl_annot in non_terminal_recursion ?type_logger tc_context @@ -3539,7 +3529,6 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : -> ( check_kind [Seq_kind] body >>?= fun () -> parse_var_type_annot loc annot >>?= fun (_ret_annot, list_ty_name) -> - let _elt_annot = gen_access_annot None default_elt_annot in non_terminal_recursion ?type_logger tc_context @@ -3576,7 +3565,6 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_ITER, [body], annot), Item_t (List_t (elt, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let _elt_annot = gen_access_annot None default_elt_annot in non_terminal_recursion ?type_logger tc_context @@ -3622,7 +3610,6 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_ITER, [body], annot), Item_t (Set_t (comp_elt, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> error_unexpected_annot loc annot >>?= fun () -> - let _elt_annot = gen_access_annot None default_elt_annot in let elt = ty_of_comparable_ty comp_elt in non_terminal_recursion ?type_logger @@ -4010,12 +3997,9 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in typed_no_lwt ctxt loc instr rest) | ( Prim (loc, I_LOOP_LEFT, [body], annot), - (Item_t (Union_t ((tl, l_field), (tr, _), _), rest) as stack) ) -> ( + (Item_t (Union_t ((tl, _l_field), (tr, _), _), rest) as stack) ) -> ( check_kind [Seq_kind] body >>?= fun () -> parse_var_annot loc annot >>?= fun _annot -> - let _l_annot = - gen_access_annot None l_field ~default:default_left_annot - in non_terminal_recursion ?type_logger tc_context @@ -4641,13 +4625,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_UNPACK, [ty], annot), Item_t (Bytes_t _, rest)) -> parse_packable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ty >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> option_t loc t ~annot:ty_name >>?= fun res_ty -> - let _annot = - default_annot - annot - ~default:(gen_access_annot None default_unpack_annot) - in let instr = {apply = (fun kinfo k -> IUnpack (kinfo, t, k))} in let stack = Item_t (res_ty, rest) in typed ctxt loc instr stack -- GitLab From 899546311a9de4a9fdaad8ae032a7ad39bcc1941 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 5 Jan 2022 20:25:53 +0100 Subject: [PATCH 03/35] Proto/Michelson: var_to_field_annot None is None --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 4 ---- src/proto_alpha/lib_protocol/script_ir_annot.mli | 2 -- src/proto_alpha/lib_protocol/script_ir_translator.ml | 8 ++++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index cadc17dbc6f5..65c32fa9b630 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -125,10 +125,6 @@ let type_to_var_annot : type_annot option -> var_annot option = function | None -> None | Some (Type_annot s) -> Some (Var_annot s) -let var_to_field_annot : var_annot option -> field_annot option = function - | None -> None - | Some (Var_annot s) -> Some (Field_annot s) - let field_annot_opt_to_entrypoint_strict ~loc = function | None -> Ok Entrypoint.default | Some (Field_annot a) -> Entrypoint.of_annot_strict ~loc a diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 302bb9917b11..aba0a3c6a835 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -109,8 +109,6 @@ val field_to_var_annot : field_annot option -> var_annot option val type_to_var_annot : type_annot option -> var_annot option -val var_to_field_annot : var_annot option -> field_annot option - (** Converts a field annot option to an entrypoint. An error is returned if the field annot is too long or is "default". [None] is converted to [Some default]. diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 66f1129bd5a9..515b58a3021e 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3250,8 +3250,8 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_constr_annot loc annot - ~if_special_first:(var_to_field_annot None) - ~if_special_second:(var_to_field_annot None) + ~if_special_first:None + ~if_special_second:None >>?= fun (_annot, ty_name, l_field, r_field) -> pair_t loc (a, l_field, None) (b, r_field, None) ~annot:ty_name >>?= fun ty -> @@ -3425,7 +3425,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_LEFT, [tr], annot), Item_t (tl, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tr >>?= fun (Ex_ty tr, ctxt) -> - parse_constr_annot loc annot ~if_special_first:(var_to_field_annot None) + parse_constr_annot loc annot ~if_special_first:None >>?= fun (_annot, tname, l_field, r_field) -> let cons_left = {apply = (fun kinfo k -> ICons_left (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> @@ -3434,7 +3434,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tl >>?= fun (Ex_ty tl, ctxt) -> - parse_constr_annot loc annot ~if_special_second:(var_to_field_annot None) + parse_constr_annot loc annot ~if_special_second:None >>?= fun (_annot, tname, l_field, r_field) -> let cons_right = {apply = (fun kinfo k -> ICons_right (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> -- GitLab From 87534d69348a160ddbd05e6b4ff2f6cee0b91565 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 5 Jan 2022 20:31:00 +0100 Subject: [PATCH 04/35] Proto/Michelson: simplify parse_constr_annot 1/2 - `if_special_first/second` are always `None` - consequently simplify `split_if_special` - remove dead `split_last_dot` and `Non_empty_string.split_on_last` --- .../lib_protocol/non_empty_string.ml | 8 ----- .../lib_protocol/non_empty_string.mli | 6 ---- .../lib_protocol/script_ir_annot.ml | 31 +++++-------------- .../lib_protocol/script_ir_annot.mli | 2 -- .../lib_protocol/script_ir_translator.ml | 12 ++----- 5 files changed, 10 insertions(+), 49 deletions(-) diff --git a/src/proto_alpha/lib_protocol/non_empty_string.ml b/src/proto_alpha/lib_protocol/non_empty_string.ml index 9ce9b11d27e8..410c86171248 100644 --- a/src/proto_alpha/lib_protocol/non_empty_string.ml +++ b/src/proto_alpha/lib_protocol/non_empty_string.ml @@ -32,11 +32,3 @@ let of_string_exn = function | s -> s let cat2 a ?(sep = "") b = String.concat sep [a; b] - -let split_on_last sep s = - match String.rindex_opt s sep with - | Some i when Compare.Int.(i > 0 && i < String.length s - 1) -> - let s1 = String.sub s 0 i in - let s2 = String.sub s (i + 1) (String.length s - 1 - i) in - Some (s1, s2) - | _ -> None diff --git a/src/proto_alpha/lib_protocol/non_empty_string.mli b/src/proto_alpha/lib_protocol/non_empty_string.mli index a9973efd775f..5807a2dcbb1a 100644 --- a/src/proto_alpha/lib_protocol/non_empty_string.mli +++ b/src/proto_alpha/lib_protocol/non_empty_string.mli @@ -37,9 +37,3 @@ val of_string_exn : string -> t (** [cat2 a b] concatenates [a] and [b]. [cat2 a ~sep b] concatenates [a], [sep], and [b]. *) val cat2 : t -> ?sep:string -> t -> t - -(** [split_on_last c s] finds the last occurrence of [c] in [s] and returns - the substring before and the substring after. - Returns [None] if [c] is not present in [s] or if one or both substrings - would end up being empty. *) -val split_on_last : char -> t -> (t * t) option diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 65c32fa9b630..884126615797 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -384,26 +384,11 @@ let parse_var_annot : | Some _ as a -> a | None -> ( match default with Some a -> a | None -> None) -let split_last_dot = function - | None -> (None, None) - | Some (Field_annot s) -> ( - match Non_empty_string.split_on_last '.' s with - | Some (s1, s2) -> - let f = - match (s2 :> string) with - | "car" | "cdr" -> None - | _ -> Some (Field_annot s2) - in - (Some (Var_annot s1), f) - | None -> (None, Some (Field_annot s))) - -let split_if_special ~loc ~if_special v f = +let split_if_special ~loc v f = match f with - | Some (Field_annot fa) when Non_empty_string.(fa = at) -> ( - match if_special with - | Some special_var -> ok @@ split_last_dot special_var - | None -> error (Unexpected_annotation loc)) - | _ -> ok (v, f) + | Some (Field_annot fa) when Non_empty_string.(fa = at) -> + error (Unexpected_annotation loc) + | _ -> ok v let common_prefix v1 v2 = match (v1, v2) with @@ -416,22 +401,20 @@ let common_prefix v1 v2 = let parse_constr_annot : Script.location -> - ?if_special_first:field_annot option -> - ?if_special_second:field_annot option -> string list -> (var_annot option * type_annot option * field_annot option * field_annot option) tzresult = - fun loc ?if_special_first ?if_special_second annot -> + fun loc annot -> parse_annots ~allow_special_field:true loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> get_one_annot loc vars >>? fun v -> get_one_annot loc types >>? fun t -> get_two_annot loc fields >>? fun (f1, f2) -> - split_if_special ~loc ~if_special:if_special_first v f1 >>? fun (v1, f1) -> - split_if_special ~loc ~if_special:if_special_second v f2 >|? fun (v2, f2) -> + split_if_special ~loc v f1 >>? fun v1 -> + split_if_special ~loc v f2 >|? fun v2 -> let v = match v with None -> common_prefix v1 v2 | Some _ -> v in (v, t, f1, f2) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index aba0a3c6a835..21e408603282 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -193,8 +193,6 @@ val is_allowed_char : char -> bool val parse_constr_annot : Script.location -> - ?if_special_first:field_annot option -> - ?if_special_second:field_annot option -> string list -> (var_annot option * type_annot option diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 515b58a3021e..86e7d249b778 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3247,11 +3247,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Lwt.return @@ merge_branches ~legacy ctxt loc btr bfr {branch} (* pairs *) | (Prim (loc, I_PAIR, [], annot), Item_t (a, Item_t (b, rest))) -> - parse_constr_annot - loc - annot - ~if_special_first:None - ~if_special_second:None + parse_constr_annot loc annot >>?= fun (_annot, ty_name, l_field, r_field) -> pair_t loc (a, l_field, None) (b, r_field, None) ~annot:ty_name >>?= fun ty -> @@ -3425,8 +3421,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_LEFT, [tr], annot), Item_t (tl, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tr >>?= fun (Ex_ty tr, ctxt) -> - parse_constr_annot loc annot ~if_special_first:None - >>?= fun (_annot, tname, l_field, r_field) -> + parse_constr_annot loc annot >>?= fun (_annot, tname, l_field, r_field) -> let cons_left = {apply = (fun kinfo k -> ICons_left (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> let stack_ty = Item_t (ty, rest) in @@ -3434,8 +3429,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tl >>?= fun (Ex_ty tl, ctxt) -> - parse_constr_annot loc annot ~if_special_second:None - >>?= fun (_annot, tname, l_field, r_field) -> + parse_constr_annot loc annot >>?= fun (_annot, tname, l_field, r_field) -> let cons_right = {apply = (fun kinfo k -> ICons_right (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> let stack_ty = Item_t (ty, rest) in -- GitLab From 4c58624172cd03ba18bf149ffa455643715d7d60 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:23:36 +0100 Subject: [PATCH 05/35] Proto/Michelson: simplify parse_constr_annot 2/2 - first returned value was always ignored - simplify further `split_if_special` (returned value was unused) - remove dead `common_prefix` --- .../lib_protocol/script_ir_annot.ml | 27 +++++-------------- .../lib_protocol/script_ir_annot.mli | 6 +---- .../lib_protocol/script_ir_translator.ml | 7 +++-- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 884126615797..158d7f199942 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -384,39 +384,24 @@ let parse_var_annot : | Some _ as a -> a | None -> ( match default with Some a -> a | None -> None) -let split_if_special ~loc v f = +let split_if_special ~loc f = match f with | Some (Field_annot fa) when Non_empty_string.(fa = at) -> error (Unexpected_annotation loc) - | _ -> ok v - -let common_prefix v1 v2 = - match (v1, v2) with - | (Some (Var_annot s1), Some (Var_annot s2)) when Non_empty_string.(s1 = s2) - -> - v1 - | (Some _, None) -> v1 - | (None, Some _) -> v2 - | (_, _) -> None + | _ -> ok () let parse_constr_annot : Script.location -> string list -> - (var_annot option - * type_annot option - * field_annot option - * field_annot option) - tzresult = + (type_annot option * field_annot option * field_annot option) tzresult = fun loc annot -> parse_annots ~allow_special_field:true loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> - get_one_annot loc vars >>? fun v -> + get_one_annot loc vars >>? fun (_v : var_annot option) -> get_one_annot loc types >>? fun t -> get_two_annot loc fields >>? fun (f1, f2) -> - split_if_special ~loc v f1 >>? fun v1 -> - split_if_special ~loc v f2 >|? fun v2 -> - let v = match v with None -> common_prefix v1 v2 | Some _ -> v in - (v, t, f1, f2) + split_if_special ~loc f1 >>? fun () -> + split_if_special ~loc f2 >|? fun () -> (t, f1, f2) let parse_two_var_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 21e408603282..029d25189269 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -194,11 +194,7 @@ val is_allowed_char : char -> bool val parse_constr_annot : Script.location -> string list -> - (var_annot option - * type_annot option - * field_annot option - * field_annot option) - tzresult + (type_annot option * field_annot option * field_annot option) tzresult val parse_two_var_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 86e7d249b778..e44b13877ae9 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3247,8 +3247,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Lwt.return @@ merge_branches ~legacy ctxt loc btr bfr {branch} (* pairs *) | (Prim (loc, I_PAIR, [], annot), Item_t (a, Item_t (b, rest))) -> - parse_constr_annot loc annot - >>?= fun (_annot, ty_name, l_field, r_field) -> + parse_constr_annot loc annot >>?= fun (ty_name, l_field, r_field) -> pair_t loc (a, l_field, None) (b, r_field, None) ~annot:ty_name >>?= fun ty -> let stack_ty = Item_t (ty, rest) in @@ -3421,7 +3420,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_LEFT, [tr], annot), Item_t (tl, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tr >>?= fun (Ex_ty tr, ctxt) -> - parse_constr_annot loc annot >>?= fun (_annot, tname, l_field, r_field) -> + parse_constr_annot loc annot >>?= fun (tname, l_field, r_field) -> let cons_left = {apply = (fun kinfo k -> ICons_left (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> let stack_ty = Item_t (ty, rest) in @@ -3429,7 +3428,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest)) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tl >>?= fun (Ex_ty tl, ctxt) -> - parse_constr_annot loc annot >>?= fun (_annot, tname, l_field, r_field) -> + parse_constr_annot loc annot >>?= fun (tname, l_field, r_field) -> let cons_right = {apply = (fun kinfo k -> ICons_right (kinfo, k))} in union_t loc (tl, l_field) (tr, r_field) ~annot:tname >>?= fun ty -> let stack_ty = Item_t (ty, rest) in -- GitLab From c80e27fc7a75a1de576f07357b42cc35a957575f Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:23:36 +0100 Subject: [PATCH 06/35] Proto/Michelson: simplify parse_destr_annot 1/2 First returned value was always ignored --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 13 ++++--------- src/proto_alpha/lib_protocol/script_ir_annot.mli | 2 +- .../lib_protocol/script_ir_translator.ml | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 158d7f199942..1b5babf769ab 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -434,18 +434,13 @@ let parse_destr_annot : field_name:field_annot option -> pair_annot:var_annot option -> value_annot:var_annot option -> - (var_annot option * field_annot option) tzresult = - fun loc annot ~default_accessor ~field_name ~pair_annot ~value_annot -> + field_annot option tzresult = + fun loc annot ~default_accessor:_ ~field_name:_ ~pair_annot:_ ~value_annot:_ -> parse_annots loc ~allow_special_var:true annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> - get_one_annot loc vars >>? fun v -> - get_one_annot loc fields >|? fun f -> - let default = - gen_access_annot pair_annot field_name ~default:default_accessor - in - let v = var_annot_from_special ~field_name ~default ~value_annot v in - (v, f) + get_one_annot loc vars >>? fun (_v : var_annot option) -> + get_one_annot loc fields let parse_unpair_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 029d25189269..db486c312b5f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -208,7 +208,7 @@ val parse_destr_annot : field_name:field_annot option -> pair_annot:var_annot option -> value_annot:var_annot option -> - (var_annot option * field_annot option) tzresult + field_annot option tzresult val parse_unpair_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index e44b13877ae9..66fcdb47e557 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3399,7 +3399,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~value_annot:a_annot ~field_name:expected_field_annot ~default_accessor:default_car_annot - >>?= fun (_annot, field_annot) -> + >>?= fun field_annot -> check_correct_field field_annot expected_field_annot >>?= fun () -> let car = {apply = (fun kinfo k -> ICar (kinfo, k))} in typed ctxt loc car (Item_t (a, rest)) @@ -3412,7 +3412,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~value_annot:b_annot ~field_name:expected_field_annot ~default_accessor:default_cdr_annot - >>?= fun (_annot, field_annot) -> + >>?= fun field_annot -> check_correct_field field_annot expected_field_annot >>?= fun () -> let cdr = {apply = (fun kinfo k -> ICdr (kinfo, k))} in typed ctxt loc cdr (Item_t (b, rest)) -- GitLab From 112f3e9f326adc75b65b2d3a60c887407db68871 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:29:59 +0100 Subject: [PATCH 07/35] Proto/Michelson: simplify parse_destr_annot 2/2 Removed unused parameters --- .../lib_protocol/script_ir_annot.ml | 10 ++------- .../lib_protocol/script_ir_annot.mli | 8 +------ .../lib_protocol/script_ir_translator.ml | 22 ++++--------------- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 1b5babf769ab..a310d3feeded 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -428,14 +428,8 @@ let var_annot_from_special : | None -> value_annot let parse_destr_annot : - Script.location -> - string list -> - default_accessor:field_annot option -> - field_name:field_annot option -> - pair_annot:var_annot option -> - value_annot:var_annot option -> - field_annot option tzresult = - fun loc annot ~default_accessor:_ ~field_name:_ ~pair_annot:_ ~value_annot:_ -> + Script.location -> string list -> field_annot option tzresult = + fun loc annot -> parse_annots loc ~allow_special_var:true annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index db486c312b5f..37c7f73c46f2 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -202,13 +202,7 @@ val parse_two_var_annot : (var_annot option * var_annot option) tzresult val parse_destr_annot : - Script.location -> - string list -> - default_accessor:field_annot option -> - field_name:field_annot option -> - pair_annot:var_annot option -> - value_annot:var_annot option -> - field_annot option tzresult + Script.location -> string list -> field_annot option tzresult val parse_unpair_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 66fcdb47e557..07d35bb94da2 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3391,28 +3391,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let unpair = {apply = (fun kinfo k -> IUnpair (kinfo, k))} in typed ctxt loc unpair (Item_t (a, Item_t (b, rest))) | ( Prim (loc, I_CAR, [], annot), - Item_t (Pair_t ((a, expected_field_annot, a_annot), _, _), rest) ) -> - parse_destr_annot - loc - annot - ~pair_annot:None - ~value_annot:a_annot - ~field_name:expected_field_annot - ~default_accessor:default_car_annot - >>?= fun field_annot -> + Item_t (Pair_t ((a, expected_field_annot, _a_annot), _, _), rest) ) -> + parse_destr_annot loc annot >>?= fun field_annot -> check_correct_field field_annot expected_field_annot >>?= fun () -> let car = {apply = (fun kinfo k -> ICar (kinfo, k))} in typed ctxt loc car (Item_t (a, rest)) | ( Prim (loc, I_CDR, [], annot), - Item_t (Pair_t (_, (b, expected_field_annot, b_annot), _), rest) ) -> - parse_destr_annot - loc - annot - ~pair_annot:None - ~value_annot:b_annot - ~field_name:expected_field_annot - ~default_accessor:default_cdr_annot - >>?= fun field_annot -> + Item_t (Pair_t (_, (b, expected_field_annot, _b_annot), _), rest) ) -> + parse_destr_annot loc annot >>?= fun field_annot -> check_correct_field field_annot expected_field_annot >>?= fun () -> let cdr = {apply = (fun kinfo k -> ICdr (kinfo, k))} in typed ctxt loc cdr (Item_t (b, rest)) -- GitLab From 9eee4a7fd36e517eaa47fd66364b13580a883185 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:23:36 +0100 Subject: [PATCH 08/35] Proto/Michelson: simplify parse_unpair_annot 1/2 - first two returned values were always ignored - remove dead `var_annot_from_special` --- .../lib_protocol/script_ir_annot.ml | 55 +++---------------- .../lib_protocol/script_ir_annot.mli | 6 +- .../lib_protocol/script_ir_translator.ml | 2 +- 3 files changed, 9 insertions(+), 54 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index a310d3feeded..19afd9ab692a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -412,21 +412,6 @@ let parse_two_var_annot : error_unexpected_annot loc types >>? fun () -> error_unexpected_annot loc fields >>? fun () -> get_two_annot loc vars -let var_annot_from_special : - field_name:field_annot option -> - default:var_annot option -> - value_annot:var_annot option -> - var_annot option -> - var_annot option = - fun ~field_name ~default ~value_annot v -> - match v with - | Some (Var_annot va) -> ( - match (va :> string) with - | "%" -> field_to_var_annot field_name - | "%%" -> default - | _ -> v) - | None -> value_annot - let parse_destr_annot : Script.location -> string list -> field_annot option tzresult = fun loc annot -> @@ -444,44 +429,18 @@ let parse_unpair_annot : pair_annot:var_annot option -> value_annot_car:var_annot option -> value_annot_cdr:var_annot option -> - (var_annot option - * var_annot option - * field_annot option - * field_annot option) - tzresult = + (field_annot option * field_annot option) tzresult = fun loc annot - ~field_name_car - ~field_name_cdr - ~pair_annot - ~value_annot_car - ~value_annot_cdr -> + ~field_name_car:_ + ~field_name_cdr:_ + ~pair_annot:_ + ~value_annot_car:_ + ~value_annot_cdr:_ -> parse_annots loc ~allow_special_var:true annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> - get_two_annot loc vars >>? fun (vcar, vcdr) -> - get_two_annot loc fields >|? fun (fcar, fcdr) -> - let default_car = - gen_access_annot pair_annot field_name_car ~default:default_car_annot - in - let default_cdr = - gen_access_annot pair_annot field_name_cdr ~default:default_cdr_annot - in - let vcar = - var_annot_from_special - ~field_name:field_name_car - ~default:default_car - ~value_annot:value_annot_car - vcar - in - let vcdr = - var_annot_from_special - ~field_name:field_name_cdr - ~default:default_cdr - ~value_annot:value_annot_cdr - vcdr - in - (vcar, vcdr, fcar, fcdr) + get_two_annot loc vars >>? fun (_vcar, _vcdr) -> get_two_annot loc fields let parse_entrypoint_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 37c7f73c46f2..ce67df6e84cb 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -212,11 +212,7 @@ val parse_unpair_annot : pair_annot:var_annot option -> value_annot_car:var_annot option -> value_annot_cdr:var_annot option -> - (var_annot option - * var_annot option - * field_annot option - * field_annot option) - tzresult + (field_annot option * field_annot option) tzresult val parse_entrypoint_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 07d35bb94da2..6761d9a33f26 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3385,7 +3385,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~value_annot_cdr:b_annot ~field_name_car:expected_field_annot_a ~field_name_cdr:expected_field_annot_b - >>?= fun (_annot_a, _annot_b, field_a, field_b) -> + >>?= fun (field_a, field_b) -> check_correct_field field_a expected_field_annot_a >>?= fun () -> check_correct_field field_b expected_field_annot_b >>?= fun () -> let unpair = {apply = (fun kinfo k -> IUnpair (kinfo, k))} in -- GitLab From f9bb1e5f5f7dc0d3db7cdc5246faf6fa5c800a0e Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:29:59 +0100 Subject: [PATCH 09/35] Proto/Michelson: simplify parse_unpair_annot 2/2 Removed unused parameters --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 13 +------------ src/proto_alpha/lib_protocol/script_ir_annot.mli | 5 ----- .../lib_protocol/script_ir_translator.ml | 14 +++----------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 19afd9ab692a..4693da42c337 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -424,19 +424,8 @@ let parse_destr_annot : let parse_unpair_annot : Script.location -> string list -> - field_name_car:field_annot option -> - field_name_cdr:field_annot option -> - pair_annot:var_annot option -> - value_annot_car:var_annot option -> - value_annot_cdr:var_annot option -> (field_annot option * field_annot option) tzresult = - fun loc - annot - ~field_name_car:_ - ~field_name_cdr:_ - ~pair_annot:_ - ~value_annot_car:_ - ~value_annot_cdr:_ -> + fun loc annot -> parse_annots loc ~allow_special_var:true annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index ce67df6e84cb..649b7e9b9e8b 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -207,11 +207,6 @@ val parse_destr_annot : val parse_unpair_annot : Script.location -> string list -> - field_name_car:field_annot option -> - field_name_cdr:field_annot option -> - pair_annot:var_annot option -> - value_annot_car:var_annot option -> - value_annot_cdr:var_annot option -> (field_annot option * field_annot option) tzresult val parse_entrypoint_annot : diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 6761d9a33f26..187bf40dece3 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3373,19 +3373,11 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_UNPAIR, [], annot), Item_t ( Pair_t - ( (a, expected_field_annot_a, a_annot), - (b, expected_field_annot_b, b_annot), + ( (a, expected_field_annot_a, _a_annot), + (b, expected_field_annot_b, _b_annot), _ ), rest ) ) -> - parse_unpair_annot - loc - annot - ~pair_annot:None - ~value_annot_car:a_annot - ~value_annot_cdr:b_annot - ~field_name_car:expected_field_annot_a - ~field_name_cdr:expected_field_annot_b - >>?= fun (field_a, field_b) -> + parse_unpair_annot loc annot >>?= fun (field_a, field_b) -> check_correct_field field_a expected_field_annot_a >>?= fun () -> check_correct_field field_b expected_field_annot_b >>?= fun () -> let unpair = {apply = (fun kinfo k -> IUnpair (kinfo, k))} in -- GitLab From a741da8c54f1ac10e827342b58d42b0a42043ff3 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:23:36 +0100 Subject: [PATCH 10/35] Proto/Michelson: simplify parse_entrypoint_annot 1/2 First returned value was always ignored --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 8 +++----- src/proto_alpha/lib_protocol/script_ir_annot.mli | 2 +- src/proto_alpha/lib_protocol/script_ir_translator.ml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 4693da42c337..ee6428c27c61 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -435,14 +435,12 @@ let parse_entrypoint_annot : Script.location -> ?default:var_annot option -> string list -> - (var_annot option * field_annot option) tzresult = - fun loc ?default annot -> + field_annot option tzresult = + fun loc ?default:_ annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> get_one_annot loc fields >>? fun f -> - get_one_annot loc vars >|? function - | Some _ as a -> (a, f) - | None -> ( match default with Some a -> (a, f) | None -> (None, f)) + get_one_annot loc vars >|? fun (_v : var_annot option) -> f let parse_var_type_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 649b7e9b9e8b..01f80e5e9579 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -213,7 +213,7 @@ val parse_entrypoint_annot : Script.location -> ?default:var_annot option -> string list -> - (var_annot option * field_annot option) tzresult + field_annot option tzresult val parse_var_type_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 187bf40dece3..3acd3775a0a8 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -4620,7 +4620,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : loc annot ~default:(gen_access_annot None default_contract_annot) - >>?= fun (_annot, entrypoint) -> + >>?= fun entrypoint -> Script_ir_annot.field_annot_opt_to_entrypoint_strict ~loc entrypoint >>?= fun entrypoint -> let instr = @@ -4807,7 +4807,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, (I_SELF as prim), [], annot), stack) -> Lwt.return ( parse_entrypoint_annot loc annot ~default:default_self_annot - >>? fun (_annot, entrypoint) -> + >>? fun entrypoint -> (match entrypoint with | None -> Ok Entrypoint.default | Some (Field_annot annot) -> Entrypoint.of_annot_lax annot) -- GitLab From 408fbdf17c7ce6b6a93f07a37d8e7a99d95171f3 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:29:59 +0100 Subject: [PATCH 11/35] Proto/Michelson: simplify parse_entrypoint_annot 2/2 Removed unused parameter --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 7 ++----- src/proto_alpha/lib_protocol/script_ir_annot.mli | 5 +---- src/proto_alpha/lib_protocol/script_ir_translator.ml | 9 ++------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index ee6428c27c61..a4defd23ecc7 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -432,11 +432,8 @@ let parse_unpair_annot : get_two_annot loc vars >>? fun (_vcar, _vcdr) -> get_two_annot loc fields let parse_entrypoint_annot : - Script.location -> - ?default:var_annot option -> - string list -> - field_annot option tzresult = - fun loc ?default:_ annot -> + Script.location -> string list -> field_annot option tzresult = + fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> get_one_annot loc fields >>? fun f -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 01f80e5e9579..90e76323bdd3 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -210,10 +210,7 @@ val parse_unpair_annot : (field_annot option * field_annot option) tzresult val parse_entrypoint_annot : - Script.location -> - ?default:var_annot option -> - string list -> - field_annot option tzresult + Script.location -> string list -> field_annot option tzresult val parse_var_type_annot : Script.location -> diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 3acd3775a0a8..4dbc3a2bfb0e 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -4616,11 +4616,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>?= fun (Ex_ty t, ctxt) -> contract_t loc t ~annot:None >>?= fun contract_ty -> option_t loc contract_ty ~annot:None >>?= fun res_ty -> - parse_entrypoint_annot - loc - annot - ~default:(gen_access_annot None default_contract_annot) - >>?= fun entrypoint -> + parse_entrypoint_annot loc annot >>?= fun entrypoint -> Script_ir_annot.field_annot_opt_to_entrypoint_strict ~loc entrypoint >>?= fun entrypoint -> let instr = @@ -4806,8 +4802,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, (I_SELF as prim), [], annot), stack) -> Lwt.return - ( parse_entrypoint_annot loc annot ~default:default_self_annot - >>? fun entrypoint -> + ( parse_entrypoint_annot loc annot >>? fun entrypoint -> (match entrypoint with | None -> Ok Entrypoint.default | Some (Field_annot annot) -> Entrypoint.of_annot_lax annot) -- GitLab From bc4df7feb55e258bc3bc388aba37c941a3db0709 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:23:36 +0100 Subject: [PATCH 12/35] Proto/Michelson: simplify parse_var_type_annot First returned value was always ignored --- .../lib_protocol/script_ir_annot.ml | 8 +++--- .../lib_protocol/script_ir_annot.mli | 4 +-- .../lib_protocol/script_ir_translator.ml | 26 +++++++++---------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index a4defd23ecc7..4616313cd365 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -440,11 +440,9 @@ let parse_entrypoint_annot : get_one_annot loc vars >|? fun (_v : var_annot option) -> f let parse_var_type_annot : - Script.location -> - string list -> - (var_annot option * type_annot option) tzresult = + Script.location -> string list -> type_annot option tzresult = fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc fields >>? fun () -> - get_one_annot loc vars >>? fun v -> - get_one_annot loc types >|? fun t -> (v, t) + get_one_annot loc vars >>? fun (_v : var_annot option) -> + get_one_annot loc types diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 90e76323bdd3..9371793cbada 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -213,6 +213,4 @@ val parse_entrypoint_annot : Script.location -> string list -> field_annot option tzresult val parse_var_type_annot : - Script.location -> - string list -> - (var_annot option * type_annot option) tzresult + Script.location -> string list -> type_annot option tzresult diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 4dbc3a2bfb0e..47817444702a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3168,26 +3168,26 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let const = {apply = (fun kinfo k -> IConst (kinfo, v, k))} in typed ctxt loc const (Item_t (t, stack)) | (Prim (loc, I_UNIT, [], annot), stack) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let const = {apply = (fun kinfo k -> IConst (kinfo, (), k))} in typed ctxt loc const (Item_t (unit_t ~annot:ty_name, stack)) (* options *) | (Prim (loc, I_SOME, [], annot), Item_t (t, rest)) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let cons_some = {apply = (fun kinfo k -> ICons_some (kinfo, k))} in option_t loc t ~annot:ty_name >>?= fun ty -> typed ctxt loc cons_some (Item_t (ty, rest)) | (Prim (loc, I_NONE, [t], annot), stack) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let cons_none = {apply = (fun kinfo k -> ICons_none (kinfo, k))} in option_t loc t ~annot:ty_name >>?= fun ty -> let stack_ty = Item_t (ty, stack) in typed ctxt loc cons_none stack_ty | (Prim (loc, I_MAP, [body], annot), Item_t (Option_t (t, _), rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_type_annot loc annot >>?= fun (_ret_annot, opt_ty_name) -> + parse_var_type_annot loc annot >>?= fun opt_ty_name -> non_terminal_recursion ?type_logger ~legacy @@ -3451,7 +3451,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_NIL, [t], annot), stack) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let nil = {apply = (fun kinfo k -> INil (kinfo, k))} in list_t loc t ~annot:ty_name >>?= fun ty -> typed ctxt loc nil (Item_t (ty, stack)) @@ -3493,13 +3493,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in Lwt.return @@ merge_branches ~legacy ctxt loc btr bfr {branch} | (Prim (loc, I_SIZE, [], annot), Item_t (List_t _, rest)) -> - parse_var_type_annot loc annot >>?= fun (_annot, tname) -> + parse_var_type_annot loc annot >>?= fun tname -> let list_size = {apply = (fun kinfo k -> IList_size (kinfo, k))} in typed ctxt loc list_size (Item_t (nat_t ~annot:tname, rest)) | (Prim (loc, I_MAP, [body], annot), Item_t (List_t (elt, _), starting_rest)) -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_type_annot loc annot >>?= fun (_ret_annot, list_ty_name) -> + parse_var_type_annot loc annot >>?= fun list_ty_name -> non_terminal_recursion ?type_logger tc_context @@ -3574,7 +3574,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_EMPTY_SET, [t], annot), rest) -> parse_comparable_ty ~stack_depth:(stack_depth + 1) ctxt t >>?= fun (Ex_comparable_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (_annot, tname) -> + parse_var_type_annot loc annot >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEmpty_set (kinfo, t, k))} in set_t loc t ~annot:tname >>?= fun ty -> typed ctxt loc instr (Item_t (ty, rest)) @@ -3618,7 +3618,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ) | (Prim (loc, I_MEM, [], annot), Item_t (v, Item_t (Set_t (elt, _), rest))) -> let elt = ty_of_comparable_ty elt in - parse_var_type_annot loc annot >>?= fun (_annot, tname) -> + parse_var_type_annot loc annot >>?= fun tname -> check_item_ty ctxt elt v loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> let instr = {apply = (fun kinfo k -> ISet_mem (kinfo, k))} in (typed ctxt loc instr (Item_t (bool_t ~annot:tname, rest)) @@ -3641,7 +3641,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>?= fun (Ex_comparable_ty tk, ctxt) -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tv >>?= fun (Ex_ty tv, ctxt) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let instr = {apply = (fun kinfo k -> IEmpty_map (kinfo, tk, k))} in map_t loc tk tv ~annot:ty_name >>?= fun ty -> typed ctxt loc instr (Item_t (ty, stack)) @@ -3649,7 +3649,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (Map_t (ck, elt, _), starting_rest) ) -> ( let k = ty_of_comparable_ty ck in check_kind [Seq_kind] body >>?= fun () -> - parse_var_type_annot loc annot >>?= fun (_ret_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let k_name = field_to_var_annot default_key_annot in let e_name = field_to_var_annot default_elt_annot in pair_t loc (k, None, k_name) (elt, None, e_name) ~annot:None @@ -3787,7 +3787,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : >>?= fun (Ex_comparable_ty tk, ctxt) -> parse_big_map_value_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy tv >>?= fun (Ex_ty tv, ctxt) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> let instr = {apply = (fun kinfo k -> IEmpty_big_map (kinfo, tk, tv, k))} in @@ -4596,7 +4596,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_UNPACK, [ty], annot), Item_t (Bytes_t _, rest)) -> parse_packable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ty >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot >>?= fun (_annot, ty_name) -> + parse_var_type_annot loc annot >>?= fun ty_name -> option_t loc t ~annot:ty_name >>?= fun res_ty -> let instr = {apply = (fun kinfo k -> IUnpack (kinfo, t, k))} in let stack = Item_t (res_ty, rest) in -- GitLab From be5445ca0eee433a48e4d85431ea1bcecabb62d6 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:29:59 +0100 Subject: [PATCH 13/35] Proto/Michelson: simplify gen_access_annot 1/2 `default` argument was never provided --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 17 ++++++----------- .../lib_protocol/script_ir_annot.mli | 5 +---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 4616313cd365..16fe23d7e078 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -140,17 +140,12 @@ let field_annot_opt_eq_entrypoint_lax field_annot_opt entrypoint = let default_annot ~default = function None -> default | annot -> annot let gen_access_annot : - var_annot option -> - ?default:field_annot option -> - field_annot option -> - var_annot option = - fun value_annot ?(default = None) field_annot -> - match (value_annot, field_annot, default) with - | (None, None, _) | (Some _, None, None) -> None - | (None, Some (Field_annot f), _) -> Some (Var_annot f) - | (Some (Var_annot v), None, Some (Field_annot f)) -> - Some (Var_annot (Non_empty_string.cat2 v ~sep:"." f)) - | (Some (Var_annot v), Some (Field_annot f), _) -> + var_annot option -> field_annot option -> var_annot option = + fun value_annot field_annot -> + match (value_annot, field_annot) with + | (None, None) | (Some _, None) -> None + | (None, Some (Field_annot f)) -> Some (Var_annot f) + | (Some (Var_annot v), Some (Field_annot f)) -> Some (Var_annot (Non_empty_string.cat2 v ~sep:"." f)) let merge_type_annot : diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 9371793cbada..bd9b1a90929f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -126,10 +126,7 @@ val default_annot : default:'a option -> 'a option -> 'a option (** Generate annotation for field accesses, of the form [var.field1.field2] *) val gen_access_annot : - var_annot option -> - ?default:field_annot option -> - field_annot option -> - var_annot option + var_annot option -> field_annot option -> var_annot option (** Merge type annotations. @return an error {!Inconsistent_type_annotations} if they are both present -- GitLab From ca1c94ab1c074e684d84eefa0acdfecd8c6b3417 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 11:29:59 +0100 Subject: [PATCH 14/35] Proto/Michelson: simplify gen_access_annot 2/2 First parameter was always `None` --- .../lib_protocol/script_ir_annot.ml | 13 +++++------ .../lib_protocol/script_ir_annot.mli | 3 +-- .../lib_protocol/script_ir_translator.ml | 22 +++++-------------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 16fe23d7e078..a4273f3f69e9 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -139,14 +139,11 @@ let field_annot_opt_eq_entrypoint_lax field_annot_opt entrypoint = let default_annot ~default = function None -> default | annot -> annot -let gen_access_annot : - var_annot option -> field_annot option -> var_annot option = - fun value_annot field_annot -> - match (value_annot, field_annot) with - | (None, None) | (Some _, None) -> None - | (None, Some (Field_annot f)) -> Some (Var_annot f) - | (Some (Var_annot v), Some (Field_annot f)) -> - Some (Var_annot (Non_empty_string.cat2 v ~sep:"." f)) +let gen_access_annot : field_annot option -> var_annot option = + fun field_annot -> + match field_annot with + | None -> None + | Some (Field_annot f) -> Some (Var_annot f) let merge_type_annot : type error_trace. diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index bd9b1a90929f..82023f15421c 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -125,8 +125,7 @@ val field_annot_opt_eq_entrypoint_lax : val default_annot : default:'a option -> 'a option -> 'a option (** Generate annotation for field accesses, of the form [var.field1.field2] *) -val gen_access_annot : - var_annot option -> field_annot option -> var_annot option +val gen_access_annot : field_annot option -> var_annot option (** Merge type annotations. @return an error {!Inconsistent_type_annotations} if they are both present diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 47817444702a..32222b2a3c09 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -4202,10 +4202,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr (Item_t (String_t tname, rest)) | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (String_t tname, rest))) ) -> - parse_var_annot - ~default:(gen_access_annot None default_slice_annot) - loc - annot + parse_var_annot ~default:(gen_access_annot default_slice_annot) loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISlice_string (kinfo, k))} in let stack = Item_t (option_string'_t tname, rest) in @@ -4232,10 +4229,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (Bytes_t tname, rest))) ) -> - parse_var_annot - ~default:(gen_access_annot None default_slice_annot) - loc - annot + parse_var_annot ~default:(gen_access_annot default_slice_annot) loc annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} in let stack = Item_t (option_bytes'_t tname, rest) in @@ -4585,10 +4579,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* allow to pack contracts for hash/signature checks *) loc t >>?= fun () -> - parse_var_annot - loc - annot - ~default:(gen_access_annot None default_pack_annot) + parse_var_annot loc annot ~default:(gen_access_annot default_pack_annot) >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IPack (kinfo, t, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in @@ -4603,10 +4594,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* protocol *) | (Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest)) -> - parse_var_annot - loc - annot - ~default:(gen_access_annot None default_addr_annot) + parse_var_annot loc annot ~default:(gen_access_annot default_addr_annot) >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAddress (kinfo, k))} in let stack = Item_t (address_t ~annot:None, rest) in @@ -4634,7 +4622,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_var_annot loc annot - ~default:(gen_access_annot None default_contract_annot) + ~default:(gen_access_annot default_contract_annot) >>?= fun _annot -> let instr = { -- GitLab From a4c015009cbd15e29764621155cb2d409cc14790 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Wed, 5 Jan 2022 21:58:42 +0100 Subject: [PATCH 15/35] Proto/Michelson: gen_access_annot is field_to_var_annot --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 6 ------ src/proto_alpha/lib_protocol/script_ir_annot.mli | 3 --- .../lib_protocol/script_ir_translator.ml | 16 +++++++++++----- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index a4273f3f69e9..17c5609091cd 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -139,12 +139,6 @@ let field_annot_opt_eq_entrypoint_lax field_annot_opt entrypoint = let default_annot ~default = function None -> default | annot -> annot -let gen_access_annot : field_annot option -> var_annot option = - fun field_annot -> - match field_annot with - | None -> None - | Some (Field_annot f) -> Some (Var_annot f) - let merge_type_annot : type error_trace. legacy:bool -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 82023f15421c..e0e0d021be43 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -124,9 +124,6 @@ val field_annot_opt_eq_entrypoint_lax : (** Replace an annotation by its default value if it is [None] *) val default_annot : default:'a option -> 'a option -> 'a option -(** Generate annotation for field accesses, of the form [var.field1.field2] *) -val gen_access_annot : field_annot option -> var_annot option - (** Merge type annotations. @return an error {!Inconsistent_type_annotations} if they are both present and different, unless [legacy] *) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 32222b2a3c09..abf27c0a9fb0 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -4202,7 +4202,10 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr (Item_t (String_t tname, rest)) | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (String_t tname, rest))) ) -> - parse_var_annot ~default:(gen_access_annot default_slice_annot) loc annot + parse_var_annot + ~default:(field_to_var_annot default_slice_annot) + loc + annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISlice_string (kinfo, k))} in let stack = Item_t (option_string'_t tname, rest) in @@ -4229,7 +4232,10 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (Bytes_t tname, rest))) ) -> - parse_var_annot ~default:(gen_access_annot default_slice_annot) loc annot + parse_var_annot + ~default:(field_to_var_annot default_slice_annot) + loc + annot >>?= fun _annot -> let instr = {apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} in let stack = Item_t (option_bytes'_t tname, rest) in @@ -4579,7 +4585,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* allow to pack contracts for hash/signature checks *) loc t >>?= fun () -> - parse_var_annot loc annot ~default:(gen_access_annot default_pack_annot) + parse_var_annot loc annot ~default:(field_to_var_annot default_pack_annot) >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IPack (kinfo, t, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in @@ -4594,7 +4600,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* protocol *) | (Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest)) -> - parse_var_annot loc annot ~default:(gen_access_annot default_addr_annot) + parse_var_annot loc annot ~default:(field_to_var_annot default_addr_annot) >>?= fun _annot -> let instr = {apply = (fun kinfo k -> IAddress (kinfo, k))} in let stack = Item_t (address_t ~annot:None, rest) in @@ -4622,7 +4628,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_var_annot loc annot - ~default:(gen_access_annot default_contract_annot) + ~default:(field_to_var_annot default_contract_annot) >>?= fun _annot -> let instr = { -- GitLab From 38befe3eaa7945bee95a0394d860c8615ad8d20d Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 10:44:39 +0100 Subject: [PATCH 16/35] Proto/Michelson: simplify parse_var_annot 1/2 Returned value was always ignored --- .../lib_protocol/script_ir_annot.ml | 12 +- .../lib_protocol/script_ir_annot.mli | 5 +- .../lib_protocol/script_ir_translator.ml | 253 +++++++++--------- 3 files changed, 131 insertions(+), 139 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 17c5609091cd..ef1c773a415a 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -358,17 +358,13 @@ let check_correct_field : ("%" ^ (s1 :> string), "%" ^ (s2 :> string))) let parse_var_annot : - Script.location -> - ?default:var_annot option -> - string list -> - var_annot option tzresult = - fun loc ?default annot -> + Script.location -> ?default:var_annot option -> string list -> unit tzresult + = + fun loc ?default:_ annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> error_unexpected_annot loc fields >>? fun () -> - get_one_annot loc vars >|? function - | Some _ as a -> a - | None -> ( match default with Some a -> a | None -> None) + get_one_annot loc vars >|? fun (_a : var_annot option) -> () let split_if_special ~loc f = match f with diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index e0e0d021be43..afd6b0012b00 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -177,10 +177,7 @@ val check_correct_field : (** Parse a variable annotation, replaced by a default value if [None]. *) val parse_var_annot : - Script.location -> - ?default:var_annot option -> - string list -> - var_annot option tzresult + Script.location -> ?default:var_annot option -> string list -> unit tzresult val is_allowed_char : char -> bool diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index abf27c0a9fb0..9a51cc3eaaa2 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3050,7 +3050,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : However, DROP is equivalent to DROP 1 so hinting at an arity of 1 makes sense. *) fail (Invalid_arity (loc, I_DROP, 1, List.length l)) | (Prim (loc, I_DUP, [], annot), Item_t (v, rest)) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> record_trace_eval (fun () -> let t = serialize_ty_for_error v in @@ -3060,7 +3060,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let dup = {apply = (fun kinfo k -> IDup (kinfo, k))} in typed ctxt loc dup (Item_t (v, Item_t (v, rest))) | (Prim (loc, I_DUP, [n], v_annot), stack_ty) -> - parse_var_annot loc v_annot >>?= fun _annot -> + parse_var_annot loc v_annot >>?= fun () -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a * s) dup_n_proof_argument tzresult = @@ -3153,7 +3153,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack_ty = Item_t (w, Item_t (v, rest)) in typed ctxt loc swap stack_ty | (Prim (loc, I_PUSH, [t; d], annot), stack) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> parse_packable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> parse_data @@ -3254,7 +3254,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let cons_pair = {apply = (fun kinfo k -> ICons_pair (kinfo, k))} in typed ctxt loc cons_pair stack_ty | (Prim (loc, I_PAIR, [n], annot), stack_ty) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a * s) comb_proof_argument tzresult = @@ -3308,7 +3308,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let uncomb = {apply = (fun kinfo k -> IUncomb (kinfo, n, witness, k))} in typed ctxt loc uncomb after_ty | (Prim (loc, I_GET, [n], annot), Item_t (comb_ty, rest_ty)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let rec make_proof_argument : type b. int -> b ty -> b comb_get_proof_argument tzresult = fun n ty -> @@ -3337,7 +3337,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc comb_get after_stack_ty | ( Prim (loc, I_UPDATE, [n], annot), Item_t (value_ty, Item_t (comb_ty, rest_ty)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let rec make_proof_argument : type value before. int -> @@ -3458,7 +3458,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_CONS, [], annot), Item_t (tv, Item_t (List_t (t, ty_name), rest)) ) -> check_item_ty ctxt tv t loc I_CONS 1 2 >>?= fun (Eq, t, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let cons_list = {apply = (fun kinfo k -> ICons_list (kinfo, k))} in (typed ctxt loc cons_list (Item_t (List_t (t, ty_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3627,12 +3627,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (v, Item_t (Bool_t _, Item_t (Set_t (elt, tname), rest))) ) -> check_item_ty ctxt (ty_of_comparable_ty elt) v loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_update (kinfo, k))} in (typed ctxt loc instr (Item_t (Set_t (elt, tname), rest)) : ((a, s) judgement * context) tzresult Lwt.t) | (Prim (loc, I_SIZE, [], annot), Item_t (Set_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_size (kinfo, k))} in typed ctxt loc instr (Item_t (nat_t ~annot:None, rest)) (* maps *) @@ -3739,7 +3739,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_mem (kinfo, k))} in (typed ctxt loc instr (Item_t (bool_t ~annot:None, rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3747,7 +3747,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (vk, Item_t (Map_t (ck, elt, _), rest)) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_get (kinfo, k))} in option_t loc elt ~annot:None >>?= fun ty : ((a, s) judgement * context) tzresult Lwt.t -> @@ -3759,7 +3759,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_update (kinfo, k))} in (typed ctxt loc instr (Item_t (Map_t (ck, v, map_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3771,14 +3771,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_get_and_update (kinfo, k))} in let stack = Item_t (Option_t (vv, vname), Item_t (Map_t (ck, v, map_name), rest)) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | (Prim (loc, I_SIZE, [], annot), Item_t (Map_t (_, _, _), rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_size (kinfo, k))} in typed ctxt loc instr (Item_t (nat_t ~annot:None, rest)) (* big_map *) @@ -3798,7 +3798,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (set_key, Item_t (Big_map_t (map_key, _, _), rest)) ) -> let k = ty_of_comparable_ty map_key in check_item_ty ctxt set_key k loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_mem (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -3806,7 +3806,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (vk, Item_t (Big_map_t (ck, elt, _), rest)) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_get (kinfo, k))} in option_t loc elt ~annot:None >>?= fun ty -> let stack = Item_t (ty, rest) in @@ -3821,7 +3821,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_item_ty ctxt set_key k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt set_value map_value loc I_UPDATE 2 3 >>?= fun (Eq, map_value, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_update (kinfo, k))} in let stack = Item_t (Big_map_t (map_key, map_value, map_name), rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -3834,7 +3834,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_get_and_update (kinfo, k))} in @@ -3846,7 +3846,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (loc, I_SAPLING_EMPTY_STATE, [memo_size], annot), rest) -> parse_memo_size memo_size >>?= fun memo_size -> parse_var_annot loc annot ~default:default_sapling_state_annot - >>?= fun _annot -> + >>?= fun () -> let instr = {apply = (fun kinfo k -> ISapling_empty_state (kinfo, memo_size, k))} in @@ -3970,7 +3970,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_LOOP_LEFT, [body], annot), (Item_t (Union_t ((tl, _l_field), (tr, _), _), rest) as stack) ) -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> non_terminal_recursion ?type_logger tc_context @@ -4024,7 +4024,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ret >>?= fun (Ex_ty ret, ctxt) -> check_kind [Seq_kind] code >>?= fun () -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> parse_returning (Tc_context.add_lambda tc_context) ?type_logger @@ -4042,7 +4042,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_EXEC, [], annot), Item_t (arg, Item_t (Lambda_t (param, ret, _), rest)) ) -> check_item_ty ctxt arg param loc I_EXEC 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IExec (kinfo, k))} in let stack = Item_t (ret, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -4059,7 +4059,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_packable ~legacy:false loc capture_ty >>?= fun () -> check_item_ty ctxt capture capture_ty loc I_APPLY 1 2 >>?= fun (Eq, capture_ty, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IApply (kinfo, capture_ty, k))} in lambda_t loc arg_ty ret ~annot:lam_annot (* This cannot fail because the type [lambda 'arg 'ret] is always smaller than @@ -4157,21 +4157,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* timestamp operations *) | ( Prim (loc, I_ADD, [], annot), Item_t (Timestamp_t tname, Item_t (Int_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_timestamp_to_seconds (kinfo, k))} in typed ctxt loc instr (Item_t (Timestamp_t tname, rest)) | ( Prim (loc, I_ADD, [], annot), Item_t (Int_t _, Item_t (Timestamp_t tname, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_seconds_to_timestamp (kinfo, k))} in typed ctxt loc instr (Item_t (Timestamp_t tname, rest)) | ( Prim (loc, I_SUB, [], annot), Item_t (Timestamp_t tname, Item_t (Int_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISub_timestamp_seconds (kinfo, k))} in @@ -4181,7 +4181,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t ( Timestamp_t {annot = tn1; size = _}, Item_t (Timestamp_t {annot = tn2; size = _}, rest) ) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_annot ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IDiff_timestamps (kinfo, k))} in @@ -4190,14 +4190,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* string operations *) | ( Prim (loc, I_CONCAT, [], annot), Item_t (String_t tn1, Item_t (String_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IConcat_string_pair (kinfo, k))} in typed ctxt loc instr (Item_t (String_t tname, rest)) | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (String_t tname, _), rest)) -> - parse_var_annot ~default:None loc annot >>?= fun _annot -> + parse_var_annot ~default:None loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IConcat_string (kinfo, k))} in typed ctxt loc instr (Item_t (String_t tname, rest)) | ( Prim (loc, I_SLICE, [], annot), @@ -4206,19 +4206,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~default:(field_to_var_annot default_slice_annot) loc annot - >>?= fun _annot -> + >>?= fun () -> let instr = {apply = (fun kinfo k -> ISlice_string (kinfo, k))} in let stack = Item_t (option_string'_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SIZE, [], annot), Item_t (String_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IString_size (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack (* bytes operations *) | ( Prim (loc, I_CONCAT, [], annot), Item_t (Bytes_t tn1, Item_t (Bytes_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IConcat_bytes_pair (kinfo, k))} in @@ -4226,7 +4226,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (Bytes_t tname, _), rest)) -> - parse_var_annot ~default:None loc annot >>?= fun _annot -> + parse_var_annot ~default:None loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IConcat_bytes (kinfo, k))} in let stack = Item_t (Bytes_t tname, rest) in typed ctxt loc instr stack @@ -4236,19 +4236,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~default:(field_to_var_annot default_slice_annot) loc annot - >>?= fun _annot -> + >>?= fun () -> let instr = {apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} in let stack = Item_t (option_bytes'_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SIZE, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBytes_size (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack (* currency operations *) | ( Prim (loc, I_ADD, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_tez (kinfo, k))} in @@ -4257,7 +4257,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_SUB, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> if legacy then - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_tez_legacy (kinfo, k))} in @@ -4266,7 +4266,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : else fail (Deprecated_instruction I_SUB) | ( Prim (loc, I_SUB_MUTEZ, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_tez (kinfo, k))} in @@ -4275,21 +4275,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_MUL, [], annot), Item_t (Mutez_t tname, Item_t (Nat_t _, rest)) ) -> (* no type name check *) - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_teznat (kinfo, k))} in let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Mutez_t tname, rest)) ) -> (* no type name check *) - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_nattez (kinfo, k))} in let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack (* boolean operations *) | (Prim (loc, I_OR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IOr (kinfo, k))} in @@ -4297,7 +4297,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_AND, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAnd (kinfo, k))} in @@ -4305,46 +4305,46 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_XOR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IXor (kinfo, k))} in let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NOT, [], annot), Item_t (Bool_t tname, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INot (kinfo, k))} in let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack (* integer operations *) | (Prim (loc, I_ABS, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAbs_int (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> let instr = {apply = (fun kinfo k -> IIs_nat (kinfo, k))} in let stack = Item_t (option_nat_t, rest) in typed ctxt loc instr stack | (Prim (loc, I_INT, [], annot), Item_t (Nat_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IInt_nat (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Int_t tname, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Nat_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in @@ -4352,19 +4352,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_nat (kinfo, k))} in @@ -4372,7 +4372,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in @@ -4380,19 +4380,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun _tname -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in @@ -4400,7 +4400,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IMul_int (kinfo, k))} in @@ -4408,19 +4408,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_nat (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IMul_nat (kinfo, k))} in @@ -4428,13 +4428,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_EDIV, [], annot), Item_t (Mutez_t tname, Item_t (Nat_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEdiv_teznat (kinfo, k))} in let stack = Item_t (option_pair_mutez'_mutez'_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_EDIV, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_tez (kinfo, k))} in @@ -4442,7 +4442,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_int (kinfo, k))} in @@ -4450,19 +4450,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEdiv_int (kinfo, k))} in let stack = Item_t (option_pair_int'_nat_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Nat_t tname, Item_t (Int_t _, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEdiv_nat (kinfo, k))} in let stack = Item_t (option_pair_int_nat'_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_nat (kinfo, k))} in @@ -4470,7 +4470,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_LSL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ILsl_nat (kinfo, k))} in @@ -4478,7 +4478,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_LSR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ILsr_nat (kinfo, k))} in @@ -4486,7 +4486,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_OR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IOr_nat (kinfo, k))} in @@ -4494,7 +4494,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_AND, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAnd_nat (kinfo, k))} in @@ -4502,31 +4502,31 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_AND, [], annot), Item_t (Int_t _, Item_t (Nat_t tname, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAnd_int_nat (kinfo, k))} in let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_XOR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IXor_nat (kinfo, k))} in let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NOT, [], annot), Item_t (Int_t tname, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INot_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NOT, [], annot), Item_t (Nat_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INot_int (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack (* comparison *) | (Prim (loc, I_COMPARE, [], annot), Item_t (t1, Item_t (t2, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> check_item_ty ctxt t1 t2 loc I_COMPARE 1 2 >>?= fun (Eq, t, ctxt) -> comparable_ty_of_ty ctxt loc t >>?= fun (key, ctxt) -> let instr = {apply = (fun kinfo k -> ICompare (kinfo, key, k))} in @@ -4534,38 +4534,38 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) (* comparators *) | (Prim (loc, I_EQ, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEq (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEQ, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeq (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_LT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILt (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_GT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IGt (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_LE, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILe (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_GE, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IGe (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack (* annotations *) | (Prim (loc, I_CAST, [cast_t], annot), Item_t (t, stack)) -> - parse_var_annot loc annot ~default:None >>?= fun _annot -> + parse_var_annot loc annot ~default:None >>?= fun () -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy cast_t >>?= fun (Ex_ty cast_t, ctxt) -> ty_eq ~legacy ctxt loc cast_t t >>?= fun (Eq, ctxt) -> @@ -4573,7 +4573,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (cast_t, stack) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | (Prim (loc, I_RENAME, [], annot), Item_t (t, stack)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> (* can erase annot *) let instr = {apply = (fun _ k -> k)} in let stack = Item_t (t, stack) in @@ -4586,7 +4586,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : t >>?= fun () -> parse_var_annot loc annot ~default:(field_to_var_annot default_pack_annot) - >>?= fun _annot -> + >>?= fun () -> let instr = {apply = (fun kinfo k -> IPack (kinfo, t, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack @@ -4601,7 +4601,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* protocol *) | (Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest)) -> parse_var_annot loc annot ~default:(field_to_var_annot default_addr_annot) - >>?= fun _annot -> + >>?= fun () -> let instr = {apply = (fun kinfo k -> IAddress (kinfo, k))} in let stack = Item_t (address_t ~annot:None, rest) in typed ctxt loc instr stack @@ -4629,7 +4629,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : loc annot ~default:(field_to_var_annot default_contract_annot) - >>?= fun _annot -> + >>?= fun () -> let instr = { apply = @@ -4643,21 +4643,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (p, Item_t (Mutez_t _, Item_t (Contract_t (cp, _), rest))) ) -> Tc_context.check_not_in_view loc ~legacy tc_context prim >>?= fun () -> check_item_ty ctxt p cp loc prim 1 4 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ITransfer_tokens (kinfo, k))} in let stack = Item_t (operation_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, (I_SET_DELEGATE as prim), [], annot), Item_t (Option_t (Key_hash_t _, _), rest) ) -> Tc_context.check_not_in_view loc ~legacy tc_context prim >>?= fun () -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_delegate (kinfo, k))} in let stack = Item_t (operation_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (_, I_CREATE_ACCOUNT, _, _), _) -> fail (Deprecated_instruction I_CREATE_ACCOUNT) | (Prim (loc, I_IMPLICIT_ACCOUNT, [], annot), Item_t (Key_hash_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IImplicit_account (kinfo, k))} in let stack = Item_t (contract_unit_t, rest) in typed ctxt loc instr stack @@ -4747,50 +4747,49 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in typed ctxt loc instr stack | (Prim (loc, I_NOW, [], annot), stack) -> - parse_var_annot loc annot ~default:default_now_annot >>?= fun _annot -> + parse_var_annot loc annot ~default:default_now_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INow (kinfo, k))} in let stack = Item_t (timestamp_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_AMOUNT, [], annot), stack) -> - parse_var_annot loc annot ~default:default_amount_annot >>?= fun _annot -> + parse_var_annot loc annot ~default:default_amount_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAmount (kinfo, k))} in let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_CHAIN_ID, [], annot), stack) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IChainId (kinfo, k))} in let stack = Item_t (chain_id_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_BALANCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_balance_annot - >>?= fun _annot -> + parse_var_annot loc annot ~default:default_balance_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBalance (kinfo, k))} in let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_LEVEL, [], annot), stack) -> - parse_var_annot loc annot ~default:default_level_annot >>?= fun _annot -> + parse_var_annot loc annot ~default:default_level_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILevel (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_VOTING_POWER, [], annot), Item_t (Key_hash_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IVoting_power (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_TOTAL_VOTING_POWER, [], annot), stack) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ITotal_voting_power (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (_, I_STEPS_TO_QUOTA, _, _), _) -> fail (Deprecated_instruction I_STEPS_TO_QUOTA) | (Prim (loc, I_SOURCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_source_annot >>?= fun _annot -> + parse_var_annot loc annot ~default:default_source_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISource (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_SENDER, [], annot), stack) -> - parse_var_annot loc annot ~default:default_sender_annot >>?= fun _annot -> + parse_var_annot loc annot ~default:default_sender_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISender (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack @@ -4830,50 +4829,50 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (res_ty, stack) in typed_no_lwt ctxt loc instr stack ) | (Prim (loc, I_SELF_ADDRESS, [], annot), stack) -> - parse_var_annot loc annot ~default:default_self_annot >>?= fun _annot -> + parse_var_annot loc annot ~default:default_self_annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISelf_address (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack (* cryptography *) | (Prim (loc, I_HASH_KEY, [], annot), Item_t (Key_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IHash_key (kinfo, k))} in let stack = Item_t (key_hash_t ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_CHECK_SIGNATURE, [], annot), Item_t (Key_t _, Item_t (Signature_t _, Item_t (Bytes_t _, rest))) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ICheck_signature (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_BLAKE2B, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBlake2b (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_SHA256, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISha256 (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_SHA512, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISha512 (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_KECCAK, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IKeccak (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_SHA3, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISha3 (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_g1_t tn1, Item_t (Bls12_381_g1_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_g1 (kinfo, k))} in @@ -4881,7 +4880,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_g2_t tn1, Item_t (Bls12_381_g2_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_g2 (kinfo, k))} in @@ -4889,7 +4888,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_fr_t tn1, Item_t (Bls12_381_fr_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_fr (kinfo, k))} in @@ -4897,63 +4896,63 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_g1_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_g1 (kinfo, k))} in let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_g2_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_g2 (kinfo, k))} in let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} in let stack = Item_t (bls12_381_fr_t ~annot:tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Int_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} in let stack = Item_t (bls12_381_fr_t ~annot:tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Int_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Nat_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_INT, [], annot), Item_t (Bls12_381_fr_t _, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IInt_bls12_381_fr (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g1_t tname, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_g1 (kinfo, k))} in let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g2_t tname, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_g2 (kinfo, k))} in let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_fr_t tname, rest)) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack @@ -4962,7 +4961,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( List_t (Pair_t ((Bls12_381_g1_t _, _, _), (Bls12_381_g2_t _, _, _), _), _), rest ) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IPairing_check_bls12_381 (kinfo, k))} in @@ -4970,7 +4969,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* Tickets *) | (Prim (loc, I_TICKET, [], annot), Item_t (t, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> comparable_ty_of_ty ctxt loc t >>?= fun (ty, ctxt) -> ticket_t loc ty ~annot:None >>?= fun res_ty -> let instr = {apply = (fun kinfo k -> ITicket (kinfo, k))} in @@ -4978,7 +4977,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_READ_TICKET, [], annot), (Item_t (Ticket_t (t, _), _) as full_stack) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let () = check_dupable_comparable_ty t in opened_ticket_type loc t >>?= fun opened_ticket_ty -> let result = ty_of_comparable_ty opened_ticket_ty in @@ -4990,7 +4989,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( (Ticket_t (t, _) as ticket_t), Item_t (Pair_t ((Nat_t _, fa_a, a_a), (Nat_t _, fa_b, a_b), _), rest) ) ) -> - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> let () = check_dupable_comparable_ty t in pair_t loc (ticket_t, fa_a, a_a) (ticket_t, fa_b, a_b) ~annot:None >>?= fun pair_tickets_ty -> @@ -5002,7 +5001,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t ( Pair_t (((Ticket_t _ as ty_a), _, _), ((Ticket_t _ as ty_b), _, _), _), rest ) ) -> ( - parse_var_annot loc annot >>?= fun _annot -> + parse_var_annot loc annot >>?= fun () -> Gas_monad.run ctxt @@ merge_types ~legacy ~error_details:Informative loc ty_a ty_b >>?= fun (eq_ty, ctxt) -> -- GitLab From 0860688206e745ba60fc70620c61eae7787f9ea7 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 10:52:28 +0100 Subject: [PATCH 17/35] Proto/Michelson: simplify parse_var_annot 2/2 Default parameter was unused --- .../lib_protocol/script_ir_annot.ml | 6 +- .../lib_protocol/script_ir_annot.mli | 5 +- .../lib_protocol/script_ir_translator.ml | 61 +++++++------------ 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index ef1c773a415a..c578e8e4b28c 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -357,10 +357,8 @@ let check_correct_field : (Inconsistent_field_annotations ("%" ^ (s1 :> string), "%" ^ (s2 :> string))) -let parse_var_annot : - Script.location -> ?default:var_annot option -> string list -> unit tzresult - = - fun loc ?default:_ annot -> +let parse_var_annot : Script.location -> string list -> unit tzresult = + fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> error_unexpected_annot loc fields >>? fun () -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index afd6b0012b00..4a0ed8157756 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -175,9 +175,8 @@ val check_correct_field : (** Instruction annotations parsing *) -(** Parse a variable annotation, replaced by a default value if [None]. *) -val parse_var_annot : - Script.location -> ?default:var_annot option -> string list -> unit tzresult +(** Parse a variable annotation. *) +val parse_var_annot : Script.location -> string list -> unit tzresult val is_allowed_char : char -> bool diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 9a51cc3eaaa2..d98219ada1ab 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3050,7 +3050,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : However, DROP is equivalent to DROP 1 so hinting at an arity of 1 makes sense. *) fail (Invalid_arity (loc, I_DROP, 1, List.length l)) | (Prim (loc, I_DUP, [], annot), Item_t (v, rest)) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> record_trace_eval (fun () -> let t = serialize_ty_for_error v in @@ -3627,7 +3627,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (v, Item_t (Bool_t _, Item_t (Set_t (elt, tname), rest))) ) -> check_item_ty ctxt (ty_of_comparable_ty elt) v loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_update (kinfo, k))} in (typed ctxt loc instr (Item_t (Set_t (elt, tname), rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3759,7 +3759,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_update (kinfo, k))} in (typed ctxt loc instr (Item_t (Map_t (ck, v, map_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3771,7 +3771,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_get_and_update (kinfo, k))} in let stack = Item_t (Option_t (vv, vname), Item_t (Map_t (ck, v, map_name), rest)) @@ -3821,7 +3821,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_item_ty ctxt set_key k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt set_value map_value loc I_UPDATE 2 3 >>?= fun (Eq, map_value, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_update (kinfo, k))} in let stack = Item_t (Big_map_t (map_key, map_value, map_name), rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -3834,7 +3834,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_get_and_update (kinfo, k))} in @@ -3845,8 +3845,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* Sapling *) | (Prim (loc, I_SAPLING_EMPTY_STATE, [memo_size], annot), rest) -> parse_memo_size memo_size >>?= fun memo_size -> - parse_var_annot loc annot ~default:default_sapling_state_annot - >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISapling_empty_state (kinfo, memo_size, k))} in @@ -4197,16 +4196,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr (Item_t (String_t tname, rest)) | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (String_t tname, _), rest)) -> - parse_var_annot ~default:None loc annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IConcat_string (kinfo, k))} in typed ctxt loc instr (Item_t (String_t tname, rest)) | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (String_t tname, rest))) ) -> - parse_var_annot - ~default:(field_to_var_annot default_slice_annot) - loc - annot - >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISlice_string (kinfo, k))} in let stack = Item_t (option_string'_t tname, rest) in typed ctxt loc instr stack @@ -4226,17 +4221,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (Bytes_t tname, _), rest)) -> - parse_var_annot ~default:None loc annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IConcat_bytes (kinfo, k))} in let stack = Item_t (Bytes_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (Bytes_t tname, rest))) ) -> - parse_var_annot - ~default:(field_to_var_annot default_slice_annot) - loc - annot - >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} in let stack = Item_t (option_bytes'_t tname, rest) in typed ctxt loc instr stack @@ -4323,7 +4314,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IIs_nat (kinfo, k))} in let stack = Item_t (option_nat_t, rest) in typed ctxt loc instr stack @@ -4565,7 +4556,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* annotations *) | (Prim (loc, I_CAST, [cast_t], annot), Item_t (t, stack)) -> - parse_var_annot loc annot ~default:None >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy cast_t >>?= fun (Ex_ty cast_t, ctxt) -> ty_eq ~legacy ctxt loc cast_t t >>?= fun (Eq, ctxt) -> @@ -4585,8 +4576,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* allow to pack contracts for hash/signature checks *) loc t >>?= fun () -> - parse_var_annot loc annot ~default:(field_to_var_annot default_pack_annot) - >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IPack (kinfo, t, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack @@ -4600,8 +4590,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* protocol *) | (Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest)) -> - parse_var_annot loc annot ~default:(field_to_var_annot default_addr_annot) - >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAddress (kinfo, k))} in let stack = Item_t (address_t ~annot:None, rest) in typed ctxt loc instr stack @@ -4625,11 +4614,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_view_output_ty ctxt ~stack_depth:0 ~legacy output_ty >>?= fun (Ex_ty output_ty, ctxt) -> option_t output_ty_loc output_ty ~annot:None >>?= fun res_ty -> - parse_var_annot - loc - annot - ~default:(field_to_var_annot default_contract_annot) - >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = { apply = @@ -4747,12 +4732,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in typed ctxt loc instr stack | (Prim (loc, I_NOW, [], annot), stack) -> - parse_var_annot loc annot ~default:default_now_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INow (kinfo, k))} in let stack = Item_t (timestamp_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_AMOUNT, [], annot), stack) -> - parse_var_annot loc annot ~default:default_amount_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAmount (kinfo, k))} in let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack @@ -4762,12 +4747,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (chain_id_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_BALANCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_balance_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBalance (kinfo, k))} in let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_LEVEL, [], annot), stack) -> - parse_var_annot loc annot ~default:default_level_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILevel (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack @@ -4784,12 +4769,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | (Prim (_, I_STEPS_TO_QUOTA, _, _), _) -> fail (Deprecated_instruction I_STEPS_TO_QUOTA) | (Prim (loc, I_SOURCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_source_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISource (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_SENDER, [], annot), stack) -> - parse_var_annot loc annot ~default:default_sender_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISender (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack @@ -4829,7 +4814,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (res_ty, stack) in typed_no_lwt ctxt loc instr stack ) | (Prim (loc, I_SELF_ADDRESS, [], annot), stack) -> - parse_var_annot loc annot ~default:default_self_annot >>?= fun () -> + parse_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISelf_address (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack -- GitLab From 389bb2114251f45339f9977a96e9ebbbb60f74c9 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 10:44:39 +0100 Subject: [PATCH 18/35] Proto/Michelson: simplify parse_two_var_annot Returned value was always ignored --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 8 +++----- src/proto_alpha/lib_protocol/script_ir_annot.mli | 5 +---- src/proto_alpha/lib_protocol/script_ir_translator.ml | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index c578e8e4b28c..a9f94dae01d9 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -383,14 +383,12 @@ let parse_constr_annot : split_if_special ~loc f1 >>? fun () -> split_if_special ~loc f2 >|? fun () -> (t, f1, f2) -let parse_two_var_annot : - Script.location -> - string list -> - (var_annot option * var_annot option) tzresult = +let parse_two_var_annot : Script.location -> string list -> unit tzresult = fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> - error_unexpected_annot loc fields >>? fun () -> get_two_annot loc vars + error_unexpected_annot loc fields >>? fun () -> + get_two_annot loc vars >|? fun (_a1, _a2) -> () let parse_destr_annot : Script.location -> string list -> field_annot option tzresult = diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 4a0ed8157756..05dc8351c8a8 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -185,10 +185,7 @@ val parse_constr_annot : string list -> (type_annot option * field_annot option * field_annot option) tzresult -val parse_two_var_annot : - Script.location -> - string list -> - (var_annot option * var_annot option) tzresult +val parse_two_var_annot : Script.location -> string list -> unit tzresult val parse_destr_annot : Script.location -> string list -> field_annot option tzresult diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index d98219ada1ab..739e7f1ef24d 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -4651,7 +4651,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (Option_t (Key_hash_t _, _), Item_t (Mutez_t _, Item_t (ginit, rest))) ) -> Tc_context.check_not_in_view ~legacy loc tc_context prim >>?= fun () -> - parse_two_var_annot loc annot >>?= fun (_op_annot, _addr_annot) -> + parse_two_var_annot loc annot >>?= fun () -> let canonical_code = Micheline.strip_locations code in parse_toplevel ctxt ~legacy canonical_code >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> -- GitLab From 78e068d113580812c21b910cf6add32509fb779e Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 12:53:52 +0100 Subject: [PATCH 19/35] Proto/Michelson: simplify parse_returning The variable annotation was ignored --- .../lib_protocol/script_ir_translator.ml | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 739e7f1ef24d..69711bb09ba2 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -2633,7 +2633,7 @@ let[@coq_axiom_with_reason "gadt"] rec parse_data : ~stack_depth:(stack_depth + 1) ctxt ~legacy - (ta, lambda_arg_annot) + ta tr script_instr | (Lambda_t _, expr) -> @@ -2919,18 +2919,11 @@ and[@coq_axiom_with_reason "gadt"] parse_returning : tc_context -> context -> legacy:bool -> - arg ty * var_annot option -> + arg ty -> ret ty -> Script.node -> ((arg, ret) lambda * context) tzresult Lwt.t = - fun ?type_logger - ~stack_depth - tc_context - ctxt - ~legacy - (arg, _arg_annot) - ret - script_instr -> + fun ?type_logger ~stack_depth tc_context ctxt ~legacy arg ret script_instr -> parse_instr ?type_logger tc_context @@ -4030,7 +4023,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~stack_depth:(stack_depth + 1) ctxt ~legacy - (arg, default_arg_annot) + arg ret code >>=? fun (lambda, ctxt) -> @@ -4704,7 +4697,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ~legacy ?type_logger ~stack_depth:(stack_depth + 1) - (arg_type_full, None) + arg_type_full ret_type_full code_field) >>=? fun ( (Lam @@ -5524,7 +5517,7 @@ let parse_code : ~legacy ~stack_depth:0 ?type_logger - (arg_type_full, None) + arg_type_full ret_type_full code_field) >>=? fun (code, ctxt) -> @@ -5654,7 +5647,7 @@ let typecheck_code : ~legacy ~stack_depth:0 ?type_logger - (arg_type_full, None) + arg_type_full ret_type_full code_field in -- GitLab From 13f16c1275c9fdecde9dfe4b8ce572ed4a292005 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 11 Jan 2021 10:26:53 +0100 Subject: [PATCH 20/35] Proto/Michelson: remove unused default annot names --- .../lib_protocol/script_ir_annot.ml | 44 ------------------- .../lib_protocol/script_ir_annot.mli | 44 ------------------- 2 files changed, 88 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index a9f94dae01d9..c028a7d0adcf 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -50,58 +50,14 @@ let some_var_annot_of_string_exn s = let some_field_annot_of_string_exn s = Some (Field_annot (Non_empty_string.of_string_exn s)) -let default_now_annot = some_var_annot_of_string_exn "now" - -let default_amount_annot = some_var_annot_of_string_exn "amount" - -let default_balance_annot = some_var_annot_of_string_exn "balance" - -let default_level_annot = some_var_annot_of_string_exn "level" - -let default_source_annot = some_var_annot_of_string_exn "source" - -let default_sender_annot = some_var_annot_of_string_exn "sender" - -let default_self_annot = some_var_annot_of_string_exn "self" - -let default_arg_annot = some_var_annot_of_string_exn "arg" - -let lambda_arg_annot = some_var_annot_of_string_exn "@arg" - let default_param_annot = some_var_annot_of_string_exn "parameter" let default_storage_annot = some_var_annot_of_string_exn "storage" -let default_car_annot = some_field_annot_of_string_exn "car" - -let default_cdr_annot = some_field_annot_of_string_exn "cdr" - -let default_contract_annot = some_field_annot_of_string_exn "contract" - -let default_addr_annot = some_field_annot_of_string_exn "address" - -let default_pack_annot = some_field_annot_of_string_exn "packed" - -let default_unpack_annot = some_field_annot_of_string_exn "unpacked" - -let default_slice_annot = some_field_annot_of_string_exn "slice" - let default_elt_annot = some_field_annot_of_string_exn "elt" let default_key_annot = some_field_annot_of_string_exn "key" -let default_hd_annot = some_field_annot_of_string_exn "hd" - -let default_tl_annot = some_field_annot_of_string_exn "tl" - -let default_some_annot = some_field_annot_of_string_exn "some" - -let default_left_annot = some_field_annot_of_string_exn "left" - -let default_right_annot = some_field_annot_of_string_exn "right" - -let default_sapling_state_annot = some_var_annot_of_string_exn "sapling" - let default_sapling_balance_annot = some_var_annot_of_string_exn "sapling_balance" diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 05dc8351c8a8..18dc22605c1e 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -41,60 +41,16 @@ end (** Default annotations *) -val default_now_annot : var_annot option - -val default_amount_annot : var_annot option - -val default_balance_annot : var_annot option - -val default_level_annot : var_annot option - -val default_source_annot : var_annot option - -val default_sender_annot : var_annot option - -val default_self_annot : var_annot option - -val default_arg_annot : var_annot option - -val lambda_arg_annot : var_annot option - val default_param_annot : var_annot option val default_storage_annot : var_annot option -val default_sapling_state_annot : var_annot option - val default_sapling_balance_annot : var_annot option -val default_car_annot : field_annot option - -val default_cdr_annot : field_annot option - -val default_contract_annot : field_annot option - -val default_addr_annot : field_annot option - -val default_pack_annot : field_annot option - -val default_unpack_annot : field_annot option - -val default_slice_annot : field_annot option - val default_elt_annot : field_annot option val default_key_annot : field_annot option -val default_hd_annot : field_annot option - -val default_tl_annot : field_annot option - -val default_some_annot : field_annot option - -val default_left_annot : field_annot option - -val default_right_annot : field_annot option - (** Unparse annotations to their string representation *) val unparse_type_annot : type_annot option -> string list -- GitLab From 9c350793cc79da89e84c2864ff6bde9634820601 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 6 Jan 2022 01:23:23 +0100 Subject: [PATCH 21/35] Tests/Python: regenerate regtest outputs --- ...ck::test_typecheck[attic--accounts.tz].out | 386 ++-- ...echeck::test_typecheck[attic--add1.tz].out | 4 +- ...k::test_typecheck[attic--add1_list.tz].out | 4 +- ...st_typecheck[attic--after_strategy.tz].out | 15 +- ...heck::test_typecheck[attic--always.tz].out | 12 +- ...heck::test_typecheck[attic--append.tz].out | 2 +- ...ck::test_typecheck[attic--at_least.tz].out | 10 +- ...eck::test_typecheck[attic--auction.tz].out | 62 +- ...::test_typecheck[attic--bad_lockup.tz].out | 66 +- ...est_typecheck[attic--big_map_union.tz].out | 2 +- ...t_typecheck[attic--cadr_annotation.tz].out | 2 +- ...heck::test_typecheck[attic--concat.tz].out | 8 +- ...test_typecheck[attic--conditionals.tz].out | 6 +- ...::test_typecheck[attic--cons_twice.tz].out | 10 +- ...ck::test_typecheck[attic--cps_fact.tz].out | 61 +- ...typecheck[attic--create_add1_lists.tz].out | 7 +- ...st_typecheck[attic--data_publisher.tz].out | 59 +- ...ck::test_typecheck[attic--dispatch.tz].out | 13 +- ...check::test_typecheck[attic--empty.tz].out | 6 +- ...:test_typecheck[attic--fail_amount.tz].out | 4 +- ...heck::test_typecheck[attic--faucet.tz].out | 16 +- ...eck::test_typecheck[attic--forward.tz].out | 261 ++- ...ypecheck::test_typecheck[attic--id.tz].out | 6 +- ...st_typecheck[attic--insertion_sort.tz].out | 50 +- ...est_typecheck[attic--int_publisher.tz].out | 40 +- ...:test_typecheck[attic--king_of_tez.tz].out | 65 +- ...echeck[attic--list_of_transactions.tz].out | 51 +- ...check::test_typecheck[attic--queue.tz].out | 8 +- ...::test_typecheck[attic--reduce_map.tz].out | 29 +- ...::test_typecheck[attic--reentrancy.tz].out | 54 +- ...k::test_typecheck[attic--reservoir.tz].out | 89 +- ...pecheck[attic--scrutable_reservoir.tz].out | 56 +- ..._typecheck[attic--spawn_identities.tz].out | 68 +- ...eck::test_typecheck[macros--assert.tz].out | 2 +- ...est_typecheck[macros--assert_cmpeq.tz].out | 6 +- ...est_typecheck[macros--assert_cmpge.tz].out | 6 +- ...est_typecheck[macros--assert_cmpgt.tz].out | 6 +- ...est_typecheck[macros--assert_cmple.tz].out | 6 +- ...est_typecheck[macros--assert_cmplt.tz].out | 6 +- ...st_typecheck[macros--assert_cmpneq.tz].out | 6 +- ...::test_typecheck[macros--assert_eq.tz].out | 6 +- ...::test_typecheck[macros--assert_ge.tz].out | 6 +- ...::test_typecheck[macros--assert_gt.tz].out | 6 +- ...::test_typecheck[macros--assert_le.tz].out | 6 +- ...::test_typecheck[macros--assert_lt.tz].out | 6 +- ...:test_typecheck[macros--assert_neq.tz].out | 6 +- ..._typecheck[macros--big_map_get_add.tz].out | 2 +- ...:test_typecheck[macros--build_list.tz].out | 36 +- ...st_typecheck[macros--carn_and_cdrn.tz].out | 24 +- ...ck::test_typecheck[macros--compare.tz].out | 51 +- ...st_typecheck[macros--compare_bytes.tz].out | 51 +- ...::test_typecheck[macros--guestbook.tz].out | 29 +- ...ypecheck[macros--macro_annotations.tz].out | 8 +- ...test_typecheck[macros--max_in_list.tz].out | 18 +- ...echeck::test_typecheck[macros--min.tz].out | 13 +- ...:test_typecheck[macros--pair_macro.tz].out | 6 +- ...st_typecheck[macros--take_my_money.tz].out | 2 +- ...est_typecheck[macros--unpair_macro.tz].out | 20 +- ...eck[mini_scenarios--authentication.tz].out | 21 +- ...ini_scenarios--big_map_entrypoints.tz].out | 68 +- ...heck[mini_scenarios--big_map_magic.tz].out | 23 +- ...check[mini_scenarios--big_map_read.tz].out | 8 +- ...heck[mini_scenarios--big_map_write.tz].out | 17 +- ...ck[mini_scenarios--create_contract.tz].out | 29 +- ..._scenarios--create_contract_simple.tz].out | 22 +- ...ck[mini_scenarios--default_account.tz].out | 2 +- ...cenarios--execution_order_appender.tz].out | 31 +- ..._scenarios--execution_order_caller.tz].out | 23 +- ..._scenarios--execution_order_storer.tz].out | 4 +- ...eck[mini_scenarios--fa12_reference.tz].out | 1012 +++++------ ...k[mini_scenarios--generic_multisig.tz].out | 244 ++- ..._typecheck[mini_scenarios--groth16.tz].out | 235 ++- ...ypecheck[mini_scenarios--hardlimit.tz].out | 8 +- ...ck[mini_scenarios--legacy_multisig.tz].out | 246 ++- ...t_typecheck[mini_scenarios--lockup.tz].out | 46 +- ...eck[mini_scenarios--lqt_fa12.mligo.tz].out | 1569 ++++++++--------- ...check[mini_scenarios--multiple_en2.tz].out | 162 +- ...rios--multiple_entrypoints_counter.tz].out | 139 +- ..._scenarios--parameterized_multisig.tz].out | 24 +- ...t_typecheck[mini_scenarios--replay.tz].out | 32 +- ..._scenarios--reveal_signed_preimage.tz].out | 36 +- ...i_scenarios--self_address_receiver.tz].out | 12 +- ...ini_scenarios--self_address_sender.tz].out | 9 +- ...scenarios--ticket_builder_fungible.tz].out | 53 +- ...arios--ticket_builder_non_fungible.tz].out | 65 +- ..._scenarios--ticket_wallet_fungible.tz].out | 223 +-- ...narios--ticket_wallet_non_fungible.tz].out | 123 +- ...pecheck[mini_scenarios--tzip4_view.tz].out | 10 +- ...est_typecheck[mini_scenarios--xcat.tz].out | 48 +- ...ypecheck[mini_scenarios--xcat_dapp.tz].out | 299 ++-- ..._typecheck[non_regression--bug_262.tz].out | 2 +- ...echeck[non_regression--pairk_annot.tz].out | 16 +- ...check::test_typecheck[opcodes--abs.tz].out | 8 +- ...check::test_typecheck[opcodes--add.tz].out | 70 +- ...ypecheck[opcodes--add_bls12_381_fr.tz].out | 2 +- ...ypecheck[opcodes--add_bls12_381_g1.tz].out | 2 +- ...ypecheck[opcodes--add_bls12_381_g2.tz].out | 2 +- ...check[opcodes--add_delta_timestamp.tz].out | 6 +- ...check[opcodes--add_timestamp_delta.tz].out | 6 +- ...k::test_typecheck[opcodes--address.tz].out | 4 +- ...eck[opcodes--amount_after_fib_view.tz].out | 28 +- ...des--amount_after_nonexistent_view.tz].out | 29 +- ...pecheck[opcodes--amount_after_view.tz].out | 31 +- ...check::test_typecheck[opcodes--and.tz].out | 14 +- ...test_typecheck[opcodes--and_binary.tz].out | 4 +- ...t_typecheck[opcodes--and_logical_1.tz].out | 8 +- ...k::test_typecheck[opcodes--balance.tz].out | 6 +- ...ck[opcodes--balance_after_fib_view.tz].out | 28 +- ...es--balance_after_nonexistent_view.tz].out | 29 +- ...echeck[opcodes--balance_after_view.tz].out | 31 +- ...typecheck[opcodes--big_map_mem_nat.tz].out | 4 +- ...echeck[opcodes--big_map_mem_string.tz].out | 4 +- ...typecheck[opcodes--big_map_to_self.tz].out | 58 +- ...check[opcodes--bls12_381_fr_to_int.tz].out | 2 +- ...eck[opcodes--bls12_381_fr_to_mutez.tz].out | 4 +- ...echeck[opcodes--bls12_381_fr_z_int.tz].out | 2 +- ...echeck[opcodes--bls12_381_fr_z_nat.tz].out | 2 +- ...echeck[opcodes--bls12_381_z_fr_int.tz].out | 4 +- ...echeck[opcodes--bls12_381_z_fr_nat.tz].out | 4 +- ...eck::test_typecheck[opcodes--bytes.tz].out | 6 +- ...check::test_typecheck[opcodes--car.tz].out | 2 +- ...check::test_typecheck[opcodes--cdr.tz].out | 2 +- ...::test_typecheck[opcodes--chain_id.tz].out | 6 +- ...typecheck[opcodes--check_signature.tz].out | 22 +- ...::test_typecheck[opcodes--comb-get.tz].out | 32 +- ...test_typecheck[opcodes--comb-set-2.tz].out | 4 +- ...::test_typecheck[opcodes--comb-set.tz].out | 4 +- ...est_typecheck[opcodes--comparisons.tz].out | 64 +- ...st_typecheck[opcodes--concat_hello.tz].out | 7 +- ...echeck[opcodes--concat_hello_bytes.tz].out | 4 +- ...est_typecheck[opcodes--concat_list.tz].out | 12 +- ...heck::test_typecheck[opcodes--cons.tz].out | 2 +- ...st_typecheck[opcodes--contains_all.tz].out | 34 +- ...::test_typecheck[opcodes--contract.tz].out | 4 +- ...typecheck[opcodes--create_contract.tz].out | 6 +- ...[opcodes--create_contract_rootname.tz].out | 6 +- ...odes--create_contract_rootname_alt.tz].out | 6 +- ...opcodes--create_contract_with_view.tz].out | 6 +- ...typecheck[opcodes--diff_timestamps.tz].out | 6 +- ...ck::test_typecheck[opcodes--dig_eq.tz].out | 74 +- ...heck::test_typecheck[opcodes--dign.tz].out | 2 +- ...check::test_typecheck[opcodes--dip.tz].out | 2 +- ...heck::test_typecheck[opcodes--dipn.tz].out | 2 +- ...eck::test_typecheck[opcodes--dropn.tz].out | 2 +- ...heck::test_typecheck[opcodes--dugn.tz].out | 2 +- ...heck::test_typecheck[opcodes--ediv.tz].out | 41 +- ...test_typecheck[opcodes--ediv_mutez.tz].out | 2 +- ...est_typecheck[opcodes--exec_concat.tz].out | 16 +- ...eck::test_typecheck[opcodes--first.tz].out | 8 +- ...pecheck[opcodes--get_big_map_value.tz].out | 4 +- ...t_typecheck[opcodes--get_map_value.tz].out | 4 +- ...[opcodes--hash_consistency_checker.tz].out | 4 +- ...::test_typecheck[opcodes--hash_key.tz].out | 2 +- ...est_typecheck[opcodes--hash_string.tz].out | 4 +- ...echeck::test_typecheck[opcodes--if.tz].out | 2 +- ...k::test_typecheck[opcodes--if_some.tz].out | 4 +- ...check::test_typecheck[opcodes--int.tz].out | 2 +- ...:test_typecheck[opcodes--iter_fail.tz].out | 8 +- ...ck::test_typecheck[opcodes--keccak.tz].out | 2 +- ...test_typecheck[opcodes--left_right.tz].out | 2 +- ...eck::test_typecheck[opcodes--level.tz].out | 6 +- ...est_typecheck[opcodes--list_concat.tz].out | 4 +- ...pecheck[opcodes--list_concat_bytes.tz].out | 4 +- ...k::test_typecheck[opcodes--list_id.tz].out | 6 +- ...est_typecheck[opcodes--list_id_map.tz].out | 4 +- ...:test_typecheck[opcodes--list_iter.tz].out | 6 +- ..._typecheck[opcodes--list_map_block.tz].out | 8 +- ...:test_typecheck[opcodes--list_size.tz].out | 2 +- ...t_typecheck[opcodes--loop_failwith.tz].out | 8 +- ...:test_typecheck[opcodes--loop_left.tz].out | 25 +- ...echeck[opcodes--loop_left_failwith.tz].out | 2 +- ...ck::test_typecheck[opcodes--map_id.tz].out | 6 +- ...::test_typecheck[opcodes--map_iter.tz].out | 40 +- ...k::test_typecheck[opcodes--map_map.tz].out | 14 +- ...echeck[opcodes--map_map_sideeffect.tz].out | 39 +- ...est_typecheck[opcodes--map_mem_nat.tz].out | 4 +- ..._typecheck[opcodes--map_mem_string.tz].out | 4 +- ...::test_typecheck[opcodes--map_size.tz].out | 2 +- ...ck[opcodes--merge_comparable_pairs.tz].out | 18 +- ...check::test_typecheck[opcodes--mul.tz].out | 2 +- ...ypecheck[opcodes--mul_bls12_381_fr.tz].out | 2 +- ...ypecheck[opcodes--mul_bls12_381_g1.tz].out | 2 +- ...ypecheck[opcodes--mul_bls12_381_g2.tz].out | 2 +- ...st_typecheck[opcodes--mul_overflow.tz].out | 18 +- ...eck::test_typecheck[opcodes--munch.tz].out | 6 +- ...eck[opcodes--mutez_to_bls12_381_fr.tz].out | 6 +- ...check::test_typecheck[opcodes--neg.tz].out | 2 +- ...ypecheck[opcodes--neg_bls12_381_fr.tz].out | 2 +- ...ypecheck[opcodes--neg_bls12_381_g1.tz].out | 2 +- ...ypecheck[opcodes--neg_bls12_381_g2.tz].out | 2 +- ...heck::test_typecheck[opcodes--noop.tz].out | 6 +- ...check::test_typecheck[opcodes--not.tz].out | 2 +- ...test_typecheck[opcodes--not_binary.tz].out | 2 +- ...echeck::test_typecheck[opcodes--or.tz].out | 8 +- ...:test_typecheck[opcodes--or_binary.tz].out | 2 +- ...pecheck[opcodes--originate_big_map.tz].out | 6 +- ...test_typecheck[opcodes--packunpack.tz].out | 6 +- ..._typecheck[opcodes--packunpack_rev.tz].out | 73 +- ...echeck[opcodes--packunpack_rev_cty.tz].out | 113 +- ...k::test_typecheck[opcodes--pair_id.tz].out | 2 +- ...t_typecheck[opcodes--pairing_check.tz].out | 2 +- ...eck::test_typecheck[opcodes--pexec.tz].out | 4 +- ...k::test_typecheck[opcodes--pexec_2.tz].out | 16 +- ...eck::test_typecheck[opcodes--proxy.tz].out | 16 +- ...k::test_typecheck[opcodes--reverse.tz].out | 6 +- ...st_typecheck[opcodes--reverse_loop.tz].out | 16 +- ...check[opcodes--sapling_empty_state.tz].out | 6 +- ...heck::test_typecheck[opcodes--self.tz].out | 8 +- ...st_typecheck[opcodes--self_address.tz].out | 6 +- ...codes--self_address_after_fib_view.tz].out | 28 +- ...elf_address_after_nonexistent_view.tz].out | 26 +- ...k[opcodes--self_address_after_view.tz].out | 31 +- ...check[opcodes--self_after_fib_view.tz].out | 30 +- ...codes--self_after_nonexistent_view.tz].out | 31 +- ...typecheck[opcodes--self_after_view.tz].out | 33 +- ...odes--self_with_default_entrypoint.tz].out | 12 +- ...heck[opcodes--self_with_entrypoint.tz].out | 46 +- ...ck::test_typecheck[opcodes--sender.tz].out | 6 +- ...eck[opcodes--sender_after_fib_view.tz].out | 28 +- ...des--sender_after_nonexistent_view.tz].out | 26 +- ...pecheck[opcodes--sender_after_view.tz].out | 31 +- ...st_typecheck[opcodes--set_delegate.tz].out | 12 +- ...ck::test_typecheck[opcodes--set_id.tz].out | 6 +- ...::test_typecheck[opcodes--set_iter.tz].out | 6 +- ...test_typecheck[opcodes--set_member.tz].out | 4 +- ...::test_typecheck[opcodes--set_size.tz].out | 2 +- ...heck::test_typecheck[opcodes--sha3.tz].out | 2 +- ...ck::test_typecheck[opcodes--shifts.tz].out | 2 +- ...eck::test_typecheck[opcodes--slice.tz].out | 10 +- ...est_typecheck[opcodes--slice_bytes.tz].out | 10 +- ...ck::test_typecheck[opcodes--slices.tz].out | 89 +- ...ck::test_typecheck[opcodes--source.tz].out | 6 +- ...est_typecheck[opcodes--split_bytes.tz].out | 59 +- ...st_typecheck[opcodes--split_string.tz].out | 59 +- ...echeck[opcodes--store_bls12_381_fr.tz].out | 2 +- ...echeck[opcodes--store_bls12_381_g1.tz].out | 2 +- ...echeck[opcodes--store_bls12_381_g2.tz].out | 2 +- ...est_typecheck[opcodes--store_input.tz].out | 6 +- ...:test_typecheck[opcodes--store_now.tz].out | 6 +- ...ck::test_typecheck[opcodes--str_id.tz].out | 2 +- ...check[opcodes--sub_timestamp_delta.tz].out | 6 +- ...ck::test_typecheck[opcodes--subset.tz].out | 9 +- ...est_typecheck[opcodes--tez_add_sub.tz].out | 29 +- ...test_typecheck[opcodes--ticket_bad.tz].out | 6 +- ...ypecheck[opcodes--ticket_big_store.tz].out | 18 +- ...est_typecheck[opcodes--ticket_join.tz].out | 8 +- ...est_typecheck[opcodes--ticket_read.tz].out | 4 +- ...st_typecheck[opcodes--ticket_split.tz].out | 6 +- ..._typecheck[opcodes--ticket_store-2.tz].out | 6 +- ...st_typecheck[opcodes--ticket_store.tz].out | 2 +- ...test_typecheck[opcodes--ticketer-2.tz].out | 12 +- ...::test_typecheck[opcodes--ticketer.tz].out | 37 +- ...typecheck[opcodes--transfer_amount.tz].out | 6 +- ...typecheck[opcodes--transfer_tokens.tz].out | 8 +- ...ck::test_typecheck[opcodes--uncomb.tz].out | 2 +- ..._typecheck[opcodes--update_big_map.tz].out | 2 +- ...:test_typecheck[opcodes--utxo_read.tz].out | 2 +- ...eck::test_typecheck[opcodes--utxor.tz].out | 115 +- ...::test_typecheck[opcodes--view_fib.tz].out | 8 +- ...eck[opcodes--view_mutual_recursion.tz].out | 14 +- ...est_typecheck[opcodes--view_op_add.tz].out | 10 +- ...ypecheck[opcodes--view_op_constant.tz].out | 10 +- ...test_typecheck[opcodes--view_op_id.tz].out | 10 +- ...[opcodes--view_op_nonexistent_addr.tz].out | 2 +- ...[opcodes--view_op_nonexistent_func.tz].out | 4 +- ...pcodes--view_op_test_step_contants.tz].out | 11 +- ...p_toplevel_inconsistent_input_type.tz].out | 4 +- ..._toplevel_inconsistent_output_type.tz].out | 4 +- ...::test_typecheck[opcodes--view_rec.tz].out | 18 +- ...pecheck[opcodes--view_toplevel_lib.tz].out | 55 +- ...st_typecheck[opcodes--voting_power.tz].out | 2 +- ...check::test_typecheck[opcodes--xor.tz].out | 2 +- ...(Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" | 8 +- ...(Some 5) { Elt \"hello\" 4.0427752f13.out" | 8 +- ...(Some 5) { Elt \"hello\" 4.0793dc66d5.out" | 8 +- ...None { Elt \"1\" 1 ; .df114499b8.out" | 8 +- ...None { Elt \"1\" 1 ; .f9bea98de9.out" | 8 +- ...None { Elt \"hello\" 4 })-.1db12cd837.out" | 8 +- ...None {})-\"hello\"-(Pair N.6fc7d0acf2.out" | 8 +- ..." \"one\" ; Elt \"2\" \"tw.524c5459f8.out" | 6 +- ...ello\" \"hi\" } None)-\"\".33eba403e7.out" | 6 +- ...hello\" \"hi\" } None)-\"h.a5cd1005c9.out" | 6 +- ...one\" ; Elt \"2\" \"two\" .6f3d35b151.out" | 8 +- ...one\" ; Elt \"2\" \"two\" .76aeaa0706.out" | 12 +- ...one\" ; Elt \"2\" \"two\" .7e7197f248.out" | 12 +- ...one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" | 12 +- ...one\" ; Elt \"2\" \"two\" .b688cc94a7.out" | 12 +- ...one\" ; Elt \"2\" \"two\" .c68db221ed.out" | 12 +- ...TestContractOpcodes::test_balance[0.5].out | 4 +- ...s.TestContractOpcodes::test_balance[0].out | 4 +- ...estContractOpcodes::test_balance[1000].out | 4 +- ...s.TestContractOpcodes::test_balance[1].out | 4 +- ...stContractOpcodes::test_balance[1e-06].out | 4 +- ...s.TestContractOpcodes::test_balance[5].out | 4 +- ...Opcodes::test_balance[8000000000000.0].out | 4 +- ... \"two\" }) )-(Right (Righ.7492e8cdea.out" | 30 +- ... \"two\" }))-(Left Unit)-(.21b30dd90f.out" | 14 +- ... \"two\" }))-(Right (Left .2873ef610c.out" | 16 +- ... \"two\" }))-(Right (Left .8a6f480005.out" | 16 +- ... \"two\" }))-(Right (Right.d336ca1903.out" | 32 +- ...Pair \"foo\" \"bar\" } { P.7f2ee47600.out" | 28 +- ...tContractOpcodes::test_check_signature.out | 44 +- ...tract_input_output[abs.tz-Unit-0-Unit].out | 10 +- ....tz-Unit-12039123919239192312931-Unit].out | 10 +- ...act_input_output[abs.tz-Unit-948-Unit].out | 10 +- ...ct_input_output[add.tz-Unit-Unit-Unit].out | 132 +- ...r 0x00 0x00-(Some 0x0000000.3c2de60480.out | 2 +- ...r 0x01 0x00-(Some 0x0100000.12b2c1172b.out | 2 +- ...r 0x010000 0x00-(Some 0x010.0e44fc6f40.out | 2 +- ...r 0x010000 0x010000-(Some 0.7e0ed229a3.out | 2 +- ...air -100 100)-(Some \"1970.7c1b1e4e5b.out" | 10 +- ...air 0 \"1970-01-01T00:00:0.528ed42c01.out" | 10 +- ...air 100 100)-(Some \"1970-.6566111ad2.out" | 10 +- ...air \"1970-01-01T00:00:00Z.72c424f3da.out" | 10 +- ...air 100 -100)-(Some \"1970.7c4b12e9aa.out" | 10 +- ...air 100 100)-(Some \"1970-.af32743640.out" | 10 +- ...dhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" | 4 +- ...-None-(Pair False False)-(Some False)].out | 14 +- ...z-None-(Pair False True)-(Some False)].out | 14 +- ...z-None-(Pair True False)-(Some False)].out | 14 +- ....tz-None-(Pair True True)-(Some True)].out | 14 +- ...t_output[and_binary.tz-Unit-Unit-Unit].out | 2 +- ...l_1.tz-False-(Pair False False)-False].out | 8 +- ...al_1.tz-False-(Pair False True)-False].out | 8 +- ...al_1.tz-False-(Pair True False)-False].out | 8 +- ...ical_1.tz-False-(Pair True True)-True].out | 8 +- ...put[balance.tz-111-Unit-4000000000000].out | 4 +- ...lt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out | 8 +- ...lt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out | 8 +- ...lt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out | 8 +- ...lt 1 0 } None)-1-(Pair 4 (S.73700321f8.out | 8 +- ...lt 1 4 ; Elt 2 11 } None)-1.1182eca937.out | 8 +- ...lt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out | 8 +- ...lt 1 4 ; Elt 2 11 } None)-2.1eead33885.out | 8 +- ...lt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out | 8 +- ...lt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out | 8 +- ...lt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out | 8 +- ...air {} None)-1-(Pair 4 (Some False))0].out | 8 +- ...air {} None)-1-(Pair 4 (Some False))1].out | 8 +- ... \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" | 8 +- ... \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" | 8 +- ... \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" | 8 +- ... \"foo\" 0 } None)-\"foo\".968709d39d.out" | 8 +- ... \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" | 8 +- ... None)-\"bar\"-(Pair 4 (Some False))].out" | 8 +- ...utput[bls12_381_fr_to_int.tz-0-0x00-0].out | 2 +- ...utput[bls12_381_fr_to_int.tz-0-0x01-1].out | 2 +- ...8db8e57af88d9576acd181b89f2.7a85c336ff.out | 2 +- ...9e8abf8dc324a010007addde986.b821eb26b3.out | 2 +- ...ut[bls12_381_fr_to_mutez.tz-0-0x10-16].out | 8 +- ...000000000000000000000000000.0accef5bef.out | 4 +- ...000000000000000000000000000.0ecc537252.out | 4 +- ...000000000000000000000000000.2229b767cd.out | 4 +- ...000000000000000000000000000.2ff549b46b.out | 4 +- ...000000000000000000000000000.bf8a711be6.out | 4 +- ...000000000000000000000000000.d41cbb044b.out | 4 +- ...a5ad0a633e4880d2296f08ec5c1.a50412e458.out | 4 +- ...cd0fa853810e356f1eb79721e80.f3a349c4a7.out | 4 +- ...be1766f92cd82c5e5135c374a03.1b9676e4c2.out | 4 +- ...be1766f92cd82c5e5135c374a03.e966dc6de5.out | 4 +- ...000000000000000000000000000.964835cc43.out | 4 +- ...000000000000000000000000000.b25ea709fb.out | 4 +- ...000000000000000000000000000.eae36753ea.out | 4 +- ...000000000000000000000000000.ee57dac8f7.out | 4 +- ...a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out | 4 +- ...cd0fa853810e356f1eb79721e80.bd5800f6b8.out | 4 +- ...be1766f92cd82c5e5135c374a03.00e897789a.out | 4 +- ...be1766f92cd82c5e5135c374a03.a4697eaa13.out | 4 +- ...000000000000000000000000000.0177355bbf.out | 8 +- ...000000000000000000000000000.744166c609.out | 8 +- ...000000000000000000000000000.9f3c5cdc6a.out | 8 +- ...000000000000000000000000000.a54cb341ba.out | 8 +- ...000000000000000000000000000.b0dc584c94.out | 8 +- ...000000000000000000000000000.bddcad090c.out | 8 +- ...a5ad0a633e4880d2296f08ec5c1.92c153eb47.out | 8 +- ...cd0fa853810e356f1eb79721e80.290ab49d11.out | 8 +- ...be1766f92cd82c5e5135c374a03.69f3589a06.out | 8 +- ...be1766f92cd82c5e5135c374a03.fee3c5cf43.out | 8 +- ...000000000000000000000000000.1bccc033e8.out | 8 +- ...000000000000000000000000000.40958700fe.out | 8 +- ...000000000000000000000000000.6c62b03d78.out | 8 +- ...000000000000000000000000000.d23f269341.out | 8 +- ...a5ad0a633e4880d2296f08ec5c1.927f808504.out | 8 +- ...cd0fa853810e356f1eb79721e80.0c114c956a.out | 8 +- ...be1766f92cd82c5e5135c374a03.03c4f38e68.out | 8 +- ...be1766f92cd82c5e5135c374a03.8ed19cfdd9.out | 8 +- ...input_output[car.tz-0-(Pair 34 17)-34].out | 2 +- ...input_output[cdr.tz-0-(Pair 34 17)-17].out | 2 +- ...mb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out | 82 +- ... Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" | 4 +- ...r 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out | 4 +- ...; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out | 236 +-- ...-{ \"World!\" }-{ \"Hello World!\" }].out" | 8 +- ..."test2\" }-{ \"Hello test1.c27e8c3ee6.out" | 14 +- ...input_output[concat_hello.tz-{}-{}-{}].out | 2 +- ...}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out | 10 +- ...hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out | 6 +- ...output[concat_hello_bytes.tz-{}-{}-{}].out | 2 +- ...; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" | 46 +- ...\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" | 36 +- ...t_output[concat_list.tz-\"\"-{}-\"\"].out" | 6 +- ...ns.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out | 4 +- ..._output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out | 4 +- ...act_input_output[cons.tz-{}-10-{ 10 }].out | 4 +- ...ir { \"A\" } { \"B\" })-(Some False)].out" | 26 +- ...\"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" | 68 +- ...\"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" | 64 +- ...air { \"B\" } { \"B\" })-(Some True)].out" | 26 +- ...ir { \"c\" } { \"B\" })-(Some False)].out" | 26 +- ..._all.tz-None-(Pair {} {})-(Some True)].out | 10 +- ...wnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" | 8 +- ...Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" | 4 +- ...970-01-01T00:03:20Z\" \"19.90e9215d17.out" | 10 +- ...t[diff_timestamps.tz-111-(Pair 0 0)-0].out | 10 +- ...[diff_timestamps.tz-111-(Pair 0 1)--1].out | 10 +- ...t[diff_timestamps.tz-111-(Pair 1 0)-1].out | 10 +- ...r 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out | 734 ++++---- ... 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out | 734 ++++---- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out | 2 +- ...p.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out | 2 +- ...z-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out | 2 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out | 2 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out | 2 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out | 2 +- ... None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out | 48 +- ... None)-(Pair 10 -3)-(Pair (.3caea50555.out | 48 +- ... None)-(Pair 10 0)-(Pair No.f9448c04fb.out | 48 +- ... None)-(Pair 10 (Left 0))-(Left None)].out | 2 +- ...air 10 (Left 10))-(Left (So.f782cc1dec.out | 2 +- ...air 10 (Left 3))-(Left (Som.016b4db96c.out | 2 +- ...one)-(Pair 10 (Right 0))-(Right None)].out | 2 +- ...air 10 (Right 10))-(Right (.e705a30e07.out | 2 +- ...air 10 (Right 3))-(Right (S.44485eda6a.out | 2 +- ...air 5 (Right 10))-(Right (S.8ab987af15.out | 2 +- ...t[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" | 16 +- ...oncat.tz-\"?\"-\"test\"-\"test_abc\"].out" | 16 +- ...tput[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out | 14 +- ...act_input_output[first.tz-111-{ 4 }-4].out | 14 +- ...me 4) {})-\"hello\"-(Pair .161d86cef6.out" | 8 +- ...me 5) { Elt \"hello\" 4 }).684ab7e326.out" | 8 +- ...me 5) { Elt \"hello\" 4 }).d49817fb83.out" | 8 +- ...e { Elt \"1\" 1 ; .6900b1da14.out" | 8 +- ...e { Elt \"1\" 1 ; .bca0ede8be.out" | 8 +- ... { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" | 8 +- ...ir None {})-\"hello\"-(Pair None {})].out" | 8 +- ... \"1\" \"one\" ; .bc4127094e.out" | 6 +- ..."hello\" \"hi\" })-\"\"-(P.0c03056487.out" | 6 +- ...\"hello\" \"hi\" })-\"hell.cc45544c66.out" | 6 +- ...nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" | 2 +- ...2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" | 2 +- ...xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" | 4 +- ...-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" | 4 +- ..._output[if.tz-None-False-(Some False)].out | 2 +- ...ut_output[if.tz-None-True-(Some True)].out | 2 +- ....tz-\"?\"-(Some \"hello\")-\"hello\"].out" | 2 +- ...ut_output[if_some.tz-\"?\"-None-\"\"].out" | 2 +- ...t_input_output[int.tz-None-0-(Some 0)].out | 2 +- ...t_input_output[int.tz-None-1-(Some 1)].out | 2 +- ...t_output[int.tz-None-9999-(Some 9999)].out | 2 +- ...c20776f726c6421-(Some 0xb6e.34c02678c9.out | 2 +- ...Left \"X\")-(Left True)-(Right True)].out" | 4 +- ...ft \"X\")-(Right \"a\")-(Left \"a\")].out" | 4 +- ...ract_input_output[level.tz-111-Unit-1].out | 4 +- ...{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" | 8 +- ...ut[list_concat.tz-\"abc\"-{}-\"abc\"].out" | 8 +- ...tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out | 8 +- ..._output[list_concat_bytes.tz-0x-{}-0x].out | 8 +- ...b-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out | 8 +- ...list_concat_bytes.tz-0xabcd-{}-0xabcd].out | 8 +- ... ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" | 4 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 4 +- ...input_output[list_id.tz-{\"\"}-{}-{}].out" | 4 +- ... ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" | 2 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 2 +- ...t_output[list_id_map.tz-{\"\"}-{}-{}].out" | 2 +- ...tput[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out | 12 +- ...tput[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out | 12 +- ...}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out | 22 +- ...}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out | 22 +- ...ut_output[list_map_block.tz-{0}-{}-{}].out | 6 +- ...ze.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out | 2 +- ...tput[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out | 2 +- ...input_output[list_size.tz-111-{ 1 }-1].out | 2 +- ...ct_input_output[list_size.tz-111-{}-0].out | 2 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 58 +- ...put_output[loop_left.tz-{\"\"}-{}-{}].out" | 10 +- ...0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out | 4 +- ...[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out | 4 +- ...[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out | 4 +- ... Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out | 92 +- ...-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out | 92 +- ...foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" | 52 +- ...lt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" | 32 +- ...ract_input_output[map_map.tz-{}-10-{}].out | 12 +- ... 1 } None)-1-(Pair { Elt 0 .7396e5f090.out | 8 +- ... 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out | 8 +- ... 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out | 8 +- ... 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out | 8 +- ... 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out | 8 +- ...air {} None)-1-(Pair {} (Some False))].out | 8 +- ...ar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" | 8 +- ...ar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" | 8 +- ...ar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" | 8 +- ...oo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" | 8 +- ...oo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" | 8 +- ...None)-\"bar\"-(Pair {} (Some False))].out" | 8 +- ... \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" | 2 +- ...\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" | 2 +- ...ut[map_size.tz-111-{ Elt \"a\" 1 }-1].out" | 2 +- ...act_input_output[map_size.tz-111-{}-0].out | 2 +- ...ct_input_output[mul.tz-Unit-Unit-Unit].out | 2 +- ...0-257-0x0101000000000000000.be11332c7f.out | 10 +- ...2-16-0x10000000000000000000.8230fb4fac.out | 10 +- ...act_input_output[neg.tz-0-(Left -2)-2].out | 4 +- ...ract_input_output[neg.tz-0-(Left 0)-0].out | 4 +- ...act_input_output[neg.tz-0-(Left 2)--2].out | 4 +- ...act_input_output[neg.tz-0-(Right 0)-0].out | 4 +- ...ct_input_output[neg.tz-0-(Right 2)--2].out | 4 +- ..._output[not.tz-None-False-(Some True)].out | 2 +- ..._output[not.tz-None-True-(Some False)].out | 2 +- ...not_binary.tz-None-(Left -8)-(Some 7)].out | 4 +- ...not_binary.tz-None-(Left -9)-(Some 8)].out | 4 +- ...not_binary.tz-None-(Left 0)-(Some -1)].out | 4 +- ...not_binary.tz-None-(Left 7)-(Some -8)].out | 4 +- ...not_binary.tz-None-(Left 8)-(Some -9)].out | 4 +- ...ot_binary.tz-None-(Right 0)-(Some -1)].out | 4 +- ...ot_binary.tz-None-(Right 7)-(Some -8)].out | 4 +- ...ot_binary.tz-None-(Right 8)-(Some -9)].out | 4 +- ...-None-(Pair False False)-(Some False)].out | 10 +- ...tz-None-(Pair False True)-(Some True)].out | 10 +- ...tz-None-(Pair True False)-(Some True)].out | 10 +- ....tz-None-(Pair True True)-(Some True)].out | 10 +- ...or_binary.tz-None-(Pair 0 8)-(Some 8)].out | 2 +- ..._binary.tz-None-(Pair 14 1)-(Some 15)].out | 2 +- ..._binary.tz-None-(Pair 15 4)-(Some 15)].out | 2 +- ...r_binary.tz-None-(Pair 4 8)-(Some 12)].out | 2 +- ...or_binary.tz-None-(Pair 7 7)-(Some 7)].out | 2 +- ...or_binary.tz-None-(Pair 8 0)-(Some 8)].out | 2 +- ... (Pair 1 (Pair \"foobar\".368bdfd73a.out" | 100 +- ... (Pair 1 (Pair \"foobar\".735d9ae802.out" | 100 +- ...ir \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" | 170 +- ...ir \"edpkuBknW28nW72KG6RoH.4e20b52378.out" | 170 +- ...alse False)-(Some (Pair False False))].out | 2 +- ... False True)-(Some (Pair False True))].out | 2 +- ... True False)-(Some (Pair True False))].out | 2 +- ...ir True True)-(Some (Pair True True))].out | 2 +- ...ntract_input_output[pexec.tz-14-38-52].out | 10 +- ... 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out | 44 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 12 +- ...input_output[reverse.tz-{\"\"}-{}-{}].out" | 6 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 70 +- ..._output[reverse_loop.tz-{\"\"}-{}-{}].out" | 16 +- ...tput[sapling_empty_state.tz-{}-Unit-0].out | 4 +- ...output[self_address.tz-Unit-Unit-Unit].out | 6 +- ..._default_entrypoint.tz-Unit-Unit-Unit].out | 16 +- ...entrypoint.tz-Unit-Left (Left 0)-Unit].out | 60 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 4 +- ...; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" | 4 +- ...tract_input_output[set_id.tz-{}-{}-{}].out | 4 +- ..._iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out | 14 +- ..._input_output[set_iter.tz-111-{ 1 }-1].out | 8 +- ...act_input_output[set_iter.tz-111-{}-0].out | 6 +- ..."World\" } None)-\"\"-(Pai.3d2044726e.out" | 8 +- ...)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" | 8 +- ... None)-\"Hi\"-(Pair {} (Some False))].out" | 8 +- ...ze.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out | 2 +- ...utput[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out | 2 +- ..._input_output[set_size.tz-111-{ 1 }-1].out | 2 +- ...act_input_output[set_size.tz-111-{}-0].out | 2 +- ...0776f726c6421-(Some 0xf345a.a07ae9dddf.out | 2 +- ...ts.tz-None-(Left (Pair 0 0))-(Some 0)].out | 4 +- ...ts.tz-None-(Left (Pair 0 1))-(Some 0)].out | 4 +- ...ts.tz-None-(Left (Pair 1 2))-(Some 4)].out | 4 +- ....tz-None-(Left (Pair 15 2))-(Some 60)].out | 4 +- ...s.tz-None-(Left (Pair 8 1))-(Some 16)].out | 4 +- ...s.tz-None-(Right (Pair 0 0))-(Some 0)].out | 4 +- ...s.tz-None-(Right (Pair 0 1))-(Some 0)].out | 4 +- ...s.tz-None-(Right (Pair 1 2))-(Some 0)].out | 4 +- ....tz-None-(Right (Pair 15 2))-(Some 3)].out | 4 +- ...s.tz-None-(Right (Pair 8 1))-(Some 4)].out | 4 +- ...ut_output[slice.tz-None-Pair 0 0-None].out | 10 +- ...tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" | 18 +- ...slice.tz-Some \"Foo\"-Pair 0 10-None].out" | 18 +- ...-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" | 18 +- ...z-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" | 18 +- ...[slice.tz-Some \"Foo\"-Pair 1 3-None].out" | 18 +- ...slice.tz-Some \"Foo\"-Pair 10 5-None].out" | 18 +- ...FooFooFooFooFooFooFooFooFo.c508d67bb0.out" | 18 +- ...put[slice_bytes.tz-None-Pair 0 1-None].out | 10 +- ...s.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out | 18 +- ...tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out | 18 +- ...z-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out | 18 +- ...z-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out | 18 +- ...-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out | 18 +- ..._bytes.tz-Some 0xaabbcc-Pair 1 3-None].out | 18 +- ...aabbccaabbccaabbccaabbccaab.df5895de85.out | 18 +- ...d.tz-None-\"Hello\"-(Some \"Hello\")].out" | 2 +- ..._id.tz-None-\"abcd\"-(Some \"abcd\")].out" | 2 +- ...r 100 -100)-\"1970-01-01T00:03:20Z\"].out" | 10 +- ...ir 100 100)-\"1970-01-01T00:00:00Z\"].out" | 10 +- ...Pair 100 200000000000000000.3db82d2c25.out | 10 +- ...00000 1000000)-(Some (Pair .b461aa042b.out | 42 +- ...10000 1010000)-(Some (Pair .1e8cf7679c.out | 42 +- ...t_output[uncomb.tz-0-(Pair 1 4 2)-142].out | 2 +- ...dpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" | 2 +- ...Pair False False)-(Some (Left False))].out | 4 +- ... (Pair False True)-(Some (Left True))].out | 4 +- ... (Pair True False)-(Some (Left True))].out | 4 +- ... (Pair True True)-(Some (Left False))].out | 4 +- ...one-Right (Pair 0 0)-(Some (Right 0))].out | 4 +- ...one-Right (Pair 0 1)-(Some (Right 1))].out | 4 +- ...one-Right (Pair 1 0)-(Some (Right 1))].out | 4 +- ...one-Right (Pair 1 1)-(Some (Right 0))].out | 4 +- ...-Right (Pair 42 21)-(Some (Right 63))].out | 4 +- ...-Right (Pair 42 63)-(Some (Right 21))].out | 4 +- ...pcodes.TestContractOpcodes::test_level.out | 4 +- ..._opcodes.TestContractOpcodes::test_now.out | 4 +- ...s.TestContractOpcodes::test_packunpack.out | 14 +- 618 files changed, 7100 insertions(+), 7752 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out index 8d2fc20986ab..9995b3f7c951 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out @@ -16,7 +16,7 @@ Gas remaining: 1039925.145 units remaining (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; CAR - /* [ @parameter or (key_hash %Initialize) + /* [ or (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig)) : pair (or @parameter (key_hash %Initialize) @@ -24,161 +24,142 @@ Gas remaining: 1039925.145 units remaining (map :stored_balance @stored_balance key_hash mutez) ] */ ; IF_LEFT { DUP - /* [ @parameter.Initialize key_hash : @parameter.Initialize key_hash + /* [ key_hash : key_hash : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; DIIP { CDR %stored_balance - /* [ @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez ] */ ; DUP - /* [ @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @parameter.Initialize key_hash : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez : map :stored_balance key_hash mutez ] */ } + /* [ key_hash : key_hash : map :stored_balance key_hash mutez + : map :stored_balance key_hash mutez ] */ ; DIP { SWAP - /* [ @stored_balance map :stored_balance key_hash mutez - : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez : key_hash + : map :stored_balance key_hash mutez ] */ } + /* [ key_hash : map :stored_balance key_hash mutez : key_hash + : map :stored_balance key_hash mutez ] */ ; GET @opt_prev_balance - /* [ @opt_prev_balance option mutez : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ option mutez : key_hash : map :stored_balance key_hash mutez ] */ ; IF_SOME { RENAME @previous_balance - /* [ @previous_balance mutez : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : key_hash : map :stored_balance key_hash mutez ] */ ; AMOUNT - /* [ @amount mutez : @previous_balance mutez : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : mutez : key_hash : map :stored_balance key_hash mutez ] */ ; ADD - /* [ mutez : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : key_hash : map :stored_balance key_hash mutez ] */ ; SOME - /* [ option mutez : @parameter.Initialize key_hash - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ option mutez : key_hash : map :stored_balance key_hash mutez ] */ ; SWAP - /* [ @parameter.Initialize key_hash : option mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ key_hash : option mutez : map :stored_balance key_hash mutez ] */ ; UPDATE - /* [ @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez ] */ ; NIL operation - /* [ list operation : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ list operation : map :stored_balance key_hash mutez ] */ ; PAIR - /* [ pair (list operation) (map :stored_balance @stored_balance key_hash mutez) ] */ } + /* [ pair (list operation) (map :stored_balance key_hash mutez) ] */ } { DIP { AMOUNT - /* [ @amount mutez : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : map :stored_balance key_hash mutez ] */ ; SOME - /* [ option mutez : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @parameter.Initialize key_hash : option mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ option mutez : map :stored_balance key_hash mutez ] */ } + /* [ key_hash : option mutez : map :stored_balance key_hash mutez ] */ ; UPDATE - /* [ @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez ] */ ; NIL operation - /* [ list operation : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ list operation : map :stored_balance key_hash mutez ] */ ; PAIR - /* [ pair (list operation) (map :stored_balance @stored_balance key_hash mutez) ] */ } } + /* [ pair (list operation) (map :stored_balance key_hash mutez) ] */ } } { DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; CAR %from - /* [ key - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ key : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; DIIP { CDAR %withdraw_amount ; PACK - /* [ @packed bytes - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ bytes : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; BLAKE2B @signed_amount - /* [ @signed_amount bytes - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ bytes : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ } - /* [ key - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @signed_amount bytes - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ key : pair (key %from) (mutez %withdraw_amount) (signature %sig) : bytes + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; DIP { CDDR %sig } - /* [ key : signature : @signed_amount bytes - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ key : signature : bytes + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; CHECK_SIGNATURE - /* [ bool - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ bool : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ ; - IF { /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + IF { /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) (map :stored_balance @stored_balance key_hash mutez) ] */ } { PUSH string "Bad signature" - /* [ string - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) + /* [ string : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) : pair (or @parameter (key_hash %Initialize) (pair %Withdraw (key %from) (mutez %withdraw_amount) (signature %sig))) @@ -186,194 +167,169 @@ Gas remaining: 1039925.145 units remaining FAILWITH /* [] */ } ; DIIP { CDR %stored_balance - /* [ @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez ] */ ; DUP - /* [ @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez : map :stored_balance key_hash mutez ] */ } + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez : map :stored_balance key_hash mutez ] */ ; CAR %from - /* [ key - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ key : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez : map :stored_balance key_hash mutez ] */ ; HASH_KEY @from_hash - /* [ @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ key_hash : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez : map :stored_balance key_hash mutez ] */ ; DUP - /* [ @from_hash key_hash : @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ key_hash : key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez : map :stored_balance key_hash mutez ] */ ; DIP { DIP { SWAP - /* [ @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @from_hash key_hash : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ } + /* [ key_hash : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; SWAP - /* [ @stored_balance map :stored_balance key_hash mutez : @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @from_hash key_hash : @stored_balance map :stored_balance key_hash mutez - : @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ map :stored_balance key_hash mutez : key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ } + /* [ key_hash : map :stored_balance key_hash mutez : key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; GET - /* [ option mutez : @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ option mutez : key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; IF_NONE { PUSH string "Account does not exist" - /* [ string : @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ string : key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; PAIR - /* [ pair string (key_hash @from_hash) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ pair string key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; FAILWITH /* [] */ } { RENAME @previous_balance - /* [ @previous_balance mutez : @from_hash key_hash - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : key_hash + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; DIP { DROP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @previous_balance mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ } + /* [ mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; DUP - /* [ @previous_balance mutez : @previous_balance mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; DIIP { DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; CDAR %withdraw_amount ; DUP - /* [ mutez : mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ @previous_balance mutez : @previous_balance mutez : mutez : mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ } + /* [ mutez : mutez : mutez : mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; DIP { CMPLT @not_enough } - /* [ @previous_balance mutez : @not_enough bool : mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ mutez : bool : mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; SWAP - /* [ @not_enough bool : @previous_balance mutez : mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ bool : mutez : mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; IF { PUSH string "Not enough funds" - /* [ string : @previous_balance mutez : mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ string : mutez : mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; FAILWITH /* [] */ } { SUB_MUTEZ @new_balance - /* [ @new_balance option mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ option mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; ASSERT_SOME ; DIP { DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; DIP { SWAP - /* [ @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } - /* [ @new_balance.some mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } + /* [ mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; DUP - /* [ @new_balance.some mutez : @new_balance.some mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ mutez : mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; PUSH @zero mutez 0 - /* [ @zero mutez : @new_balance.some mutez : @new_balance.some mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ mutez : mutez : mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; CMPEQ @null_balance ; IF { DROP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; NONE @new_balance mutez - /* [ @new_balance option mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } + /* [ option mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } { SOME @new_balance - /* [ @new_balance option mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } ; + /* [ option mutez : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ } ; SWAP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @new_balance option mutez - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) : option mutez + : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; CAR %from - /* [ key : @new_balance option mutez - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ key : option mutez : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; HASH_KEY @from_hash - /* [ @from_hash key_hash : @new_balance option mutez - : @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ key_hash : option mutez : map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; UPDATE - /* [ @stored_balance map :stored_balance key_hash mutez - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; + /* [ map :stored_balance key_hash mutez + : pair (key %from) (mutez %withdraw_amount) (signature %sig) ] */ ; SWAP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; DUP - /* [ @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @parameter.Withdraw pair (key %from) (mutez %withdraw_amount) (signature %sig) - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ pair (key %from) (mutez %withdraw_amount) (signature %sig) + : pair (key %from) (mutez %withdraw_amount) (signature %sig) + : map :stored_balance key_hash mutez ] */ ; CDAR %withdraw_amount ; DIP { CAR %from - /* [ key : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ key : map :stored_balance key_hash mutez ] */ ; HASH_KEY @from_hash - /* [ @from_hash key_hash : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ key_hash : map :stored_balance key_hash mutez ] */ ; IMPLICIT_ACCOUNT @from_account - /* [ @from_account contract unit - : @stored_balance map :stored_balance key_hash mutez ] */ } - /* [ mutez : @from_account contract unit - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ contract unit : map :stored_balance key_hash mutez ] */ } + /* [ mutez : contract unit : map :stored_balance key_hash mutez ] */ ; UNIT - /* [ unit : mutez : @from_account contract unit - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ unit : mutez : contract unit : map :stored_balance key_hash mutez ] */ ; TRANSFER_TOKENS @withdraw_transfer_op - /* [ @withdraw_transfer_op operation - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ operation : map :stored_balance key_hash mutez ] */ ; NIL operation - /* [ list operation : @withdraw_transfer_op operation - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ list operation : operation : map :stored_balance key_hash mutez ] */ ; SWAP - /* [ @withdraw_transfer_op operation : list operation - : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ operation : list operation : map :stored_balance key_hash mutez ] */ ; CONS - /* [ list operation : @stored_balance map :stored_balance key_hash mutez ] */ ; + /* [ list operation : map :stored_balance key_hash mutez ] */ ; PAIR - /* [ pair (list operation) (map :stored_balance @stored_balance key_hash mutez) ] */ } } } } } + /* [ pair (list operation) (map :stored_balance key_hash mutez) ] */ } } } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out index 50ce2510babc..69764ae7d11d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039996.134 units remaining { parameter int ; storage int ; code { CAR - /* [ @parameter int ] */ ; + /* [ int ] */ ; PUSH int 1 - /* [ int : @parameter int ] */ ; + /* [ int : int ] */ ; ADD /* [ int ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out index 170787c4229a..6f603286efc7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039995.173 units remaining { parameter (list int) ; storage (list int) ; code { CAR - /* [ @parameter list int ] */ ; - MAP { PUSH int 1 /* [ int : @parameter.elt int ] */ ; ADD /* [ int ] */ } + /* [ list int ] */ ; + MAP { PUSH int 1 /* [ int : int ] */ ; ADD /* [ int ] */ } /* [ list int ] */ ; NIL operation /* [ list operation : list int ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out index faf5e807ca87..c556cd5fe60d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out @@ -8,20 +8,19 @@ Gas remaining: 1039989.643 units remaining /* [ pair (nat @parameter) (pair @storage (pair nat bool) timestamp) : pair (nat @parameter) (pair @storage (pair nat bool) timestamp) ] */ ; CAR - /* [ @parameter nat - : pair (nat @parameter) (pair @storage (pair nat bool) timestamp) ] */ ; + /* [ nat : pair (nat @parameter) (pair @storage (pair nat bool) timestamp) ] */ ; DIP { CDDR ; DUP /* [ timestamp : timestamp ] */ ; NOW - /* [ @now timestamp : timestamp : timestamp ] */ ; + /* [ timestamp : timestamp : timestamp ] */ ; CMPGT } - /* [ @parameter nat : bool : timestamp ] */ ; + /* [ nat : bool : timestamp ] */ ; PAIR - /* [ pair (nat @parameter) bool : timestamp ] */ ; + /* [ pair nat bool : timestamp ] */ ; PAIR - /* [ pair (pair (nat @parameter) bool) timestamp ] */ ; + /* [ pair (pair nat bool) timestamp ] */ ; NIL operation - /* [ list operation : pair (pair (nat @parameter) bool) timestamp ] */ ; + /* [ list operation : pair (pair nat bool) timestamp ] */ ; PAIR - /* [ pair (list operation) (pair (nat @parameter) bool) timestamp ] */ } } + /* [ pair (list operation) (pair nat bool) timestamp ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out index 2cd97b048a3d..74eb39855ad4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out @@ -5,14 +5,14 @@ Gas remaining: 1039994.981 units remaining { parameter nat ; storage (pair nat bool) ; code { CAR - /* [ @parameter nat ] */ ; + /* [ nat ] */ ; PUSH bool True - /* [ bool : @parameter nat ] */ ; + /* [ bool : nat ] */ ; SWAP - /* [ @parameter nat : bool ] */ ; + /* [ nat : bool ] */ ; PAIR - /* [ pair (nat @parameter) bool ] */ ; + /* [ pair nat bool ] */ ; NIL operation - /* [ list operation : pair (nat @parameter) bool ] */ ; + /* [ list operation : pair nat bool ] */ ; PAIR - /* [ pair (list operation) (nat @parameter) bool ] */ } } + /* [ pair (list operation) nat bool ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out index a247ef621605..48da5f096289 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039991.379 units remaining { parameter (pair (list int) (list int)) ; storage (list int) ; code { CAR - /* [ @parameter pair (list int) (list int) ] */ ; + /* [ pair (list int) (list int) ] */ ; UNPAIR /* [ list int : list int ] */ ; NIL int diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out index df8fd02ced20..1edabcf2fee5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out @@ -5,14 +5,14 @@ Gas remaining: 1039992.950 units remaining { parameter unit ; storage mutez ; code { CDR - /* [ @storage mutez ] */ ; + /* [ mutez ] */ ; DUP - /* [ @storage mutez : @storage mutez ] */ ; + /* [ mutez : mutez ] */ ; AMOUNT - /* [ @amount mutez : @storage mutez : @storage mutez ] */ ; + /* [ mutez : mutez : mutez ] */ ; CMPLT ; IF { FAIL } { NIL operation - /* [ list operation : @storage mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @storage) ] */ } } } + /* [ pair (list operation) mutez ] */ } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out index d34a449c7c89..7944e5d105ed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out @@ -12,7 +12,7 @@ Gas remaining: 1039972.258 units remaining /* [ timestamp : timestamp : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) ] */ ; NOW - /* [ @now timestamp : timestamp : timestamp + /* [ timestamp : timestamp : timestamp : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) ] */ ; CMPGT ; IF { FAIL } @@ -26,62 +26,48 @@ Gas remaining: 1039972.258 units remaining : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) : timestamp ] */ ; CAR - /* [ @parameter key_hash + /* [ key_hash : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) : timestamp ] */ ; DIP { CDDR } - /* [ @parameter key_hash : pair mutez key_hash : timestamp ] */ ; + /* [ key_hash : pair mutez key_hash : timestamp ] */ ; AMOUNT - /* [ @amount mutez : @parameter key_hash : pair mutez key_hash : timestamp ] */ ; + /* [ mutez : key_hash : pair mutez key_hash : timestamp ] */ ; PAIR - /* [ pair (mutez @amount) (key_hash @parameter) : pair mutez key_hash - : timestamp ] */ ; + /* [ pair mutez key_hash : pair mutez key_hash : timestamp ] */ ; SWAP - /* [ pair mutez key_hash : pair (mutez @amount) (key_hash @parameter) - : timestamp ] */ ; + /* [ pair mutez key_hash : pair mutez key_hash : timestamp ] */ ; DIP { SWAP - /* [ timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ timestamp : pair mutez key_hash ] */ ; PAIR - /* [ pair timestamp (mutez @amount) (key_hash @parameter) ] */ } - /* [ pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair timestamp mutez key_hash ] */ } + /* [ pair mutez key_hash : pair timestamp mutez key_hash ] */ ; DUP - /* [ pair mutez key_hash : pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair mutez key_hash : pair mutez key_hash : pair timestamp mutez key_hash ] */ ; CAR - /* [ mutez : pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ mutez : pair mutez key_hash : pair timestamp mutez key_hash ] */ ; AMOUNT - /* [ @amount mutez : mutez : pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ mutez : mutez : pair mutez key_hash : pair timestamp mutez key_hash ] */ ; CMPLE ; - IF { FAIL } - { /* [ pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ } ; + IF { FAIL } { /* [ pair mutez key_hash : pair timestamp mutez key_hash ] */ } ; DUP - /* [ pair mutez key_hash : pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair mutez key_hash : pair mutez key_hash : pair timestamp mutez key_hash ] */ ; CAR - /* [ mutez : pair mutez key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ mutez : pair mutez key_hash : pair timestamp mutez key_hash ] */ ; DIP { CDR - /* [ key_hash : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ key_hash : pair timestamp mutez key_hash ] */ ; IMPLICIT_ACCOUNT - /* [ contract unit : pair timestamp (mutez @amount) (key_hash @parameter) ] */ } - /* [ mutez : contract unit - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ contract unit : pair timestamp mutez key_hash ] */ } + /* [ mutez : contract unit : pair timestamp mutez key_hash ] */ ; UNIT - /* [ unit : mutez : contract unit - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ unit : mutez : contract unit : pair timestamp mutez key_hash ] */ ; TRANSFER_TOKENS - /* [ operation : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ operation : pair timestamp mutez key_hash ] */ ; NIL operation - /* [ list operation : operation - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ list operation : operation : pair timestamp mutez key_hash ] */ ; SWAP - /* [ operation : list operation - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ operation : list operation : pair timestamp mutez key_hash ] */ ; CONS - /* [ list operation : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ list operation : pair timestamp mutez key_hash ] */ ; PAIR - /* [ pair (list operation) timestamp (mutez @amount) (key_hash @parameter) ] */ } } + /* [ pair (list operation) timestamp mutez key_hash ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out index 38c0a84ba1eb..26cf17375650 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out @@ -5,67 +5,55 @@ Gas remaining: 1039972.793 units remaining { parameter unit ; storage (pair timestamp (pair address address)) ; code { CDR - /* [ @storage pair timestamp address address ] */ ; + /* [ pair timestamp address address ] */ ; DUP - /* [ @storage pair timestamp address address - : @storage pair timestamp address address ] */ ; + /* [ pair timestamp address address : pair timestamp address address ] */ ; CAR - /* [ timestamp : @storage pair timestamp address address ] */ ; + /* [ timestamp : pair timestamp address address ] */ ; NOW - /* [ @now timestamp : timestamp : @storage pair timestamp address address ] */ ; + /* [ timestamp : timestamp : pair timestamp address address ] */ ; CMPLT ; - IF { FAIL } { /* [ @storage pair timestamp address address ] */ } ; + IF { FAIL } { /* [ pair timestamp address address ] */ } ; DUP - /* [ @storage pair timestamp address address - : @storage pair timestamp address address ] */ ; + /* [ pair timestamp address address : pair timestamp address address ] */ ; CDAR ; - CONTRACT - unit - /* [ @contract option (contract unit) - : @storage pair timestamp address address ] */ ; + CONTRACT unit + /* [ option (contract unit) : pair timestamp address address ] */ ; ASSERT_SOME ; - PUSH mutez - 100000000 - /* [ mutez : @contract.some contract unit - : @storage pair timestamp address address ] */ ; + PUSH mutez 100000000 + /* [ mutez : contract unit : pair timestamp address address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair timestamp address address ] */ ; + /* [ unit : mutez : contract unit : pair timestamp address address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair timestamp address address ] */ ; + /* [ operation : pair timestamp address address ] */ ; SWAP - /* [ @storage pair timestamp address address : operation ] */ ; + /* [ pair timestamp address address : operation ] */ ; DUP - /* [ @storage pair timestamp address address - : @storage pair timestamp address address : operation ] */ ; + /* [ pair timestamp address address : pair timestamp address address + : operation ] */ ; CDDR ; CONTRACT unit - /* [ @contract option (contract unit) : @storage pair timestamp address address - : operation ] */ ; + /* [ option (contract unit) : pair timestamp address address : operation ] */ ; ASSERT_SOME ; PUSH mutez 100000000 - /* [ mutez : @contract.some contract unit - : @storage pair timestamp address address : operation ] */ ; + /* [ mutez : contract unit : pair timestamp address address : operation ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair timestamp address address : operation ] */ ; + /* [ unit : mutez : contract unit : pair timestamp address address : operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair timestamp address address : operation ] */ ; - DIP { SWAP /* [ operation : @storage pair timestamp address address ] */ } - /* [ operation : operation : @storage pair timestamp address address ] */ ; + /* [ operation : pair timestamp address address : operation ] */ ; + DIP { SWAP /* [ operation : pair timestamp address address ] */ } + /* [ operation : operation : pair timestamp address address ] */ ; NIL operation - /* [ list operation : operation : operation - : @storage pair timestamp address address ] */ ; + /* [ list operation : operation : operation : pair timestamp address address ] */ ; SWAP - /* [ operation : list operation : operation - : @storage pair timestamp address address ] */ ; + /* [ operation : list operation : operation : pair timestamp address address ] */ ; CONS - /* [ list operation : operation : @storage pair timestamp address address ] */ ; + /* [ list operation : operation : pair timestamp address address ] */ ; SWAP - /* [ operation : list operation : @storage pair timestamp address address ] */ ; + /* [ operation : list operation : pair timestamp address address ] */ ; CONS - /* [ list operation : @storage pair timestamp address address ] */ ; + /* [ list operation : pair timestamp address address ] */ ; PAIR - /* [ pair (list operation) (pair @storage timestamp address address) ] */ } } + /* [ pair (list operation) timestamp address address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out index b89734df9931..40cc293d5a61 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out @@ -15,7 +15,7 @@ Gas remaining: 1039983.939 units remaining /* [ option int : string : int : big_map string int : unit ] */ ; IF_NONE { PUSH int 0 /* [ int : string : int : big_map string int : unit ] */ } - { /* [ @some int : string : int : big_map string int : unit ] */ } ; + { /* [ int : string : int : big_map string int : unit ] */ } ; SWAP /* [ string : int : int : big_map string int : unit ] */ ; DIP { ADD diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out index 110e6df511c4..b2d40856bcb6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039994.745 units remaining { parameter (pair (pair %p1 unit (string %no_name)) bool) ; storage unit ; code { CAR @param - /* [ @param pair (pair %p1 unit (string %no_name)) bool ] */ ; + /* [ pair (pair %p1 unit (string %no_name)) bool ] */ ; CADR @name %no_name ; DROP /* [] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out index d90b998fdde8..aed12ebd6982 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out @@ -8,16 +8,16 @@ Gas remaining: 1039992.618 units remaining /* [ pair (string @parameter) (string @storage) : pair (string @parameter) (string @storage) ] */ ; DIP { CDR - /* [ @storage string ] */ ; + /* [ string ] */ ; NIL string - /* [ list string : @storage string ] */ ; + /* [ list string : string ] */ ; SWAP - /* [ @storage string : list string ] */ ; + /* [ string : list string ] */ ; CONS /* [ list string ] */ } /* [ pair (string @parameter) (string @storage) : list string ] */ ; CAR - /* [ @parameter string : list string ] */ ; + /* [ string : list string ] */ ; CONS /* [ list string ] */ ; CONCAT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out index b59a1661386f..e010c993068f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039989.496 units remaining { parameter (or string (option int)) ; storage string ; code { CAR - /* [ @parameter or string (option int) ] */ ; + /* [ or string (option int) ] */ ; IF_LEFT - { /* [ @parameter.left string ] */ } + { /* [ string ] */ } { IF_NONE { FAIL } { PUSH int 0 - /* [ int : @parameter.right.some int ] */ ; + /* [ int : int ] */ ; CMPGT ; IF { FAIL } { PUSH string "" /* [ string ] */ } } } ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out index cb057472528b..88a5f13091a2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out @@ -8,13 +8,13 @@ Gas remaining: 1039992.638 units remaining /* [ pair (nat @parameter) (list @storage nat) : pair (nat @parameter) (list @storage nat) ] */ ; CAR - /* [ @parameter nat : pair (nat @parameter) (list @storage nat) ] */ ; - DIP { CDR /* [ @storage list nat ] */ } - /* [ @parameter nat : @storage list nat ] */ ; + /* [ nat : pair (nat @parameter) (list @storage nat) ] */ ; + DIP { CDR /* [ list nat ] */ } + /* [ nat : list nat ] */ ; DUP - /* [ @parameter nat : @parameter nat : @storage list nat ] */ ; + /* [ nat : nat : list nat ] */ ; DIP { CONS /* [ list nat ] */ } - /* [ @parameter nat : list nat ] */ ; + /* [ nat : list nat ] */ ; CONS /* [ list nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out index e792828c343d..075ec6c54a04 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out @@ -5,57 +5,52 @@ Gas remaining: 1039973.219 units remaining { storage nat ; parameter nat ; code { UNPAIR - /* [ @parameter nat : @storage nat ] */ ; + /* [ nat : nat ] */ ; DIP { SELF - /* [ @self contract nat : @storage nat ] */ ; + /* [ contract nat : nat ] */ ; ADDRESS - /* [ @self.address address : @storage nat ] */ ; + /* [ address : nat ] */ ; SENDER - /* [ @sender address : @self.address address : @storage nat ] */ ; - IFCMPEQ - { /* [ @storage nat ] */ } - { DROP /* [] */ ; PUSH @storage nat 1 /* [ @storage nat ] */ } } - /* [ @parameter nat : @storage nat ] */ ; + /* [ address : address : nat ] */ ; + IFCMPEQ { /* [ nat ] */ } { DROP /* [] */ ; PUSH @storage nat 1 /* [ nat ] */ } } + /* [ nat : nat ] */ ; DUP - /* [ @parameter nat : @parameter nat : @storage nat ] */ ; + /* [ nat : nat : nat ] */ ; PUSH nat 1 - /* [ nat : @parameter nat : @parameter nat : @storage nat ] */ ; + /* [ nat : nat : nat : nat ] */ ; IFCMPGE { DROP - /* [ @storage nat ] */ ; + /* [ nat ] */ ; NIL operation - /* [ list operation : @storage nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @storage) ] */ } + /* [ pair (list operation) nat ] */ } { PUSH nat 1 - /* [ nat : @parameter nat : @storage nat ] */ ; + /* [ nat : nat : nat ] */ ; SWAP - /* [ @parameter nat : nat : @storage nat ] */ ; + /* [ nat : nat : nat ] */ ; SUB @parameter - /* [ @parameter int : @storage nat ] */ ; + /* [ int : nat ] */ ; ISNAT - /* [ @parameter option nat : @storage nat ] */ ; + /* [ option nat : nat ] */ ; IF_NONE { NIL operation - /* [ list operation : @storage nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @storage) ] */ } + /* [ pair (list operation) nat ] */ } { DUP - /* [ @parameter.some nat : @parameter.some nat : @storage nat ] */ ; + /* [ nat : nat : nat ] */ ; DIP { PUSH nat 1 - /* [ nat : @parameter.some nat : @storage nat ] */ ; + /* [ nat : nat : nat ] */ ; ADD - /* [ nat : @storage nat ] */ ; + /* [ nat : nat ] */ ; MUL @storage - /* [ @storage nat ] */ } - /* [ @parameter.some nat : @storage nat ] */ ; + /* [ nat ] */ } + /* [ nat : nat ] */ ; SWAP - /* [ @storage nat : @parameter.some nat ] */ ; - DIP { DIP { SELF - /* [ @self contract nat ] */ ; - PUSH mutez 0 - /* [ mutez : @self contract nat ] */ } - /* [ @parameter.some nat : mutez : @self contract nat ] */ ; + /* [ nat : nat ] */ ; + DIP { DIP { SELF /* [ contract nat ] */ ; PUSH mutez 0 /* [ mutez : contract nat ] */ } + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; NIL operation @@ -64,8 +59,8 @@ Gas remaining: 1039973.219 units remaining /* [ operation : list operation ] */ ; CONS /* [ list operation ] */ } - /* [ @storage nat : list operation ] */ ; + /* [ nat : list operation ] */ ; SWAP - /* [ list operation : @storage nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @storage) ] */ } } } } + /* [ pair (list operation) nat ] */ } } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out index 79874518c08c..7e31cd0adc57 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out @@ -6,13 +6,12 @@ Gas remaining: 1039986.470 units remaining storage address ; code { DROP /* [] */ ; - NIL int /* [ @parameter list int ] */ + NIL int /* [ list int ] */ /* [ list int ] */ ; AMOUNT /* [ list int ] */ ; - NONE key_hash - /* [ int : @parameter.elt int ] */ - /* [ option key_hash : @amount mutez : list int ] */ ; + NONE key_hash /* [ int : int ] */ + /* [ option key_hash : mutez : list int ] */ ; CREATE_CONTRACT { parameter (list int /* [ list operation : list int ] */) /* [ int ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out index f8bce77cdb9a..5df6245e17bd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out @@ -8,54 +8,47 @@ Gas remaining: 1039974.524 units remaining /* [ pair (pair @parameter signature string nat) (pair @storage (pair key nat) string) : pair (pair @parameter signature string nat) (pair @storage (pair key nat) string) ] */ ; CAR - /* [ @parameter pair signature string nat + /* [ pair signature string nat : pair (pair @parameter signature string nat) (pair @storage (pair key nat) string) ] */ ; DIP { CDR - /* [ @storage pair (pair key nat) string ] */ ; + /* [ pair (pair key nat) string ] */ ; DUP - /* [ @storage pair (pair key nat) string : @storage pair (pair key nat) string ] */ } - /* [ @parameter pair signature string nat : @storage pair (pair key nat) string - : @storage pair (pair key nat) string ] */ ; + /* [ pair (pair key nat) string : pair (pair key nat) string ] */ } + /* [ pair signature string nat : pair (pair key nat) string + : pair (pair key nat) string ] */ ; SWAP - /* [ @storage pair (pair key nat) string : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ pair (pair key nat) string : pair signature string nat + : pair (pair key nat) string ] */ ; DIP { DUP - /* [ @parameter pair signature string nat : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ } - /* [ @storage pair (pair key nat) string : @parameter pair signature string nat - : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ pair signature string nat : pair signature string nat + : pair (pair key nat) string ] */ } + /* [ pair (pair key nat) string : pair signature string nat + : pair signature string nat : pair (pair key nat) string ] */ ; CAAR ; DIP { DUP - /* [ @parameter pair signature string nat : @parameter pair signature string nat - : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ pair signature string nat : pair signature string nat + : pair signature string nat : pair (pair key nat) string ] */ ; CAR - /* [ signature : @parameter pair signature string nat - : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ signature : pair signature string nat : pair signature string nat + : pair (pair key nat) string ] */ ; DIP { CDR - /* [ pair string nat : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ pair string nat : pair signature string nat : pair (pair key nat) string ] */ ; PACK - /* [ @packed bytes : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ bytes : pair signature string nat : pair (pair key nat) string ] */ ; BLAKE2B - /* [ bytes : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ } - /* [ signature : bytes : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ } - /* [ key : signature : bytes : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ bytes : pair signature string nat : pair (pair key nat) string ] */ } + /* [ signature : bytes : pair signature string nat + : pair (pair key nat) string ] */ } + /* [ key : signature : bytes : pair signature string nat + : pair (pair key nat) string ] */ ; CHECK_SIGNATURE - /* [ bool : @parameter pair signature string nat - : @storage pair (pair key nat) string ] */ ; + /* [ bool : pair signature string nat : pair (pair key nat) string ] */ ; IF { CDR - /* [ pair string nat : @storage pair (pair key nat) string ] */ ; + /* [ pair string nat : pair (pair key nat) string ] */ ; DUP - /* [ pair string nat : pair string nat : @storage pair (pair key nat) string ] */ ; + /* [ pair string nat : pair string nat : pair (pair key nat) string ] */ ; DIP { CAR - /* [ string : @storage pair (pair key nat) string ] */ ; + /* [ string : pair (pair key nat) string ] */ ; DIP { CAAR } /* [ string : key ] */ } /* [ pair string nat : string : key ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out index 0282fa6dbbcb..98b786e67eb7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out @@ -14,28 +14,27 @@ Gas remaining: 1039979.486 units remaining (pair @storage string (map string (lambda unit string))) : map string (lambda unit string) ] */ ; CAR - /* [ @parameter or string (pair string (lambda unit string)) + /* [ or string (pair string (lambda unit string)) : map string (lambda unit string) ] */ ; IF_LEFT { DIP { DUP /* [ map string (lambda unit string) : map string (lambda unit string) ] */ } - /* [ @parameter.left string : map string (lambda unit string) + /* [ string : map string (lambda unit string) : map string (lambda unit string) ] */ ; GET /* [ option (lambda unit string) : map string (lambda unit string) ] */ ; IF_NONE { FAIL } - { /* [ @some lambda unit string : map string (lambda unit string) ] */ } ; + { /* [ lambda unit string : map string (lambda unit string) ] */ } ; UNIT - /* [ unit : @some lambda unit string : map string (lambda unit string) ] */ ; + /* [ unit : lambda unit string : map string (lambda unit string) ] */ ; EXEC /* [ string : map string (lambda unit string) ] */ } { DUP - /* [ @parameter.right pair string (lambda unit string) - : @parameter.right pair string (lambda unit string) + /* [ pair string (lambda unit string) : pair string (lambda unit string) : map string (lambda unit string) ] */ ; CAR - /* [ string : @parameter.right pair string (lambda unit string) + /* [ string : pair string (lambda unit string) : map string (lambda unit string) ] */ ; DIP { CDR /* [ lambda unit string : map string (lambda unit string) ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out index ac83c38cfa90..a85b93fa0f52 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039997.267 units remaining { parameter unit ; storage unit ; code { CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out index 8aaf40b3fea5..6a87e49d2f4d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out @@ -7,9 +7,9 @@ Gas remaining: 1039992.147 units remaining code { DROP /* [] */ ; AMOUNT - /* [ @amount mutez ] */ ; + /* [ mutez ] */ ; PUSH mutez 10000000 - /* [ mutez : @amount mutez ] */ ; + /* [ mutez : mutez ] */ ; CMPGT ; IF { FAIL } { /* [] */ } ; UNIT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out index 0c1c99c8e217..5ad05a7ce276 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out @@ -5,15 +5,15 @@ Gas remaining: 1039986.830 units remaining { parameter key_hash ; storage timestamp ; code { UNPAIR - /* [ @parameter key_hash : @storage timestamp ] */ ; + /* [ key_hash : timestamp ] */ ; SWAP - /* [ @storage timestamp : @parameter key_hash ] */ ; + /* [ timestamp : key_hash ] */ ; PUSH int 300 - /* [ int : @storage timestamp : @parameter key_hash ] */ ; + /* [ int : timestamp : key_hash ] */ ; ADD @FIVE_MINUTES_LATER - /* [ @FIVE_MINUTES_LATER timestamp : @parameter key_hash ] */ ; + /* [ timestamp : key_hash ] */ ; NOW - /* [ @now timestamp : @FIVE_MINUTES_LATER timestamp : @parameter key_hash ] */ ; + /* [ timestamp : timestamp : key_hash ] */ ; ASSERT_CMPGE ; IMPLICIT_ACCOUNT /* [ contract unit ] */ ; @@ -29,7 +29,7 @@ Gas remaining: 1039986.830 units remaining /* [ operation : list operation ] */ ; CONS /* [ list operation ] */ ; - DIP { NOW /* [ @now timestamp ] */ } - /* [ list operation : @now timestamp ] */ ; + DIP { NOW /* [ timestamp ] */ } + /* [ list operation : timestamp ] */ ; PAIR - /* [ pair (list operation) (timestamp @now) ] */ } } + /* [ pair (list operation) timestamp ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out index ab85fb4f6e2a..4dc2407fa3e2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out @@ -52,7 +52,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; NOW - /* [ @now timestamp : timestamp + /* [ timestamp : timestamp : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -94,7 +94,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; CAR - /* [ @parameter or string nat + /* [ or string nat : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -104,7 +104,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; IF_LEFT { DUP - /* [ @parameter.left string : @parameter.left string + /* [ string : string : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -114,7 +114,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; PUSH string "buyer" - /* [ string : @parameter.left string : @parameter.left string + /* [ string : string : string : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -123,7 +123,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; COMPARE - /* [ int : @parameter.left string + /* [ int : string : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -132,7 +132,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; EQ - /* [ bool : @parameter.left string + /* [ bool : string : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -165,7 +165,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; CDADAR ; DIP { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -173,7 +173,7 @@ Gas remaining: 1039634.172 units remaining (pair mutez mutez) (pair address address) address) ] */ } - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -267,7 +267,7 @@ Gas remaining: 1039634.172 units remaining address ] */ } { PUSH string "seller" - /* [ string : @parameter.left string + /* [ string : string : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -310,7 +310,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; CDADDR ; DIP { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -318,7 +318,7 @@ Gas remaining: 1039634.172 units remaining (pair mutez mutez) (pair address address) address) ] */ } - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -422,7 +422,7 @@ Gas remaining: 1039634.172 units remaining { FAIL } } } { FAIL } } { BALANCE - /* [ @balance mutez + /* [ mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -432,7 +432,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; PUSH mutez 0 - /* [ mutez : @balance mutez + /* [ mutez : mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -518,7 +518,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; BALANCE - /* [ @balance mutez : mutez + /* [ mutez : mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -545,295 +545,294 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; IF { CDR - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; CADAR ; DIP { DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; CDDDAAR } /* [ mutez : address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair nat mutez mutez) + /* [ option (contract unit) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; ASSERT_SOME } - /* [ mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ unit : mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; NIL operation /* [ list operation : operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; SWAP /* [ operation : list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; CONS /* [ list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; SWAP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; CADDR ; DIP { DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; CDDDADR } /* [ mutez : address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair nat mutez mutez) + /* [ option (contract unit) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; ASSERT_SOME } - /* [ mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ unit : mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; SWAP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; CADAR ; DIP { DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; CADDR } /* [ mutez : mutez - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; ADD /* [ mutez - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; BALANCE - /* [ @balance mutez : mutez - : @storage pair (pair nat mutez mutez) + /* [ mutez : mutez + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; SUB_MUTEZ /* [ option mutez - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; ASSERT_SOME ; DIP { DUP - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; CDDDDR } - /* [ @some mutez : address - : @storage pair (pair nat mutez mutez) + /* [ mutez : address + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair nat mutez mutez) + /* [ option (contract unit) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; ASSERT_SOME } - /* [ @some mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; UNIT - /* [ unit : @some mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ unit : mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address : list operation ] */ ; DIP { SWAP /* [ list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ } /* [ operation : list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; CONS /* [ list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (pair nat mutez mutez) - (pair nat timestamp timestamp) - (pair mutez mutez) - (pair address address) - address) ] */ } + (pair nat mutez mutez) + (pair nat timestamp timestamp) + (pair mutez mutez) + (pair address address) + address ] */ } { DUP /* [ pair (or @parameter string nat) (pair @storage @@ -851,7 +850,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; CDDADAR ; NOW - /* [ @now timestamp : timestamp + /* [ timestamp : timestamp : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -914,7 +913,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; NOW - /* [ @now timestamp : timestamp + /* [ timestamp : timestamp : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -956,7 +955,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; CAR - /* [ @parameter or string nat + /* [ or string nat : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -967,7 +966,7 @@ Gas remaining: 1039634.172 units remaining IF_LEFT { PUSH string "buyer" - /* [ string : @parameter.left string + /* [ string : string : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1010,7 +1009,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; CDADAR ; DIP { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1018,7 +1017,7 @@ Gas remaining: 1039634.172 units remaining (pair mutez mutez) (pair address address) address) ] */ } - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1304,7 +1303,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; IF { BALANCE - /* [ @balance mutez + /* [ mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1328,7 +1327,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; CDDDDADR } - /* [ @balance mutez : address + /* [ mutez : address : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1337,75 +1336,74 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; DIIP { CDR - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ } - /* [ @balance mutez : address - : @storage pair (pair nat mutez mutez) + /* [ mutez : address + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair nat mutez mutez) + /* [ option (contract unit) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; ASSERT_SOME } - /* [ @balance mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ unit : mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; NIL operation /* [ list operation : operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; SWAP /* [ operation : list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; CONS /* [ list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (pair nat mutez mutez) - (pair nat timestamp timestamp) - (pair mutez mutez) - (pair address address) - address) ] */ } + (pair nat mutez mutez) + (pair nat timestamp timestamp) + (pair mutez mutez) + (pair address address) + address ] */ } { DUP /* [ pair (or @parameter string nat) (pair @storage @@ -1461,7 +1459,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; NOW - /* [ @now timestamp : timestamp + /* [ timestamp : timestamp : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1504,7 +1502,7 @@ Gas remaining: 1039634.172 units remaining address) ] */ ; CDDDDDR ; SENDER - /* [ @sender address : address + /* [ address : address : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1554,7 +1552,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; CAR - /* [ @parameter or string nat + /* [ or string nat : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1580,7 +1578,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; CDAAR } - /* [ @parameter.right nat : nat + /* [ nat : nat : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1718,7 +1716,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address ] */ } { BALANCE - /* [ @balance mutez + /* [ mutez : pair unit (pair nat mutez mutez) (pair nat timestamp timestamp) @@ -1739,7 +1737,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address ] */ ; CDDDDADR } - /* [ @balance mutez : address + /* [ mutez : address : pair unit (pair nat mutez mutez) (pair nat timestamp timestamp) @@ -1752,7 +1750,7 @@ Gas remaining: 1039634.172 units remaining (pair mutez mutez) (pair address address) address ] */ } - /* [ @balance mutez : address + /* [ mutez : address : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) @@ -1760,21 +1758,21 @@ Gas remaining: 1039634.172 units remaining address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) + /* [ option (contract unit) : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; ASSERT_SOME } - /* [ @balance mutez : @contract.some contract unit + /* [ mutez : contract unit : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit + /* [ unit : mutez : contract unit : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) @@ -1816,7 +1814,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address ] */ } { BALANCE - /* [ @balance mutez + /* [ mutez : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1840,7 +1838,7 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; CDDDDAAR } - /* [ @balance mutez : address + /* [ mutez : address : pair (or @parameter string nat) (pair @storage (pair nat mutez mutez) @@ -1849,72 +1847,71 @@ Gas remaining: 1039634.172 units remaining (pair address address) address) ] */ ; DIIP { CDR - /* [ @storage pair (pair nat mutez mutez) + /* [ pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ } - /* [ @balance mutez : address - : @storage pair (pair nat mutez mutez) + /* [ mutez : address + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair nat mutez mutez) + /* [ option (contract unit) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; ASSERT_SOME } - /* [ @balance mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit - : @storage pair (pair nat mutez mutez) + /* [ unit : mutez : contract unit + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; NIL operation /* [ list operation : operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; SWAP /* [ operation : list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; CONS /* [ list operation - : @storage pair (pair nat mutez mutez) + : pair (pair nat mutez mutez) (pair nat timestamp timestamp) (pair mutez mutez) (pair address address) address ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (pair nat mutez mutez) - (pair nat timestamp timestamp) - (pair mutez mutez) - (pair address address) - address) ] */ } } } } } } } } + (pair nat mutez mutez) + (pair nat timestamp timestamp) + (pair mutez mutez) + (pair address address) + address ] */ } } } } } } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out index ca385364f1d2..e16eb48f7116 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039997.267 units remaining { parameter string ; storage string ; code { CAR - /* [ @parameter string ] */ ; + /* [ string ] */ ; NIL operation - /* [ list operation : @parameter string ] */ ; + /* [ list operation : string ] */ ; PAIR - /* [ pair (list operation) (string @parameter) ] */ } } + /* [ pair (list operation) string ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out index 024399f0d554..7dd48a160061 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out @@ -5,51 +5,51 @@ Gas remaining: 1039971.505 units remaining { parameter (list int) ; storage (list int) ; code { CAR - /* [ @parameter list int ] */ ; + /* [ list int ] */ ; NIL int - /* [ list int : @parameter list int ] */ ; + /* [ list int : list int ] */ ; SWAP - /* [ @parameter list int : list int ] */ ; + /* [ list int : list int ] */ ; ITER { SWAP - /* [ list int : @parameter.elt int ] */ ; + /* [ list int : int ] */ ; DIIP { NIL int /* [ list int ] */ } - /* [ list int : @parameter.elt int : list int ] */ ; + /* [ list int : int : list int ] */ ; PUSH bool True - /* [ bool : list int : @parameter.elt int : list int ] */ ; + /* [ bool : list int : int : list int ] */ ; LOOP { IF_CONS { SWAP - /* [ @tl list int : @hd int : @parameter.elt int : list int ] */ ; + /* [ list int : int : int : list int ] */ ; DIP { DUP - /* [ @hd int : @hd int : @parameter.elt int : list int ] */ ; - DIIP { DUP /* [ @parameter.elt int : @parameter.elt int : list int ] */ } - /* [ @hd int : @hd int : @parameter.elt int : @parameter.elt int : list int ] */ ; + /* [ int : int : int : list int ] */ ; + DIIP { DUP /* [ int : int : list int ] */ } + /* [ int : int : int : int : list int ] */ ; DIP { CMPLT } - /* [ @hd int : bool : @parameter.elt int : list int ] */ ; + /* [ int : bool : int : list int ] */ ; SWAP - /* [ bool : @hd int : @parameter.elt int : list int ] */ } - /* [ @tl list int : bool : @hd int : @parameter.elt int : list int ] */ ; + /* [ bool : int : int : list int ] */ } + /* [ list int : bool : int : int : list int ] */ ; SWAP - /* [ bool : @tl list int : @hd int : @parameter.elt int : list int ] */ ; + /* [ bool : list int : int : int : list int ] */ ; IF { DIP { SWAP - /* [ @parameter.elt int : @hd int : list int ] */ ; + /* [ int : int : list int ] */ ; DIP { CONS /* [ list int ] */ } - /* [ @parameter.elt int : list int ] */ } - /* [ @tl list int : @parameter.elt int : list int ] */ ; + /* [ int : list int ] */ } + /* [ list int : int : list int ] */ ; PUSH bool True - /* [ bool : @tl list int : @parameter.elt int : list int ] */ } + /* [ bool : list int : int : list int ] */ } { SWAP - /* [ @hd int : @tl list int : @parameter.elt int : list int ] */ ; + /* [ int : list int : int : list int ] */ ; CONS - /* [ list int : @parameter.elt int : list int ] */ ; + /* [ list int : int : list int ] */ ; PUSH bool False - /* [ bool : list int : @parameter.elt int : list int ] */ } } + /* [ bool : list int : int : list int ] */ } } { NIL int - /* [ list int : @parameter.elt int : list int ] */ ; + /* [ list int : int : list int ] */ ; PUSH bool False - /* [ bool : list int : @parameter.elt int : list int ] */ } } - /* [ list int : @parameter.elt int : list int ] */ ; + /* [ bool : list int : int : list int ] */ } } + /* [ list int : int : list int ] */ ; SWAP - /* [ @parameter.elt int : list int : list int ] */ ; + /* [ int : list int : list int ] */ ; CONS /* [ list int : list int ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out index 85775d8e82ba..ca260fe7eed5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out @@ -12,7 +12,7 @@ Gas remaining: 1039967.523 units remaining : pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; CAR - /* [ @parameter option (pair signature int) + /* [ option (pair signature int) : pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; IF_NONE @@ -22,7 +22,7 @@ Gas remaining: 1039967.523 units remaining : pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; AMOUNT - /* [ @amount mutez : mutez + /* [ mutez : mutez : pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; CMPLE ; @@ -30,50 +30,48 @@ Gas remaining: 1039967.523 units remaining { /* [ pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ } ; CDR - /* [ @storage pair key int + /* [ pair key int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; DIP { CDDR } - /* [ @storage pair key int : int ] */ } + /* [ pair key int : int ] */ } { DUP - /* [ @parameter.some pair signature int : @parameter.some pair signature int + /* [ pair signature int : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; DIP { SWAP /* [ pair (option @parameter (pair signature int)) (pair @storage key int) - : @parameter.some pair signature int + : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ } - /* [ @parameter.some pair signature int + /* [ pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) - : @parameter.some pair signature int + : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; SWAP /* [ pair (option @parameter (pair signature int)) (pair @storage key int) - : @parameter.some pair signature int : @parameter.some pair signature int + : pair signature int : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; CDAR ; DIP { DUP - /* [ @parameter.some pair signature int : @parameter.some pair signature int - : @parameter.some pair signature int + /* [ pair signature int : pair signature int : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; CAR - /* [ signature : @parameter.some pair signature int - : @parameter.some pair signature int + /* [ signature : pair signature int : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; DIP { CDR - /* [ int : @parameter.some pair signature int + /* [ int : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; PACK - /* [ @packed bytes : @parameter.some pair signature int + /* [ bytes : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; BLAKE2B - /* [ bytes : @parameter.some pair signature int + /* [ bytes : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ } - /* [ signature : bytes : @parameter.some pair signature int + /* [ signature : bytes : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ } - /* [ key : signature : bytes : @parameter.some pair signature int + /* [ key : signature : bytes : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; CHECK_SIGNATURE - /* [ bool : @parameter.some pair signature int + /* [ bool : pair signature int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; IF { CDR /* [ int @@ -93,10 +91,10 @@ Gas remaining: 1039967.523 units remaining /* [ pair (option @parameter (pair signature int)) (pair @storage key int) : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; CDR - /* [ @storage pair key int + /* [ pair key int : pair (option @parameter (pair signature int)) (pair @storage key int) ] */ ; DIP { CDDR } - /* [ @storage pair key int : int ] */ } } ; + /* [ pair key int : int ] */ } } ; DIP { DROP /* [] */ } /* [ pair key int ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out index 940de8303d15..b32f89c88d43 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out @@ -9,71 +9,64 @@ Gas remaining: 1039971.047 units remaining : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) ] */ ; CDAR ; NOW - /* [ @now timestamp : timestamp + /* [ timestamp : timestamp : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) ] */ ; CMPGT ; IF { CAR - /* [ @parameter key_hash ] */ ; + /* [ key_hash ] */ ; AMOUNT - /* [ @amount mutez : @parameter key_hash ] */ ; + /* [ mutez : key_hash ] */ ; PAIR - /* [ pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair mutez key_hash ] */ ; NOW - /* [ @now timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; - PUSH int - 604800 - /* [ int : @now timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ timestamp : pair mutez key_hash ] */ ; + PUSH int 604800 + /* [ int : timestamp : pair mutez key_hash ] */ ; ADD - /* [ timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ timestamp : pair mutez key_hash ] */ ; PAIR - /* [ pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair timestamp mutez key_hash ] */ ; NIL operation - /* [ list operation : pair timestamp (mutez @amount) (key_hash @parameter) ] */ } + /* [ list operation : pair timestamp mutez key_hash ] */ } { DUP /* [ pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) ] */ ; CDDAR ; AMOUNT - /* [ @amount mutez : mutez + /* [ mutez : mutez : pair (key_hash @parameter) (pair @storage timestamp mutez key_hash) ] */ ; CMPLT ; IF { FAIL } { CAR - /* [ @parameter key_hash ] */ ; + /* [ key_hash ] */ ; DUP - /* [ @parameter key_hash : @parameter key_hash ] */ ; + /* [ key_hash : key_hash ] */ ; DIP { AMOUNT - /* [ @amount mutez : @parameter key_hash ] */ ; + /* [ mutez : key_hash ] */ ; PAIR - /* [ pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair mutez key_hash ] */ ; NOW - /* [ @now timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; - PUSH int - 604800 - /* [ int : @now timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ timestamp : pair mutez key_hash ] */ ; + PUSH int 604800 + /* [ int : timestamp : pair mutez key_hash ] */ ; ADD - /* [ timestamp : pair (mutez @amount) (key_hash @parameter) ] */ ; + /* [ timestamp : pair mutez key_hash ] */ ; PAIR - /* [ pair timestamp (mutez @amount) (key_hash @parameter) ] */ } - /* [ @parameter key_hash - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ pair timestamp mutez key_hash ] */ } + /* [ key_hash : pair timestamp mutez key_hash ] */ ; IMPLICIT_ACCOUNT - /* [ contract unit : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ contract unit : pair timestamp mutez key_hash ] */ ; AMOUNT - /* [ @amount mutez : contract unit - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ mutez : contract unit : pair timestamp mutez key_hash ] */ ; UNIT - /* [ unit : @amount mutez : contract unit - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ unit : mutez : contract unit : pair timestamp mutez key_hash ] */ ; TRANSFER_TOKENS - /* [ operation : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ operation : pair timestamp mutez key_hash ] */ ; NIL operation - /* [ list operation : operation - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ list operation : operation : pair timestamp mutez key_hash ] */ ; SWAP - /* [ operation : list operation - : pair timestamp (mutez @amount) (key_hash @parameter) ] */ ; + /* [ operation : list operation : pair timestamp mutez key_hash ] */ ; CONS - /* [ list operation : pair timestamp (mutez @amount) (key_hash @parameter) ] */ } } ; + /* [ list operation : pair timestamp mutez key_hash ] */ } } ; PAIR - /* [ pair (list operation) timestamp (mutez @amount) (key_hash @parameter) ] */ } } + /* [ pair (list operation) timestamp mutez key_hash ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out index 2ee8c36df0bd..192b717db240 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out @@ -5,45 +5,38 @@ Gas remaining: 1039982.122 units remaining { parameter unit ; storage (list address) ; code { CDR - /* [ @storage list address ] */ ; + /* [ list address ] */ ; DUP - /* [ @storage list address : @storage list address ] */ ; - DIP { NIL operation /* [ list operation : @storage list address ] */ } - /* [ @storage list address : list operation : @storage list address ] */ ; - PUSH bool - True - /* [ bool : @storage list address : list operation : @storage list address ] */ ; + /* [ list address : list address ] */ ; + DIP { NIL operation /* [ list operation : list address ] */ } + /* [ list address : list operation : list address ] */ ; + PUSH bool True + /* [ bool : list address : list operation : list address ] */ ; LOOP { IF_CONS { CONTRACT unit - /* [ @storage.hd.contract option (contract unit) : @storage.tl list address - : list operation : @storage list address ] */ ; + /* [ option (contract unit) : list address : list operation : list address ] */ ; ASSERT_SOME ; PUSH mutez 1000000 - /* [ mutez : @storage.hd.contract.some contract unit : @storage.tl list address - : list operation : @storage list address ] */ ; + /* [ mutez : contract unit : list address : list operation : list address ] */ ; UNIT - /* [ unit : mutez : @storage.hd.contract.some contract unit - : @storage.tl list address : list operation : @storage list address ] */ ; + /* [ unit : mutez : contract unit : list address : list operation + : list address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.tl list address : list operation - : @storage list address ] */ ; + /* [ operation : list address : list operation : list address ] */ ; SWAP - /* [ @storage.tl list address : operation : list operation - : @storage list address ] */ ; - DIP { CONS /* [ list operation : @storage list address ] */ } - /* [ @storage.tl list address : list operation : @storage list address ] */ ; - PUSH bool - True - /* [ bool : @storage.tl list address : list operation : @storage list address ] */ } + /* [ list address : operation : list operation : list address ] */ ; + DIP { CONS /* [ list operation : list address ] */ } + /* [ list address : list operation : list address ] */ ; + PUSH bool True + /* [ bool : list address : list operation : list address ] */ } { NIL address - /* [ list address : list operation : @storage list address ] */ ; - PUSH bool - False - /* [ bool : list address : list operation : @storage list address ] */ } } - /* [ @storage list address : list operation : @storage list address ] */ ; + /* [ list address : list operation : list address ] */ ; + PUSH bool False + /* [ bool : list address : list operation : list address ] */ } } + /* [ list address : list operation : list address ] */ ; DROP - /* [ list operation : @storage list address ] */ ; + /* [ list operation : list address ] */ ; PAIR - /* [ pair (list operation) (list @storage address) ] */ } } + /* [ pair (list operation) (list address) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out index f2f48023ae52..3cc8befc24cc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out @@ -10,7 +10,7 @@ Gas remaining: 1039952.504 units remaining : pair (option @parameter string) (pair @storage (option string) (pair nat nat) (map nat string)) ] */ ; CAR - /* [ @parameter option string + /* [ option string : pair (option @parameter string) (pair @storage (option string) (pair nat nat) (map nat string)) ] */ ; IF_NONE @@ -77,11 +77,11 @@ Gas remaining: 1039952.504 units remaining /* [ pair nat nat : map nat string ] */ ; DUP /* [ pair nat nat : pair nat nat : map nat string ] */ } - /* [ @parameter.some string : pair nat nat : pair nat nat : map nat string ] */ ; + /* [ string : pair nat nat : pair nat nat : map nat string ] */ ; SWAP - /* [ pair nat nat : @parameter.some string : pair nat nat : map nat string ] */ ; + /* [ pair nat nat : string : pair nat nat : map nat string ] */ ; CAR - /* [ nat : @parameter.some string : pair nat nat : map nat string ] */ ; + /* [ nat : string : pair nat nat : map nat string ] */ ; DIP { SOME /* [ option string : pair nat nat : map nat string ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out index fdffbd365ee5..cf4502fb1b58 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out @@ -8,36 +8,35 @@ Gas remaining: 1039975.926 units remaining /* [ pair (pair @parameter (lambda int int) (list int)) (list @storage int) : list int ] */ ; CAR - /* [ @parameter pair (lambda int int) (list int) : list int ] */ ; + /* [ pair (lambda int int) (list int) : list int ] */ ; DUP - /* [ @parameter pair (lambda int int) (list int) - : @parameter pair (lambda int int) (list int) : list int ] */ ; + /* [ pair (lambda int int) (list int) : pair (lambda int int) (list int) + : list int ] */ ; DIP { CAR /* [ lambda int int : list int ] */ ; PAIR /* [ pair (lambda int int) (list int) ] */ } - /* [ @parameter pair (lambda int int) (list int) - : pair (lambda int int) (list int) ] */ ; + /* [ pair (lambda int int) (list int) : pair (lambda int int) (list int) ] */ ; CDR /* [ list int : pair (lambda int int) (list int) ] */ ; ITER { PAIR - /* [ pair (int @elt) (lambda int int) (list int) ] */ ; + /* [ pair int (lambda int int) (list int) ] */ ; DUP - /* [ pair (int @elt) (lambda int int) (list int) - : pair (int @elt) (lambda int int) (list int) ] */ ; + /* [ pair int (lambda int int) (list int) + : pair int (lambda int int) (list int) ] */ ; CDAR ; DIP { DUP - /* [ pair (int @elt) (lambda int int) (list int) - : pair (int @elt) (lambda int int) (list int) ] */ ; + /* [ pair int (lambda int int) (list int) + : pair int (lambda int int) (list int) ] */ ; DIP { CDAR } - /* [ pair (int @elt) (lambda int int) (list int) : lambda int int ] */ ; + /* [ pair int (lambda int int) (list int) : lambda int int ] */ ; DUP - /* [ pair (int @elt) (lambda int int) (list int) - : pair (int @elt) (lambda int int) (list int) : lambda int int ] */ ; + /* [ pair int (lambda int int) (list int) : pair int (lambda int int) (list int) + : lambda int int ] */ ; CAR - /* [ @elt int : pair (int @elt) (lambda int int) (list int) : lambda int int ] */ ; + /* [ int : pair int (lambda int int) (list int) : lambda int int ] */ ; DIP { CDDR ; SWAP /* [ lambda int int : list int ] */ } - /* [ @elt int : lambda int int : list int ] */ ; + /* [ int : lambda int int : list int ] */ ; EXEC /* [ int : list int ] */ ; CONS diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out index af10f8254f1c..26d95bc92b92 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out @@ -5,45 +5,39 @@ Gas remaining: 1039981.752 units remaining { parameter unit ; storage (pair address address) ; code { CDR - /* [ @storage pair address address ] */ ; + /* [ pair address address ] */ ; DUP - /* [ @storage pair address address : @storage pair address address ] */ ; + /* [ pair address address : pair address address ] */ ; CAR - /* [ address : @storage pair address address ] */ ; - CONTRACT - unit - /* [ @contract option (contract unit) : @storage pair address address ] */ ; + /* [ address : pair address address ] */ ; + CONTRACT unit + /* [ option (contract unit) : pair address address ] */ ; ASSERT_SOME ; - PUSH mutez - 5000000 - /* [ mutez : @contract.some contract unit : @storage pair address address ] */ ; + PUSH mutez 5000000 + /* [ mutez : contract unit : pair address address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair address address ] */ ; + /* [ unit : mutez : contract unit : pair address address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair address address ] */ ; + /* [ operation : pair address address ] */ ; DIP { DUP - /* [ @storage pair address address : @storage pair address address ] */ ; + /* [ pair address address : pair address address ] */ ; CDR - /* [ address : @storage pair address address ] */ ; - CONTRACT - unit - /* [ @contract option (contract unit) : @storage pair address address ] */ ; + /* [ address : pair address address ] */ ; + CONTRACT unit + /* [ option (contract unit) : pair address address ] */ ; ASSERT_SOME ; - PUSH mutez - 5000000 - /* [ mutez : @contract.some contract unit : @storage pair address address ] */ ; + PUSH mutez 5000000 + /* [ mutez : contract unit : pair address address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair address address ] */ ; + /* [ unit : mutez : contract unit : pair address address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair address address ] */ } - /* [ operation : operation : @storage pair address address ] */ ; - DIIP { NIL operation /* [ list operation : @storage pair address address ] */ } - /* [ operation : operation : list operation : @storage pair address address ] */ ; - DIP { CONS /* [ list operation : @storage pair address address ] */ } - /* [ operation : list operation : @storage pair address address ] */ ; + /* [ operation : pair address address ] */ } + /* [ operation : operation : pair address address ] */ ; + DIIP { NIL operation /* [ list operation : pair address address ] */ } + /* [ operation : operation : list operation : pair address address ] */ ; + DIP { CONS /* [ list operation : pair address address ] */ } + /* [ operation : list operation : pair address address ] */ ; CONS - /* [ list operation : @storage pair address address ] */ ; + /* [ list operation : pair address address ] */ ; PAIR - /* [ pair (list operation) (pair @storage address address) ] */ } } + /* [ pair (list operation) address address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out index 81cfea320905..10a29a45fa80 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out @@ -5,96 +5,89 @@ Gas remaining: 1039963.237 units remaining { parameter unit ; storage (pair (pair (timestamp %T) (mutez %N)) (pair (address %A) (address %B))) ; code { CDR - /* [ @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; DUP - /* [ @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; CAAR %T ; NOW - /* [ @now timestamp : timestamp - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ timestamp : timestamp + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; COMPARE - /* [ int - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ int : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; LE - /* [ bool - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ bool : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; IF { DUP - /* [ @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; CADR %N ; BALANCE - /* [ @balance mutez : mutez - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ mutez : mutez + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; COMPARE - /* [ int - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ int : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; LE - /* [ bool - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ bool : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; IF { NIL operation /* [ list operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; PAIR - /* [ pair (list operation) - (pair @storage (pair (timestamp %T) (mutez %N)) (address %A) (address %B)) ] */ } + /* [ pair (list operation) (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ } { DUP - /* [ @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; CDDR %B ; CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ option (contract unit) + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; ASSERT_SOME ; BALANCE - /* [ @balance mutez : @contract.some contract unit - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ mutez : contract unit + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ unit : mutez : contract unit + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; NIL operation /* [ list operation : operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; SWAP /* [ operation : list operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; CONS /* [ list operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; PAIR - /* [ pair (list operation) - (pair @storage (pair (timestamp %T) (mutez %N)) (address %A) (address %B)) ] */ } } + /* [ pair (list operation) (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ } } { DUP - /* [ @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; CDAR %A ; CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ option (contract unit) + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; ASSERT_SOME ; BALANCE - /* [ @balance mutez : @contract.some contract unit - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ mutez : contract unit + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + /* [ unit : mutez : contract unit + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; TRANSFER_TOKENS /* [ operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; NIL operation /* [ list operation : operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; SWAP /* [ operation : list operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; CONS /* [ list operation - : @storage pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; + : pair (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ ; PAIR - /* [ pair (list operation) - (pair @storage (pair (timestamp %T) (mutez %N)) (address %A) (address %B)) ] */ } } } + /* [ pair (list operation) (pair (timestamp %T) (mutez %N)) (address %A) (address %B) ] */ } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out index cf3c83df4a1f..52189ffb5cd1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out @@ -33,7 +33,7 @@ Gas remaining: 1039876.691 units remaining (pair @storage string timestamp (pair mutez mutez) address address address) ] */ ; CDDAR ; NOW - /* [ @now timestamp : timestamp + /* [ timestamp : timestamp : pair (unit @parameter) (pair @storage string timestamp (pair mutez mutez) address address address) ] */ ; COMPARE @@ -76,7 +76,7 @@ Gas remaining: 1039876.691 units remaining : pair (unit @parameter) (pair @storage string timestamp (pair mutez mutez) address address address) ] */ ; BALANCE - /* [ @balance mutez : mutez + /* [ mutez : mutez : pair (unit @parameter) (pair @storage string timestamp (pair mutez mutez) address address address) ] */ ; COMPARE @@ -88,13 +88,12 @@ Gas remaining: 1039876.691 units remaining : pair (unit @parameter) (pair @storage string timestamp (pair mutez mutez) address address address) ] */ ; IF { CDR - /* [ @storage pair string timestamp (pair mutez mutez) address address address ] */ ; + /* [ pair string timestamp (pair mutez mutez) address address address ] */ ; NIL operation /* [ list operation - : @storage pair string timestamp (pair mutez mutez) address address address ] */ ; + : pair string timestamp (pair mutez mutez) address address address ] */ ; PAIR - /* [ pair (list operation) - (pair @storage string timestamp (pair mutez mutez) address address address) ] */ } + /* [ pair (list operation) string timestamp (pair mutez mutez) address address address ] */ } { CDDR ; PUSH string "success" @@ -113,13 +112,13 @@ Gas remaining: 1039876.691 units remaining : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) + /* [ option (contract unit) : pair string timestamp (pair mutez mutez) address address address ] */ ; ASSERT_SOME } - /* [ mutez : @contract.some contract unit + /* [ mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit + /* [ unit : mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; TRANSFER_TOKENS /* [ operation @@ -136,13 +135,13 @@ Gas remaining: 1039876.691 units remaining : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) + /* [ option (contract unit) : pair string timestamp (pair mutez mutez) address address address ] */ ; ASSERT_SOME } - /* [ mutez : @contract.some contract unit + /* [ mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit + /* [ unit : mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; TRANSFER_TOKENS /* [ operation @@ -173,36 +172,34 @@ Gas remaining: 1039876.691 units remaining PAIR /* [ pair string timestamp (pair mutez mutez) address address address ] */ ; BALANCE - /* [ @balance mutez - : pair string timestamp (pair mutez mutez) address address address ] */ ; + /* [ mutez : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { DUP /* [ pair string timestamp (pair mutez mutez) address address address : pair string timestamp (pair mutez mutez) address address address ] */ ; CDDAAR } - /* [ @balance mutez : mutez + /* [ mutez : mutez : pair string timestamp (pair mutez mutez) address address address ] */ ; COMPARE /* [ int : pair string timestamp (pair mutez mutez) address address address ] */ ; LT /* [ bool : pair string timestamp (pair mutez mutez) address address address ] */ ; IF { BALANCE - /* [ @balance mutez - : pair string timestamp (pair mutez mutez) address address address ] */ ; + /* [ mutez : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { DUP /* [ pair string timestamp (pair mutez mutez) address address address : pair string timestamp (pair mutez mutez) address address address ] */ ; CDDDAR } - /* [ @balance mutez : address + /* [ mutez : address : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) + /* [ option (contract unit) : pair string timestamp (pair mutez mutez) address address address ] */ ; ASSERT_SOME } - /* [ @balance mutez : @contract.some contract unit + /* [ mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit + /* [ unit : mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; TRANSFER_TOKENS /* [ operation @@ -219,35 +216,34 @@ Gas remaining: 1039876.691 units remaining : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) + /* [ option (contract unit) : pair string timestamp (pair mutez mutez) address address address ] */ ; ASSERT_SOME } - /* [ mutez : @contract.some contract unit + /* [ mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit + /* [ unit : mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; TRANSFER_TOKENS /* [ operation : pair string timestamp (pair mutez mutez) address address address ] */ } ; DIP { BALANCE - /* [ @balance mutez - : pair string timestamp (pair mutez mutez) address address address ] */ ; + /* [ mutez : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { DUP /* [ pair string timestamp (pair mutez mutez) address address address : pair string timestamp (pair mutez mutez) address address address ] */ ; CDDDDDR } - /* [ @balance mutez : address + /* [ mutez : address : pair string timestamp (pair mutez mutez) address address address ] */ ; DIP { CONTRACT unit - /* [ @contract option (contract unit) + /* [ option (contract unit) : pair string timestamp (pair mutez mutez) address address address ] */ ; ASSERT_SOME } - /* [ @balance mutez : @contract.some contract unit + /* [ mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit + /* [ unit : mutez : contract unit : pair string timestamp (pair mutez mutez) address address address ] */ ; TRANSFER_TOKENS /* [ operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out index ee8349bf1e4d..a5e5598bb845 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out @@ -6,66 +6,56 @@ Gas remaining: 1039971.200 units remaining storage (list address) ; code { /* [ pair (string @parameter) (string @storage) ] */ DUP - /* [ list operation : @parameter string ] */ ; + /* [ list operation : string ] */ ; CAR - /* [ @parameter nat : pair (nat @parameter) (list @storage address) ] */ ; - DIP { CDR - /* [ @storage list address ] */ ; - NIL operation - /* [ list operation : @storage list address ] */ } - /* [ pair (list operation) (string @parameter) ] */ ; - PUSH bool - True - /* [ bool : @parameter nat : list operation : @storage list address ] */ ; + /* [ nat : pair (nat @parameter) (list @storage address) ] */ ; + DIP { CDR /* [ list address ] */ ; NIL operation /* [ list operation : list address ] */ } + /* [ pair (list operation) string ] */ ; + PUSH bool True + /* [ bool : nat : list operation : list address ] */ ; LOOP { DUP - /* [ @parameter nat : @parameter nat : list operation : @storage list address ] */ ; - PUSH nat - 0 - /* [ nat : @parameter nat : @parameter nat : list operation - : @storage list address ] */ ; + /* [ nat : nat : list operation : list address ] */ ; + PUSH nat 0 + /* [ nat : nat : nat : list operation : list address ] */ ; CMPEQ ; - IF { PUSH bool - False - /* [ bool : @parameter nat : list operation : @storage list address ] */ } + IF { PUSH bool False /* [ bool : nat : list operation : list address ] */ } { PUSH nat 1 - /* [ nat : @parameter nat : list operation : @storage list address ] */ ; + /* [ nat : nat : list operation : list address ] */ ; SWAP - /* [ @parameter nat : nat : list operation : @storage list address ] */ ; + /* [ nat : nat : list operation : list address ] */ ; SUB - /* [ int : list operation : @storage list address ] */ ; + /* [ int : list operation : list address ] */ ; ABS - /* [ nat : list operation : @storage list address ] */ ; + /* [ nat : list operation : list address ] */ ; PUSH string "init" - /* [ string : nat : list operation : @storage list address ] */ ; - PUSH mutez - 5000000 - /* [ mutez : string : nat : list operation : @storage list address ] */ ; + /* [ string : nat : list operation : list address ] */ ; + PUSH mutez 5000000 + /* [ mutez : string : nat : list operation : list address ] */ ; NONE key_hash - /* [ option key_hash : mutez : string : nat : list operation - : @storage list address ] */ ; + /* [ option key_hash : mutez : string : nat : list operation : list address ] */ ; CREATE_CONTRACT { parameter string ; storage string ; code { CAR ; NIL operation ; PAIR } } - /* [ operation : address : nat : list operation : @storage list address ] */ ; + /* [ operation : address : nat : list operation : list address ] */ ; SWAP - /* [ address : operation : nat : list operation : @storage list address ] */ ; + /* [ address : operation : nat : list operation : list address ] */ ; DIP { SWAP - /* [ nat : operation : list operation : @storage list address ] */ ; - DIP { CONS /* [ list operation : @storage list address ] */ } - /* [ nat : list operation : @storage list address ] */ } - /* [ address : nat : list operation : @storage list address ] */ ; + /* [ nat : operation : list operation : list address ] */ ; + DIP { CONS /* [ list operation : list address ] */ } + /* [ nat : list operation : list address ] */ } + /* [ address : nat : list operation : list address ] */ ; SWAP - /* [ nat : address : list operation : @storage list address ] */ ; + /* [ nat : address : list operation : list address ] */ ; DIP { SWAP - /* [ list operation : address : @storage list address ] */ ; + /* [ list operation : address : list address ] */ ; DIP { CONS /* [ list address ] */ } /* [ list operation : list address ] */ } /* [ nat : list operation : list address ] */ ; PUSH bool True /* [ bool : nat : list operation : list address ] */ } } - /* [ @parameter nat : list operation : @storage list address ] */ ; + /* [ nat : list operation : list address ] */ ; DROP - /* [ list operation : @storage list address ] */ ; + /* [ list operation : list address ] */ ; PAIR - /* [ pair (list operation) (list @storage address) ] */ } } + /* [ pair (list operation) (list address) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out index cfb65da18ebc..aa15244dcd2e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039994.573 units remaining { parameter bool ; storage unit ; code { CAR - /* [ @parameter bool ] */ ; + /* [ bool ] */ ; ASSERT ; UNIT /* [ unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out index 80458a249b02..846bae98a266 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.676 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; ASSERT_CMPEQ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out index 5073c99f98ab..2b3cea6f1c6c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.676 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; ASSERT_CMPGE ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out index be2cd26e3e45..ad6bb1ac9649 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.676 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; ASSERT_CMPGT ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out index 5cc85ff9a552..36ad2136d548 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.676 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; ASSERT_CMPLE ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out index 000f0ea66091..6f118050fbd7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.676 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; ASSERT_CMPLT ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out index de154d8d34be..1074fab56ea5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.676 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; ASSERT_CMPNEQ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out index 7e330d2e78fe..f50cda99d240 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.923 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out index 378c6f154655..c830756ba187 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.923 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out index 2bdf64d8f95e..d1ef6bd676dd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.923 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out index f19c14040e6a..5c9142933c80 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.923 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out index 3b1d0aea197c..cd7132002fd3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.923 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out index 3ac47d9013ba..ee74f643533c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039990.923 units remaining { parameter (pair int int) ; storage unit ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int ] */ ; + /* [ int : pair int int ] */ ; DIP { CDR /* [ int ] */ } /* [ int : int ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out index 66533d3d5db8..a83096b521aa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out @@ -56,7 +56,7 @@ Gas remaining: 1039968.666 units remaining /* [ option int : option int : big_map int int ] */ ; IF_SOME { SWAP - /* [ option int : @some int : big_map int int ] */ ; + /* [ option int : int : big_map int int ] */ ; IF_SOME { ASSERT_CMPEQ } { FAIL } } { ASSERT_NONE } ; UNIT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out index d345db9440a9..ae6c0ea324e7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out @@ -5,38 +5,38 @@ Gas remaining: 1039982.791 units remaining { parameter nat ; storage (list nat) ; code { CAR @counter - /* [ @counter nat ] */ ; + /* [ nat ] */ ; NIL @acc nat - /* [ @acc list nat : @counter nat ] */ ; + /* [ list nat : nat ] */ ; SWAP - /* [ @counter nat : @acc list nat ] */ ; + /* [ nat : list nat ] */ ; DUP @cmp_num - /* [ @cmp_num nat : @counter nat : @acc list nat ] */ ; + /* [ nat : nat : list nat ] */ ; PUSH nat 0 - /* [ nat : @cmp_num nat : @counter nat : @acc list nat ] */ ; + /* [ nat : nat : nat : list nat ] */ ; CMPNEQ ; LOOP { DUP - /* [ @counter nat : @counter nat : @acc list nat ] */ ; - DIP { SWAP /* [ @acc list nat : @counter nat ] */ } - /* [ @counter nat : @acc list nat : @counter nat ] */ ; + /* [ nat : nat : list nat ] */ ; + DIP { SWAP /* [ list nat : nat ] */ } + /* [ nat : list nat : nat ] */ ; CONS @acc - /* [ @acc list nat : @counter nat ] */ ; + /* [ list nat : nat ] */ ; SWAP - /* [ @counter nat : @acc list nat ] */ ; + /* [ nat : list nat ] */ ; PUSH nat 1 - /* [ nat : @counter nat : @acc list nat ] */ ; + /* [ nat : nat : list nat ] */ ; SWAP - /* [ @counter nat : nat : @acc list nat ] */ ; + /* [ nat : nat : list nat ] */ ; SUB @counter - /* [ @counter int : @acc list nat ] */ ; + /* [ int : list nat ] */ ; DUP - /* [ @counter int : @counter int : @acc list nat ] */ ; - DIP { ABS /* [ nat : @acc list nat ] */ } - /* [ @counter int : nat : @acc list nat ] */ ; + /* [ int : int : list nat ] */ ; + DIP { ABS /* [ nat : list nat ] */ } + /* [ int : nat : list nat ] */ ; PUSH int 0 - /* [ int : @counter int : nat : @acc list nat ] */ ; + /* [ int : int : nat : list nat ] */ ; CMPNEQ } - /* [ @counter nat : @acc list nat ] */ ; + /* [ nat : list nat ] */ ; CONS /* [ list nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out index eccaff3d32e9..8c1238fd9eae 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out @@ -5,37 +5,37 @@ Gas remaining: 1039963.184 units remaining { parameter (pair nat nat nat unit) ; storage unit ; code { CAR - /* [ @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit ] */ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; CAR - /* [ nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : pair nat nat nat unit ] */ ; PUSH nat 1 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; CAR 0 ; PUSH nat 1 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; CAR 1 ; PUSH nat 4 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; CAR 2 ; PUSH nat 2 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; CDR 3 ; UNIT - /* [ unit : unit : @parameter pair nat nat nat unit ] */ ; + /* [ unit : unit : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DROP /* [] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out index 890f923d4e78..a237a39ff280 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out @@ -5,29 +5,25 @@ Gas remaining: 1039968.322 units remaining { parameter (pair mutez mutez) ; storage (list bool) ; code { CAR - /* [ @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez : pair mutez mutez ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez : pair mutez mutez + : pair mutez mutez ] */ ; DIIIIIP { NIL bool /* [ list bool ] */ } - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez : pair mutez mutez + : pair mutez mutez : list bool ] */ ; DIIIIP { DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : list bool ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ mutez : pair mutez mutez : list bool ] */ ; DIP { CDR /* [ mutez : list bool ] */ } /* [ mutez : mutez : list bool ] */ ; COMPARE @@ -36,13 +32,13 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez : pair mutez mutez + : list bool ] */ ; DIIIP { DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : list bool ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ mutez : pair mutez mutez : list bool ] */ ; DIP { CDR /* [ mutez : list bool ] */ } /* [ mutez : mutez : list bool ] */ ; COMPARE @@ -51,12 +47,11 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez : list bool ] */ ; DIIP { DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : list bool ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ mutez : pair mutez mutez : list bool ] */ ; DIP { CDR /* [ mutez : list bool ] */ } /* [ mutez : mutez : list bool ] */ ; COMPARE @@ -65,11 +60,11 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : list bool ] */ ; DIP { DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : list bool ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ mutez : pair mutez mutez : list bool ] */ ; DIP { CDR /* [ mutez : list bool ] */ } /* [ mutez : mutez : list bool ] */ ; COMPARE @@ -78,11 +73,11 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : list bool ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ pair mutez mutez : pair mutez mutez : list bool ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez : list bool ] */ ; + /* [ mutez : pair mutez mutez : list bool ] */ ; DIP { CDR /* [ mutez : list bool ] */ } /* [ mutez : mutez : list bool ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out index 21c57e92ae3f..8978929af908 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out @@ -5,29 +5,25 @@ Gas remaining: 1039968.322 units remaining { parameter (pair bytes bytes) ; storage (list bool) ; code { CAR - /* [ @parameter pair bytes bytes ] */ ; + /* [ pair bytes bytes ] */ ; DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes ] */ ; + /* [ pair bytes bytes : pair bytes bytes ] */ ; DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes ] */ ; + /* [ pair bytes bytes : pair bytes bytes : pair bytes bytes ] */ ; DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes : @parameter pair bytes bytes ] */ ; + /* [ pair bytes bytes : pair bytes bytes : pair bytes bytes : pair bytes bytes ] */ ; DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes ] */ ; + /* [ pair bytes bytes : pair bytes bytes : pair bytes bytes : pair bytes bytes + : pair bytes bytes ] */ ; DIIIIIP { NIL bool /* [ list bool ] */ } - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : pair bytes bytes : pair bytes bytes + : pair bytes bytes : list bool ] */ ; DIIIIP { DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : list bool ] */ ; CAR - /* [ bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ bytes : pair bytes bytes : list bool ] */ ; DIP { CDR /* [ bytes : list bool ] */ } /* [ bytes : bytes : list bool ] */ ; COMPARE @@ -36,13 +32,13 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : pair bytes bytes : pair bytes bytes + : list bool ] */ ; DIIIP { DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : list bool ] */ ; CAR - /* [ bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ bytes : pair bytes bytes : list bool ] */ ; DIP { CDR /* [ bytes : list bool ] */ } /* [ bytes : bytes : list bool ] */ ; COMPARE @@ -51,12 +47,11 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes - : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : pair bytes bytes : list bool ] */ ; DIIP { DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : list bool ] */ ; CAR - /* [ bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ bytes : pair bytes bytes : list bool ] */ ; DIP { CDR /* [ bytes : list bool ] */ } /* [ bytes : bytes : list bool ] */ ; COMPARE @@ -65,11 +60,11 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : list bool ] */ ; DIP { DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : list bool ] */ ; CAR - /* [ bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ bytes : pair bytes bytes : list bool ] */ ; DIP { CDR /* [ bytes : list bool ] */ } /* [ bytes : bytes : list bool ] */ ; COMPARE @@ -78,11 +73,11 @@ Gas remaining: 1039968.322 units remaining /* [ bool : list bool ] */ ; CONS /* [ list bool ] */ } - /* [ @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : list bool ] */ ; DUP - /* [ @parameter pair bytes bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ pair bytes bytes : pair bytes bytes : list bool ] */ ; CAR - /* [ bytes : @parameter pair bytes bytes : list bool ] */ ; + /* [ bytes : pair bytes bytes : list bool ] */ ; DIP { CDR /* [ bytes : list bool ] */ } /* [ bytes : bytes : list bool ] */ ; COMPARE diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out index b6f156a67dee..1c111b04fdd0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out @@ -5,32 +5,29 @@ Gas remaining: 1039986.383 units remaining { parameter string ; storage (map address (option string)) ; code { UNPAIR @message @guestbook - /* [ @message string : @guestbook map address (option string) ] */ ; + /* [ string : map address (option string) ] */ ; SWAP - /* [ @guestbook map address (option string) : @message string ] */ ; + /* [ map address (option string) : string ] */ ; DUP - /* [ @guestbook map address (option string) - : @guestbook map address (option string) : @message string ] */ ; + /* [ map address (option string) : map address (option string) : string ] */ ; SENDER - /* [ @sender address : @guestbook map address (option string) - : @guestbook map address (option string) : @message string ] */ ; + /* [ address : map address (option string) : map address (option string) + : string ] */ ; GET @previous_message - /* [ @previous_message option (option string) - : @guestbook map address (option string) : @message string ] */ ; + /* [ option (option string) : map address (option string) : string ] */ ; ASSERT_SOME ; ASSERT_NONE ; SWAP - /* [ @message string : @guestbook map address (option string) ] */ ; + /* [ string : map address (option string) ] */ ; SOME - /* [ option string : @guestbook map address (option string) ] */ ; + /* [ option string : map address (option string) ] */ ; SOME - /* [ option (option string) : @guestbook map address (option string) ] */ ; + /* [ option (option string) : map address (option string) ] */ ; SENDER - /* [ @sender address : option (option string) - : @guestbook map address (option string) ] */ ; + /* [ address : option (option string) : map address (option string) ] */ ; UPDATE - /* [ @guestbook map address (option string) ] */ ; + /* [ map address (option string) ] */ ; NIL operation - /* [ list operation : @guestbook map address (option string) ] */ ; + /* [ list operation : map address (option string) ] */ ; PAIR - /* [ pair (list operation) (map @guestbook address (option string)) ] */ } } + /* [ pair (list operation) (map address (option string)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out index f8d3223170ff..2e73b3abe0db 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out @@ -15,10 +15,10 @@ Gas remaining: 1039992.402 units remaining UNIT /* [ unit : pair (unit %truc) unit ] */ ; DUUP @new_storage - /* [ @new_storage pair (unit %truc) unit : unit : pair (unit %truc) unit ] */ ; + /* [ pair (unit %truc) unit : unit : pair (unit %truc) unit ] */ ; DIP { DROP /* [ pair (unit %truc) unit ] */ ; DROP /* [] */ } - /* [ @new_storage pair (unit %truc) unit ] */ ; + /* [ pair (unit %truc) unit ] */ ; NIL operation - /* [ list operation : @new_storage pair (unit %truc) unit ] */ ; + /* [ list operation : pair (unit %truc) unit ] */ ; PAIR - /* [ pair (list operation) (pair @new_storage (unit %truc) unit) ] */ } } + /* [ pair (list operation) (unit %truc) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out index 73a2e8e886e7..27893a7e2524 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out @@ -5,21 +5,21 @@ Gas remaining: 1039985.981 units remaining { parameter (list int) ; storage (option int) ; code { CAR - /* [ @parameter list int ] */ ; + /* [ list int ] */ ; DIP { NONE int /* [ option int ] */ } - /* [ @parameter list int : option int ] */ ; + /* [ list int : option int ] */ ; ITER { SWAP - /* [ option int : @parameter.elt int ] */ ; + /* [ option int : int ] */ ; IF_NONE { SOME /* [ option int ] */ } - { DIP { DUP /* [ @parameter.elt int : @parameter.elt int ] */ } - /* [ @some int : @parameter.elt int : @parameter.elt int ] */ ; + { DIP { DUP /* [ int : int ] */ } + /* [ int : int : int ] */ ; DUP - /* [ @some int : @some int : @parameter.elt int : @parameter.elt int ] */ ; - DIP { SWAP /* [ @parameter.elt int : @some int : @parameter.elt int ] */ } - /* [ @some int : @parameter.elt int : @some int : @parameter.elt int ] */ ; + /* [ int : int : int : int ] */ ; + DIP { SWAP /* [ int : int : int ] */ } + /* [ int : int : int : int ] */ ; CMPLE ; - IF { DROP /* [ @parameter.elt int ] */ } { DIP { DROP /* [] */ } /* [ @some int ] */ } ; + IF { DROP /* [ int ] */ } { DIP { DROP /* [] */ } /* [ int ] */ } ; SOME /* [ option int ] */ } } /* [ option int ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out index 82357667f49c..962d0fa3738e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out @@ -5,16 +5,15 @@ Gas remaining: 1039990.871 units remaining { parameter (pair int int) ; storage int ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int - : @parameter pair int int ] */ ; + /* [ pair int int : pair int int : pair int int ] */ ; CAR - /* [ int : @parameter pair int int : @parameter pair int int ] */ ; - DIP { CDR /* [ int : @parameter pair int int ] */ } - /* [ int : int : @parameter pair int int ] */ ; + /* [ int : pair int int : pair int int ] */ ; + DIP { CDR /* [ int : pair int int ] */ } + /* [ int : int : pair int int ] */ ; CMPLT ; IF { CAR /* [ int ] */ } { CDR /* [ int ] */ } ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out index 1e2f563c6f84..8abd8525ba50 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out @@ -19,8 +19,8 @@ Gas remaining: 1039988.218 units remaining DROP /* [ pair (unit @parameter) (unit @storage) ] */ ; CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out index f44e40007b31..f90685682e42 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039992.790 units remaining { parameter key_hash ; storage unit ; code { CAR - /* [ @parameter key_hash ] */ ; + /* [ key_hash ] */ ; IMPLICIT_ACCOUNT /* [ contract unit ] */ ; DIP { UNIT /* [ unit ] */ } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out index a8af48d673a3..2daa0cca804a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out @@ -7,26 +7,26 @@ Gas remaining: 1039976.490 units remaining code { DROP /* [] */ ; UNIT :u4 @a4 - /* [ @a4 unit :u4 ] */ ; + /* [ unit :u4 ] */ ; UNIT :u3 @a3 - /* [ @a3 unit :u3 : @a4 unit :u4 ] */ ; + /* [ unit :u3 : unit :u4 ] */ ; UNIT :u2 @a2 - /* [ @a2 unit :u2 : @a3 unit :u3 : @a4 unit :u4 ] */ ; + /* [ unit :u2 : unit :u3 : unit :u4 ] */ ; UNIT :u1 @a1 - /* [ @a1 unit :u1 : @a2 unit :u2 : @a3 unit :u3 : @a4 unit :u4 ] */ ; + /* [ unit :u1 : unit :u2 : unit :u3 : unit :u4 ] */ ; PAIR - /* [ pair (unit :u1 @a1) (unit :u2 @a2) : @a3 unit :u3 : @a4 unit :u4 ] */ ; + /* [ pair (unit :u1) (unit :u2) : unit :u3 : unit :u4 ] */ ; UNPAIR @x1 @x2 - /* [ @x1 unit :u1 : @x2 unit :u2 : @a3 unit :u3 : @a4 unit :u4 ] */ ; + /* [ unit :u1 : unit :u2 : unit :u3 : unit :u4 ] */ ; PPAIPAIR @p1 %x1 %x2 %x3 %x4 ; UNPPAIPAIR %x1 % %x3 %x4 @uno @due @tre @quattro ; PAPAPAIR @p2 %x1 %x2 %x3 %x4 ; UNPAPAPAIR @un @deux @trois @quatre ; PAPPAIIR @p3 %x1 %x2 %x3 %x4 ; UNPAPPAIIR @one @two @three @four ; - DIP { DROP /* [ @a3 unit :u3 : @a4 unit :u4 ] */ ; DROP /* [ @a4 unit :u4 ] */ ; DROP /* [] */ } - /* [ @x1 unit :u1 ] */ ; + DIP { DROP /* [ unit :u3 : unit :u4 ] */ ; DROP /* [ unit :u4 ] */ ; DROP /* [] */ } + /* [ unit :u1 ] */ ; NIL operation - /* [ list operation : @x1 unit :u1 ] */ ; + /* [ list operation : unit :u1 ] */ ; PAIR - /* [ pair (list operation) (unit :u1 @x1) ] */ } } + /* [ pair (list operation) (unit :u1) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out index 80ade1980943..c9c80a6e7458 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out @@ -11,28 +11,25 @@ Gas remaining: 1039978.751 units remaining /* [ lambda unit (list operation) : nat : lambda unit (list operation) : signature : nat : key ] */ ; SELF - /* [ @self contract (pair (lambda unit (list operation)) signature) + /* [ contract (pair (lambda unit (list operation)) signature) : lambda unit (list operation) : nat : lambda unit (list operation) : signature : nat : key ] */ ; CHAIN_ID - /* [ chain_id : @self contract (pair (lambda unit (list operation)) signature) + /* [ chain_id : contract (pair (lambda unit (list operation)) signature) : lambda unit (list operation) : nat : lambda unit (list operation) : signature : nat : key ] */ ; PPAIPAIR ; PACK - /* [ @packed bytes : lambda unit (list operation) : signature : nat : key ] */ ; + /* [ bytes : lambda unit (list operation) : signature : nat : key ] */ ; DIP { SWAP /* [ signature : lambda unit (list operation) : nat : key ] */ } - /* [ @packed bytes : signature : lambda unit (list operation) : nat : key ] */ ; + /* [ bytes : signature : lambda unit (list operation) : nat : key ] */ ; DUUUUUP - /* [ key : @packed bytes : signature : lambda unit (list operation) : nat - : key ] */ ; - DIP { SWAP - /* [ signature : @packed bytes : lambda unit (list operation) : nat : key ] */ } - /* [ key : signature : @packed bytes : lambda unit (list operation) : nat - : key ] */ ; + /* [ key : bytes : signature : lambda unit (list operation) : nat : key ] */ ; + DIP { SWAP /* [ signature : bytes : lambda unit (list operation) : nat : key ] */ } + /* [ key : signature : bytes : lambda unit (list operation) : nat : key ] */ ; DUUUP - /* [ bytes : key : signature : @packed bytes : lambda unit (list operation) - : nat : key ] */ ; + /* [ bytes : key : signature : bytes : lambda unit (list operation) : nat + : key ] */ ; DIP { CHECK_SIGNATURE /* [ bool : lambda unit (list operation) : nat : key ] */ } /* [ bytes : bool : lambda unit (list operation) : nat : key ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out index 24288811c4ec..ea6e9342f601 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out @@ -5,63 +5,59 @@ Gas remaining: 1039940.196 units remaining { storage (pair (big_map string nat) (big_map string nat)) ; parameter (or (unit %default - /* [ list operation : @storage big_map string nat ] */) + /* [ list operation : big_map string nat ] */) (or (or %mem (string %mem_left) (string %mem_right) - /* [ pair (list operation) (big_map @storage string nat) ] */) + /* [ pair (list operation) (big_map string nat) ] */) (or (or %add (pair %add_left string nat) (pair %add_right string nat)) (or %rem (string %rem_left) (string %rem_right)))) - /* [ @storage big_map string nat ] */) - /* [ @parameter string : @storage big_map string nat ] */ ; + /* [ big_map string nat ] */) + /* [ string : big_map string nat ] */ ; code { UNPAIR - /* [ @parameter or (unit %default) + /* [ or (unit %default) (or (or %mem (string %mem_left) (string %mem_right)) (or (or %add (pair %add_left string nat) (pair %add_right string nat)) (or %rem (string %rem_left) (string %rem_right)))) - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + : pair (big_map string nat) (big_map string nat) ] */ ; IF_LEFT { DROP - /* [ @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ pair (big_map string nat) (big_map string nat) ] */ ; DUP - /* [ @storage pair (big_map string nat) (big_map string nat) - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ pair (big_map string nat) (big_map string nat) + : pair (big_map string nat) (big_map string nat) ] */ ; CAR - /* [ big_map string nat - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ big_map string nat : pair (big_map string nat) (big_map string nat) ] */ ; PUSH mutez 0 /* [ mutez : big_map string nat - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + : pair (big_map string nat) (big_map string nat) ] */ ; NONE key_hash /* [ option key_hash : mutez : big_map string nat - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + : pair (big_map string nat) (big_map string nat) ] */ ; CREATE_CONTRACT { parameter string ; storage (big_map string nat) ; code { UNPAIR ; DROP ; NIL operation ; PAIR } } - /* [ operation : address - : @storage pair (big_map string nat) (big_map string nat) ] */ ; - DIP { DROP /* [ @storage pair (big_map string nat) (big_map string nat) ] */ } - /* [ operation : @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ operation : address : pair (big_map string nat) (big_map string nat) ] */ ; + DIP { DROP /* [ pair (big_map string nat) (big_map string nat) ] */ } + /* [ operation : pair (big_map string nat) (big_map string nat) ] */ ; NIL operation /* [ list operation : operation - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + : pair (big_map string nat) (big_map string nat) ] */ ; SWAP /* [ operation : list operation - : @storage pair (big_map string nat) (big_map string nat) ] */ ; + : pair (big_map string nat) (big_map string nat) ] */ ; CONS - /* [ list operation : @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ list operation : pair (big_map string nat) (big_map string nat) ] */ ; PAIR - /* [ pair (list operation) (pair @storage (big_map string nat) (big_map string nat)) ] */ } + /* [ pair (list operation) (big_map string nat) (big_map string nat) ] */ } { IF_LEFT { IF_LEFT { DIP { UNPAIR /* [ big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.mem.mem_left string : big_map string nat - : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat ] */ ; DIP { DUP /* [ big_map string nat : big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.mem.mem_left string : big_map string nat - : big_map string nat : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat : big_map string nat ] */ ; MEM /* [ bool : big_map string nat : big_map string nat ] */ ; ASSERT } @@ -69,11 +65,9 @@ Gas remaining: 1039940.196 units remaining /* [ big_map string nat : big_map string nat ] */ ; SWAP /* [ big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.mem.mem_right string : big_map string nat - : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat ] */ ; DIP { DUP /* [ big_map string nat : big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.mem.mem_right string : big_map string nat - : big_map string nat : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat : big_map string nat ] */ ; MEM /* [ bool : big_map string nat : big_map string nat ] */ ; ASSERT ; @@ -82,7 +76,7 @@ Gas remaining: 1039940.196 units remaining { IF_LEFT { IF_LEFT { UNPAIR - /* [ string : nat : @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ string : nat : pair (big_map string nat) (big_map string nat) ] */ ; DIIP { UNPAIR /* [ big_map string nat : big_map string nat ] */ } /* [ string : nat : big_map string nat : big_map string nat ] */ ; DIP { SOME /* [ option nat : big_map string nat : big_map string nat ] */ } @@ -90,7 +84,7 @@ Gas remaining: 1039940.196 units remaining UPDATE /* [ big_map string nat : big_map string nat ] */ } { UNPAIR - /* [ string : nat : @storage pair (big_map string nat) (big_map string nat) ] */ ; + /* [ string : nat : pair (big_map string nat) (big_map string nat) ] */ ; DIIP { UNPAIR /* [ big_map string nat : big_map string nat ] */ ; SWAP @@ -104,22 +98,18 @@ Gas remaining: 1039940.196 units remaining /* [ big_map string nat : big_map string nat ] */ } } { IF_LEFT { DIP { UNPAIR /* [ big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.right.rem.rem_left string : big_map string nat - : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat ] */ ; DIP { NONE nat /* [ option nat : big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.right.rem.rem_left string : option nat - : big_map string nat : big_map string nat ] */ ; + /* [ string : option nat : big_map string nat : big_map string nat ] */ ; UPDATE /* [ big_map string nat : big_map string nat ] */ } { DIP { UNPAIR /* [ big_map string nat : big_map string nat ] */ ; SWAP /* [ big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.right.rem.rem_right string : big_map string nat - : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat ] */ ; DIP { NONE nat /* [ option nat : big_map string nat : big_map string nat ] */ } - /* [ @parameter.right.right.rem.rem_right string : option nat - : big_map string nat : big_map string nat ] */ ; + /* [ string : option nat : big_map string nat : big_map string nat ] */ ; UPDATE /* [ big_map string nat : big_map string nat ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out index 66e7eff8d1ff..dfa1a5e5e416 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out @@ -9,14 +9,14 @@ Gas remaining: 1039941.750 units remaining (or (pair %import (list (pair string string)) (list (pair string string))) (or (list %add (pair string string)) (list %rem string))))) ; code { UNPAIR - /* [ @parameter or (unit %swap) + /* [ or (unit %swap) (or (or %reset (pair (big_map string string) (big_map string string)) unit) (or (pair %import (list (pair string string)) (list (pair string string))) (or (list %add (pair string string)) (list %rem string)))) - : @storage or (pair (big_map string string) (big_map string string)) unit ] */ ; + : or (pair (big_map string string) (big_map string string)) unit ] */ ; IF_LEFT { DROP - /* [ @storage or (pair (big_map string string) (big_map string string)) unit ] */ ; + /* [ or (pair (big_map string string) (big_map string string)) unit ] */ ; ASSERT_LEFT ; UNPAIR /* [ big_map string string : big_map string string ] */ ; @@ -28,13 +28,13 @@ Gas remaining: 1039941.750 units remaining /* [ or (pair (big_map string string) (big_map string string)) unit ] */ } { IF_LEFT { SWAP - /* [ @storage or (pair (big_map string string) (big_map string string)) unit - : @parameter.right.reset or (pair (big_map string string) (big_map string string)) unit ] */ ; + /* [ or (pair (big_map string string) (big_map string string)) unit + : or (pair (big_map string string) (big_map string string)) unit ] */ ; DROP - /* [ @parameter.right.reset or (pair (big_map string string) (big_map string string)) unit ] */ } + /* [ or (pair (big_map string string) (big_map string string)) unit ] */ } { IF_LEFT { DIP { ASSERT_RIGHT ; DROP /* [] */ } - /* [ @parameter.right.right.import pair (list (pair string string)) (list (pair string string)) ] */ ; + /* [ pair (list (pair string string)) (list (pair string string)) ] */ ; UNPAIR /* [ list (pair string string) : list (pair string string) ] */ ; DIP { EMPTY_BIG_MAP @@ -72,8 +72,7 @@ Gas remaining: 1039941.750 units remaining /* [ or (pair (big_map string string) (big_map string string)) unit ] */ } { IF_LEFT { DIP { ASSERT_LEFT ; UNPAIR /* [ big_map string string : big_map string string ] */ } - /* [ @parameter.right.right.right.add list (pair string string) - : big_map string string : big_map string string ] */ ; + /* [ list (pair string string) : big_map string string : big_map string string ] */ ; ITER { UNPAIR /* [ string : string : big_map string string : big_map string string ] */ ; DIP { SOME /* [ option string : big_map string string : big_map string string ] */ } @@ -86,12 +85,10 @@ Gas remaining: 1039941.750 units remaining LEFT unit /* [ or (pair (big_map string string) (big_map string string)) unit ] */ } { DIP { ASSERT_LEFT ; UNPAIR /* [ big_map string string : big_map string string ] */ } - /* [ @parameter.right.right.right.rem list string : big_map string string - : big_map string string ] */ ; + /* [ list string : big_map string string : big_map string string ] */ ; ITER { DIP { NONE string /* [ option string : big_map string string : big_map string string ] */ } - /* [ @parameter.right.right.right.rem.elt string : option string - : big_map string string : big_map string string ] */ ; + /* [ string : option string : big_map string string : big_map string string ] */ ; UPDATE /* [ big_map string string : big_map string string ] */ } /* [ big_map string string : big_map string string ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out index 35fc1089793e..fb6af71493cc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039993.434 units remaining { storage nat ; parameter (big_map nat nat) ; code { CAR - /* [ @parameter big_map nat nat ] */ ; + /* [ big_map nat nat ] */ ; PUSH nat 1 - /* [ nat : @parameter big_map nat nat ] */ ; + /* [ nat : big_map nat nat ] */ ; GET /* [ option nat ] */ ; ASSERT_SOME ; NIL operation - /* [ list operation : @some nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @some) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out index 5ed2c7dc6be8..2314efe7a47b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out @@ -5,17 +5,16 @@ Gas remaining: 1039994.022 units remaining { storage unit ; parameter (big_map nat nat) ; code { UNPAIR - /* [ @parameter big_map nat nat : @storage unit ] */ ; - PUSH (option nat) - (Some 1) - /* [ option nat : @parameter big_map nat nat : @storage unit ] */ ; + /* [ big_map nat nat : unit ] */ ; + PUSH (option nat) (Some 1) + /* [ option nat : big_map nat nat : unit ] */ ; PUSH nat 1 - /* [ nat : option nat : @parameter big_map nat nat : @storage unit ] */ ; + /* [ nat : option nat : big_map nat nat : unit ] */ ; UPDATE - /* [ @parameter big_map nat nat : @storage unit ] */ ; + /* [ big_map nat nat : unit ] */ ; DROP - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out index a8a81f106d0a..3be134e65c71 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out @@ -6,9 +6,9 @@ Gas remaining: 1039968.907 units remaining storage unit ; code { /* [ pair (string @parameter) (string @storage) ] */ CAR - /* [ list operation : @parameter string ] */ ; + /* [ list operation : string ] */ ; IF_NONE - { /* [ list operation : @parameter string ] */ + { /* [ list operation : string ] */ PUSH string "dummy" /* [ string ] */ ; PUSH mutez 100000000 @@ -23,10 +23,10 @@ Gas remaining: 1039968.907 units remaining DIP { SOME /* [ option address ] */ ; DIP { SELF - /* [ @self contract (option address) ] */ ; + /* [ contract (option address) ] */ ; PUSH mutez 0 - /* [ mutez : @self contract (option address) ] */ } - /* [ option address : mutez : @self contract (option address) ] */ ; + /* [ mutez : contract (option address) ] */ } + /* [ option address : mutez : contract (option address) ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; NIL operation @@ -45,20 +45,19 @@ Gas remaining: 1039968.907 units remaining PAIR /* [ pair (list operation) unit ] */ } { SELF - /* [ @self contract (option address) : @parameter.some address ] */ ; + /* [ contract (option address) : address ] */ ; ADDRESS - /* [ @self.address address : @parameter.some address ] */ ; + /* [ address : address ] */ ; SENDER - /* [ @sender address : @self.address address : @parameter.some address ] */ ; - IFCMPNEQ { FAIL } { /* [ @parameter.some address ] */ } ; + /* [ address : address : address ] */ ; + IFCMPNEQ { FAIL } { /* [ address ] */ } ; CONTRACT string - /* [ @parameter.some.contract option (contract string) ] */ ; - IF_SOME { /* [ @parameter.some.contract.some contract string ] */ } { FAIL } ; + /* [ option (contract string) ] */ ; + IF_SOME { /* [ contract string ] */ } { FAIL } ; PUSH mutez 0 - /* [ mutez : @parameter.some.contract.some contract string ] */ ; - PUSH string - "abcdefg" - /* [ string : mutez : @parameter.some.contract.some contract string ] */ ; + /* [ mutez : contract string ] */ ; + PUSH string "abcdefg" + /* [ string : mutez : contract string ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out index 048cd27e61b3..6a09a9aed8c5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out @@ -5,25 +5,23 @@ Gas remaining: 1039989.249 units remaining { parameter unit ; storage unit ; code { CAR - /* [ @parameter string ] */ ; - PUSH string - "foo" - /* [ pair (list operation) (string @parameter) ] */ - /* [ list operation : @parameter string ] */ ; + /* [ string ] */ ; + PUSH string "foo" /* [ pair (list operation) string ] */ + /* [ list operation : string ] */ ; PUSH mutez 0 - /* [ mutez : string : @parameter unit ] */ ; + /* [ mutez : string : unit ] */ ; NONE key_hash - /* [ option key_hash : mutez : string : @parameter unit ] */ ; + /* [ option key_hash : mutez : string : unit ] */ ; CREATE_CONTRACT { parameter string ; storage string ; code { CAR ; NIL operation ; PAIR } } - /* [ operation : address : @parameter unit ] */ ; + /* [ operation : address : unit ] */ ; DROP - /* [ address : @parameter unit ] */ ; + /* [ address : unit ] */ ; DROP - /* [ @parameter unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @parameter unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @parameter) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out index fe088fd8f192..45ce559fb80f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out @@ -7,7 +7,7 @@ Gas remaining: 1039992.790 units remaining code { DIP { UNIT /* [ unit ] */ } /* [ pair (key_hash @parameter) (unit @storage) : unit ] */ ; CAR - /* [ @parameter key_hash : unit ] */ ; + /* [ key_hash : unit ] */ ; IMPLICIT_ACCOUNT /* [ contract unit : unit ] */ ; PUSH mutez 100000000 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out index 7655ce31e15c..621174989a07 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out @@ -5,30 +5,25 @@ Gas remaining: 1039989.364 units remaining { parameter unit ; storage (pair address string) ; code { CDR - /* [ @storage pair address string ] */ ; + /* [ pair address string ] */ ; DUP - /* [ @storage pair address string : @storage pair address string ] */ ; + /* [ pair address string : pair address string ] */ ; UNPAIR - /* [ address : string : @storage pair address string ] */ ; - CONTRACT - string - /* [ @contract option (contract string) : string - : @storage pair address string ] */ ; + /* [ address : string : pair address string ] */ ; + CONTRACT string + /* [ option (contract string) : string : pair address string ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @contract.some contract string : string - : @storage pair address string ] */ ; + PUSH mutez 0 + /* [ mutez : contract string : string : pair address string ] */ ; DIG 2 - /* [ string : mutez : @contract.some contract string - : @storage pair address string ] */ ; + /* [ string : mutez : contract string : pair address string ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair address string ] */ ; + /* [ operation : pair address string ] */ ; NIL operation - /* [ list operation : operation : @storage pair address string ] */ ; + /* [ list operation : operation : pair address string ] */ ; SWAP - /* [ operation : list operation : @storage pair address string ] */ ; + /* [ operation : list operation : pair address string ] */ ; CONS - /* [ list operation : @storage pair address string ] */ ; + /* [ list operation : pair address string ] */ ; PAIR - /* [ pair (list operation) (pair @storage address string) ] */ } } + /* [ pair (list operation) address string ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out index 199cc39695ec..435c3e2e782e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out @@ -5,21 +5,18 @@ Gas remaining: 1039991.291 units remaining { parameter unit ; storage (list address) ; code { CDR - /* [ @storage list address ] */ ; + /* [ list address ] */ ; DUP - /* [ @storage list address : @storage list address ] */ ; - MAP { CONTRACT - unit - /* [ @storage.elt.contract option (contract unit) : @storage list address ] */ ; + /* [ list address : list address ] */ ; + MAP { CONTRACT unit + /* [ option (contract unit) : list address ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @storage.elt.contract.some contract unit : @storage list address ] */ ; + PUSH mutez 0 + /* [ mutez : contract unit : list address ] */ ; UNIT - /* [ unit : mutez : @storage.elt.contract.some contract unit - : @storage list address ] */ ; + /* [ unit : mutez : contract unit : list address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage list address ] */ } - /* [ list operation : @storage list address ] */ ; + /* [ operation : list address ] */ } + /* [ list operation : list address ] */ ; PAIR - /* [ pair (list operation) (list @storage address) ] */ } } + /* [ pair (list operation) (list address) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out index 0bdfca4c333d..48c6bb61f757 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039996.340 units remaining { parameter string ; storage string ; code { UNPAIR - /* [ @parameter string : @storage string ] */ ; + /* [ string : string ] */ ; SWAP - /* [ @storage string : @parameter string ] */ ; + /* [ string : string ] */ ; CONCAT /* [ string ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out index d0f84d82226a..f7704cda2314 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out @@ -136,7 +136,7 @@ Gas remaining: 1039229.258 units remaining /* [ address : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SENDER - /* [ @sender address : address : pair address address nat + /* [ address : address : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; COMPARE /* [ int : pair address address nat @@ -163,15 +163,15 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SENDER - /* [ @sender address : address + /* [ address : address : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (address @sender) address + /* [ pair address address : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DUP - /* [ pair (address @sender) address : pair (address @sender) address + /* [ pair address address : pair address address : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CDR @@ -195,10 +195,10 @@ Gas remaining: 1039229.258 units remaining { CDR /* [ map address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } - /* [ pair (address @sender) address : map address nat + /* [ pair address address : map address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ @sender address : map address nat + /* [ address : map address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; GET /* [ option nat @@ -208,7 +208,7 @@ Gas remaining: 1039229.258 units remaining 0 /* [ nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - { /* [ @some nat + { /* [ nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } /* [ pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; @@ -219,7 +219,7 @@ Gas remaining: 1039229.258 units remaining /* [ address : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { SENDER - /* [ @sender address : pair address address nat : nat + /* [ address : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address address nat : pair address address nat : nat @@ -284,207 +284,195 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat : pair address address nat : nat + { /* [ nat : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } - /* [ @sender address : @some nat : pair address address nat : nat + /* [ address : nat : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (address @sender) (nat @some) : pair address address nat : nat + /* [ pair address nat : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ address : pair (address @sender) (nat @some) : pair address address nat - : nat + /* [ address : pair address nat : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair address (address @sender) (nat @some) : pair address address nat : nat + /* [ pair address address nat : pair address address nat : nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DROP /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair address (address @sender) (nat @some) + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair address (address @sender) (nat @some) + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ pair (big_map address (pair nat (map address nat))) address bool nat - : pair address (address @sender) (nat @some) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair address (address @sender) (nat @some) - : pair address (address @sender) (nat @some) + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ address : pair address (address @sender) (nat @some) + /* [ address : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair (big_map address (pair nat (map address nat))) address bool nat - : address : pair address (address @sender) (nat @some) + : address : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat - : pair address (address @sender) (nat @some) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR - /* [ big_map address (pair nat (map address nat)) - : pair address (address @sender) (nat @some) + /* [ big_map address (pair nat (map address nat)) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ address : big_map address (pair nat (map address nat)) - : pair address (address @sender) (nat @some) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; GET - /* [ option (pair nat (map address nat)) - : pair address (address @sender) (nat @some) + /* [ option (pair nat (map address nat)) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { PUSH nat 0 - /* [ nat : pair address (address @sender) (nat @some) + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { EMPTY_MAP address nat - /* [ map address nat : pair address (address @sender) (nat @some) + /* [ map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : map address nat : pair address (address @sender) (nat @some) + /* [ nat : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EMPTY_MAP address nat - /* [ map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ pair nat (map address nat) : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ map address nat : @some pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DIP { DUP - /* [ pair address (address @sender) (nat @some) - : pair address (address @sender) (nat @some) + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair nat (map address nat) : pair address (address @sender) (nat @some) - : pair address (address @sender) (nat @some) + /* [ pair nat (map address nat) : pair address address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address (address @sender) (nat @some) : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : pair address (address @sender) (nat @some) - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ map address nat : pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address (address @sender) (nat @some) : map address nat - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair address address nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair (address @sender) (nat @some) : map address nat - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair address nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ @some nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DUP - /* [ @some nat : @some nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ nat : nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : @some nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ int : nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : @some nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ bool : nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DROP - /* [ map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; NONE nat /* [ option nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { SOME /* [ option nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DIP { DIP { DUP - /* [ pair address (address @sender) (nat @some) - : pair address (address @sender) (nat @some) + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair nat (map address nat) : pair address (address @sender) (nat @some) - : pair address (address @sender) (nat @some) + /* [ pair nat (map address nat) : pair address address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address (address @sender) (nat @some) : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : pair address (address @sender) (nat @some) - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ map address nat : pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address (address @sender) (nat @some) : map address nat - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair address address nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ option nat : pair address (address @sender) (nat @some) : map address nat - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ option nat : pair address address nat : map address nat + : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address (address @sender) (nat @some) : option nat : map address nat - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair address address nat : option nat : map address nat + : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair (address @sender) (nat @some) : option nat : map address nat - : pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair address nat : option nat : map address nat + : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ @sender address : option nat : map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ address : option nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; UPDATE - /* [ map address nat : pair nat (map address nat) - : pair address (address @sender) (nat @some) + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair nat (map address nat) : pair nat (map address nat) - : pair address (address @sender) (nat @some) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR - /* [ nat : pair address (address @sender) (nat @some) + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair nat (map address nat) : nat - : pair address (address @sender) (nat @some) + /* [ pair nat (map address nat) : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ map address nat : nat : pair address (address @sender) (nat @some) + /* [ map address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : map address nat : nat - : pair address (address @sender) (nat @some) + /* [ map address nat : map address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP - /* [ nat : pair address (address @sender) (nat @some) + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : nat : pair address (address @sender) (nat @some) + /* [ map address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ nat : map address nat : pair address (address @sender) (nat @some) + /* [ nat : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair nat (map address nat) : pair address (address @sender) (nat @some) + /* [ pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address (address @sender) (nat @some) : pair nat (map address nat) + /* [ pair address address nat : pair nat (map address nat) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ address : pair nat (map address nat) @@ -609,41 +597,39 @@ Gas remaining: 1039229.258 units remaining { DIP { DUP /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some pair nat (map address nat) : pair address address nat + /* [ pair nat (map address nat) : pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address address nat : @some pair nat (map address nat) + /* [ pair address address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair address nat : @some pair nat (map address nat) - : pair address address nat + /* [ pair address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ nat : @some pair nat (map address nat) : pair address address nat + /* [ nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ nat : @some pair nat (map address nat) : pair address address nat + /* [ nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : nat : @some pair nat (map address nat) : pair address address nat + /* [ nat : nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; ADD - /* [ nat : @some pair nat (map address nat) : pair address address nat + /* [ nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CDR /* [ map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some pair nat (map address nat) : map address nat - : pair address address nat + /* [ pair nat (map address nat) : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ nat : map address nat : pair address address nat @@ -744,7 +730,7 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat + { /* [ nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -752,7 +738,7 @@ Gas remaining: 1039229.258 units remaining CDR /* [ pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : pair address bool nat + /* [ nat : pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address bool nat : pair address bool nat @@ -765,7 +751,7 @@ Gas remaining: 1039229.258 units remaining CDR /* [ pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : pair bool nat : address + /* [ nat : pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair bool nat : pair bool nat : address @@ -778,24 +764,24 @@ Gas remaining: 1039229.258 units remaining CDR /* [ nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : nat : bool : address + /* [ nat : nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : bool : address + /* [ nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ bool : @some nat : address + /* [ bool : nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair bool (nat @some) : address + /* [ pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ address : pair bool (nat @some) + /* [ address : pair bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair address bool (nat @some) + /* [ pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -805,393 +791,383 @@ Gas remaining: 1039229.258 units remaining : big_map address (pair nat (map address nat)) ] */ ; CDR /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) : pair address bool nat + /* [ pair address bool nat : pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; DIP { DROP /* [ big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) - : big_map address (pair nat (map address nat)) ] */ ; + /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; SWAP - /* [ big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ ; + /* [ big_map address (pair nat (map address nat)) : pair address bool nat ] */ ; PAIR - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) + /* [ pair (big_map address (pair nat (map address nat))) address bool nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat : pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) + : pair (big_map address (pair nat (map address nat))) address bool nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) + : pair (big_map address (pair nat (map address nat))) address bool nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR /* [ big_map address (pair nat (map address nat)) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ address : big_map address (pair nat (map address nat)) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; GET /* [ option (pair nat (map address nat)) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { CDR /* [ pair address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PUSH nat 0 /* [ nat : nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ nat : nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR /* [ pair nat nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PUSH string "NotEnoughBalance" /* [ string : pair nat nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR /* [ pair string nat nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } ; + { /* [ pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ nat : @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DIP { DUP /* [ pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ pair nat (map address nat) : pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address address nat : @some pair nat (map address nat) + /* [ pair address address nat : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ nat : pair address address nat : @some pair nat (map address nat) + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : pair address address nat : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address address nat : nat : @some pair nat (map address nat) + /* [ pair address address nat : nat : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair address nat : nat : @some pair nat (map address nat) + /* [ pair address nat : nat : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ nat : nat : @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat : nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ nat : nat : @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat : nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SUB - /* [ int : @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ int : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; ISNAT - /* [ option nat : @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ option nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { CAR /* [ nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ nat : pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ pair address address nat : nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ pair address nat : nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ nat : nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR /* [ pair nat nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PUSH string "NotEnoughBalance" /* [ string : pair nat nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR /* [ pair string nat nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat : @some pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } ; + { /* [ nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CDR /* [ map address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some pair nat (map address nat) : map address nat - : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ pair nat (map address nat) : map address nat : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ nat : map address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some nat : nat : map address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : nat : map address nat : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ map address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some nat : map address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : map address nat : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ pair (nat @some) (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ pair nat (map address nat) : pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address address nat : pair (nat @some) (map address nat) + /* [ pair address address nat : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (nat @some) (map address nat) : pair (nat @some) (map address nat) + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ @some nat : pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ int : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ bool : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DUP - /* [ pair (nat @some) (map address nat) : pair (nat @some) (map address nat) + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ map address nat : pair (nat @some) (map address nat) - : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ map address nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SIZE - /* [ nat : pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ int : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : pair (nat @some) (map address nat) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ bool : pair nat (map address nat) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DROP /* [ pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; NONE (pair nat (map address nat)) /* [ option (pair nat (map address nat)) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { SOME - /* [ option (pair (nat @some) (map address nat)) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } } + /* [ option (pair nat (map address nat)) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } { SOME - /* [ option (pair (nat @some) (map address nat)) : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } ; + /* [ option (pair nat (map address nat)) : pair address address nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; SWAP /* [ pair address address nat : option (pair nat (map address nat)) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ address : option (pair nat (map address nat)) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DIP { DUP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ big_map address (pair nat (map address nat)) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ option (pair nat (map address nat)) : big_map address (pair nat (map address nat)) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ address : option (pair nat (map address nat)) : big_map address (pair nat (map address nat)) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; UPDATE /* [ big_map address (pair nat (map address nat)) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; - DIP { CDR /* [ pair address bool (nat @some) ] */ } - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; + DIP { CDR /* [ pair address bool nat ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair address bool nat ] */ ; CAR - /* [ big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ } - /* [ big_map address (pair nat (map address nat)) - : big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ ; - DIP { DROP /* [ pair address bool (nat @some) ] */ } + /* [ big_map address (pair nat (map address nat)) : pair address bool nat ] */ } /* [ big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ ; + : big_map address (pair nat (map address nat)) : pair address bool nat ] */ ; + DIP { DROP /* [ pair address bool nat ] */ } + /* [ big_map address (pair nat (map address nat)) : pair address bool nat ] */ ; PAIR - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DUP /* [ pair address address nat : pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CDR /* [ pair address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; NEG /* [ int - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ @some nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ int : @some nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ int : nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; ADD /* [ int - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; ISNAT /* [ option nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { PUSH string "Internal: Negative total supply" /* [ string - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } ; + { /* [ nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DUP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some nat : pair address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : pair address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair address bool (nat @some) : pair address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair address bool nat : pair address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR /* [ address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ pair address bool (nat @some) : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ pair address bool nat : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair bool (nat @some) : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some nat : pair bool (nat @some) : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair bool nat : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : pair bool nat : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair bool (nat @some) : pair bool (nat @some) : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair bool nat : pair bool nat : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR /* [ bool : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ pair bool (nat @some) : bool : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ pair bool nat : bool : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ @some nat : bool : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some nat : @some nat : bool : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ nat : bool : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : nat : bool : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ bool : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } - /* [ @some nat : bool : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } + /* [ nat : bool : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ bool : @some nat : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ bool : nat : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair bool (nat @some) : address - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair bool nat : address + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ address : pair bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ address : pair bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR /* [ big_map address (pair nat (map address nat)) ] */ } - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) + /* [ pair (big_map address (pair nat (map address nat))) address bool nat : big_map address (pair nat (map address nat)) ] */ ; CDR - /* [ pair address bool (nat @some) - : big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) : pair address bool (nat @some) + /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ } + /* [ pair address bool nat : pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; DIP { DROP /* [ big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) - : big_map address (pair nat (map address nat)) ] */ ; + /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; SWAP - /* [ big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ ; + /* [ big_map address (pair nat (map address nat)) : pair address bool nat ] */ ; PAIR - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair address address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DROP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; NIL operation /* [ list operation : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR /* [ pair (list operation) (big_map address (pair nat (map address nat))) address bool nat ] */ } { SENDER - /* [ @sender address : pair address nat + /* [ address : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -1218,307 +1194,297 @@ Gas remaining: 1039229.258 units remaining FAILWITH /* [] */ } { /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (address @sender) address nat : pair (address @sender) address nat + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat : pair (address @sender) address nat + : pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DUP - /* [ pair (address @sender) address nat : pair (address @sender) address nat + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR - /* [ @sender address + /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR - /* [ big_map address (pair nat (map address nat)) - : pair (address @sender) address nat + /* [ big_map address (pair nat (map address nat)) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @sender address : big_map address (pair nat (map address nat)) - : pair (address @sender) address nat + /* [ address : big_map address (pair nat (map address nat)) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; GET - /* [ option (pair nat (map address nat)) : pair (address @sender) address nat + /* [ option (pair nat (map address nat)) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { EMPTY_MAP address nat - /* [ map address nat : pair (address @sender) address nat + /* [ map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { CDR - /* [ map address nat : pair (address @sender) address nat + /* [ map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } - /* [ pair (address @sender) address nat : map address nat - : pair (address @sender) address nat + /* [ pair address address nat : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair address nat : map address nat : pair (address @sender) address nat + /* [ pair address nat : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ address : map address nat : pair (address @sender) address nat + /* [ address : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; GET - /* [ option nat : pair (address @sender) address nat + /* [ option nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { PUSH nat 0 - /* [ nat : pair (address @sender) address nat + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - { /* [ @some nat : pair (address @sender) address nat + { /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DUP - /* [ nat : nat : pair (address @sender) address nat + /* [ nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : nat : pair (address @sender) address nat + /* [ int : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : nat : pair (address @sender) address nat + /* [ bool : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DROP - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { DIP { DUP - /* [ pair (address @sender) address nat : pair (address @sender) address nat + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : pair (address @sender) address nat - : pair (address @sender) address nat + /* [ nat : pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : nat - : pair (address @sender) address nat + /* [ pair address address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ pair address nat : nat : pair (address @sender) address nat + /* [ pair address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ nat : nat : pair (address @sender) address nat + /* [ nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : nat : pair (address @sender) address nat + /* [ int : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : nat : pair (address @sender) address nat + /* [ bool : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DROP - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { PUSH string "UnsafeAllowanceChange" - /* [ string : nat : pair (address @sender) address nat + /* [ string : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair string nat : pair (address @sender) address nat + /* [ pair string nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } } ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair (address @sender) address nat + /* [ pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP /* [ pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (address @sender) address nat : pair (address @sender) address nat + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ @sender address : pair (address @sender) address nat + /* [ address : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair (big_map address (pair nat (map address nat))) address bool nat - : @sender address : pair (address @sender) address nat + : address : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ @sender address + /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR - /* [ big_map address (pair nat (map address nat)) - : pair (address @sender) address nat + /* [ big_map address (pair nat (map address nat)) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @sender address : big_map address (pair nat (map address nat)) - : pair (address @sender) address nat + /* [ address : big_map address (pair nat (map address nat)) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; GET - /* [ option (pair nat (map address nat)) : pair (address @sender) address nat + /* [ option (pair nat (map address nat)) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { PUSH nat 0 - /* [ nat : pair (address @sender) address nat + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { EMPTY_MAP address nat - /* [ map address nat : pair (address @sender) address nat + /* [ map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : map address nat : pair (address @sender) address nat + /* [ nat : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair nat (map address nat) : pair (address @sender) address nat + /* [ pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EMPTY_MAP address nat - /* [ map address nat : pair nat (map address nat) - : pair (address @sender) address nat + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) - : pair (address @sender) address nat + /* [ pair nat (map address nat) : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ map address nat : @some pair nat (map address nat) - : pair (address @sender) address nat + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DIP { DUP - /* [ pair (address @sender) address nat : pair (address @sender) address nat + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair nat (map address nat) : pair (address @sender) address nat - : pair (address @sender) address nat + /* [ pair nat (map address nat) : pair address address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : pair nat (map address nat) - : pair (address @sender) address nat + /* [ pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : pair (address @sender) address nat - : pair nat (map address nat) : pair (address @sender) address nat + /* [ map address nat : pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : map address nat - : pair nat (map address nat) : pair (address @sender) address nat + /* [ pair address address nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ pair address nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DUP /* [ nat : nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT /* [ int : nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ /* [ bool : nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DROP - /* [ map address nat : pair nat (map address nat) - : pair (address @sender) address nat + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; NONE nat /* [ option nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { SOME /* [ option nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DIP { DIP { DUP - /* [ pair (address @sender) address nat : pair (address @sender) address nat + /* [ pair address address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair nat (map address nat) : pair (address @sender) address nat - : pair (address @sender) address nat + /* [ pair nat (map address nat) : pair address address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : pair nat (map address nat) - : pair (address @sender) address nat + /* [ pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : pair (address @sender) address nat - : pair nat (map address nat) : pair (address @sender) address nat + /* [ map address nat : pair address address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : map address nat - : pair nat (map address nat) : pair (address @sender) address nat + /* [ pair address address nat : map address nat : pair nat (map address nat) + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ option nat : pair (address @sender) address nat : map address nat - : pair nat (map address nat) : pair (address @sender) address nat + /* [ option nat : pair address address nat : map address nat + : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : option nat : map address nat - : pair nat (map address nat) : pair (address @sender) address nat + /* [ pair address address nat : option nat : map address nat + : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR /* [ pair address nat : option nat : map address nat - : pair nat (map address nat) : pair (address @sender) address nat + : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ address : option nat : map address nat : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; UPDATE - /* [ map address nat : pair nat (map address nat) - : pair (address @sender) address nat + /* [ map address nat : pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair nat (map address nat) : pair nat (map address nat) - : pair (address @sender) address nat + : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CAR - /* [ nat : pair (address @sender) address nat + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair nat (map address nat) : nat : pair (address @sender) address nat + /* [ pair nat (map address nat) : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ map address nat : nat : pair (address @sender) address nat + /* [ map address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : map address nat : nat - : pair (address @sender) address nat + /* [ map address nat : map address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP - /* [ nat : pair (address @sender) address nat + /* [ nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ map address nat : nat : pair (address @sender) address nat + /* [ map address nat : nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ nat : map address nat : pair (address @sender) address nat + /* [ nat : map address nat : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair nat (map address nat) : pair (address @sender) address nat + /* [ pair nat (map address nat) : pair address address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair (address @sender) address nat : pair nat (map address nat) + /* [ pair address address nat : pair nat (map address nat) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ @sender address : pair nat (map address nat) + /* [ address : pair nat (map address nat) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { SOME /* [ option (pair nat (map address nat)) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @sender address : option (pair nat (map address nat)) + /* [ address : option (pair nat (map address nat)) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -1529,7 +1495,7 @@ Gas remaining: 1039229.258 units remaining /* [ option (pair nat (map address nat)) : big_map address (pair nat (map address nat)) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @sender address : option (pair nat (map address nat)) + /* [ address : option (pair nat (map address nat)) : big_map address (pair nat (map address nat)) : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; UPDATE @@ -1656,12 +1622,12 @@ Gas remaining: 1039229.258 units remaining 0 /* [ nat : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - { /* [ @some nat : contract nat + { /* [ nat : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { AMOUNT - /* [ @amount mutez : contract nat + /* [ mutez : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : @amount mutez : contract nat + /* [ nat : mutez : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; TRANSFER_TOKENS /* [ operation @@ -1742,9 +1708,9 @@ Gas remaining: 1039229.258 units remaining /* [ nat : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { AMOUNT - /* [ @amount mutez : contract nat + /* [ mutez : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : @amount mutez : contract nat + /* [ nat : mutez : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; TRANSFER_TOKENS /* [ operation @@ -1802,9 +1768,9 @@ Gas remaining: 1039229.258 units remaining /* [ nat : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { AMOUNT - /* [ @amount mutez : contract nat + /* [ mutez : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : @amount mutez : contract nat + /* [ nat : mutez : contract nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; TRANSFER_TOKENS /* [ operation @@ -1832,7 +1798,7 @@ Gas remaining: 1039229.258 units remaining /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SENDER - /* [ @sender address : address + /* [ address : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; COMPARE /* [ int @@ -1934,7 +1900,7 @@ Gas remaining: 1039229.258 units remaining /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SENDER - /* [ @sender address : address + /* [ address : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; COMPARE /* [ int @@ -2047,9 +2013,9 @@ Gas remaining: 1039229.258 units remaining /* [ address : contract address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { AMOUNT - /* [ @amount mutez : contract address + /* [ mutez : contract address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ address : @amount mutez : contract address + /* [ address : mutez : contract address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; TRANSFER_TOKENS /* [ operation @@ -2076,7 +2042,7 @@ Gas remaining: 1039229.258 units remaining /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SENDER - /* [ @sender address : address + /* [ address : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; COMPARE /* [ int @@ -2171,34 +2137,32 @@ Gas remaining: 1039229.258 units remaining { DIP { DUP /* [ pair address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some pair nat (map address nat) : pair address nat : pair address nat + /* [ pair nat (map address nat) : pair address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address nat : @some pair nat (map address nat) : pair address nat + /* [ pair address nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ nat : @some pair nat (map address nat) : pair address nat + /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) - : pair address nat + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ nat : @some pair nat (map address nat) : pair address nat + /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : nat : @some pair nat (map address nat) : pair address nat + /* [ nat : nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; ADD - /* [ nat : @some pair nat (map address nat) : pair address nat + /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) - : pair address nat + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CDR /* [ map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some pair nat (map address nat) : map address nat : pair address nat + /* [ pair nat (map address nat) : map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ nat : map address nat : pair address nat @@ -2292,7 +2256,7 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat + { /* [ nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -2300,7 +2264,7 @@ Gas remaining: 1039229.258 units remaining CDR /* [ pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : pair address bool nat + /* [ nat : pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address bool nat : pair address bool nat @@ -2313,7 +2277,7 @@ Gas remaining: 1039229.258 units remaining CDR /* [ pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : pair bool nat : address + /* [ nat : pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair bool nat : pair bool nat : address @@ -2326,24 +2290,24 @@ Gas remaining: 1039229.258 units remaining CDR /* [ nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : nat : bool : address + /* [ nat : nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : bool : address + /* [ nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ bool : @some nat : address + /* [ bool : nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair bool (nat @some) : address + /* [ pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ address : pair bool (nat @some) + /* [ address : pair bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair address bool (nat @some) + /* [ pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -2353,29 +2317,23 @@ Gas remaining: 1039229.258 units remaining : big_map address (pair nat (map address nat)) ] */ ; CDR /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) : pair address bool nat + /* [ pair address bool nat : pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; DIP { DROP /* [ big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) - : big_map address (pair nat (map address nat)) ] */ ; + /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; SWAP - /* [ big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ ; + /* [ big_map address (pair nat (map address nat)) : pair address bool nat ] */ ; PAIR - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DROP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; NIL operation /* [ list operation - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (list operation) - (big_map address (pair nat (map address nat))) - address - bool - (nat @some) ] */ } + /* [ pair (list operation) (big_map address (pair nat (map address nat))) address bool nat ] */ } { DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; @@ -2386,7 +2344,7 @@ Gas remaining: 1039229.258 units remaining /* [ address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SENDER - /* [ @sender address : address + /* [ address : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; COMPARE /* [ int @@ -2466,41 +2424,38 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some pair nat (map address nat) : pair address nat + { /* [ pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) - : pair address nat + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ nat : @some pair nat (map address nat) : pair address nat + /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DIP { DUP /* [ pair address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some pair nat (map address nat) : pair address nat : pair address nat + /* [ pair nat (map address nat) : pair address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address nat : @some pair nat (map address nat) : pair address nat + /* [ pair address nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ nat : pair address nat : @some pair nat (map address nat) - : pair address nat + /* [ nat : pair address nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address nat : nat : @some pair nat (map address nat) - : pair address nat + /* [ pair address nat : nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ nat : nat : @some pair nat (map address nat) : pair address nat + /* [ nat : nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ nat : nat : @some pair nat (map address nat) : pair address nat + /* [ nat : nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SUB - /* [ int : @some pair nat (map address nat) : pair address nat + /* [ int : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; ISNAT - /* [ option nat : @some pair nat (map address nat) : pair address nat + /* [ option nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF_NONE { CAR @@ -2529,66 +2484,63 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat : @some pair nat (map address nat) : pair address nat + { /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DUP - /* [ @some pair nat (map address nat) : @some pair nat (map address nat) - : pair address nat + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { CDR /* [ map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some pair nat (map address nat) : map address nat : pair address nat + /* [ pair nat (map address nat) : map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR /* [ nat : map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : nat : map address nat : pair address nat + /* [ nat : nat : map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : map address nat : pair address nat + /* [ nat : map address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (nat @some) (map address nat) : pair address nat + /* [ pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ pair (nat @some) (map address nat) : pair address nat : pair address nat + /* [ pair nat (map address nat) : pair address nat : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ pair address nat : pair (nat @some) (map address nat) : pair address nat + /* [ pair address nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP - /* [ pair (nat @some) (map address nat) : pair (nat @some) (map address nat) - : pair address nat + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CAR - /* [ @some nat : pair (nat @some) (map address nat) : pair address nat + /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : pair (nat @some) (map address nat) : pair address nat + /* [ int : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : pair (nat @some) (map address nat) : pair address nat + /* [ bool : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DUP - /* [ pair (nat @some) (map address nat) : pair (nat @some) (map address nat) - : pair address nat + /* [ pair nat (map address nat) : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; CDR - /* [ map address nat : pair (nat @some) (map address nat) : pair address nat + /* [ map address nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SIZE - /* [ nat : pair (nat @some) (map address nat) : pair address nat + /* [ nat : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; INT - /* [ int : pair (nat @some) (map address nat) : pair address nat + /* [ int : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; EQ - /* [ bool : pair (nat @some) (map address nat) : pair address nat + /* [ bool : pair nat (map address nat) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; IF { DROP /* [ pair address nat @@ -2597,10 +2549,10 @@ Gas remaining: 1039229.258 units remaining /* [ option (pair nat (map address nat)) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } { SOME - /* [ option (pair (nat @some) (map address nat)) : pair address nat + /* [ option (pair nat (map address nat)) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } } { SOME - /* [ option (pair (nat @some) (map address nat)) : pair address nat + /* [ option (pair nat (map address nat)) : pair address nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; SWAP /* [ pair address nat : option (pair nat (map address nat)) @@ -2675,7 +2627,7 @@ Gas remaining: 1039229.258 units remaining : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; FAILWITH /* [] */ } - { /* [ @some nat + { /* [ nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -2683,7 +2635,7 @@ Gas remaining: 1039229.258 units remaining CDR /* [ pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : pair address bool nat + /* [ nat : pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair address bool nat : pair address bool nat @@ -2696,7 +2648,7 @@ Gas remaining: 1039229.258 units remaining CDR /* [ pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : pair bool nat : address + /* [ nat : pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair bool nat : pair bool nat : address @@ -2709,24 +2661,24 @@ Gas remaining: 1039229.258 units remaining CDR /* [ nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : nat : bool : address + /* [ nat : nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DROP /* [ bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ } - /* [ @some nat : bool : address + /* [ nat : bool : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ bool : @some nat : address + /* [ bool : nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair bool (nat @some) : address + /* [ pair bool nat : address : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; SWAP - /* [ address : pair bool (nat @some) + /* [ address : pair bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair address bool (nat @some) + /* [ pair address bool nat : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DIP { DUP /* [ pair (big_map address (pair nat (map address nat))) address bool nat @@ -2736,26 +2688,20 @@ Gas remaining: 1039229.258 units remaining : big_map address (pair nat (map address nat)) ] */ ; CDR /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) : pair address bool nat + /* [ pair address bool nat : pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; DIP { DROP /* [ big_map address (pair nat (map address nat)) ] */ } - /* [ pair address bool (nat @some) - : big_map address (pair nat (map address nat)) ] */ ; + /* [ pair address bool nat : big_map address (pair nat (map address nat)) ] */ ; SWAP - /* [ big_map address (pair nat (map address nat)) - : pair address bool (nat @some) ] */ ; + /* [ big_map address (pair nat (map address nat)) : pair address bool nat ] */ ; PAIR - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ } + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ } /* [ pair address nat - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; DROP - /* [ pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + /* [ pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; NIL operation /* [ list operation - : pair (big_map address (pair nat (map address nat))) address bool (nat @some) ] */ ; + : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ; PAIR - /* [ pair (list operation) - (big_map address (pair nat (map address nat))) - address - bool - (nat @some) ] */ } } } } } } + /* [ pair (list operation) (big_map address (pair nat (map address nat))) address bool nat ] */ } } } } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out index 7abc822c7f86..d04a4b6064a4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out @@ -13,7 +13,7 @@ Gas remaining: 1039928.421 units remaining (list %sigs (option signature)))) ; storage (pair (nat %stored_counter) (pair (nat %threshold) (list %keys key))) ; code { UNPAIR - /* [ @parameter or (unit %default) + /* [ or (unit %default) (pair %main (pair :payload (nat %counter) @@ -21,69 +21,68 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; IF_LEFT { DROP - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; NIL operation /* [ list operation - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair (list operation) - (pair @storage (nat %stored_counter) (nat %threshold) (list %keys key)) ] */ } + /* [ pair (list operation) (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } { PUSH mutez 0 /* [ mutez - : @parameter.main pair (pair :payload + : pair (pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; AMOUNT - /* [ @amount mutez : mutez - : @parameter.main pair (pair :payload + /* [ mutez : mutez + : pair (pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ASSERT_CMPEQ ; SWAP - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @parameter.main pair (pair :payload + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature)) ] */ ; DUP - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @parameter.main pair (pair :payload + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature)) ] */ ; DIP { SWAP - /* [ @parameter.main pair (pair :payload + /* [ pair (pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @parameter.main pair (pair :payload + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { UNPAIR /* [ pair :payload (nat %counter) @@ -91,7 +90,7 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DUP /* [ pair :payload (nat %counter) @@ -104,9 +103,9 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SELF - /* [ @self contract unit + /* [ contract unit : pair :payload (nat %counter) (or :action @@ -118,9 +117,9 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ADDRESS - /* [ @self.address address + /* [ address : pair :payload (nat %counter) (or :action @@ -132,9 +131,9 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; CHAIN_ID - /* [ chain_id : @self.address address + /* [ chain_id : address : pair :payload (nat %counter) (or :action @@ -146,9 +145,9 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair chain_id (address @self.address) + /* [ pair chain_id address : pair :payload (nat %counter) (or :action @@ -160,9 +159,9 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair (pair chain_id (address @self.address)) + /* [ pair (pair chain_id address) (pair :payload (nat %counter) (or :action @@ -174,265 +173,260 @@ Gas remaining: 1039928.421 units remaining (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PACK - /* [ @packed bytes + /* [ bytes : pair :payload (nat %counter) (or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { UNPAIR @counter - /* [ @counter nat + /* [ nat : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { SWAP /* [ list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @counter nat : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @packed bytes : @counter nat : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ bytes : nat : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ @counter nat : @packed bytes : list (option signature) + /* [ nat : bytes : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @counter nat : @packed bytes : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) : nat : bytes + : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; UNPAIR @stored_counter - /* [ @stored_counter nat : pair (nat %threshold) (list %keys key) : @counter nat - : @packed bytes : list (option signature) + /* [ nat : pair (nat %threshold) (list %keys key) : nat : bytes + : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { SWAP - /* [ @counter nat : pair (nat %threshold) (list %keys key) : @packed bytes + /* [ nat : pair (nat %threshold) (list %keys key) : bytes : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @stored_counter nat : @counter nat : pair (nat %threshold) (list %keys key) - : @packed bytes : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : nat : pair (nat %threshold) (list %keys key) : bytes + : list (option signature) : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ASSERT_CMPEQ ; DIP { SWAP - /* [ list (option signature) : @packed bytes + /* [ list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ pair (nat %threshold) (list %keys key) : list (option signature) - : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair (nat %threshold) (list %keys key) : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; UNPAIR @threshold @keys - /* [ @threshold nat : @keys list key : list (option signature) : @packed bytes + /* [ nat : list key : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { PUSH @valid nat 0 - /* [ @valid nat : @keys list key : list (option signature) : @packed bytes + /* [ nat : list key : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ @keys list key : @valid nat : list (option signature) : @packed bytes + /* [ list key : nat : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ITER { DIP { SWAP - /* [ list (option signature) : @valid nat : @packed bytes + /* [ list (option signature) : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @keys.elt key : list (option signature) : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ key : list (option signature) : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ list (option signature) : @keys.elt key : @valid nat : @packed bytes + /* [ list (option signature) : key : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; IF_CONS { IF_SOME { SWAP - /* [ @tl list (option signature) : @hd.some signature : @keys.elt key - : @valid nat : @packed bytes + /* [ list (option signature) : signature : key : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { SWAP - /* [ @keys.elt key : @hd.some signature : @valid nat : @packed bytes + /* [ key : signature : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIIP { DUUP - /* [ bytes : @valid nat : @packed bytes + /* [ bytes : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @keys.elt key : @hd.some signature : bytes : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ key : signature : bytes : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; { DUUUP - /* [ bytes : @keys.elt key : @hd.some signature : bytes : @valid nat - : @packed bytes + /* [ bytes : key : signature : bytes : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { CHECK_SIGNATURE - /* [ bool : @valid nat : @packed bytes + /* [ bool : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ bytes : bool : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ bytes : bool : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ bool : bytes : @valid nat : @packed bytes + /* [ bool : bytes : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; IF { DROP - /* [ @valid nat : @packed bytes + /* [ nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } { FAILWITH /* [] */ } } ; PUSH nat 1 - /* [ nat : @valid nat : @packed bytes + /* [ nat : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ADD @valid - /* [ @valid nat : @packed bytes + /* [ nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @tl list (option signature) : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ list (option signature) : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } { SWAP - /* [ @keys.elt key : @tl list (option signature) : @valid nat : @packed bytes + /* [ key : list (option signature) : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DROP - /* [ @tl list (option signature) : @valid nat : @packed bytes + /* [ list (option signature) : nat : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } } + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } } { FAIL } ; SWAP - /* [ @valid nat : @tl list (option signature) : @packed bytes + /* [ nat : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @valid nat : list (option signature) : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @threshold nat : @valid nat : list (option signature) : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : nat : list (option signature) : bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ASSERT_CMPLE ; IF_CONS { FAIL } - { /* [ @packed bytes + { /* [ bytes : or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } ; DROP /* [ or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { UNPAIR /* [ nat : pair (nat %threshold) (list %keys key) ] */ ; PUSH nat 1 /* [ nat : nat : pair (nat %threshold) (list %keys key) ] */ ; ADD @new_counter - /* [ @new_counter nat : pair (nat %threshold) (list %keys key) ] */ ; + /* [ nat : pair (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair nat (nat %threshold) (list %keys key) ] */ } /* [ or :action (lambda %operation unit (list operation)) (pair %change_keys (nat %threshold) (list %keys key)) - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + : pair nat (nat %threshold) (list %keys key) ] */ ; IF_LEFT { UNIT - /* [ unit : @operation lambda unit (list operation) - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + /* [ unit : lambda unit (list operation) + : pair nat (nat %threshold) (list %keys key) ] */ ; EXEC - /* [ list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ } - { DIP { CAR /* [ @new_counter nat ] */ } - /* [ @change_keys pair (nat %threshold) (list %keys key) : @new_counter nat ] */ ; + /* [ list operation : pair nat (nat %threshold) (list %keys key) ] */ } + { DIP { CAR /* [ nat ] */ } + /* [ pair (nat %threshold) (list %keys key) : nat ] */ ; SWAP - /* [ @new_counter nat : @change_keys pair (nat %threshold) (list %keys key) ] */ ; + /* [ nat : pair (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair (nat @new_counter) (pair @change_keys (nat %threshold) (list %keys key)) ] */ ; + /* [ pair nat (nat %threshold) (list %keys key) ] */ ; NIL operation - /* [ list operation - : pair (nat @new_counter) (pair @change_keys (nat %threshold) (list %keys key)) ] */ } ; + /* [ list operation : pair nat (nat %threshold) (list %keys key) ] */ } ; PAIR - /* [ pair (list operation) (nat @new_counter) (nat %threshold) (list %keys key) ] */ } } } + /* [ pair (list operation) nat (nat %threshold) (list %keys key) ] */ } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out index 9c4775b883c9..8c9ddb0e95d6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out @@ -7,7 +7,7 @@ Gas remaining: 1039478.027 units remaining (pair (pair (bls12_381_fr %input_x) (bls12_381_fr %input_y)) (pair (pair (bls12_381_g1 %proof_a) (bls12_381_g2 %proof_b)) (bls12_381_g1 %proof_c))) ; code { CAR - /* [ @parameter pair (pair (bls12_381_fr %input_x) (bls12_381_fr %input_y)) + /* [ pair (pair (bls12_381_fr %input_x) (bls12_381_fr %input_y)) (pair (bls12_381_g1 %proof_a) (bls12_381_g2 %proof_b)) (bls12_381_g1 %proof_c) ] */ ; UNPPAIPPAIIR ; @@ -15,213 +15,176 @@ Gas remaining: 1039478.027 units remaining { PUSH @vk_gamma_c bls12_381_g1 0x063bd6e11e2fcaac1dd8cf68c6b1925a73c3c583e298ed37c41c3715115cf96358a42dbe85a0228cbfd8a6c8a8c54cd015b5ae2860d1cc47f84698d951f14d9448d03f04df2ca0ffe609a2067d6f1a892163a5e05e541279134cae52b1f23c6b - /* [ @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g1 ] */ ; PUSH @vk_gamma_b bls12_381_g1 0x11f5b5db1da7f1f26217edcce2219d016003af6e5b4d1ca3ad0ff477e354717e658bf16beddc4f4fb76ce39d3327811e0601709dc7ed98c70463cfa1ba33f99851b52b51d1a042d7425bec6277287441c399973632445ce61e7fdd63a70f0f60 - /* [ @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g1 : bls12_381_g1 ] */ ; PUSH @vk_gamma_a bls12_381_g1 0x03535a322edd23c55b0ca025e54d450d95df49cc9ee873dcd500e8219f4771264bf159b3b105954d85c7bea8ffe1ea0400c767fe58989366c2837fba76f1b4f46644f19be8ad01e22d894b649e427e0d7e04677ee3919d982f0f96bb0a2f0c34 - /* [ @vk_gamma_a bls12_381_g1 : @vk_gamma_b bls12_381_g1 - : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PUSH @vk_delta bls12_381_g2 0x10c6d5cdca84fc3c7f33061add256f48e0ab03a697832b338901898b650419eb6f334b28153fb73ad2ecd1cd2ac67053161e9f46cfbdaf7b1132a4654a55162850249650f9b873ac3113fa8c02ef1cd1df481480a4457f351d28f4da89d19fa405c3d77f686dc9a24d2681c9184bf2b091f62e6b24df651a3da8bd7067e14e7908fb02f8955b84af5081614cb5bc49b416d9edf914fc608c441b3f2eb8b6043736ddb9d4e4d62334a23b5625c14ef3e1a7e99258386310221b22d83a5eac035c - /* [ @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PUSH @vk_gamma bls12_381_g2 0x16dcbd28bff336c2649c7dd1d8391ac7ce6f7ef0124a9db7a4a485a124199eded7ce963c1c18aee1eca9994fe06f192c00e0fb653e1fc737d8d0e2f2f91424ca01f6e6e7c5c04f1c43db03a2900cf6b942aaed6ae77daea6200e094b78c38d770028d531a9d1a118ec23d5a39be7aa6dc28f778da1988856d2235c4a35e81fa48380f050d4baf7ebd7b5e058bf294da916afc34562f097c02a8fcbcf62a00de44f8ae6cfa7acb8ad254e3aeea8b2af12f65b7ee0f54855cb9bd432f3436f238f - /* [ @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PUSH @vk_b bls12_381_g2 0x0e9383f98df2c6e8b5b45f3876c3384596a0cdbc41349f83c4380bf463a050cdbd1d5057aa483a642e66486d1ed7362a1869e423c3877095e215c17282b11108601166f928043254bbce603bf86f4cec9f2e97e9660e98e4f5bce9b2b3bbacb40946b702ccfcc9a31e0bfc1543a2128edcc95807740a2310ae25eb47b935648e392c58dfae5b5e899d3b970d64e4e9e209741ea8bfedcfcc16b3fd890ff02c788ec0943feaaf01bbb354317acb85fcfd611133e4e563d53ca4e0f50e21cf2e7e - /* [ @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 - : @vk_gamma_a bls12_381_g1 : @vk_gamma_b bls12_381_g1 - : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g1 ] */ ; PUSH @vk_a bls12_381_g1 0x1040577c7d349e332735fc947c868c24a665f812f5dc1e7f60e65e2df80be2267a4b7341ed2287285fccd517acd96d910abba947235c364553aa6445f2f2b3a1a728225a330286ba5197ab87f0edc560d89fc7b623812f7d0d633341726e597a - /* [ @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ } + /* [ bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 + : bls12_381_g1 : bls12_381_g1 ] */ } /* [ bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 + : bls12_381_g1 : bls12_381_g1 ] */ ; DUP /* [ bls12_381_fr : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 - : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 12 /* [ bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; MUL /* [ bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 - : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 3 /* [ bls12_381_fr : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 14 /* [ bls12_381_g1 : bls12_381_fr : bls12_381_g1 : bls12_381_fr : bls12_381_fr - : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 - : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 - : @vk_gamma_a bls12_381_g1 : @vk_gamma_b bls12_381_g1 - : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 + : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; MUL /* [ bls12_381_g1 : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; ADD /* [ bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 - : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 11 /* [ bls12_381_g1 : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; ADD @vk_x - /* [ @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; NIL (pair bls12_381_g1 bls12_381_g2) - /* [ list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 : bls12_381_fr - : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr + : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g1 ] */ ; DUP 9 - /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 + /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 + : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 9 /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; NEG /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PAIR /* [ pair bls12_381_g1 bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; CONS - /* [ list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 : bls12_381_fr - : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr + : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g1 ] */ ; DUP 11 - /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 + /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 + : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 8 /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; NEG /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PAIR /* [ pair bls12_381_g1 bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; CONS - /* [ list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 : bls12_381_fr - : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr + : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g1 ] */ ; DUP 10 - /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 + /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 + : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 3 /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; NEG /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PAIR /* [ pair bls12_381_g1 bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; CONS - /* [ list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 : bls12_381_fr - : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr + : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g1 ] */ ; DUP 6 - /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 + /* [ bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 + : bls12_381_g1 : bls12_381_g1 ] */ ; DUP 6 /* [ bls12_381_g1 : bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; PAIR /* [ pair bls12_381_g1 bls12_381_g2 : list (pair bls12_381_g1 bls12_381_g2) - : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; CONS - /* [ list (pair bls12_381_g1 bls12_381_g2) : @vk_x bls12_381_g1 : bls12_381_fr - : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 - : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 : @vk_gamma bls12_381_g2 - : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ list (pair bls12_381_g1 bls12_381_g2) : bls12_381_g1 : bls12_381_fr + : bls12_381_fr : bls12_381_g1 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g2 : bls12_381_g2 : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 + : bls12_381_g1 ] */ ; PAIRING_CHECK - /* [ bool : @vk_x bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 - : bls12_381_g2 : bls12_381_g1 : @vk_a bls12_381_g1 : @vk_b bls12_381_g2 - : @vk_gamma bls12_381_g2 : @vk_delta bls12_381_g2 : @vk_gamma_a bls12_381_g1 - : @vk_gamma_b bls12_381_g1 : @vk_gamma_c bls12_381_g1 ] */ ; + /* [ bool : bls12_381_g1 : bls12_381_fr : bls12_381_fr : bls12_381_g1 + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g2 : bls12_381_g2 + : bls12_381_g2 : bls12_381_g1 : bls12_381_g1 : bls12_381_g1 ] */ ; ASSERT ; DROP 13 /* [] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out index 81b23672a7a2..249282a0a2c7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039991.583 units remaining { parameter unit ; storage int ; code { CDR - /* [ @storage int ] */ ; + /* [ int ] */ ; DUP - /* [ @storage int : @storage int ] */ ; + /* [ int : int ] */ ; PUSH int 0 - /* [ int : @storage int : @storage int ] */ ; + /* [ int : int : int ] */ ; CMPLT ; - IF { PUSH int -1 /* [ int : @storage int ] */ ; ADD /* [ int ] */ } { FAIL } ; + IF { PUSH int -1 /* [ int : int ] */ ; ADD /* [ int ] */ } { FAIL } ; NIL operation /* [ list operation : int ] */ ; PAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out index 6f09d0a63e32..45564ca3bf24 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out @@ -12,17 +12,17 @@ Gas remaining: 1039931.026 units remaining (list %sigs (option signature))) ; storage (pair (nat %stored_counter) (pair (nat %threshold) (list %keys key))) ; code { UNPAIR - /* [ @parameter pair (pair :payload + /* [ pair (pair :payload (nat %counter) (or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @parameter pair (pair :payload + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (pair :payload (nat %counter) (or :action (pair :transfer (mutez %amount) (contract %dest unit)) @@ -30,9 +30,9 @@ Gas remaining: 1039931.026 units remaining (pair %change_keys (nat %threshold) (list %keys key))))) (list %sigs (option signature)) ] */ ; DUP - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @parameter pair (pair :payload + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (pair :payload (nat %counter) (or :action (pair :transfer (mutez %amount) (contract %dest unit)) @@ -40,23 +40,23 @@ Gas remaining: 1039931.026 units remaining (pair %change_keys (nat %threshold) (list %keys key))))) (list %sigs (option signature)) ] */ ; DIP { SWAP - /* [ @parameter pair (pair :payload + /* [ pair (pair :payload (nat %counter) (or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @parameter pair (pair :payload + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) + : pair (pair :payload (nat %counter) (or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))))) (list %sigs (option signature)) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { UNPAIR /* [ pair :payload (nat %counter) @@ -65,7 +65,7 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DUP /* [ pair :payload (nat %counter) @@ -80,9 +80,9 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SELF - /* [ @self contract + /* [ contract (pair (pair :payload (nat %counter) (or :action @@ -103,9 +103,9 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ADDRESS - /* [ @self.address address + /* [ address : pair :payload (nat %counter) (or :action @@ -119,9 +119,9 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; CHAIN_ID - /* [ chain_id : @self.address address + /* [ chain_id : address : pair :payload (nat %counter) (or :action @@ -135,9 +135,9 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair chain_id (address @self.address) + /* [ pair chain_id address : pair :payload (nat %counter) (or :action @@ -151,9 +151,9 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair (pair chain_id (address @self.address)) + /* [ pair (pair chain_id address) (pair :payload (nat %counter) (or :action @@ -167,9 +167,9 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; PACK - /* [ @packed bytes + /* [ bytes : pair :payload (nat %counter) (or :action @@ -177,325 +177,313 @@ Gas remaining: 1039931.026 units remaining (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key)))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { UNPAIR @counter - /* [ @counter nat + /* [ nat : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) : list (option signature) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { SWAP /* [ list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @counter nat : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @packed bytes : @counter nat : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ bytes : nat : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ @counter nat : @packed bytes : list (option signature) + /* [ nat : bytes : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) - : @counter nat : @packed bytes : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair (nat %stored_counter) (nat %threshold) (list %keys key) : nat : bytes + : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; UNPAIR @stored_counter - /* [ @stored_counter nat : pair (nat %threshold) (list %keys key) : @counter nat - : @packed bytes : list (option signature) + /* [ nat : pair (nat %threshold) (list %keys key) : nat : bytes + : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { SWAP - /* [ @counter nat : pair (nat %threshold) (list %keys key) : @packed bytes + /* [ nat : pair (nat %threshold) (list %keys key) : bytes : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @stored_counter nat : @counter nat : pair (nat %threshold) (list %keys key) - : @packed bytes : list (option signature) + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : nat : pair (nat %threshold) (list %keys key) : bytes + : list (option signature) : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ASSERT_CMPEQ ; DIP { SWAP - /* [ list (option signature) : @packed bytes + /* [ list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ pair (nat %threshold) (list %keys key) : list (option signature) - : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair (nat %threshold) (list %keys key) : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; UNPAIR @threshold @keys - /* [ @threshold nat : @keys list key : list (option signature) : @packed bytes + /* [ nat : list key : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { PUSH @valid nat 0 - /* [ @valid nat : @keys list key : list (option signature) : @packed bytes + /* [ nat : list key : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ @keys list key : @valid nat : list (option signature) : @packed bytes + /* [ list key : nat : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ITER { DIP { SWAP - /* [ list (option signature) : @valid nat : @packed bytes + /* [ list (option signature) : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @keys.elt key : list (option signature) : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ key : list (option signature) : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ list (option signature) : @keys.elt key : @valid nat : @packed bytes + /* [ list (option signature) : key : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; IF_CONS { IF_SOME { SWAP - /* [ @tl list (option signature) : @hd.some signature : @keys.elt key - : @valid nat : @packed bytes + /* [ list (option signature) : signature : key : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { SWAP - /* [ @keys.elt key : @hd.some signature : @valid nat : @packed bytes + /* [ key : signature : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIIP { DUUP - /* [ bytes : @valid nat : @packed bytes + /* [ bytes : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @keys.elt key : @hd.some signature : bytes : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ key : signature : bytes : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; { DUUUP - /* [ bytes : @keys.elt key : @hd.some signature : bytes : @valid nat - : @packed bytes + /* [ bytes : key : signature : bytes : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { CHECK_SIGNATURE - /* [ bool : @valid nat : @packed bytes + /* [ bool : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ bytes : bool : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ bytes : bool : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; SWAP - /* [ bool : bytes : @valid nat : @packed bytes + /* [ bool : bytes : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; IF { DROP - /* [ @valid nat : @packed bytes + /* [ nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } { FAILWITH /* [] */ } } ; PUSH nat 1 - /* [ nat : @valid nat : @packed bytes + /* [ nat : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ADD @valid - /* [ @valid nat : @packed bytes + /* [ nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @tl list (option signature) : @valid nat : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ list (option signature) : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } { SWAP - /* [ @keys.elt key : @tl list (option signature) : @valid nat : @packed bytes + /* [ key : list (option signature) : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DROP - /* [ @tl list (option signature) : @valid nat : @packed bytes + /* [ list (option signature) : nat : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } } + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } } { FAIL } ; SWAP - /* [ @valid nat : @tl list (option signature) : @packed bytes + /* [ nat : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @valid nat : list (option signature) : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } - /* [ @threshold nat : @valid nat : list (option signature) : @packed bytes + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ } + /* [ nat : nat : list (option signature) : bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; ASSERT_CMPLE ; DROP - /* [ @packed bytes + /* [ bytes : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DROP /* [ or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : @storage pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; + : pair (nat %stored_counter) (nat %threshold) (list %keys key) ] */ ; DIP { UNPAIR /* [ nat : pair (nat %threshold) (list %keys key) ] */ ; PUSH nat 1 /* [ nat : nat : pair (nat %threshold) (list %keys key) ] */ ; ADD @new_counter - /* [ @new_counter nat : pair (nat %threshold) (list %keys key) ] */ ; + /* [ nat : pair (nat %threshold) (list %keys key) ] */ ; PAIR - /* [ pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ } + /* [ pair nat (nat %threshold) (list %keys key) ] */ } /* [ or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + : pair nat (nat %threshold) (list %keys key) ] */ ; NIL operation /* [ list operation : or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + : pair nat (nat %threshold) (list %keys key) ] */ ; SWAP /* [ or :action (pair :transfer (mutez %amount) (contract %dest unit)) (or (option %delegate key_hash) (pair %change_keys (nat %threshold) (list %keys key))) : list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + : pair nat (nat %threshold) (list %keys key) ] */ ; IF_LEFT { UNPAIR /* [ mutez : contract unit : list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + : pair nat (nat %threshold) (list %keys key) ] */ ; UNIT /* [ unit : mutez : contract unit : list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + : pair nat (nat %threshold) (list %keys key) ] */ ; TRANSFER_TOKENS - /* [ operation : list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + /* [ operation : list operation : pair nat (nat %threshold) (list %keys key) ] */ ; CONS - /* [ list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ } + /* [ list operation : pair nat (nat %threshold) (list %keys key) ] */ } { IF_LEFT { SET_DELEGATE - /* [ operation : list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ ; + /* [ operation : list operation : pair nat (nat %threshold) (list %keys key) ] */ ; CONS - /* [ list operation - : pair (nat @new_counter) (nat %threshold) (list %keys key) ] */ } + /* [ list operation : pair nat (nat %threshold) (list %keys key) ] */ } { DIP { SWAP - /* [ pair (nat @new_counter) (nat %threshold) (list %keys key) - : list operation ] */ ; + /* [ pair nat (nat %threshold) (list %keys key) : list operation ] */ ; CAR - /* [ @new_counter nat : list operation ] */ } - /* [ @change_keys pair (nat %threshold) (list %keys key) : @new_counter nat - : list operation ] */ ; + /* [ nat : list operation ] */ } + /* [ pair (nat %threshold) (list %keys key) : nat : list operation ] */ ; SWAP - /* [ @new_counter nat : @change_keys pair (nat %threshold) (list %keys key) - : list operation ] */ ; + /* [ nat : pair (nat %threshold) (list %keys key) : list operation ] */ ; PAIR - /* [ pair (nat @new_counter) (pair @change_keys (nat %threshold) (list %keys key)) - : list operation ] */ ; + /* [ pair nat (nat %threshold) (list %keys key) : list operation ] */ ; SWAP - /* [ list operation - : pair (nat @new_counter) (pair @change_keys (nat %threshold) (list %keys key)) ] */ } } ; + /* [ list operation : pair nat (nat %threshold) (list %keys key) ] */ } } ; PAIR - /* [ pair (list operation) (nat @new_counter) (nat %threshold) (list %keys key) ] */ } } + /* [ pair (list operation) nat (nat %threshold) (list %keys key) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out index 095ac3aedd6f..c9137027d4df 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out @@ -5,44 +5,38 @@ Gas remaining: 1039981.235 units remaining { parameter unit ; storage (pair timestamp (pair mutez address)) ; code { CDR - /* [ @storage pair timestamp mutez address ] */ ; + /* [ pair timestamp mutez address ] */ ; DUP - /* [ @storage pair timestamp mutez address - : @storage pair timestamp mutez address ] */ ; + /* [ pair timestamp mutez address : pair timestamp mutez address ] */ ; CAR - /* [ timestamp : @storage pair timestamp mutez address ] */ ; + /* [ timestamp : pair timestamp mutez address ] */ ; NOW - /* [ @now timestamp : timestamp : @storage pair timestamp mutez address ] */ ; + /* [ timestamp : timestamp : pair timestamp mutez address ] */ ; CMPLT ; - IF { FAIL } { /* [ @storage pair timestamp mutez address ] */ } ; + IF { FAIL } { /* [ pair timestamp mutez address ] */ } ; DUP - /* [ @storage pair timestamp mutez address - : @storage pair timestamp mutez address ] */ ; + /* [ pair timestamp mutez address : pair timestamp mutez address ] */ ; CDR - /* [ pair mutez address : @storage pair timestamp mutez address ] */ ; + /* [ pair mutez address : pair timestamp mutez address ] */ ; DUP - /* [ pair mutez address : pair mutez address - : @storage pair timestamp mutez address ] */ ; + /* [ pair mutez address : pair mutez address : pair timestamp mutez address ] */ ; CAR - /* [ mutez : pair mutez address : @storage pair timestamp mutez address ] */ ; - DIP { CDR /* [ address : @storage pair timestamp mutez address ] */ } - /* [ mutez : address : @storage pair timestamp mutez address ] */ ; - DIP { CONTRACT - unit - /* [ @contract option (contract unit) : @storage pair timestamp mutez address ] */ ; + /* [ mutez : pair mutez address : pair timestamp mutez address ] */ ; + DIP { CDR /* [ address : pair timestamp mutez address ] */ } + /* [ mutez : address : pair timestamp mutez address ] */ ; + DIP { CONTRACT unit + /* [ option (contract unit) : pair timestamp mutez address ] */ ; ASSERT_SOME } - /* [ mutez : @contract.some contract unit - : @storage pair timestamp mutez address ] */ ; + /* [ mutez : contract unit : pair timestamp mutez address ] */ ; UNIT - /* [ unit : mutez : @contract.some contract unit - : @storage pair timestamp mutez address ] */ ; + /* [ unit : mutez : contract unit : pair timestamp mutez address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair timestamp mutez address ] */ ; + /* [ operation : pair timestamp mutez address ] */ ; NIL operation - /* [ list operation : operation : @storage pair timestamp mutez address ] */ ; + /* [ list operation : operation : pair timestamp mutez address ] */ ; SWAP - /* [ operation : list operation : @storage pair timestamp mutez address ] */ ; + /* [ operation : list operation : pair timestamp mutez address ] */ ; CONS - /* [ list operation : @storage pair timestamp mutez address ] */ ; + /* [ list operation : pair timestamp mutez address ] */ ; PAIR - /* [ pair (list operation) (pair @storage timestamp mutez address) ] */ } } + /* [ pair (list operation) timestamp mutez address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out index a6bf02f5187c..f5298f853529 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out @@ -45,7 +45,7 @@ Gas remaining: 1039662.882 units remaining (address %admin) (nat %total_supply)) ] */ ; CDR - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -66,7 +66,7 @@ Gas remaining: 1039662.882 units remaining PUSH mutez 0 /* [ mutez - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -85,8 +85,8 @@ Gas remaining: 1039662.882 units remaining (address %admin) (nat %total_supply)) ] */ ; AMOUNT - /* [ @amount mutez : mutez - : @storage pair (big_map %tokens address nat) + /* [ mutez : mutez + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -106,7 +106,7 @@ Gas remaining: 1039662.882 units remaining (nat %total_supply)) ] */ ; COMPARE /* [ int - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -126,7 +126,7 @@ Gas remaining: 1039662.882 units remaining (nat %total_supply)) ] */ ; NEQ /* [ bool - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -147,7 +147,7 @@ Gas remaining: 1039662.882 units remaining IF { PUSH string "DontSendTez" /* [ string - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -167,7 +167,7 @@ Gas remaining: 1039662.882 units remaining (nat %total_supply)) ] */ ; FAILWITH /* [] */ } - { /* [ @storage pair (big_map %tokens address nat) + { /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -200,12 +200,12 @@ Gas remaining: 1039662.882 units remaining (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply)) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR - /* [ @parameter or (or (or (pair %approve (address %spender) (nat %value)) + /* [ or (or (or (pair %approve (address %spender) (nat %value)) (pair %getAllowance (pair %request (address %owner) (address %spender)) (contract %callback nat))) @@ -213,7 +213,7 @@ Gas remaining: 1039662.882 units remaining (pair %getTotalSupply (unit %request) (contract %callback nat)))) (or (pair %mintOrBurn (int %quantity) (address %target)) (pair %transfer (address %from) (address %to) (nat %value))) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -221,428 +221,417 @@ Gas remaining: 1039662.882 units remaining { IF_LEFT { IF_LEFT { SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.left.approve pair (address %spender) (nat %value) ] */ ; + (nat %total_supply) : pair (address %spender) (nat %value) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.left.approve pair (address %spender) (nat %value) ] */ ; + (nat %total_supply) : pair (address %spender) (nat %value) ] */ ; DUG 2 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) + /* [ pair (address %spender) (nat %value) : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) - : @parameter.left.left.approve pair (address %spender) (nat %value) + /* [ pair (address %spender) (nat %value) : pair (address %spender) (nat %value) : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 2 - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) + /* [ pair (address %spender) (nat %value) : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SENDER - /* [ @sender address : address - : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ address : address : big_map (pair (address %owner) (address %spender)) nat + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PAIR - /* [ pair (address @sender) address + /* [ pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH nat 0 - /* [ nat : pair (address @sender) address + /* [ nat : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) : nat - : pair (address @sender) address + /* [ pair (address %spender) (nat %value) : nat : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) - : @parameter.left.left.approve pair (address %spender) (nat %value) : nat - : pair (address @sender) address + /* [ pair (address %spender) (nat %value) : pair (address %spender) (nat %value) + : nat : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) : nat - : pair (address @sender) address + /* [ pair (address %spender) (nat %value) : nat : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR - /* [ nat : nat : pair (address @sender) address + /* [ nat : nat : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE - /* [ int : pair (address @sender) address + /* [ int : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GT - /* [ bool : pair (address @sender) address + /* [ bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH nat 0 - /* [ nat : bool : pair (address @sender) address + /* [ nat : bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 /* [ big_map (pair (address %owner) (address %spender)) nat : nat : bool - : pair (address @sender) address - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP /* [ big_map (pair (address %owner) (address %spender)) nat : big_map (pair (address %owner) (address %spender)) nat : nat : bool - : pair (address @sender) address - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 /* [ big_map (pair (address %owner) (address %spender)) nat : nat : bool - : pair (address @sender) address + : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ pair (address @sender) address + /* [ pair address address : big_map (pair (address %owner) (address %spender)) nat : nat : bool : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ pair (address @sender) address : pair (address @sender) address + /* [ pair address address : pair address address : big_map (pair (address %owner) (address %spender)) nat : nat : bool : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 - /* [ pair (address @sender) address + /* [ pair address address : big_map (pair (address %owner) (address %spender)) nat : nat : bool - : pair (address @sender) address + : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET - /* [ option nat : nat : bool : pair (address @sender) address + /* [ option nat : nat : bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF_NONE { PUSH nat 0 - /* [ nat : nat : bool : pair (address @sender) address + /* [ nat : nat : bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : nat : bool : pair (address @sender) address + { /* [ nat : nat : bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; COMPARE - /* [ int : bool : pair (address @sender) address + /* [ int : bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GT - /* [ bool : bool : pair (address @sender) address + /* [ bool : bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; AND - /* [ bool : pair (address @sender) address + /* [ bool : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { PUSH string "UnsafeAllowanceChange" - /* [ string : pair (address @sender) address + /* [ string : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; FAILWITH /* [] */ } - { /* [ pair (address @sender) address + { /* [ pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 3 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : pair (address @sender) address + (nat %total_supply) : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) ] */ ; + : pair (address %spender) (nat %value) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : pair (address @sender) address + (nat %total_supply) : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) ] */ ; + : pair (address %spender) (nat %value) ] */ ; DUG 4 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : pair (address @sender) address + (nat %total_supply) : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : pair (address @sender) address + (nat %total_supply) : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR - /* [ pair (address %admin) (nat %total_supply) : pair (address @sender) address + /* [ pair (address %admin) (nat %total_supply) : pair address address : big_map (pair (address %owner) (address %spender)) nat - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 /* [ big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @parameter.left.left.approve pair (address %spender) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (address %spender) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @parameter.left.left.approve pair (address %spender) (nat %value) + /* [ pair (address %spender) (nat %value) : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH nat 0 /* [ nat : nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP /* [ nat : nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP /* [ nat : nat : nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 2 /* [ nat : nat : nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE /* [ int : nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; EQ /* [ bool : nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { DROP /* [ big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NONE nat /* [ option nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } { SOME /* [ option nat : big_map (pair (address %owner) (address %spender)) nat - : pair (address %admin) (nat %total_supply) : pair (address @sender) address - : @storage pair (big_map %tokens address nat) + : pair (address %admin) (nat %total_supply) : pair address address + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 3 - /* [ pair (address @sender) address : option nat + /* [ pair address address : option nat : big_map (pair (address %owner) (address %spender)) nat : pair (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; UPDATE /* [ big_map (pair (address %owner) (address %spender)) nat : pair (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -650,12 +639,12 @@ Gas remaining: 1039662.882 units remaining /* [ pair (big_map (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) @@ -685,107 +674,107 @@ Gas remaining: 1039662.882 units remaining (address %admin) (nat %total_supply) ] */ } { SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) ] */ ; + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) ] */ ; + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) ] */ ; DIG 2 - /* [ @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + /* [ pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NIL operation /* [ list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP - /* [ @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + /* [ pair (pair %request (address %owner) (address %spender)) (contract %callback nat) : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + /* [ pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 2 - /* [ @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + /* [ pair (pair %request (address %owner) (address %spender)) (contract %callback nat) : list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ contract nat : list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH mutez 0 /* [ mutez : contract nat : list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : mutez : contract nat : list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -793,24 +782,24 @@ Gas remaining: 1039662.882 units remaining /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : mutez : contract nat : list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ big_map (pair (address %owner) (address %spender)) nat : mutez : contract nat : list operation - : @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @parameter.left.left.getAllowance pair (pair %request (address %owner) (address %spender)) (contract %callback nat) + /* [ pair (pair %request (address %owner) (address %spender)) (contract %callback nat) : big_map (pair (address %owner) (address %spender)) nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -818,13 +807,13 @@ Gas remaining: 1039662.882 units remaining /* [ pair (address %owner) (address %spender) : big_map (pair (address %owner) (address %spender)) nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET /* [ option nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -832,163 +821,156 @@ Gas remaining: 1039662.882 units remaining { PUSH nat 0 /* [ nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + { /* [ nat : mutez : contract nat : list operation + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; TRANSFER_TOKENS /* [ operation : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CONS /* [ list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (big_map %tokens address nat) - (big_map %allowances (pair (address %owner) (address %spender)) nat) - (address %admin) - (nat %total_supply)) ] */ } } + (big_map %tokens address nat) + (big_map %allowances (pair (address %owner) (address %spender)) nat) + (address %admin) + (nat %total_supply) ] */ } } { IF_LEFT { SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) ] */ ; + (nat %total_supply) : pair (address %owner) (contract %callback nat) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) ] */ ; + (nat %total_supply) : pair (address %owner) (contract %callback nat) ] */ ; DIG 2 - /* [ @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + /* [ pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NIL operation - /* [ list operation - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + /* [ list operation : pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP - /* [ @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : list operation - : @storage pair (big_map %tokens address nat) + /* [ pair (address %owner) (contract %callback nat) : list operation + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : list operation - : @storage pair (big_map %tokens address nat) + /* [ pair (address %owner) (contract %callback nat) + : pair (address %owner) (contract %callback nat) : list operation + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 2 - /* [ @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : list operation - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + /* [ pair (address %owner) (contract %callback nat) : list operation + : pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ contract nat : list operation - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH mutez 0 /* [ mutez : contract nat : list operation - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : mutez : contract nat : list operation - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ big_map address nat : mutez : contract nat : list operation - : @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + : pair (address %owner) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @parameter.left.right.getBalance pair (address %owner) (contract %callback nat) - : big_map address nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + /* [ pair (address %owner) (contract %callback nat) : big_map address nat + : mutez : contract nat : list operation + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : big_map address nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET /* [ option nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -996,109 +978,104 @@ Gas remaining: 1039662.882 units remaining { PUSH nat 0 /* [ nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + { /* [ nat : mutez : contract nat : list operation + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; TRANSFER_TOKENS /* [ operation : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CONS /* [ list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (big_map %tokens address nat) - (big_map %allowances (pair (address %owner) (address %spender)) nat) - (address %admin) - (nat %total_supply)) ] */ } + (big_map %tokens address nat) + (big_map %allowances (pair (address %owner) (address %spender)) nat) + (address %admin) + (nat %total_supply) ] */ } { SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.right.getTotalSupply pair (unit %request) (contract %callback nat) ] */ ; + (nat %total_supply) : pair (unit %request) (contract %callback nat) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.left.right.getTotalSupply pair (unit %request) (contract %callback nat) ] */ ; + (nat %total_supply) : pair (unit %request) (contract %callback nat) ] */ ; DIG 2 - /* [ @parameter.left.right.getTotalSupply pair (unit %request) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + /* [ pair (unit %request) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NIL operation - /* [ list operation - : @parameter.left.right.getTotalSupply pair (unit %request) (contract %callback nat) - : @storage pair (big_map %tokens address nat) + /* [ list operation : pair (unit %request) (contract %callback nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP - /* [ @parameter.left.right.getTotalSupply pair (unit %request) (contract %callback nat) - : list operation - : @storage pair (big_map %tokens address nat) + /* [ pair (unit %request) (contract %callback nat) : list operation + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH mutez 0 /* [ mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -1106,465 +1083,427 @@ Gas remaining: 1039662.882 units remaining /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (address %admin) (nat %total_supply) : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ nat : mutez : contract nat : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; TRANSFER_TOKENS /* [ operation : list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CONS /* [ list operation - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (big_map %tokens address nat) - (big_map %allowances (pair (address %owner) (address %spender)) nat) - (address %admin) - (nat %total_supply)) ] */ } } } + (big_map %tokens address nat) + (big_map %allowances (pair (address %owner) (address %spender)) nat) + (address %admin) + (nat %total_supply) ] */ } } } { IF_LEFT { SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : pair (int %quantity) (address %target) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : pair (int %quantity) (address %target) ] */ ; DUG 2 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (address %admin) (nat %total_supply) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR - /* [ address - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ address : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SENDER - /* [ @sender address : address - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ address : address : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE - /* [ int : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NEQ - /* [ bool : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ bool : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { PUSH string "OnlyAdmin" - /* [ string : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ string : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; FAILWITH /* [] */ } - { /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + { /* [ pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DUP - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) + : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR - /* [ int : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : int : pair (int %quantity) (address %target) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : int : pair (int %quantity) (address %target) ] */ ; DUG 3 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR - /* [ big_map address nat : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ big_map address nat : int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : big_map address nat : int - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) : big_map address nat : int + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : big_map address nat : int - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) + : pair (int %quantity) (address %target) : big_map address nat : int + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : big_map address nat : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) : big_map address nat : int + : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ address : big_map address nat : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET - /* [ option nat : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ option nat : int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF_NONE { PUSH nat 0 - /* [ nat : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ nat : int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : int - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + { /* [ nat : int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; ADD - /* [ int : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ int : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; ISNAT - /* [ option nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ option nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF_NONE { PUSH string "Cannot burn more than the target's balance." - /* [ string : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ string : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; FAILWITH /* [] */ } - { /* [ @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + { /* [ nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; SWAP - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @some nat - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) : nat + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @some nat - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) + : pair (int %quantity) (address %target) : nat + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 2 - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ pair (int %quantity) (address %target) : nat + : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR - /* [ int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ int : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : int : nat + : pair (int %quantity) (address %target) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : int : nat + : pair (int %quantity) (address %target) ] */ ; DUG 4 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : int : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : int : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR - /* [ pair (address %admin) (nat %total_supply) : int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ pair (address %admin) (nat %total_supply) : int : nat + : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR - /* [ nat : int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ nat : int : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; ADD - /* [ int : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ int : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; ABS - /* [ nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + /* [ nat : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; DUG 4 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : nat : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : nat : nat : pair (int %quantity) (address %target) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; CAR /* [ big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; PUSH nat 0 /* [ nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; DIG 4 - /* [ @some nat : nat : big_map address nat + /* [ nat : nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ ; DUP - /* [ @some nat : @some nat : nat : big_map address nat + /* [ nat : nat : nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ ; DUG 5 - /* [ @some nat : nat : big_map address nat + /* [ nat : nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; COMPARE /* [ int : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; EQ /* [ bool : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat : @some nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : nat + : pair (int %quantity) (address %target) ] */ ; IF { DIG 3 - /* [ @some nat : big_map address nat + /* [ nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ ; DROP /* [ big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ ; NONE nat /* [ option nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ } + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ } { DIG 3 - /* [ @some nat : big_map address nat + /* [ nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ ; + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ ; SOME /* [ option nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) : nat - : @parameter.right.mintOrBurn pair (int %quantity) (address %target) ] */ } ; + (nat %total_supply) : nat : pair (int %quantity) (address %target) ] */ } ; DIG 4 - /* [ @parameter.right.mintOrBurn pair (int %quantity) (address %target) - : option nat : big_map address nat + /* [ pair (int %quantity) (address %target) : option nat : big_map address nat : pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : nat ] */ ; @@ -1697,585 +1636,564 @@ Gas remaining: 1039662.882 units remaining address nat ] */ } { SWAP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) ] */ ; + (nat %total_supply) : pair (address %from) (address %to) (nat %value) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) ] */ ; + (nat %total_supply) : pair (address %from) (address %to) (nat %value) ] */ ; DUG 2 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) - (nat %total_supply) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + (nat %total_supply) : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) ] */ ; + : pair (address %from) (address %to) (nat %value) ] */ ; DUP - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) ] */ ; + : pair (address %from) (address %to) (nat %value) ] */ ; DUG 3 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SENDER - /* [ @sender address : address : big_map address nat + /* [ address : address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE /* [ int : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; EQ /* [ bool : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { SWAP /* [ big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } { SENDER - /* [ @sender address : big_map address nat + /* [ address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @sender address : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : address + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @sender address : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : address + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @sender address : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : address + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR - /* [ address : @sender address : big_map address nat + /* [ address : address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PAIR - /* [ pair address (address @sender) : big_map address nat + /* [ pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : pair address (address @sender) : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : pair address address + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : pair address (address @sender) : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : pair address address + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : pair address (address @sender) : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : pair address address + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR - /* [ pair (address %to) (nat %value) : pair address (address @sender) + /* [ pair (address %to) (nat %value) : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR - /* [ nat : pair address (address @sender) : big_map address nat + /* [ nat : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 3 /* [ big_map (pair (address %owner) (address %spender)) nat : nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP /* [ big_map (pair (address %owner) (address %spender)) nat : big_map (pair (address %owner) (address %spender)) nat : nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 /* [ big_map (pair (address %owner) (address %spender)) nat : nat - : pair address (address @sender) : big_map address nat + : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ pair address (address @sender) + /* [ pair address address : big_map (pair (address %owner) (address %spender)) nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ pair address (address @sender) : pair address (address @sender) + /* [ pair address address : pair address address : big_map (pair (address %owner) (address %spender)) nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ pair address (address @sender) + /* [ pair address address : big_map (pair (address %owner) (address %spender)) nat : nat - : pair address (address @sender) : big_map address nat + : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET - /* [ option nat : nat : pair address (address @sender) : big_map address nat + /* [ option nat : nat : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF_NONE { PUSH nat 0 - /* [ nat : nat : pair address (address @sender) : big_map address nat + /* [ nat : nat : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : nat : pair address (address @sender) : big_map address nat + { /* [ nat : nat : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; SUB - /* [ int : pair address (address @sender) : big_map address nat + /* [ int : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; ISNAT - /* [ option nat : pair address (address @sender) : big_map address nat + /* [ option nat : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF_NONE { PUSH string "NotEnoughAllowance" - /* [ string : pair address (address @sender) : big_map address nat + /* [ string : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; FAILWITH /* [] */ } - { /* [ @some nat : pair address (address @sender) : big_map address nat + { /* [ nat : pair address address : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 3 - /* [ big_map (pair (address %owner) (address %spender)) nat : @some nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ big_map (pair (address %owner) (address %spender)) nat : nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH nat 0 - /* [ nat : big_map (pair (address %owner) (address %spender)) nat : @some nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ nat : big_map (pair (address %owner) (address %spender)) nat : nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @some nat : nat : big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ nat : nat : big_map (pair (address %owner) (address %spender)) nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @some nat : @some nat : nat - : big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ nat : nat : nat : big_map (pair (address %owner) (address %spender)) nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ @some nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @some nat : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ nat : nat : big_map (pair (address %owner) (address %spender)) nat : nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE - /* [ int : big_map (pair (address %owner) (address %spender)) nat : @some nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ int : big_map (pair (address %owner) (address %spender)) nat : nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; EQ - /* [ bool : big_map (pair (address %owner) (address %spender)) nat : @some nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ bool : big_map (pair (address %owner) (address %spender)) nat : nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { SWAP - /* [ @some nat : big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ nat : big_map (pair (address %owner) (address %spender)) nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DROP /* [ big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NONE nat /* [ option nat : big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } { SWAP - /* [ @some nat : big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + /* [ nat : big_map (pair (address %owner) (address %spender)) nat + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SOME /* [ option nat : big_map (pair (address %owner) (address %spender)) nat - : pair address (address @sender) : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair address address : big_map address nat + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 2 - /* [ pair address (address @sender) : option nat + /* [ pair address address : option nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; UPDATE /* [ big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 2 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) + /* [ pair (address %from) (address %to) (nat %value) : big_map (pair (address %owner) (address %spender)) nat : big_map address nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : big_map (pair (address %owner) (address %spender)) nat : big_map address nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) + /* [ pair (address %from) (address %to) (nat %value) : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (address %to) (nat %value) : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 /* [ big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP /* [ big_map address nat : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 /* [ big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat : nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat : big_map address nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat : nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat : big_map address nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 5 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat : nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET /* [ option nat : nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -2283,32 +2201,28 @@ Gas remaining: 1039662.882 units remaining { PUSH nat 0 /* [ nat : nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + { /* [ nat : nat : big_map (pair (address %owner) (address %spender)) nat + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; SUB /* [ int : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; ISNAT /* [ option nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -2316,249 +2230,244 @@ Gas remaining: 1039662.882 units remaining { PUSH string "NotEnoughBalance" /* [ string : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; FAILWITH /* [] */ } - { /* [ @some nat : big_map (pair (address %owner) (address %spender)) nat - : big_map address nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + { /* [ nat : big_map (pair (address %owner) (address %spender)) nat + : big_map address nat : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 2 - /* [ big_map address nat : @some nat + /* [ big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; PUSH nat 0 - /* [ nat : big_map address nat : @some nat + /* [ nat : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @some nat : nat : big_map address nat + /* [ nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @some nat : @some nat : nat : big_map address nat + /* [ nat : nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ @some nat : nat : big_map address nat : @some nat + /* [ nat : nat : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE - /* [ int : big_map address nat : @some nat + /* [ int : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; EQ - /* [ bool : big_map address nat : @some nat + /* [ bool : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { SWAP - /* [ @some nat : big_map address nat + /* [ nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DROP /* [ big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NONE nat /* [ option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } { SWAP - /* [ @some nat : big_map address nat + /* [ nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SOME /* [ option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : option nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : option nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : option nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : option nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 4 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : option nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : option nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; UPDATE /* [ big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (address %to) (nat %value) : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP /* [ big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP /* [ big_map address nat : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 2 /* [ big_map address nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 4 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat : nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat : nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) + : pair (address %from) (address %to) (nat %value) : big_map address nat : nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 5 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : big_map address nat : nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : big_map address nat : nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -2566,24 +2475,24 @@ Gas remaining: 1039662.882 units remaining /* [ pair (address %to) (nat %value) : big_map address nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : big_map address nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; GET /* [ option nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -2592,31 +2501,31 @@ Gas remaining: 1039662.882 units remaining 0 /* [ nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } - { /* [ @some nat : nat : big_map address nat + { /* [ nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; ADD /* [ nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SWAP /* [ big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; @@ -2624,122 +2533,122 @@ Gas remaining: 1039662.882 units remaining 0 /* [ nat : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 /* [ nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUP /* [ nat : nat : nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DUG 3 /* [ nat : nat : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; COMPARE /* [ int : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; EQ /* [ bool : big_map address nat : nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; IF { SWAP /* [ nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DROP /* [ big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; NONE nat /* [ option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } { SWAP /* [ nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; SOME /* [ option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : @storage pair (big_map %tokens address nat) + : pair (address %from) (address %to) (nat %value) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ } ; DIG 3 - /* [ @parameter.right.transfer pair (address %from) (address %to) (nat %value) - : option nat : big_map address nat + /* [ pair (address %from) (address %to) (nat %value) : option nat + : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CDR /* [ pair (address %to) (nat %value) : option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; CAR /* [ address : option nat : big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; UPDATE /* [ big_map address nat : big_map (pair (address %owner) (address %spender)) nat - : @storage pair (big_map %tokens address nat) + : pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) ] */ ; DIG 2 - /* [ @storage pair (big_map %tokens address nat) + /* [ pair (big_map %tokens address nat) (big_map %allowances (pair (address %owner) (address %spender)) nat) (address %admin) (nat %total_supply) : big_map address nat diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out index 8359f718cbcf..b01d416e6e68 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out @@ -5,22 +5,21 @@ Gas remaining: 1039921.322 units remaining { parameter unit ; storage (option address) ; code { SENDER - /* [ @sender address : pair (unit @parameter) (option @storage address) ] */ ; + /* [ address : pair (unit @parameter) (option @storage address) ] */ ; SELF - /* [ @self contract unit : @sender address + /* [ contract unit : address : pair (unit @parameter) (option @storage address) ] */ ; ADDRESS - /* [ @self.address address : @sender address - : pair (unit @parameter) (option @storage address) ] */ ; + /* [ address : address : pair (unit @parameter) (option @storage address) ] */ ; { /* [ pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ COMPARE - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ ; EQ /* [ bool : pair (unit @parameter) (option @storage address) ] */ ; IF { CDR - /* [ @storage option address ] */ ; - { /* [ mutez : @amount mutez + /* [ option address ] */ ; + { /* [ mutez : mutez : pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ IF_NONE { { /* [ pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ @@ -37,118 +36,89 @@ Gas remaining: 1039921.322 units remaining /* [ list operation ] */ } /* [] */ ; DUP - /* [ @parameter or (or (nat %add) (nat %sub)) (unit %default) + /* [ or (or (nat %add) (nat %sub)) (unit %default) : pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ ; - CONTRACT %add - unit - /* [ @parameter or (or (nat %add) (nat %sub)) (unit %default) : @storage int ] */ ; + CONTRACT %add unit + /* [ or (or (nat %add) (nat %sub)) (unit %default) : int ] */ ; { /* [ pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ IF_NONE - { /* [ @storage.some address : list operation ] */ } + { /* [ address : list operation ] */ } { { UNIT /* [ int ] */ ; FAILWITH /* [] */ } } } ; DUP - /* [ @storage int : @parameter.left.sub nat ] */ ; + /* [ int : nat ] */ ; CONTRACT %fact nat /* [ int ] */ ; - { /* [ @parameter.default unit : @storage int ] */ + { /* [ unit : int ] */ IF_NONE { /* [] */ } { { UNIT /* [ list operation : int ] */ ; FAILWITH /* [] */ } } /* [] */ } ; DUP /* [ pair (list operation) int ] */ ; - CONTRACT %add - nat - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + CONTRACT %add nat + /* [ option (contract nat) : address : list operation ] */ ; { IF_NONE - { { UNIT /* [ unit : @storage.some address : list operation ] */ ; FAILWITH /* [] */ } } - { /* [ @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ } } ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ ; - PUSH nat - 12 - /* [ nat : mutez : @storage.some.contract.some contract nat - : @storage.some address : list operation ] */ ; + { { UNIT /* [ unit : address : list operation ] */ ; FAILWITH /* [] */ } } + { /* [ contract nat : address : list operation ] */ } } ; + PUSH mutez 0 + /* [ mutez : contract nat : address : list operation ] */ ; + PUSH nat 12 + /* [ nat : mutez : contract nat : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT - unit - /* [ @storage.some.contract option (contract unit) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT unit + /* [ option (contract unit) : address : list operation ] */ ; { IF_NONE - { { UNIT /* [ unit : @storage.some address : list operation ] */ ; FAILWITH /* [] */ } } - { /* [ @storage.some.contract.some contract unit : @storage.some address - : list operation ] */ } } ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract unit : @storage.some address - : list operation ] */ ; - PUSH unit - Unit - /* [ unit : mutez : @storage.some.contract.some contract unit - : @storage.some address : list operation ] */ ; + { { UNIT /* [ unit : address : list operation ] */ ; FAILWITH /* [] */ } } + { /* [ contract unit : address : list operation ] */ } } ; + PUSH mutez 0 + /* [ mutez : contract unit : address : list operation ] */ ; + PUSH unit Unit + /* [ unit : mutez : contract unit : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT %sub - nat - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT %sub nat + /* [ option (contract nat) : address : list operation ] */ ; { IF_NONE - { { UNIT /* [ unit : @storage.some address : list operation ] */ ; FAILWITH /* [] */ } } - { /* [ @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ } } ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ ; - PUSH nat - 3 - /* [ nat : mutez : @storage.some.contract.some contract nat - : @storage.some address : list operation ] */ ; + { { UNIT /* [ unit : address : list operation ] */ ; FAILWITH /* [] */ } } + { /* [ contract nat : address : list operation ] */ } } ; + PUSH mutez 0 + /* [ mutez : contract nat : address : list operation ] */ ; + PUSH nat 3 + /* [ nat : mutez : contract nat : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT %add - nat - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT %add nat + /* [ option (contract nat) : address : list operation ] */ ; { IF_NONE - { { UNIT /* [ unit : @storage.some address : list operation ] */ ; FAILWITH /* [] */ } } - { /* [ @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ } } ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ ; - PUSH nat - 5 - /* [ nat : mutez : @storage.some.contract.some contract nat - : @storage.some address : list operation ] */ ; + { { UNIT /* [ unit : address : list operation ] */ ; FAILWITH /* [] */ } } + { /* [ contract nat : address : list operation ] */ } } ; + PUSH mutez 0 + /* [ mutez : contract nat : address : list operation ] */ ; + PUSH nat 5 + /* [ nat : mutez : contract nat : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DROP /* [ list operation ] */ ; DIP { NONE address /* [ option address ] */ } @@ -156,16 +126,16 @@ Gas remaining: 1039921.322 units remaining PAIR /* [ pair (list operation) (option address) ] */ } { CAR - /* [ @parameter unit ] */ ; + /* [ unit ] */ ; DUP - /* [ @parameter unit : @parameter unit ] */ ; + /* [ unit : unit ] */ ; DIP { DIP { PUSH int 0 /* [ int ] */ ; PUSH mutez 0 /* [ mutez : int ] */ ; NONE key_hash /* [ option key_hash : mutez : int ] */ } - /* [ @parameter unit : option key_hash : mutez : int ] */ ; + /* [ unit : option key_hash : mutez : int ] */ ; DROP /* [ option key_hash : mutez : int ] */ ; CREATE_CONTRACT @@ -181,12 +151,12 @@ Gas remaining: 1039921.322 units remaining NIL operation ; PAIR } } /* [ operation : address ] */ } - /* [ @parameter unit : operation : address ] */ ; + /* [ unit : operation : address ] */ ; DIP { SELF - /* [ @self contract unit : operation : address ] */ ; + /* [ contract unit : operation : address ] */ ; PUSH mutez 0 - /* [ mutez : @self contract unit : operation : address ] */ } - /* [ @parameter unit : mutez : @self contract unit : operation : address ] */ ; + /* [ mutez : contract unit : operation : address ] */ } + /* [ unit : mutez : contract unit : operation : address ] */ ; TRANSFER_TOKENS /* [ operation : operation : address ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out index 4fb6261d70c7..8e192681a635 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out @@ -5,16 +5,15 @@ Gas remaining: 1039924.032 units remaining { parameter unit ; storage (option address) ; code { SENDER - /* [ @sender address : pair (unit @parameter) (option @storage address) ] */ ; + /* [ address : pair (unit @parameter) (option @storage address) ] */ ; SELF - /* [ @self contract unit : @sender address + /* [ contract unit : address : pair (unit @parameter) (option @storage address) ] */ ; ADDRESS - /* [ @self.address address : @sender address - : pair (unit @parameter) (option @storage address) ] */ ; + /* [ address : address : pair (unit @parameter) (option @storage address) ] */ ; IFCMPEQ { CDR - /* [ @storage option address ] */ ; + /* [ option address ] */ ; ASSERT_SOME /* [ int : pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ ; @@ -23,105 +22,79 @@ Gas remaining: 1039924.032 units remaining /* [ list operation ] */ } /* [] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; + /* [ address : address : list operation ] */ ; CONTRACT %add unit /* [ int ] */ - /* [ @storage.some.contract option (contract unit) : @storage.some address - : list operation ] */ ; + /* [ option (contract unit) : address : list operation ] */ ; ASSERT_NONE ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; + /* [ address : address : list operation ] */ ; CONTRACT %fact nat /* [ list operation : int ] */ - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + /* [ option (contract nat) : address : list operation ] */ ; ASSERT_NONE ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT %add - nat - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT %add nat + /* [ option (contract nat) : address : list operation ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ ; - PUSH nat - 12 - /* [ nat : mutez : @storage.some.contract.some contract nat - : @storage.some address : list operation ] */ ; + PUSH mutez 0 + /* [ mutez : contract nat : address : list operation ] */ ; + PUSH nat 12 + /* [ nat : mutez : contract nat : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT - unit - /* [ @storage.some.contract option (contract unit) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT unit + /* [ option (contract unit) : address : list operation ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract unit : @storage.some address - : list operation ] */ ; - PUSH unit - Unit - /* [ unit : mutez : @storage.some.contract.some contract unit - : @storage.some address : list operation ] */ ; + PUSH mutez 0 + /* [ mutez : contract unit : address : list operation ] */ ; + PUSH unit Unit + /* [ unit : mutez : contract unit : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT %sub - nat - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT %sub nat + /* [ option (contract nat) : address : list operation ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ ; - PUSH nat - 3 - /* [ nat : mutez : @storage.some.contract.some contract nat - : @storage.some address : list operation ] */ ; + PUSH mutez 0 + /* [ mutez : contract nat : address : list operation ] */ ; + PUSH nat 3 + /* [ nat : mutez : contract nat : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DUP - /* [ @storage.some address : @storage.some address : list operation ] */ ; - CONTRACT %add - nat - /* [ @storage.some.contract option (contract nat) : @storage.some address - : list operation ] */ ; + /* [ address : address : list operation ] */ ; + CONTRACT %add nat + /* [ option (contract nat) : address : list operation ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @storage.some.contract.some contract nat : @storage.some address - : list operation ] */ ; - PUSH nat - 5 - /* [ nat : mutez : @storage.some.contract.some contract nat - : @storage.some address : list operation ] */ ; + PUSH mutez 0 + /* [ mutez : contract nat : address : list operation ] */ ; + PUSH nat 5 + /* [ nat : mutez : contract nat : address : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : @storage.some address : list operation ] */ ; + /* [ operation : address : list operation ] */ ; SWAP - /* [ @storage.some address : operation : list operation ] */ ; + /* [ address : operation : list operation ] */ ; DIP { CONS /* [ list operation ] */ } - /* [ @storage.some address : list operation ] */ ; + /* [ address : list operation ] */ ; DROP /* [ list operation ] */ ; DIP { NONE address /* [ option address ] */ } @@ -129,16 +102,16 @@ Gas remaining: 1039924.032 units remaining PAIR /* [ pair (list operation) (option address) ] */ } { CAR - /* [ @parameter unit ] */ ; + /* [ unit ] */ ; DUP - /* [ @parameter unit : @parameter unit ] */ ; + /* [ unit : unit ] */ ; DIP { DIP { PUSH int 0 /* [ int ] */ ; PUSH mutez 0 /* [ mutez : int ] */ ; NONE key_hash /* [ option key_hash : mutez : int ] */ } - /* [ @parameter unit : option key_hash : mutez : int ] */ ; + /* [ unit : option key_hash : mutez : int ] */ ; DROP /* [ option key_hash : mutez : int ] */ ; CREATE_CONTRACT @@ -154,12 +127,12 @@ Gas remaining: 1039924.032 units remaining NIL operation ; PAIR } } /* [ operation : address ] */ } - /* [ @parameter unit : operation : address ] */ ; + /* [ unit : operation : address ] */ ; DIP { SELF - /* [ @self contract unit : operation : address ] */ ; + /* [ contract unit : operation : address ] */ ; PUSH mutez 0 - /* [ mutez : @self contract unit : operation : address ] */ } - /* [ @parameter unit : mutez : @self contract unit : operation : address ] */ ; + /* [ mutez : contract unit : operation : address ] */ } + /* [ unit : mutez : contract unit : operation : address ] */ ; TRANSFER_TOKENS /* [ operation : operation : address ] */ ; NIL operation @@ -176,5 +149,5 @@ Gas remaining: 1039924.032 units remaining /* [ list operation : option address ] */ ; PAIR /* [ pair (list operation) (option address) ] */ } - /* [ @amount mutez + /* [ mutez : pair (or @parameter (or (nat %add) (nat %sub)) (unit %default)) (int @storage) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out index dec3b5dcf5d1..b26188b4808f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out @@ -10,29 +10,26 @@ Gas remaining: 1039928.103 units remaining : pair (or @parameter nat (pair signature nat)) (pair @storage bool (map nat (pair bool bool)) key key) ] */ ; CAR - /* [ @parameter or nat (pair signature nat) + /* [ or nat (pair signature nat) : pair (or @parameter nat (pair signature nat)) (pair @storage bool (map nat (pair bool bool)) key key) ] */ ; DIP { CDDR } - /* [ @parameter or nat (pair signature nat) - : pair (map nat (pair bool bool)) key key ] */ ; + /* [ or nat (pair signature nat) : pair (map nat (pair bool bool)) key key ] */ ; IF_LEFT { DIP { DUP /* [ pair (map nat (pair bool bool)) key key : pair (map nat (pair bool bool)) key key ] */ ; CAR /* [ map nat (pair bool bool) : pair (map nat (pair bool bool)) key key ] */ } - /* [ @parameter.left nat : map nat (pair bool bool) - : pair (map nat (pair bool bool)) key key ] */ ; + /* [ nat : map nat (pair bool bool) : pair (map nat (pair bool bool)) key key ] */ ; GET /* [ option (pair bool bool) : pair (map nat (pair bool bool)) key key ] */ ; IF_NONE { PUSH bool False /* [ bool : pair (map nat (pair bool bool)) key key ] */ } { DUP - /* [ @some pair bool bool : @some pair bool bool - : pair (map nat (pair bool bool)) key key ] */ ; + /* [ pair bool bool : pair bool bool : pair (map nat (pair bool bool)) key key ] */ ; CAR - /* [ bool : @some pair bool bool : pair (map nat (pair bool bool)) key key ] */ ; + /* [ bool : pair bool bool : pair (map nat (pair bool bool)) key key ] */ ; DIP { CDR /* [ bool : pair (map nat (pair bool bool)) key key ] */ } /* [ bool : bool : pair (map nat (pair bool bool)) key key ] */ ; AND @@ -40,17 +37,16 @@ Gas remaining: 1039928.103 units remaining PAIR /* [ pair bool (map nat (pair bool bool)) key key ] */ } { DUP - /* [ @parameter.right pair signature nat : @parameter.right pair signature nat + /* [ pair signature nat : pair signature nat : pair (map nat (pair bool bool)) key key ] */ ; CAR - /* [ signature : @parameter.right pair signature nat - : pair (map nat (pair bool bool)) key key ] */ ; + /* [ signature : pair signature nat : pair (map nat (pair bool bool)) key key ] */ ; DIP { CDR /* [ nat : pair (map nat (pair bool bool)) key key ] */ ; DUP /* [ nat : nat : pair (map nat (pair bool bool)) key key ] */ ; PACK - /* [ @packed bytes : nat : pair (map nat (pair bool bool)) key key ] */ ; + /* [ bytes : nat : pair (map nat (pair bool bool)) key key ] */ ; BLAKE2B /* [ bytes : nat : pair (map nat (pair bool bool)) key key ] */ } /* [ signature : bytes : nat : pair (map nat (pair bool bool)) key key ] */ ; @@ -105,7 +101,7 @@ Gas remaining: 1039928.103 units remaining { PUSH (pair bool bool) (Pair False False) /* [ pair bool bool : map nat (pair bool bool) : pair key key ] */ } - { /* [ @some pair bool bool : map nat (pair bool bool) : pair key key ] */ } ; + { /* [ pair bool bool : map nat (pair bool bool) : pair key key ] */ } ; CDR /* [ bool : map nat (pair bool bool) : pair key key ] */ ; PUSH bool True @@ -145,7 +141,7 @@ Gas remaining: 1039928.103 units remaining { PUSH (pair bool bool) (Pair False False) /* [ pair bool bool : nat : map nat (pair bool bool) : pair key key ] */ } - { /* [ @some pair bool bool : nat : map nat (pair bool bool) : pair key key ] */ } ; + { /* [ pair bool bool : nat : map nat (pair bool bool) : pair key key ] */ } ; CAR /* [ bool : nat : map nat (pair bool bool) : pair key key ] */ ; PUSH bool True diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out index 1415fae1de28..902e300c2c57 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out @@ -5,29 +5,25 @@ Gas remaining: 1039989.740 units remaining { parameter unit ; storage unit ; code { CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; SOURCE - /* [ @source address : list operation : @storage unit ] */ ; - CONTRACT - unit - /* [ @source.contract option (contract unit) : list operation : @storage unit ] */ ; + /* [ address : list operation : unit ] */ ; + CONTRACT unit + /* [ option (contract unit) : list operation : unit ] */ ; ASSERT_SOME ; - PUSH mutez - 1 - /* [ mutez : @source.contract.some contract unit : list operation - : @storage unit ] */ ; + PUSH mutez 1 + /* [ mutez : contract unit : list operation : unit ] */ ; UNIT - /* [ unit : mutez : @source.contract.some contract unit : list operation - : @storage unit ] */ ; + /* [ unit : mutez : contract unit : list operation : unit ] */ ; TRANSFER_TOKENS - /* [ operation : list operation : @storage unit ] */ ; + /* [ operation : list operation : unit ] */ ; DUP - /* [ operation : operation : list operation : @storage unit ] */ ; - DIP { CONS /* [ list operation : @storage unit ] */ } - /* [ operation : list operation : @storage unit ] */ ; + /* [ operation : operation : list operation : unit ] */ ; + DIP { CONS /* [ list operation : unit ] */ } + /* [ operation : list operation : unit ] */ ; CONS - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out index 3776d2441dcc..63c755149a80 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out @@ -8,13 +8,13 @@ Gas remaining: 1039977.336 units remaining /* [ pair (pair @parameter bytes signature) (pair @storage bytes key) : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; UNPAIR - /* [ @parameter pair bytes signature : @storage pair bytes key + /* [ pair bytes signature : pair bytes key : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; CAR - /* [ bytes : @storage pair bytes key + /* [ bytes : pair bytes key : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; SHA256 - /* [ bytes : @storage pair bytes key + /* [ bytes : pair bytes key : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; DIP { CAR /* [ bytes : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ } @@ -25,10 +25,10 @@ Gas remaining: 1039977.336 units remaining /* [ pair (pair @parameter bytes signature) (pair @storage bytes key) : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; UNPAIR - /* [ @parameter pair bytes signature : @storage pair bytes key + /* [ pair bytes signature : pair bytes key : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; SWAP - /* [ @storage pair bytes key : @parameter pair bytes signature + /* [ pair bytes key : pair bytes signature : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; DIP { UNPAIR /* [ bytes : signature @@ -36,7 +36,7 @@ Gas remaining: 1039977.336 units remaining SWAP /* [ signature : bytes : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ } - /* [ @storage pair bytes key : signature : bytes + /* [ pair bytes key : signature : bytes : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; CDR /* [ key : signature : bytes @@ -45,26 +45,26 @@ Gas remaining: 1039977.336 units remaining /* [ bool : pair (pair @parameter bytes signature) (pair @storage bytes key) ] */ ; ASSERT ; CDR - /* [ @storage pair bytes key ] */ ; + /* [ pair bytes key ] */ ; DUP - /* [ @storage pair bytes key : @storage pair bytes key ] */ ; + /* [ pair bytes key : pair bytes key ] */ ; CDR - /* [ key : @storage pair bytes key ] */ ; + /* [ key : pair bytes key ] */ ; HASH_KEY - /* [ key_hash : @storage pair bytes key ] */ ; + /* [ key_hash : pair bytes key ] */ ; IMPLICIT_ACCOUNT - /* [ contract unit : @storage pair bytes key ] */ ; + /* [ contract unit : pair bytes key ] */ ; BALANCE - /* [ @balance mutez : contract unit : @storage pair bytes key ] */ ; + /* [ mutez : contract unit : pair bytes key ] */ ; UNIT - /* [ unit : @balance mutez : contract unit : @storage pair bytes key ] */ ; + /* [ unit : mutez : contract unit : pair bytes key ] */ ; TRANSFER_TOKENS - /* [ operation : @storage pair bytes key ] */ ; + /* [ operation : pair bytes key ] */ ; NIL operation - /* [ list operation : operation : @storage pair bytes key ] */ ; + /* [ list operation : operation : pair bytes key ] */ ; SWAP - /* [ operation : list operation : @storage pair bytes key ] */ ; + /* [ operation : list operation : pair bytes key ] */ ; CONS - /* [ list operation : @storage pair bytes key ] */ ; + /* [ list operation : pair bytes key ] */ ; PAIR - /* [ pair (list operation) (pair @storage bytes key) ] */ } } + /* [ pair (list operation) bytes key ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out index 03a739cbe93c..f00cbadabca5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out @@ -5,15 +5,15 @@ Gas remaining: 1039991.719 units remaining { parameter (lambda unit address) ; storage unit ; code { UNPAIR - /* [ @parameter lambda unit address : @storage unit ] */ ; + /* [ lambda unit address : unit ] */ ; UNIT - /* [ unit : @parameter lambda unit address : @storage unit ] */ ; + /* [ unit : lambda unit address : unit ] */ ; EXEC - /* [ address : @storage unit ] */ ; + /* [ address : unit ] */ ; SELF_ADDRESS - /* [ @self address : address : @storage unit ] */ ; + /* [ address : address : unit ] */ ; ASSERT_CMPEQ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out index b7238503791c..14a58732171f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out @@ -5,15 +5,14 @@ Gas remaining: 1039991.879 units remaining { parameter (contract (lambda unit address)) ; storage unit ; code { CAR - /* [ @parameter contract (lambda unit address) ] */ ; + /* [ contract (lambda unit address) ] */ ; BALANCE - /* [ @balance mutez : @parameter contract (lambda unit address) ] */ ; + /* [ mutez : contract (lambda unit address) ] */ ; LAMBDA unit address - { DROP /* [] */ ; SELF_ADDRESS /* [ @self address ] */ } - /* [ lambda unit address : @balance mutez - : @parameter contract (lambda unit address) ] */ ; + { DROP /* [] */ ; SELF_ADDRESS /* [ address ] */ } + /* [ lambda unit address : mutez : contract (lambda unit address) ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; DIP { UNIT /* [ unit ] */ ; NIL operation /* [ list operation : unit ] */ } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out index a472529a08fd..55032656efbc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out @@ -7,65 +7,62 @@ Gas remaining: 1039973.685 units remaining (pair %mint (contract %destination (ticket unit)) (nat %amount))) ; storage address ; code { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter (ticket %burn unit) (pair %mint (contract %destination (ticket unit)) (nat %amount))) (address @storage) ] */ ; PUSH mutez 0 - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter (ticket %burn unit) (pair %mint (contract %destination (ticket unit)) (nat %amount))) (address @storage) ] */ ; ASSERT_CMPEQ ; UNPAIR - /* [ @parameter or (ticket %burn unit) + /* [ or (ticket %burn unit) (pair %mint (contract %destination (ticket unit)) (nat %amount)) - : @storage address ] */ ; + : address ] */ ; IF_LEFT { READ_TICKET - /* [ pair address unit nat : @parameter.burn ticket unit : @storage address ] */ ; + /* [ pair address unit nat : ticket unit : address ] */ ; CAR - /* [ address : @parameter.burn ticket unit : @storage address ] */ ; + /* [ address : ticket unit : address ] */ ; SELF_ADDRESS - /* [ @self address : address : @parameter.burn ticket unit : @storage address ] */ ; + /* [ address : address : ticket unit : address ] */ ; ASSERT_CMPEQ ; DROP - /* [ @storage address ] */ ; + /* [ address ] */ ; NIL operation - /* [ list operation : @storage address ] */ } + /* [ list operation : address ] */ } { DUP @manager 2 - /* [ @manager address - : @parameter.mint pair (contract %destination (ticket unit)) (nat %amount) - : @storage address ] */ ; + /* [ address : pair (contract %destination (ticket unit)) (nat %amount) + : address ] */ ; SENDER - /* [ @sender address : @manager address - : @parameter.mint pair (contract %destination (ticket unit)) (nat %amount) - : @storage address ] */ ; + /* [ address : address + : pair (contract %destination (ticket unit)) (nat %amount) : address ] */ ; ASSERT_CMPEQ ; UNPAIR - /* [ contract (ticket unit) : nat : @storage address ] */ ; + /* [ contract (ticket unit) : nat : address ] */ ; SWAP - /* [ nat : contract (ticket unit) : @storage address ] */ ; + /* [ nat : contract (ticket unit) : address ] */ ; UNIT - /* [ unit : nat : contract (ticket unit) : @storage address ] */ ; + /* [ unit : nat : contract (ticket unit) : address ] */ ; TICKET - /* [ ticket unit : contract (ticket unit) : @storage address ] */ ; - PUSH mutez - 0 - /* [ mutez : ticket unit : contract (ticket unit) : @storage address ] */ ; + /* [ ticket unit : contract (ticket unit) : address ] */ ; + PUSH mutez 0 + /* [ mutez : ticket unit : contract (ticket unit) : address ] */ ; SWAP - /* [ ticket unit : mutez : contract (ticket unit) : @storage address ] */ ; + /* [ ticket unit : mutez : contract (ticket unit) : address ] */ ; TRANSFER_TOKENS - /* [ operation : @storage address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @storage address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @storage address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @storage address ] */ } ; + /* [ list operation : address ] */ } ; PAIR - /* [ pair (list operation) (address @storage) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out index d05c187d10eb..c2a6e9a1ea33 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out @@ -5,69 +5,56 @@ Gas remaining: 1039970.718 units remaining { parameter (or (ticket %burn nat) (contract %mint_destination (ticket nat))) ; storage (pair (address %manager) (nat %counter)) ; code { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter (ticket %burn nat) (contract %mint_destination (ticket nat))) (pair @storage (address %manager) (nat %counter)) ] */ ; PUSH mutez 0 - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter (ticket %burn nat) (contract %mint_destination (ticket nat))) (pair @storage (address %manager) (nat %counter)) ] */ ; ASSERT_CMPEQ ; UNPAIR 3 - /* [ or (ticket %burn nat) (contract %mint_destination (ticket nat)) - : @manager address : @counter nat ] */ ; + /* [ or (ticket %burn nat) (contract %mint_destination (ticket nat)) : address + : nat ] */ ; IF_LEFT { READ_TICKET - /* [ pair address nat nat : @burn ticket nat : @manager address : @counter nat ] */ ; + /* [ pair address nat nat : ticket nat : address : nat ] */ ; CAR - /* [ address : @burn ticket nat : @manager address : @counter nat ] */ ; + /* [ address : ticket nat : address : nat ] */ ; SELF_ADDRESS - /* [ @self address : address : @burn ticket nat : @manager address - : @counter nat ] */ ; + /* [ address : address : ticket nat : address : nat ] */ ; ASSERT_CMPEQ ; DROP - /* [ @manager address : @counter nat ] */ ; + /* [ address : nat ] */ ; NIL operation - /* [ list operation : @manager address : @counter nat ] */ } - { DUP @manager - 2 - /* [ @manager address : @mint_destination contract (ticket nat) - : @manager address : @counter nat ] */ ; + /* [ list operation : address : nat ] */ } + { DUP @manager 2 + /* [ address : contract (ticket nat) : address : nat ] */ ; SENDER - /* [ @sender address : @manager address - : @mint_destination contract (ticket nat) : @manager address : @counter nat ] */ ; + /* [ address : address : contract (ticket nat) : address : nat ] */ ; ASSERT_CMPEQ ; - PUSH @amount - nat - 1 - /* [ @amount nat : @mint_destination contract (ticket nat) : @manager address - : @counter nat ] */ ; - DUP @counter - 4 - /* [ @counter nat : @amount nat : @mint_destination contract (ticket nat) - : @manager address : @counter nat ] */ ; + PUSH @amount nat 1 + /* [ nat : contract (ticket nat) : address : nat ] */ ; + DUP @counter 4 + /* [ nat : nat : contract (ticket nat) : address : nat ] */ ; TICKET - /* [ ticket nat : @mint_destination contract (ticket nat) : @manager address - : @counter nat ] */ ; - PUSH mutez - 0 - /* [ mutez : ticket nat : @mint_destination contract (ticket nat) - : @manager address : @counter nat ] */ ; + /* [ ticket nat : contract (ticket nat) : address : nat ] */ ; + PUSH mutez 0 + /* [ mutez : ticket nat : contract (ticket nat) : address : nat ] */ ; SWAP - /* [ ticket nat : mutez : @mint_destination contract (ticket nat) - : @manager address : @counter nat ] */ ; + /* [ ticket nat : mutez : contract (ticket nat) : address : nat ] */ ; TRANSFER_TOKENS - /* [ operation : @manager address : @counter nat ] */ ; + /* [ operation : address : nat ] */ ; NIL operation - /* [ list operation : operation : @manager address : @counter nat ] */ ; + /* [ list operation : operation : address : nat ] */ ; SWAP - /* [ operation : list operation : @manager address : @counter nat ] */ ; + /* [ operation : list operation : address : nat ] */ ; CONS - /* [ list operation : @manager address : @counter nat ] */ ; + /* [ list operation : address : nat ] */ ; DIP 2 - { PUSH nat 1 /* [ nat : @counter nat ] */ ; ADD /* [ nat ] */ } - /* [ list operation : @manager address : nat ] */ } ; + { PUSH nat 1 /* [ nat : nat ] */ ; ADD /* [ nat ] */ } + /* [ list operation : address : nat ] */ } ; PAIR 3 /* [ pair (list operation) address nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out index 75d371605657..4be42ebff450 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out @@ -7,14 +7,14 @@ Gas remaining: 1039935.806 units remaining (pair %send (contract %destination (ticket unit)) (nat %amount) (address %ticketer))) ; storage (pair (address %manager) (big_map %tickets address (ticket unit))) ; code { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter (ticket %receive unit) (pair %send (contract %destination (ticket unit)) (nat %amount) (address %ticketer))) (pair @storage (address %manager) (big_map %tickets address (ticket unit))) ] */ ; PUSH mutez 0 - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter (ticket %receive unit) (pair %send (contract %destination (ticket unit)) (nat %amount) (address %ticketer))) @@ -24,201 +24,152 @@ Gas remaining: 1039935.806 units remaining 3 /* [ or (ticket %receive unit) (pair %send (contract %destination (ticket unit)) (nat %amount) (address %ticketer)) - : @manager address : @tickets big_map address (ticket unit) ] */ ; + : address : big_map address (ticket unit) ] */ ; IF_LEFT { READ_TICKET - /* [ pair address unit nat : @receive ticket unit : @manager address - : @tickets big_map address (ticket unit) ] */ ; + /* [ pair address unit nat : ticket unit : address + : big_map address (ticket unit) ] */ ; CAR @ticketer - /* [ @ticketer address : @receive ticket unit : @manager address - : @tickets big_map address (ticket unit) ] */ ; + /* [ address : ticket unit : address : big_map address (ticket unit) ] */ ; DUP - /* [ @ticketer address : @ticketer address : @receive ticket unit - : @manager address : @tickets big_map address (ticket unit) ] */ ; + /* [ address : address : ticket unit : address : big_map address (ticket unit) ] */ ; DIG 4 - /* [ @tickets big_map address (ticket unit) : @ticketer address - : @ticketer address : @receive ticket unit : @manager address ] */ ; + /* [ big_map address (ticket unit) : address : address : ticket unit : address ] */ ; NONE (ticket unit) - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @ticketer address : @ticketer address : @receive ticket unit - : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) : address : address + : ticket unit : address ] */ ; DIG 2 - /* [ @ticketer address : option (ticket unit) - : @tickets big_map address (ticket unit) : @ticketer address - : @receive ticket unit : @manager address ] */ ; + /* [ address : option (ticket unit) : big_map address (ticket unit) : address + : ticket unit : address ] */ ; GET_AND_UPDATE - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @ticketer address : @receive ticket unit : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) : address + : ticket unit : address ] */ ; IF_SOME { DIG 3 - /* [ @receive ticket unit : @some ticket unit - : @tickets big_map address (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ ticket unit : ticket unit : big_map address (ticket unit) : address + : address ] */ ; PAIR - /* [ pair (ticket @receive unit) (ticket @some unit) - : @tickets big_map address (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ pair (ticket unit) (ticket unit) : big_map address (ticket unit) : address + : address ] */ ; JOIN_TICKETS - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @ticketer address : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) : address : address ] */ ; ASSERT_SOME } { DIG 2 - /* [ @receive ticket unit : @tickets big_map address (ticket unit) - : @ticketer address : @manager address ] */ } ; + /* [ ticket unit : big_map address (ticket unit) : address : address ] */ } ; SOME - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @ticketer address : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) : address : address ] */ ; DIG 2 - /* [ @ticketer address : option (ticket unit) - : @tickets big_map address (ticket unit) : @manager address ] */ ; + /* [ address : option (ticket unit) : big_map address (ticket unit) : address ] */ ; GET_AND_UPDATE - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) : address ] */ ; ASSERT_NONE ; SWAP - /* [ @manager address : @tickets big_map address (ticket unit) ] */ ; + /* [ address : big_map address (ticket unit) ] */ ; PAIR - /* [ pair (address @manager) (big_map @tickets address (ticket unit)) ] */ ; + /* [ pair address (big_map address (ticket unit)) ] */ ; NIL operation - /* [ list operation - : pair (address @manager) (big_map @tickets address (ticket unit)) ] */ } + /* [ list operation : pair address (big_map address (ticket unit)) ] */ } { DUP @manager 2 - /* [ @manager address - : @send pair (contract %destination (ticket unit)) (nat %amount) (address %ticketer) - : @manager address : @tickets big_map address (ticket unit) ] */ ; + /* [ address + : pair (contract %destination (ticket unit)) (nat %amount) (address %ticketer) + : address : big_map address (ticket unit) ] */ ; SENDER - /* [ @sender address : @manager address - : @send pair (contract %destination (ticket unit)) (nat %amount) (address %ticketer) - : @manager address : @tickets big_map address (ticket unit) ] */ ; + /* [ address : address + : pair (contract %destination (ticket unit)) (nat %amount) (address %ticketer) + : address : big_map address (ticket unit) ] */ ; ASSERT_CMPEQ ; UNPAIR 3 - /* [ @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address : @tickets big_map address (ticket unit) ] */ ; + /* [ contract (ticket unit) : nat : address : address + : big_map address (ticket unit) ] */ ; DIG 4 - /* [ @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ big_map address (ticket unit) : contract (ticket unit) : nat : address + : address ] */ ; NONE (ticket unit) - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; DUP @ticketer 5 - /* [ @ticketer address : option (ticket unit) - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ address : option (ticket unit) : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; GET_AND_UPDATE - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; ASSERT_SOME ; READ_TICKET - /* [ pair address unit nat : @some ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ pair address unit nat : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; GET @total_amount 4 - /* [ @total_amount nat : @some ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ nat : ticket unit : big_map address (ticket unit) : contract (ticket unit) + : nat : address : address ] */ ; DUP @amount 5 - /* [ @amount nat : @total_amount nat : @some ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ nat : nat : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; SWAP - /* [ @total_amount nat : @amount nat : @some ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ nat : nat : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; SUB - /* [ int : @some ticket unit : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ int : ticket unit : big_map address (ticket unit) : contract (ticket unit) + : nat : address : address ] */ ; ISNAT - /* [ option nat : @some ticket unit : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @amount nat : @ticketer address - : @manager address ] */ ; + /* [ option nat : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : nat : address : address ] */ ; ASSERT_SOME @remaining_amount ; DIG 4 - /* [ @amount nat : @remaining_amount nat : @some ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ nat : nat : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : address : address ] */ ; PAIR - /* [ pair (nat @amount) (nat @remaining_amount) : @some ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ pair nat nat : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : address : address ] */ ; SWAP - /* [ @some ticket unit : pair (nat @amount) (nat @remaining_amount) - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ ticket unit : pair nat nat : big_map address (ticket unit) + : contract (ticket unit) : address : address ] */ ; SPLIT_TICKET - /* [ option (pair (ticket @amount unit) (ticket @remaining_amount unit)) - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ option (pair (ticket unit) (ticket unit)) : big_map address (ticket unit) + : contract (ticket unit) : address : address ] */ ; ASSERT_SOME ; UNPAIR @to_send @to_keep - /* [ @to_send ticket unit : @to_keep ticket unit - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address - : @manager address ] */ ; + /* [ ticket unit : ticket unit : big_map address (ticket unit) + : contract (ticket unit) : address : address ] */ ; DUG 5 - /* [ @to_keep ticket unit : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address : @manager address - : @to_send ticket unit ] */ ; + /* [ ticket unit : big_map address (ticket unit) : contract (ticket unit) + : address : address : ticket unit ] */ ; SOME - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @ticketer address : @manager address - : @to_send ticket unit ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) + : contract (ticket unit) : address : address : ticket unit ] */ ; DIG 3 - /* [ @ticketer address : option (ticket unit) - : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @manager address - : @to_send ticket unit ] */ ; + /* [ address : option (ticket unit) : big_map address (ticket unit) + : contract (ticket unit) : address : ticket unit ] */ ; GET_AND_UPDATE - /* [ option (ticket unit) : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @manager address - : @to_send ticket unit ] */ ; + /* [ option (ticket unit) : big_map address (ticket unit) + : contract (ticket unit) : address : ticket unit ] */ ; ASSERT_NONE ; DIG 2 - /* [ @manager address : @tickets big_map address (ticket unit) - : @destination contract (ticket unit) : @to_send ticket unit ] */ ; + /* [ address : big_map address (ticket unit) : contract (ticket unit) + : ticket unit ] */ ; PAIR - /* [ pair (address @manager) (big_map @tickets address (ticket unit)) - : @destination contract (ticket unit) : @to_send ticket unit ] */ ; + /* [ pair address (big_map address (ticket unit)) : contract (ticket unit) + : ticket unit ] */ ; SWAP - /* [ @destination contract (ticket unit) - : pair (address @manager) (big_map @tickets address (ticket unit)) - : @to_send ticket unit ] */ ; + /* [ contract (ticket unit) : pair address (big_map address (ticket unit)) + : ticket unit ] */ ; PUSH mutez 0 - /* [ mutez : @destination contract (ticket unit) - : pair (address @manager) (big_map @tickets address (ticket unit)) - : @to_send ticket unit ] */ ; + /* [ mutez : contract (ticket unit) + : pair address (big_map address (ticket unit)) : ticket unit ] */ ; DIG 3 - /* [ @to_send ticket unit : mutez : @destination contract (ticket unit) - : pair (address @manager) (big_map @tickets address (ticket unit)) ] */ ; + /* [ ticket unit : mutez : contract (ticket unit) + : pair address (big_map address (ticket unit)) ] */ ; TRANSFER_TOKENS - /* [ operation - : pair (address @manager) (big_map @tickets address (ticket unit)) ] */ ; + /* [ operation : pair address (big_map address (ticket unit)) ] */ ; NIL operation - /* [ list operation : operation - : pair (address @manager) (big_map @tickets address (ticket unit)) ] */ ; + /* [ list operation : operation : pair address (big_map address (ticket unit)) ] */ ; SWAP - /* [ operation : list operation - : pair (address @manager) (big_map @tickets address (ticket unit)) ] */ ; + /* [ operation : list operation : pair address (big_map address (ticket unit)) ] */ ; CONS - /* [ list operation - : pair (address @manager) (big_map @tickets address (ticket unit)) ] */ } ; + /* [ list operation : pair address (big_map address (ticket unit)) ] */ } ; PAIR - /* [ pair (list operation) (address @manager) (big_map @tickets address (ticket unit)) ] */ } } + /* [ pair (list operation) address (big_map address (ticket unit)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out index b449006d495c..1a9b2205347e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out @@ -7,14 +7,14 @@ Gas remaining: 1039952.622 units remaining (pair %send (contract %destination (ticket nat)) (address %ticketer) (nat %id))) ; storage (pair (address %manager) (big_map %tickets (pair address nat) (ticket nat))) ; code { AMOUNT - /* [ @amount mutez + /* [ mutez : pair (or @parameter (ticket %receive nat) (pair %send (contract %destination (ticket nat)) (address %ticketer) (nat %id))) (pair @storage (address %manager) (big_map %tickets (pair address nat) (ticket nat))) ] */ ; PUSH mutez 0 - /* [ mutez : @amount mutez + /* [ mutez : mutez : pair (or @parameter (ticket %receive nat) (pair %send (contract %destination (ticket nat)) (address %ticketer) (nat %id))) @@ -24,109 +24,98 @@ Gas remaining: 1039952.622 units remaining 3 /* [ or (ticket %receive nat) (pair %send (contract %destination (ticket nat)) (address %ticketer) (nat %id)) - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + : address : big_map (pair address nat) (ticket nat) ] */ ; IF_LEFT { READ_TICKET - /* [ pair address nat nat : @receive ticket nat : @manager address - : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ pair address nat nat : ticket nat : address + : big_map (pair address nat) (ticket nat) ] */ ; CAST (pair (address %ticketer) (nat %id) (nat %amount)) - /* [ pair (address %ticketer) (nat %id) (nat %amount) : @receive ticket nat - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ pair (address %ticketer) (nat %id) (nat %amount) : ticket nat : address + : big_map (pair address nat) (ticket nat) ] */ ; UNPAIR 3 - /* [ @ticketer address : @id nat : @amount nat : @receive ticket nat - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ address : nat : nat : ticket nat : address + : big_map (pair address nat) (ticket nat) ] */ ; DIG 2 - /* [ @amount nat : @ticketer address : @id nat : @receive ticket nat - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ nat : address : nat : ticket nat : address + : big_map (pair address nat) (ticket nat) ] */ ; PUSH nat 1 - /* [ nat : @amount nat : @ticketer address : @id nat : @receive ticket nat - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ nat : nat : address : nat : ticket nat : address + : big_map (pair address nat) (ticket nat) ] */ ; ASSERT_CMPEQ ; PAIR - /* [ pair (address @ticketer) (nat @id) : @receive ticket nat : @manager address - : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ pair address nat : ticket nat : address + : big_map (pair address nat) (ticket nat) ] */ ; DIP { SOME - /* [ option (ticket nat) : @manager address - : @tickets big_map (pair address nat) (ticket nat) ] */ ; - DIP { SWAP - /* [ @tickets big_map (pair address nat) (ticket nat) : @manager address ] */ } - /* [ option (ticket nat) : @tickets big_map (pair address nat) (ticket nat) - : @manager address ] */ } - /* [ pair (address @ticketer) (nat @id) : option (ticket nat) - : @tickets big_map (pair address nat) (ticket nat) : @manager address ] */ ; + /* [ option (ticket nat) : address : big_map (pair address nat) (ticket nat) ] */ ; + DIP { SWAP /* [ big_map (pair address nat) (ticket nat) : address ] */ } + /* [ option (ticket nat) : big_map (pair address nat) (ticket nat) : address ] */ } + /* [ pair address nat : option (ticket nat) + : big_map (pair address nat) (ticket nat) : address ] */ ; GET_AND_UPDATE - /* [ option (ticket nat) : @tickets big_map (pair address nat) (ticket nat) - : @manager address ] */ ; + /* [ option (ticket nat) : big_map (pair address nat) (ticket nat) : address ] */ ; ASSERT_NONE ; SWAP - /* [ @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ address : big_map (pair address nat) (ticket nat) ] */ ; PAIR - /* [ pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + /* [ pair address (big_map (pair address nat) (ticket nat)) ] */ ; NIL operation - /* [ list operation - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ } + /* [ list operation : pair address (big_map (pair address nat) (ticket nat)) ] */ } { DUP @manager 2 - /* [ @manager address - : @send pair (contract %destination (ticket nat)) (address %ticketer) (nat %id) - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ address + : pair (contract %destination (ticket nat)) (address %ticketer) (nat %id) + : address : big_map (pair address nat) (ticket nat) ] */ ; SENDER - /* [ @sender address : @manager address - : @send pair (contract %destination (ticket nat)) (address %ticketer) (nat %id) - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ address : address + : pair (contract %destination (ticket nat)) (address %ticketer) (nat %id) + : address : big_map (pair address nat) (ticket nat) ] */ ; ASSERT_CMPEQ ; UNPAIR - /* [ contract (ticket nat) : pair (address %ticketer) (nat %id) - : @manager address : @tickets big_map (pair address nat) (ticket nat) ] */ ; + /* [ contract (ticket nat) : pair (address %ticketer) (nat %id) : address + : big_map (pair address nat) (ticket nat) ] */ ; DIG 3 - /* [ @tickets big_map (pair address nat) (ticket nat) : contract (ticket nat) - : pair (address %ticketer) (nat %id) : @manager address ] */ ; + /* [ big_map (pair address nat) (ticket nat) : contract (ticket nat) + : pair (address %ticketer) (nat %id) : address ] */ ; NONE (ticket nat) - /* [ option (ticket nat) : @tickets big_map (pair address nat) (ticket nat) - : contract (ticket nat) : pair (address %ticketer) (nat %id) - : @manager address ] */ ; + /* [ option (ticket nat) : big_map (pair address nat) (ticket nat) + : contract (ticket nat) : pair (address %ticketer) (nat %id) : address ] */ ; DIG 3 /* [ pair (address %ticketer) (nat %id) : option (ticket nat) - : @tickets big_map (pair address nat) (ticket nat) : contract (ticket nat) - : @manager address ] */ ; + : big_map (pair address nat) (ticket nat) : contract (ticket nat) : address ] */ ; GET_AND_UPDATE - /* [ option (ticket nat) : @tickets big_map (pair address nat) (ticket nat) - : contract (ticket nat) : @manager address ] */ ; + /* [ option (ticket nat) : big_map (pair address nat) (ticket nat) + : contract (ticket nat) : address ] */ ; ASSERT_SOME ; SWAP - /* [ @tickets big_map (pair address nat) (ticket nat) : @some ticket nat - : contract (ticket nat) : @manager address ] */ ; + /* [ big_map (pair address nat) (ticket nat) : ticket nat + : contract (ticket nat) : address ] */ ; DIG 3 - /* [ @manager address : @tickets big_map (pair address nat) (ticket nat) - : @some ticket nat : contract (ticket nat) ] */ ; + /* [ address : big_map (pair address nat) (ticket nat) : ticket nat + : contract (ticket nat) ] */ ; PAIR - /* [ pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) - : @some ticket nat : contract (ticket nat) ] */ ; + /* [ pair address (big_map (pair address nat) (ticket nat)) : ticket nat + : contract (ticket nat) ] */ ; DUG 2 - /* [ @some ticket nat : contract (ticket nat) - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + /* [ ticket nat : contract (ticket nat) + : pair address (big_map (pair address nat) (ticket nat)) ] */ ; PUSH mutez 0 - /* [ mutez : @some ticket nat : contract (ticket nat) - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + /* [ mutez : ticket nat : contract (ticket nat) + : pair address (big_map (pair address nat) (ticket nat)) ] */ ; SWAP - /* [ @some ticket nat : mutez : contract (ticket nat) - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + /* [ ticket nat : mutez : contract (ticket nat) + : pair address (big_map (pair address nat) (ticket nat)) ] */ ; TRANSFER_TOKENS - /* [ operation - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + /* [ operation : pair address (big_map (pair address nat) (ticket nat)) ] */ ; NIL operation /* [ list operation : operation - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + : pair address (big_map (pair address nat) (ticket nat)) ] */ ; SWAP /* [ operation : list operation - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ ; + : pair address (big_map (pair address nat) (ticket nat)) ] */ ; CONS - /* [ list operation - : pair (address @manager) (big_map @tickets (pair address nat) (ticket nat)) ] */ } ; + /* [ list operation : pair address (big_map (pair address nat) (ticket nat)) ] */ } ; PAIR - /* [ pair (list operation) - (address @manager) - (big_map @tickets (pair address nat) (ticket nat)) ] */ } } + /* [ pair (list operation) address (big_map (pair address nat) (ticket nat)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out index 5411d0459706..6da4ea7906fe 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out @@ -7,15 +7,15 @@ Gas remaining: 1039984.179 units remaining (pair %view_add (pair int int) (contract int))) ; storage unit ; code { CAR - /* [ @parameter or (pair %view_const unit (contract nat)) + /* [ or (pair %view_const unit (contract nat)) (pair %view_add (pair int int) (contract int)) ] */ ; IF_LEFT { CDR /* [ contract nat ] */ ; AMOUNT - /* [ @amount mutez : contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 5 - /* [ nat : @amount mutez : contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; NIL operation @@ -37,9 +37,9 @@ Gas remaining: 1039984.179 units remaining ADD /* [ int : contract int ] */ ; AMOUNT - /* [ @amount mutez : int : contract int ] */ ; + /* [ mutez : int : contract int ] */ ; SWAP - /* [ int : @amount mutez : contract int ] */ ; + /* [ int : mutez : contract int ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out index d40dafa17c09..de37fea144a0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out @@ -5,76 +5,66 @@ Gas remaining: 1039965.793 units remaining { parameter bytes ; storage unit ; code { CAR @preimage - /* [ @preimage bytes ] */ ; + /* [ bytes ] */ ; DIP { PUSH @from key_hash "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" - /* [ @from key_hash ] */ ; + /* [ key_hash ] */ ; IMPLICIT_ACCOUNT /* [ contract unit ] */ ; PUSH @to key_hash "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" - /* [ @to key_hash : contract unit ] */ ; + /* [ key_hash : contract unit ] */ ; IMPLICIT_ACCOUNT /* [ contract unit : contract unit ] */ ; - PUSH @target_hash - bytes - 0x123456 - /* [ @target_hash bytes : contract unit : contract unit ] */ ; + PUSH @target_hash bytes 0x123456 + /* [ bytes : contract unit : contract unit ] */ ; PUSH @deadline timestamp "2018-08-08 00:00:00Z" - /* [ @deadline timestamp : @target_hash bytes : contract unit : contract unit ] */ } - /* [ @preimage bytes : @deadline timestamp : @target_hash bytes : contract unit - : contract unit ] */ ; + /* [ timestamp : bytes : contract unit : contract unit ] */ } + /* [ bytes : timestamp : bytes : contract unit : contract unit ] */ ; SWAP - /* [ @deadline timestamp : @preimage bytes : @target_hash bytes : contract unit - : contract unit ] */ ; + /* [ timestamp : bytes : bytes : contract unit : contract unit ] */ ; NOW - /* [ @now timestamp : @deadline timestamp : @preimage bytes : @target_hash bytes - : contract unit : contract unit ] */ ; + /* [ timestamp : timestamp : bytes : bytes : contract unit : contract unit ] */ ; IFCMPLT { DROP - /* [ @target_hash bytes : contract unit : contract unit ] */ ; + /* [ bytes : contract unit : contract unit ] */ ; DROP /* [ contract unit : contract unit ] */ ; DROP /* [ contract unit ] */ ; BALANCE - /* [ @balance mutez : contract unit ] */ ; + /* [ mutez : contract unit ] */ ; UNIT - /* [ unit : @balance mutez : contract unit ] */ ; + /* [ unit : mutez : contract unit ] */ ; TRANSFER_TOKENS /* [ operation ] */ } { DUP - /* [ @preimage bytes : @preimage bytes : @target_hash bytes : contract unit - : contract unit ] */ ; + /* [ bytes : bytes : bytes : contract unit : contract unit ] */ ; SIZE - /* [ nat : @preimage bytes : @target_hash bytes : contract unit - : contract unit ] */ ; + /* [ nat : bytes : bytes : contract unit : contract unit ] */ ; PUSH @max_length nat 32 - /* [ @max_length nat : nat : @preimage bytes : @target_hash bytes - : contract unit : contract unit ] */ ; + /* [ nat : nat : bytes : bytes : contract unit : contract unit ] */ ; IFCMPLT { PUSH string "preimage too long" - /* [ string : @preimage bytes : @target_hash bytes : contract unit - : contract unit ] */ ; + /* [ string : bytes : bytes : contract unit : contract unit ] */ ; FAILWITH /* [] */ } { SHA256 @candidate_hash - /* [ @candidate_hash bytes : @target_hash bytes : contract unit - : contract unit ] */ ; + /* [ bytes : bytes : contract unit : contract unit ] */ ; IFCMPNEQ { PUSH string "invalid preimage" /* [ string : contract unit : contract unit ] */ ; FAILWITH /* [] */ } { BALANCE - /* [ @balance mutez : contract unit : contract unit ] */ ; + /* [ mutez : contract unit : contract unit ] */ ; UNIT - /* [ unit : @balance mutez : contract unit : contract unit ] */ ; + /* [ unit : mutez : contract unit : contract unit ] */ ; TRANSFER_TOKENS /* [ operation : contract unit ] */ ; DIP { DROP /* [] */ } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out index d04625a6d008..6a8693771ee7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out @@ -15,7 +15,7 @@ Gas remaining: 1039911.852 units remaining unit) ; code { NIL @operations operation - /* [ @operations list operation + /* [ list operation : pair (or @parameter (pair %fund (address %dest) @@ -38,7 +38,7 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)))) - unit) : @operations list operation ] */ ; + unit) : list operation ] */ ; UNPAPAIR @% @% @% ; DIP { DUP /* [ big_map @@ -49,8 +49,8 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ } - /* [ @parameter or (pair %fund + : list operation ] */ } + /* [ or (pair %fund (address %dest) (pair %settings (bytes %target_hash) (timestamp %deadline))) (or %claim_refund (bytes %preimage_claim) (bytes %refund_hash)) @@ -62,10 +62,10 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; IF_LEFT { UNPAIR @% @% - /* [ @dest address : @settings pair (bytes %target_hash) (timestamp %deadline) + /* [ address : pair (bytes %target_hash) (timestamp %deadline) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -74,10 +74,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DUP - /* [ @dest address : @dest address - : @settings pair (bytes %target_hash) (timestamp %deadline) + /* [ address : address : pair (bytes %target_hash) (timestamp %deadline) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -86,11 +85,11 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; CONTRACT @dest unit - /* [ @dest option (contract unit) : @dest address - : @settings pair (bytes %target_hash) (timestamp %deadline) + /* [ option (contract unit) : address + : pair (bytes %target_hash) (timestamp %deadline) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -99,10 +98,10 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_SOME ; DROP - /* [ @dest address : @settings pair (bytes %target_hash) (timestamp %deadline) + /* [ address : pair (bytes %target_hash) (timestamp %deadline) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -111,9 +110,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SWAP - /* [ @settings pair (bytes %target_hash) (timestamp %deadline) : @dest address + /* [ pair (bytes %target_hash) (timestamp %deadline) : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -122,9 +121,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; UNPAIR @% @% - /* [ @target_hash bytes : @deadline timestamp : @dest address + /* [ bytes : timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -133,9 +132,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DIP { AMOUNT @amount - /* [ @amount mutez : @deadline timestamp : @dest address + /* [ mutez : timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -144,9 +143,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SENDER - /* [ @sender address : @amount mutez : @deadline timestamp : @dest address + /* [ address : mutez : timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -155,10 +154,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DUP - /* [ @sender address : @sender address : @amount mutez : @deadline timestamp - : @dest address + /* [ address : address : mutez : timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -167,11 +165,10 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; CONTRACT @from unit - /* [ @from option (contract unit) : @sender address : @amount mutez - : @deadline timestamp : @dest address + /* [ option (contract unit) : address : mutez : timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -180,10 +177,10 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_SOME ; DROP - /* [ @sender address : @amount mutez : @deadline timestamp : @dest address + /* [ address : mutez : timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -192,9 +189,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DIP { PAIR - /* [ pair (mutez @amount) (timestamp @deadline) : @dest address + /* [ pair mutez timestamp : address : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -203,9 +200,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SWAP - /* [ @dest address : pair (mutez @amount) (timestamp @deadline) + /* [ address : pair mutez timestamp : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -214,9 +211,8 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ } - /* [ @sender address : @dest address - : pair (mutez @amount) (timestamp @deadline) + : list operation ] */ } + /* [ address : address : pair mutez timestamp : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -225,10 +221,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; PAIR - /* [ pair (address @sender) (address @dest) - : pair (mutez @amount) (timestamp @deadline) + /* [ pair address address : pair mutez timestamp : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -237,9 +232,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; PAIR - /* [ pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline) + /* [ pair (pair address address) mutez timestamp : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -248,10 +243,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SOME @xcat - /* [ @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + /* [ option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -260,87 +254,78 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SWAP /* [ big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) - : @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ } - /* [ @target_hash bytes + : list operation ] */ } + /* [ bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) - : @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DUP - /* [ @target_hash bytes : @target_hash bytes + /* [ bytes : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) - : @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DIP { MEM - /* [ bool - : @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + /* [ bool : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; NOT - /* [ bool - : @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + /* [ bool : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT } - /* [ @target_hash bytes - : @xcat option - (pair (pair (address @sender) (address @dest)) (mutez @amount) (timestamp @deadline)) + /* [ bytes : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; UPDATE /* [ big_map bytes (pair (pair address address) mutez timestamp) : unit - : @operations list operation ] */ ; + : list operation ] */ ; PAIR @new_storage - /* [ @new_storage pair (big_map bytes (pair (pair address address) mutez timestamp)) unit - : @operations list operation ] */ ; + /* [ pair (big_map bytes (pair (pair address address) mutez timestamp)) unit + : list operation ] */ ; SWAP - /* [ @operations list operation - : @new_storage pair (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; + /* [ list operation + : pair (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; PAIR - /* [ pair (list @operations operation) - (pair @new_storage (big_map bytes (pair (pair address address) mutez timestamp)) unit) ] */ } + /* [ pair (list operation) + (big_map bytes (pair (pair address address) mutez timestamp)) + unit ] */ } { IF_LEFT { DUP - /* [ @parameter.claim_refund.preimage_claim bytes - : @parameter.claim_refund.preimage_claim bytes + /* [ bytes : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -349,9 +334,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SIZE - /* [ nat : @parameter.claim_refund.preimage_claim bytes + /* [ nat : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -360,10 +345,10 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; PUSH nat 32 - /* [ nat : nat : @parameter.claim_refund.preimage_claim bytes + /* [ nat : nat : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -372,10 +357,10 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_CMPGE ; SHA256 @hash - /* [ @hash bytes + /* [ bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -384,9 +369,9 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DUP - /* [ @hash bytes : @hash bytes + /* [ bytes : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -395,78 +380,73 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DIP { SWAP /* [ big_map bytes (pair (pair %recipients (address %from) (address %dest)) - (pair %settings (mutez %amount) (timestamp %deadline))) : @hash bytes + (pair %settings (mutez %amount) (timestamp %deadline))) : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ } - /* [ @hash bytes + : list operation ] */ } + /* [ bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) - (pair %settings (mutez %amount) (timestamp %deadline))) : @hash bytes + (pair %settings (mutez %amount) (timestamp %deadline))) : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DIIP { GET /* [ option (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_SOME ; DUP - /* [ @some pair (pair %recipients (address %from) (address %dest)) + /* [ pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)) - : @some pair (pair %recipients (address %from) (address %dest)) + : pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)) : unit - : @operations list operation ] */ ; + : list operation ] */ ; CADR @% ; CONTRACT @dest unit - /* [ @dest option (contract unit) - : @some pair (pair %recipients (address %from) (address %dest)) + /* [ option (contract unit) + : pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_SOME ; SWAP - /* [ @some pair (pair %recipients (address %from) (address %dest)) - (pair %settings (mutez %amount) (timestamp %deadline)) - : @dest.some contract unit : unit : @operations list operation ] */ ; + /* [ pair (pair %recipients (address %from) (address %dest)) + (pair %settings (mutez %amount) (timestamp %deadline)) : contract unit + : unit : list operation ] */ ; CDR @% - /* [ @settings pair (mutez %amount) (timestamp %deadline) - : @dest.some contract unit : unit : @operations list operation ] */ ; + /* [ pair (mutez %amount) (timestamp %deadline) : contract unit : unit + : list operation ] */ ; UNPAIR @% @% - /* [ @amount mutez : @deadline timestamp : @dest.some contract unit : unit - : @operations list operation ] */ ; + /* [ mutez : timestamp : contract unit : unit : list operation ] */ ; SWAP - /* [ @deadline timestamp : @amount mutez : @dest.some contract unit : unit - : @operations list operation ] */ ; + /* [ timestamp : mutez : contract unit : unit : list operation ] */ ; NOW - /* [ @now timestamp : @deadline timestamp : @amount mutez - : @dest.some contract unit : unit : @operations list operation ] */ ; + /* [ timestamp : timestamp : mutez : contract unit : unit : list operation ] */ ; ASSERT_CMPLT ; UNIT - /* [ unit : @amount mutez : @dest.some contract unit : unit - : @operations list operation ] */ ; + /* [ unit : mutez : contract unit : unit : list operation ] */ ; TRANSFER_TOKENS - /* [ operation : unit : @operations list operation ] */ } - /* [ @hash bytes + /* [ operation : unit : list operation ] */ } + /* [ bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : operation - : unit : @operations list operation ] */ } + : unit : list operation ] */ } { DUP - /* [ @parameter.claim_refund.refund_hash bytes - : @parameter.claim_refund.refund_hash bytes + /* [ bytes : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) @@ -475,7 +455,7 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; DIP { GET /* [ option (pair (pair %recipients (address %from) (address %dest)) @@ -484,129 +464,126 @@ Gas remaining: 1039911.852 units remaining bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_SOME ; DUP - /* [ @some pair (pair %recipients (address %from) (address %dest)) + /* [ pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)) - : @some pair (pair %recipients (address %from) (address %dest)) + : pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; CAAR @% ; CONTRACT @from unit - /* [ @from option (contract unit) - : @some pair (pair %recipients (address %from) (address %dest)) + /* [ option (contract unit) + : pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline)) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_SOME ; SWAP - /* [ @some pair (pair %recipients (address %from) (address %dest)) - (pair %settings (mutez %amount) (timestamp %deadline)) - : @from.some contract unit + /* [ pair (pair %recipients (address %from) (address %dest)) + (pair %settings (mutez %amount) (timestamp %deadline)) : contract unit : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; CDR - /* [ pair (mutez %amount) (timestamp %deadline) : @from.some contract unit + /* [ pair (mutez %amount) (timestamp %deadline) : contract unit : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; UNPAIR @% @% - /* [ @amount mutez : @deadline timestamp : @from.some contract unit + /* [ mutez : timestamp : contract unit : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SWAP - /* [ @deadline timestamp : @amount mutez : @from.some contract unit + /* [ timestamp : mutez : contract unit : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; NOW - /* [ @now timestamp : @deadline timestamp : @amount mutez - : @from.some contract unit + /* [ timestamp : timestamp : mutez : contract unit : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; ASSERT_CMPGE ; UNIT - /* [ unit : @amount mutez : @from.some contract unit + /* [ unit : mutez : contract unit : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; TRANSFER_TOKENS /* [ operation : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : unit - : @operations list operation ] */ ; + : list operation ] */ ; SWAP /* [ big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : operation - : unit : @operations list operation ] */ } - /* [ @parameter.claim_refund.refund_hash bytes + : unit : list operation ] */ } + /* [ bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : operation - : unit : @operations list operation ] */ } ; + : unit : list operation ] */ } ; NONE @none (pair (pair address address) (pair mutez timestamp)) - /* [ @none option (pair (pair address address) mutez timestamp) : bytes + /* [ option (pair (pair address address) mutez timestamp) : bytes : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : operation - : unit : @operations list operation ] */ ; + : unit : list operation ] */ ; SWAP - /* [ bytes : @none option (pair (pair address address) mutez timestamp) + /* [ bytes : option (pair (pair address address) mutez timestamp) : big_map bytes (pair (pair %recipients (address %from) (address %dest)) (pair %settings (mutez %amount) (timestamp %deadline))) : operation - : unit : @operations list operation ] */ ; + : unit : list operation ] */ ; UPDATE @cleared_map - /* [ @cleared_map big_map bytes (pair (pair address address) mutez timestamp) - : operation : unit : @operations list operation ] */ ; + /* [ big_map bytes (pair (pair address address) mutez timestamp) : operation + : unit : list operation ] */ ; SWAP - /* [ operation - : @cleared_map big_map bytes (pair (pair address address) mutez timestamp) - : unit : @operations list operation ] */ ; + /* [ operation : big_map bytes (pair (pair address address) mutez timestamp) + : unit : list operation ] */ ; DIP { PAIR - /* [ pair (big_map @cleared_map bytes (pair (pair address address) mutez timestamp)) unit - : @operations list operation ] */ ; + /* [ pair (big_map bytes (pair (pair address address) mutez timestamp)) unit + : list operation ] */ ; SWAP - /* [ @operations list operation - : pair (big_map @cleared_map bytes (pair (pair address address) mutez timestamp)) unit ] */ } - /* [ operation : @operations list operation - : pair (big_map @cleared_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; + /* [ list operation + : pair (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ } + /* [ operation : list operation + : pair (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; CONS /* [ list operation - : pair (big_map @cleared_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; + : pair (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ ; PAIR /* [ pair (list operation) - (big_map @cleared_map bytes (pair (pair address address) mutez timestamp)) + (big_map bytes (pair (pair address address) mutez timestamp)) unit ] */ } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out index 3b073d4c1a00..3d406c545a7c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out @@ -6,7 +6,7 @@ Gas remaining: 1039994.949 units remaining storage unit ; code { DROP /* [] */ ; - LAMBDA unit unit { /* [ @arg unit ] */ } + LAMBDA unit unit { /* [ unit ] */ } /* [ lambda unit unit ] */ ; UNIT /* [ unit : lambda unit unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out index d5d3ee59a163..cc58de6ff1b7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out @@ -5,17 +5,15 @@ Gas remaining: 1039992.198 units remaining { parameter unit ; storage unit ; code { SENDER - /* [ @sender address : pair (unit @parameter) (unit @storage) ] */ ; + /* [ address : pair (unit @parameter) (unit @storage) ] */ ; SOURCE - /* [ @source address : @sender address - : pair (unit @parameter) (unit @storage) ] */ ; + /* [ address : address : pair (unit @parameter) (unit @storage) ] */ ; PAIR 2 /* [ pair address address : pair (unit @parameter) (unit @storage) ] */ ; SOURCE - /* [ @source address : pair address address - : pair (unit @parameter) (unit @storage) ] */ ; + /* [ address : pair address address : pair (unit @parameter) (unit @storage) ] */ ; SENDER - /* [ @sender address : @source address : pair address address + /* [ address : address : pair address address : pair (unit @parameter) (unit @storage) ] */ ; PAIR 2 /* [ pair address address : pair address address @@ -25,8 +23,8 @@ Gas remaining: 1039992.198 units remaining DROP /* [ pair (unit @parameter) (unit @storage) ] */ ; CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out index 51d095b2c6e2..a112b754b8d0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039991.794 units remaining { parameter nat ; storage unit ; code { CAR - /* [ @parameter nat ] */ ; + /* [ nat ] */ ; DUP - /* [ @parameter nat : @parameter nat ] */ ; + /* [ nat : nat ] */ ; NEG - /* [ int : @parameter nat ] */ ; + /* [ int : nat ] */ ; ABS - /* [ nat : @parameter nat ] */ ; + /* [ nat : nat ] */ ; COMPARE /* [ int ] */ ; ASSERT_EQ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out index 59a2ea3ad0f2..96ae56d4b842 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out @@ -5,80 +5,80 @@ Gas remaining: 1039944.723 units remaining { parameter unit ; storage unit ; code { CAR - /* [ @parameter unit ] */ ; + /* [ unit ] */ ; PUSH int 2 - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH int 2 - /* [ int : int : @parameter unit ] */ ; + /* [ int : int : unit ] */ ; ADD - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH int 4 - /* [ int : int : @parameter unit ] */ ; + /* [ int : int : unit ] */ ; ASSERT_CMPEQ ; PUSH int 2 - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH int 2 - /* [ int : int : @parameter unit ] */ ; + /* [ int : int : unit ] */ ; ADD - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH int 4 - /* [ int : int : @parameter unit ] */ ; + /* [ int : int : unit ] */ ; ASSERT_CMPEQ ; PUSH int 2 - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH nat 2 - /* [ nat : int : @parameter unit ] */ ; + /* [ nat : int : unit ] */ ; ADD - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH int 4 - /* [ int : int : @parameter unit ] */ ; + /* [ int : int : unit ] */ ; ASSERT_CMPEQ ; PUSH nat 2 - /* [ nat : @parameter unit ] */ ; + /* [ nat : unit ] */ ; PUSH int 2 - /* [ int : nat : @parameter unit ] */ ; + /* [ int : nat : unit ] */ ; ADD - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH int 4 - /* [ int : int : @parameter unit ] */ ; + /* [ int : int : unit ] */ ; ASSERT_CMPEQ ; PUSH nat 2 - /* [ nat : @parameter unit ] */ ; + /* [ nat : unit ] */ ; PUSH nat 2 - /* [ nat : nat : @parameter unit ] */ ; + /* [ nat : nat : unit ] */ ; ADD - /* [ nat : @parameter unit ] */ ; + /* [ nat : unit ] */ ; PUSH nat 4 - /* [ nat : nat : @parameter unit ] */ ; + /* [ nat : nat : unit ] */ ; ASSERT_CMPEQ ; PUSH int 60 - /* [ int : @parameter unit ] */ ; + /* [ int : unit ] */ ; PUSH timestamp "2019-09-09T12:08:37Z" - /* [ timestamp : int : @parameter unit ] */ ; + /* [ timestamp : int : unit ] */ ; ADD - /* [ timestamp : @parameter unit ] */ ; + /* [ timestamp : unit ] */ ; PUSH timestamp "2019-09-09T12:09:37Z" - /* [ timestamp : timestamp : @parameter unit ] */ ; + /* [ timestamp : timestamp : unit ] */ ; ASSERT_CMPEQ ; PUSH timestamp "2019-09-09T12:08:37Z" - /* [ timestamp : @parameter unit ] */ ; + /* [ timestamp : unit ] */ ; PUSH int 60 - /* [ int : timestamp : @parameter unit ] */ ; + /* [ int : timestamp : unit ] */ ; ADD - /* [ timestamp : @parameter unit ] */ ; + /* [ timestamp : unit ] */ ; PUSH timestamp "2019-09-09T12:09:37Z" - /* [ timestamp : timestamp : @parameter unit ] */ ; + /* [ timestamp : timestamp : unit ] */ ; ASSERT_CMPEQ ; PUSH mutez 1000 - /* [ mutez : @parameter unit ] */ ; + /* [ mutez : unit ] */ ; PUSH mutez 1000 - /* [ mutez : mutez : @parameter unit ] */ ; + /* [ mutez : mutez : unit ] */ ; ADD - /* [ mutez : @parameter unit ] */ ; + /* [ mutez : unit ] */ ; PUSH mutez 2000 - /* [ mutez : mutez : @parameter unit ] */ ; + /* [ mutez : mutez : unit ] */ ; ASSERT_CMPEQ ; NIL operation - /* [ list operation : @parameter unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @parameter) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out index 41ecd6af9eff..57132f0aa12c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair bls12_381_fr bls12_381_fr) ; storage (option bls12_381_fr) ; code { CAR - /* [ @parameter pair bls12_381_fr bls12_381_fr ] */ ; + /* [ pair bls12_381_fr bls12_381_fr ] */ ; UNPAIR /* [ bls12_381_fr : bls12_381_fr ] */ ; ADD diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out index 1a5fda2c0946..2a9525014b37 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair bls12_381_g1 bls12_381_g1) ; storage (option bls12_381_g1) ; code { CAR - /* [ @parameter pair bls12_381_g1 bls12_381_g1 ] */ ; + /* [ pair bls12_381_g1 bls12_381_g1 ] */ ; UNPAIR /* [ bls12_381_g1 : bls12_381_g1 ] */ ; ADD diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out index 72f1ae318afb..6c61074094fc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair bls12_381_g2 bls12_381_g2) ; storage (option bls12_381_g2) ; code { CAR - /* [ @parameter pair bls12_381_g2 bls12_381_g2 ] */ ; + /* [ pair bls12_381_g2 bls12_381_g2 ] */ ; UNPAIR /* [ bls12_381_g2 : bls12_381_g2 ] */ ; ADD diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out index 6719af88ac61..97c142b4a3ca 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039993.598 units remaining { parameter (pair int timestamp) ; storage (option timestamp) ; code { CAR - /* [ @parameter pair int timestamp ] */ ; + /* [ pair int timestamp ] */ ; DUP - /* [ @parameter pair int timestamp : @parameter pair int timestamp ] */ ; + /* [ pair int timestamp : pair int timestamp ] */ ; CAR - /* [ int : @parameter pair int timestamp ] */ ; + /* [ int : pair int timestamp ] */ ; DIP { CDR /* [ timestamp ] */ } /* [ int : timestamp ] */ ; ADD diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out index 1ee99fb394ee..3bad19cb989b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039993.598 units remaining { parameter (pair timestamp int) ; storage (option timestamp) ; code { CAR - /* [ @parameter pair timestamp int ] */ ; + /* [ pair timestamp int ] */ ; DUP - /* [ @parameter pair timestamp int : @parameter pair timestamp int ] */ ; + /* [ pair timestamp int : pair timestamp int ] */ ; CAR - /* [ timestamp : @parameter pair timestamp int ] */ ; + /* [ timestamp : pair timestamp int ] */ ; DIP { CDR /* [ int ] */ } /* [ timestamp : int ] */ ; ADD diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out index 5cf9f0d75eb3..9037cc408cd8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039995.954 units remaining { parameter (contract unit) ; storage (option address) ; code { CAR - /* [ @parameter contract unit ] */ ; + /* [ contract unit ] */ ; ADDRESS - /* [ @parameter.address address ] */ ; + /* [ address ] */ ; SOME /* [ option address ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out index 913ab6f7c06c..6dab0575031f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out @@ -5,34 +5,34 @@ Gas remaining: 1039985.607 units remaining { parameter address ; storage mutez ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 3 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "fib" nat - /* [ @parameter.contract option nat : @parameter address ] */ ; + /* [ option nat : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 15000000 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; AMOUNT - /* [ @amount mutez : operation ] */ ; + /* [ mutez : operation ] */ ; SWAP - /* [ operation : @amount mutez ] */ ; + /* [ operation : mutez ] */ ; NIL operation - /* [ list operation : operation : @amount mutez ] */ ; + /* [ list operation : operation : mutez ] */ ; SWAP - /* [ operation : list operation : @amount mutez ] */ ; + /* [ operation : list operation : mutez ] */ ; CONS - /* [ list operation : @amount mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @amount) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out index 993af154131e..2ee88f7fe021 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out @@ -5,33 +5,32 @@ Gas remaining: 1039985.815 units remaining { parameter address ; storage mutez ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "nonexistent" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "nonexistent" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_NONE ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 15000000 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; AMOUNT - /* [ @amount mutez : operation ] */ ; + /* [ mutez : operation ] */ ; SWAP - /* [ operation : @amount mutez ] */ ; + /* [ operation : mutez ] */ ; NIL operation - /* [ list operation : operation : @amount mutez ] */ ; + /* [ list operation : operation : mutez ] */ ; SWAP - /* [ operation : list operation : @amount mutez ] */ ; + /* [ operation : list operation : mutez ] */ ; CONS - /* [ list operation : @amount mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @amount) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out index 06ea3b71b67e..4a525f9baadf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out @@ -5,35 +5,34 @@ Gas remaining: 1039985.432 units remaining { parameter address ; storage mutez ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "id" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "id" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 15000000 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; AMOUNT - /* [ @amount mutez : operation ] */ ; + /* [ mutez : operation ] */ ; SWAP - /* [ operation : @amount mutez ] */ ; + /* [ operation : mutez ] */ ; NIL operation - /* [ list operation : operation : @amount mutez ] */ ; + /* [ list operation : operation : mutez ] */ ; SWAP - /* [ operation : list operation : @amount mutez ] */ ; + /* [ operation : list operation : mutez ] */ ; CONS - /* [ list operation : @amount mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @amount) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out index 52974234751e..c248d20f7b28 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out @@ -5,18 +5,18 @@ Gas remaining: 1039994.393 units remaining { parameter (pair :param (bool %first) (bool %second)) ; storage (option bool) ; code { CAR - /* [ @param pair :param (bool %first) (bool %second) ] */ ; + /* [ pair :param (bool %first) (bool %second) ] */ ; UNPAIR /* [ bool : bool ] */ ; AND @and - /* [ @and bool ] */ ; + /* [ bool ] */ ; SOME @res - /* [ @res option bool ] */ ; + /* [ option bool ] */ ; NIL @noop operation - /* [ @noop list operation : @res option bool ] */ ; + /* [ list operation : option bool ] */ ; PAIR - /* [ pair (list @noop operation) (option @res bool) ] */ ; + /* [ pair (list operation) (option bool) ] */ ; UNPAIR @x @y - /* [ @x list operation : @y option bool ] */ ; + /* [ list operation : option bool ] */ ; PAIR %a %b - /* [ pair (list %a @x operation) (option %b @y bool) ] */ } } + /* [ pair (list %a operation) (option %b bool) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out index 3dd31c494ba6..e55d20d732c6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out @@ -45,6 +45,6 @@ Gas remaining: 1039971.036 units remaining UNIT /* [ unit ] */ ; NIL @noop operation - /* [ @noop list operation : unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list @noop operation) unit ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out index b86f797ac517..73fe19cce803 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out @@ -5,12 +5,12 @@ Gas remaining: 1039996.174 units remaining { parameter (pair bool bool) ; storage bool ; code { CAR - /* [ @parameter pair bool bool ] */ ; + /* [ pair bool bool ] */ ; UNPAIR /* [ bool : bool ] */ ; AND @and - /* [ @and bool ] */ ; + /* [ bool ] */ ; NIL @noop operation - /* [ @noop list operation : @and bool ] */ ; + /* [ list operation : bool ] */ ; PAIR - /* [ pair (list @noop operation) (bool @and) ] */ } } + /* [ pair (list operation) bool ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out index 9f65f60772b0..54bc171a1755 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.803 units remaining code { DROP /* [] */ ; BALANCE - /* [ @balance mutez ] */ ; + /* [ mutez ] */ ; NIL operation - /* [ list operation : @balance mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @balance) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out index a5c419e3c2a2..0ec9c49abe00 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out @@ -5,34 +5,34 @@ Gas remaining: 1039985.607 units remaining { parameter address ; storage mutez ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 3 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "fib" nat - /* [ @parameter.contract option nat : @parameter address ] */ ; + /* [ option nat : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 15000000 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; BALANCE - /* [ @balance mutez : operation ] */ ; + /* [ mutez : operation ] */ ; SWAP - /* [ operation : @balance mutez ] */ ; + /* [ operation : mutez ] */ ; NIL operation - /* [ list operation : operation : @balance mutez ] */ ; + /* [ list operation : operation : mutez ] */ ; SWAP - /* [ operation : list operation : @balance mutez ] */ ; + /* [ operation : list operation : mutez ] */ ; CONS - /* [ list operation : @balance mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @balance) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out index 406353dd4883..3642c58517bf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out @@ -5,33 +5,32 @@ Gas remaining: 1039985.815 units remaining { parameter address ; storage mutez ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "nonexistent" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "nonexistent" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_NONE ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 15000000 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; BALANCE - /* [ @balance mutez : operation ] */ ; + /* [ mutez : operation ] */ ; SWAP - /* [ operation : @balance mutez ] */ ; + /* [ operation : mutez ] */ ; NIL operation - /* [ list operation : operation : @balance mutez ] */ ; + /* [ list operation : operation : mutez ] */ ; SWAP - /* [ operation : list operation : @balance mutez ] */ ; + /* [ operation : list operation : mutez ] */ ; CONS - /* [ list operation : @balance mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @balance) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out index 4bd6b2e3b91b..be6fdfb5fc91 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out @@ -5,35 +5,34 @@ Gas remaining: 1039985.432 units remaining { parameter address ; storage mutez ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "id" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "id" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 15000000 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; BALANCE - /* [ @balance mutez : operation ] */ ; + /* [ mutez : operation ] */ ; SWAP - /* [ operation : @balance mutez ] */ ; + /* [ operation : mutez ] */ ; NIL operation - /* [ list operation : operation : @balance mutez ] */ ; + /* [ list operation : operation : mutez ] */ ; SWAP - /* [ operation : list operation : @balance mutez ] */ ; + /* [ operation : list operation : mutez ] */ ; CONS - /* [ list operation : @balance mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @balance) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out index bf19b32abcff..b5b64d9fe336 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039991.894 units remaining { parameter nat ; storage (pair (big_map nat nat) (option bool)) ; code { UNPAIR - /* [ @parameter nat : @storage pair (big_map nat nat) (option bool) ] */ ; + /* [ nat : pair (big_map nat nat) (option bool) ] */ ; DIP { CAR /* [ big_map nat nat ] */ ; DUP /* [ big_map nat nat : big_map nat nat ] */ } - /* [ @parameter nat : big_map nat nat : big_map nat nat ] */ ; + /* [ nat : big_map nat nat : big_map nat nat ] */ ; MEM /* [ bool : big_map nat nat ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out index eea9c26f23b8..8c673b81b3fc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out @@ -5,12 +5,12 @@ Gas remaining: 1039991.894 units remaining { parameter string ; storage (pair (big_map string nat) (option bool)) ; code { UNPAIR - /* [ @parameter string : @storage pair (big_map string nat) (option bool) ] */ ; + /* [ string : pair (big_map string nat) (option bool) ] */ ; DIP { CAR /* [ big_map string nat ] */ ; DUP /* [ big_map string nat : big_map string nat ] */ } - /* [ @parameter string : big_map string nat : big_map string nat ] */ ; + /* [ string : big_map string nat : big_map string nat ] */ ; MEM /* [ bool : big_map string nat ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out index 3ca70236e947..58940cbf6479 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out @@ -5,55 +5,53 @@ Gas remaining: 1039984.417 units remaining { parameter (or (pair %have_fun (big_map string nat) unit) (unit %default)) ; storage (big_map string nat) ; code { UNPAIR - /* [ @parameter or (pair %have_fun (big_map string nat) unit) (unit %default) - : @storage big_map string nat ] */ ; - DIP { NIL operation /* [ list operation : @storage big_map string nat ] */ } - /* [ @parameter or (pair %have_fun (big_map string nat) unit) (unit %default) - : list operation : @storage big_map string nat ] */ ; + /* [ or (pair %have_fun (big_map string nat) unit) (unit %default) + : big_map string nat ] */ ; + DIP { NIL operation /* [ list operation : big_map string nat ] */ } + /* [ or (pair %have_fun (big_map string nat) unit) (unit %default) + : list operation : big_map string nat ] */ ; IF_LEFT - { DROP /* [ list operation : @storage big_map string nat ] */ } + { DROP /* [ list operation : big_map string nat ] */ } { DROP - /* [ list operation : @storage big_map string nat ] */ ; + /* [ list operation : big_map string nat ] */ ; SELF %have_fun - /* [ @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + /* [ contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; PUSH mutez 0 - /* [ mutez : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + /* [ mutez : contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; DUP 4 - /* [ big_map string nat : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + /* [ big_map string nat : mutez : contract (pair (big_map string nat) unit) + : list operation : big_map string nat ] */ ; PUSH (option nat) (Some 8) /* [ option nat : big_map string nat : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + : contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; PUSH string "hahaha" /* [ string : option nat : big_map string nat : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + : contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; UPDATE - /* [ big_map string nat : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + /* [ big_map string nat : mutez : contract (pair (big_map string nat) unit) + : list operation : big_map string nat ] */ ; UNIT /* [ unit : big_map string nat : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + : contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; SWAP /* [ big_map string nat : unit : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + : contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; PAIR /* [ pair (big_map string nat) unit : mutez - : @self contract (pair (big_map string nat) unit) : list operation - : @storage big_map string nat ] */ ; + : contract (pair (big_map string nat) unit) : list operation + : big_map string nat ] */ ; TRANSFER_TOKENS - /* [ operation : list operation : @storage big_map string nat ] */ ; + /* [ operation : list operation : big_map string nat ] */ ; CONS - /* [ list operation : @storage big_map string nat ] */ } ; + /* [ list operation : big_map string nat ] */ } ; PAIR - /* [ pair (list operation) (big_map @storage string nat) ] */ } } + /* [ pair (list operation) (big_map string nat) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out index 89cc97619580..dd14b051ce8d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.803 units remaining { parameter bls12_381_fr ; storage int ; code { CAR - /* [ @parameter bls12_381_fr ] */ ; + /* [ bls12_381_fr ] */ ; INT /* [ int ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out index 1d053fb07dea..0c345677e378 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out @@ -5,14 +5,14 @@ Gas remaining: 1039992.954 units remaining { parameter bls12_381_fr ; storage mutez ; code { CAR - /* [ @parameter bls12_381_fr ] */ ; + /* [ bls12_381_fr ] */ ; INT /* [ int ] */ ; ISNAT /* [ option nat ] */ ; ASSERT_SOME ; PUSH mutez 1 - /* [ mutez : @some nat ] */ ; + /* [ mutez : nat ] */ ; MUL /* [ mutez ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out index 86cd57e99373..a8ea2adf58a2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.803 units remaining { parameter int ; storage bls12_381_fr ; code { UNPAIR - /* [ @parameter int : @storage bls12_381_fr ] */ ; + /* [ int : bls12_381_fr ] */ ; MUL /* [ bls12_381_fr ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out index e59e46f18071..b5556ae1c34c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.803 units remaining { parameter nat ; storage bls12_381_fr ; code { UNPAIR - /* [ @parameter nat : @storage bls12_381_fr ] */ ; + /* [ nat : bls12_381_fr ] */ ; MUL /* [ bls12_381_fr ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out index 3667cd6a206a..0481a27c264d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039996.340 units remaining { parameter int ; storage bls12_381_fr ; code { UNPAIR - /* [ @parameter int : @storage bls12_381_fr ] */ ; + /* [ int : bls12_381_fr ] */ ; SWAP - /* [ @storage bls12_381_fr : @parameter int ] */ ; + /* [ bls12_381_fr : int ] */ ; MUL /* [ bls12_381_fr ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out index 27e1f8bf1e6d..cdc8bcc73a9a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039996.340 units remaining { parameter nat ; storage bls12_381_fr ; code { UNPAIR - /* [ @parameter nat : @storage bls12_381_fr ] */ ; + /* [ nat : bls12_381_fr ] */ ; SWAP - /* [ @storage bls12_381_fr : @parameter nat ] */ ; + /* [ bls12_381_fr : nat ] */ ; MUL /* [ bls12_381_fr ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out index b74b858d650f..c0bee3c0729c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039997.267 units remaining { parameter bytes ; storage unit ; code { CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out index b4a68b0f55b8..1ff040e52276 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.637 units remaining { parameter (pair (nat :l) (nat :r)) ; storage nat ; code { CAR - /* [ @parameter pair (nat :l) (nat :r) ] */ ; + /* [ pair (nat :l) (nat :r) ] */ ; CAR /* [ nat :l ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out index e87fa10d405c..fed4de220bc2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.637 units remaining { parameter (pair (nat :l) (nat :r)) ; storage nat ; code { CAR - /* [ @parameter pair (nat :l) (nat :r) ] */ ; + /* [ pair (nat :l) (nat :r) ] */ ; CDR /* [ nat :r ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out index 422def3f3ace..c884228e39ef 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out @@ -9,8 +9,8 @@ Gas remaining: 1039996.340 units remaining DROP /* [ pair (unit @parameter) (unit @storage) ] */ ; CAR - /* [ @parameter unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @parameter unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @parameter) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out index 908fd7a9446b..f0c95ff26ba7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out @@ -12,31 +12,31 @@ Gas remaining: 1039988.024 units remaining : pair (key @parameter) (pair @storage signature string) : pair (key @parameter) (pair @storage signature string) ] */ ; DIP { CDR - /* [ @storage pair signature string + /* [ pair signature string : pair (key @parameter) (pair @storage signature string) ] */ ; DUP - /* [ @storage pair signature string : @storage pair signature string + /* [ pair signature string : pair signature string : pair (key @parameter) (pair @storage signature string) ] */ ; CAR - /* [ signature : @storage pair signature string + /* [ signature : pair signature string : pair (key @parameter) (pair @storage signature string) ] */ ; DIP { CDR /* [ string : pair (key @parameter) (pair @storage signature string) ] */ ; PACK - /* [ @packed bytes : pair (key @parameter) (pair @storage signature string) ] */ } - /* [ signature : @packed bytes + /* [ bytes : pair (key @parameter) (pair @storage signature string) ] */ } + /* [ signature : bytes : pair (key @parameter) (pair @storage signature string) ] */ } - /* [ pair (key @parameter) (pair @storage signature string) : signature - : @packed bytes : pair (key @parameter) (pair @storage signature string) ] */ ; + /* [ pair (key @parameter) (pair @storage signature string) : signature : bytes + : pair (key @parameter) (pair @storage signature string) ] */ ; CAR - /* [ @parameter key : signature : @packed bytes + /* [ key : signature : bytes : pair (key @parameter) (pair @storage signature string) ] */ ; CHECK_SIGNATURE /* [ bool : pair (key @parameter) (pair @storage signature string) ] */ ; IF { /* [ pair (key @parameter) (pair @storage signature string) ] */ } { FAIL } ; CDR - /* [ @storage pair signature string ] */ ; + /* [ pair signature string ] */ ; NIL operation - /* [ list operation : @storage pair signature string ] */ ; + /* [ list operation : pair signature string ] */ ; PAIR - /* [ pair (list operation) (pair @storage signature string) ] */ } } + /* [ pair (list operation) signature string ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out index 68803bd2685b..1e47e5749e86 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out @@ -5,41 +5,41 @@ Gas remaining: 1039964.212 units remaining { parameter (pair nat nat nat unit) ; storage unit ; code { CAR - /* [ @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit ] */ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; CAR - /* [ nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : pair nat nat nat unit ] */ ; PUSH nat 1 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; GET 1 - /* [ nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : pair nat nat nat unit ] */ ; PUSH nat 1 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; GET 3 - /* [ nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : pair nat nat nat unit ] */ ; PUSH nat 4 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; GET 5 - /* [ nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : pair nat nat nat unit ] */ ; PUSH nat 2 - /* [ nat : nat : @parameter pair nat nat nat unit ] */ ; + /* [ nat : nat : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DUP - /* [ @parameter pair nat nat nat unit : @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit : pair nat nat nat unit ] */ ; GET 6 - /* [ unit : @parameter pair nat nat nat unit ] */ ; + /* [ unit : pair nat nat nat unit ] */ ; UNIT - /* [ unit : unit : @parameter pair nat nat nat unit ] */ ; + /* [ unit : unit : pair nat nat nat unit ] */ ; ASSERT_CMPEQ ; DROP /* [] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out index 5aae03d8c914..df7efb635d7d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039989.821 units remaining { parameter (pair nat nat nat unit) ; storage (option (pair int nat string bytes)) ; code { CAR - /* [ @parameter pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit ] */ ; PUSH int 2 - /* [ int : @parameter pair nat nat nat unit ] */ ; + /* [ int : pair nat nat nat unit ] */ ; UPDATE 1 /* [ pair int nat nat unit ] */ ; PUSH string "toto" diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out index 4590c4728986..973309367c3b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039990.023 units remaining { parameter unit ; storage (pair nat nat nat unit) ; code { CDR - /* [ @storage pair nat nat nat unit ] */ ; + /* [ pair nat nat nat unit ] */ ; PUSH nat 2 - /* [ nat : @storage pair nat nat nat unit ] */ ; + /* [ nat : pair nat nat nat unit ] */ ; UPDATE 1 /* [ pair nat nat nat unit ] */ ; PUSH nat 12 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out index b2d5fd360ef6..93155db081a0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out @@ -5,54 +5,54 @@ Gas remaining: 1039972.732 units remaining { parameter (list int) ; storage (list (list bool)) ; code { CAR - /* [ @parameter list int ] */ ; + /* [ list int ] */ ; NIL (list bool) - /* [ list (list bool) : @parameter list int ] */ ; + /* [ list (list bool) : list int ] */ ; DIP { DUP - /* [ @parameter list int : @parameter list int ] */ ; - MAP { EQ /* [ bool : @parameter list int ] */ } - /* [ list bool : @parameter list int ] */ } - /* [ list (list bool) : list bool : @parameter list int ] */ ; + /* [ list int : list int ] */ ; + MAP { EQ /* [ bool : list int ] */ } + /* [ list bool : list int ] */ } + /* [ list (list bool) : list bool : list int ] */ ; SWAP - /* [ list bool : list (list bool) : @parameter list int ] */ ; + /* [ list bool : list (list bool) : list int ] */ ; CONS - /* [ list (list bool) : @parameter list int ] */ ; + /* [ list (list bool) : list int ] */ ; DIP { DUP - /* [ @parameter list int : @parameter list int ] */ ; - MAP { NEQ /* [ bool : @parameter list int ] */ } - /* [ list bool : @parameter list int ] */ } - /* [ list (list bool) : list bool : @parameter list int ] */ ; + /* [ list int : list int ] */ ; + MAP { NEQ /* [ bool : list int ] */ } + /* [ list bool : list int ] */ } + /* [ list (list bool) : list bool : list int ] */ ; SWAP - /* [ list bool : list (list bool) : @parameter list int ] */ ; + /* [ list bool : list (list bool) : list int ] */ ; CONS - /* [ list (list bool) : @parameter list int ] */ ; + /* [ list (list bool) : list int ] */ ; DIP { DUP - /* [ @parameter list int : @parameter list int ] */ ; - MAP { LE /* [ bool : @parameter list int ] */ } - /* [ list bool : @parameter list int ] */ } - /* [ list (list bool) : list bool : @parameter list int ] */ ; + /* [ list int : list int ] */ ; + MAP { LE /* [ bool : list int ] */ } + /* [ list bool : list int ] */ } + /* [ list (list bool) : list bool : list int ] */ ; SWAP - /* [ list bool : list (list bool) : @parameter list int ] */ ; + /* [ list bool : list (list bool) : list int ] */ ; CONS - /* [ list (list bool) : @parameter list int ] */ ; + /* [ list (list bool) : list int ] */ ; DIP { DUP - /* [ @parameter list int : @parameter list int ] */ ; - MAP { LT /* [ bool : @parameter list int ] */ } - /* [ list bool : @parameter list int ] */ } - /* [ list (list bool) : list bool : @parameter list int ] */ ; + /* [ list int : list int ] */ ; + MAP { LT /* [ bool : list int ] */ } + /* [ list bool : list int ] */ } + /* [ list (list bool) : list bool : list int ] */ ; SWAP - /* [ list bool : list (list bool) : @parameter list int ] */ ; + /* [ list bool : list (list bool) : list int ] */ ; CONS - /* [ list (list bool) : @parameter list int ] */ ; + /* [ list (list bool) : list int ] */ ; DIP { DUP - /* [ @parameter list int : @parameter list int ] */ ; - MAP { GE /* [ bool : @parameter list int ] */ } - /* [ list bool : @parameter list int ] */ } - /* [ list (list bool) : list bool : @parameter list int ] */ ; + /* [ list int : list int ] */ ; + MAP { GE /* [ bool : list int ] */ } + /* [ list bool : list int ] */ } + /* [ list (list bool) : list bool : list int ] */ ; SWAP - /* [ list bool : list (list bool) : @parameter list int ] */ ; + /* [ list bool : list (list bool) : list int ] */ ; CONS - /* [ list (list bool) : @parameter list int ] */ ; + /* [ list (list bool) : list int ] */ ; DIP { MAP { GT /* [ bool ] */ } /* [ list bool ] */ } /* [ list (list bool) : list bool ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out index 48e25043a98b..e63917515ef6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out @@ -5,11 +5,8 @@ Gas remaining: 1039995.099 units remaining { parameter (list string) ; storage (list string) ; code { CAR - /* [ @parameter list string ] */ ; - MAP { PUSH @hello string "Hello " - /* [ @hello string : @parameter.elt string ] */ ; - CONCAT - /* [ string ] */ } + /* [ list string ] */ ; + MAP { PUSH @hello string "Hello " /* [ string : string ] */ ; CONCAT /* [ string ] */ } /* [ list string ] */ ; NIL operation /* [ list operation : list string ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out index 683dba908ffa..6aff3cefe222 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039995.173 units remaining { parameter (list bytes) ; storage (list bytes) ; code { CAR - /* [ @parameter list bytes ] */ ; - MAP { PUSH bytes 0xff /* [ bytes : @parameter.elt bytes ] */ ; CONCAT /* [ bytes ] */ } + /* [ list bytes ] */ ; + MAP { PUSH bytes 0xff /* [ bytes : bytes ] */ ; CONCAT /* [ bytes ] */ } /* [ list bytes ] */ ; NIL operation /* [ list operation : list bytes ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out index f6c5e9f9d279..eaae9a64bc62 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out @@ -5,17 +5,17 @@ Gas remaining: 1039991.417 units remaining { parameter (list string) ; storage string ; code { CAR - /* [ @parameter list string ] */ ; + /* [ list string ] */ ; PUSH string "" - /* [ string : @parameter list string ] */ ; + /* [ string : list string ] */ ; SWAP - /* [ @parameter list string : string ] */ ; + /* [ list string : string ] */ ; ITER { SWAP - /* [ string : @parameter.elt string ] */ ; + /* [ string : string ] */ ; DIP { NIL string - /* [ list string : @parameter.elt string ] */ ; + /* [ list string : string ] */ ; SWAP - /* [ @parameter.elt string : list string ] */ ; + /* [ string : list string ] */ ; CONS /* [ list string ] */ } /* [ string : list string ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out index 966f587d5dbf..4d5b4200cb0c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.280 units remaining { parameter int ; storage (list int) ; code { UNPAIR - /* [ @parameter int : @storage list int ] */ ; + /* [ int : list int ] */ ; CONS /* [ list int ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out index c17de30cc1b1..4597157387c8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out @@ -5,12 +5,11 @@ Gas remaining: 1039972.367 units remaining { parameter (pair (list string) (list string)) ; storage (option bool) ; code { CAR - /* [ @parameter pair (list string) (list string) ] */ ; + /* [ pair (list string) (list string) ] */ ; DUP - /* [ @parameter pair (list string) (list string) - : @parameter pair (list string) (list string) ] */ ; + /* [ pair (list string) (list string) : pair (list string) (list string) ] */ ; CAR - /* [ list string : @parameter pair (list string) (list string) ] */ ; + /* [ list string : pair (list string) (list string) ] */ ; DIP { CDR /* [ list string ] */ } /* [ list string : list string ] */ ; EMPTY_SET string @@ -18,18 +17,17 @@ Gas remaining: 1039972.367 units remaining SWAP /* [ list string : set string : list string ] */ ; ITER { PAIR - /* [ pair (string @elt) (set string) : list string ] */ ; + /* [ pair string (set string) : list string ] */ ; DUP - /* [ pair (string @elt) (set string) : pair (string @elt) (set string) - : list string ] */ ; + /* [ pair string (set string) : pair string (set string) : list string ] */ ; CAR - /* [ @elt string : pair (string @elt) (set string) : list string ] */ ; + /* [ string : pair string (set string) : list string ] */ ; DIP { CDR /* [ set string : list string ] */ } - /* [ @elt string : set string : list string ] */ ; + /* [ string : set string : list string ] */ ; PUSH bool True - /* [ bool : @elt string : set string : list string ] */ ; + /* [ bool : string : set string : list string ] */ ; SWAP - /* [ @elt string : bool : set string : list string ] */ ; + /* [ string : bool : set string : list string ] */ ; UPDATE /* [ set string : list string ] */ } /* [ set string : list string ] */ ; @@ -42,22 +40,20 @@ Gas remaining: 1039972.367 units remaining SWAP /* [ list string : pair (set string) bool ] */ ; ITER { PAIR - /* [ pair (string @elt) (set string) bool ] */ ; + /* [ pair string (set string) bool ] */ ; DUP - /* [ pair (string @elt) (set string) bool - : pair (string @elt) (set string) bool ] */ ; + /* [ pair string (set string) bool : pair string (set string) bool ] */ ; DUP - /* [ pair (string @elt) (set string) bool : pair (string @elt) (set string) bool - : pair (string @elt) (set string) bool ] */ ; + /* [ pair string (set string) bool : pair string (set string) bool + : pair string (set string) bool ] */ ; CAR - /* [ @elt string : pair (string @elt) (set string) bool - : pair (string @elt) (set string) bool ] */ ; + /* [ string : pair string (set string) bool : pair string (set string) bool ] */ ; DIP { CDAR ; DIP { CDDR } /* [ set string : bool ] */ ; DUP /* [ set string : set string : bool ] */ } - /* [ @elt string : set string : set string : bool ] */ ; + /* [ string : set string : set string : bool ] */ ; MEM /* [ bool : set string : bool ] */ ; DIP { SWAP /* [ bool : set string ] */ } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out index 1f4e9435d0d0..9b1a354a4d29 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039993.550 units remaining { parameter address ; storage unit ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT unit - /* [ @parameter.contract option (contract unit) ] */ ; + /* [ option (contract unit) ] */ ; ASSERT_SOME ; DROP /* [] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out index f00d5c3abc4b..a1ee25882b4d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out @@ -6,13 +6,13 @@ Gas remaining: 1039988.704 units remaining storage (option address) ; code { /* [ pair (unit @parameter) (unit @storage) ] */ DROP - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; UNIT /* [ unit ] */ ; AMOUNT - /* [ pair (list operation) (unit @storage) ] */ ; + /* [ pair (list operation) unit ] */ ; NONE key_hash - /* [ option key_hash : @amount mutez : unit ] */ ; + /* [ option key_hash : mutez : unit ] */ ; CREATE_CONTRACT { parameter unit ; storage unit ; code { CDR ; NIL operation ; PAIR } } /* [ operation : address ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out index b2be29868b28..cc16e3e475bb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out @@ -6,13 +6,13 @@ Gas remaining: 1039988.704 units remaining storage (option address) ; code { /* [ pair (unit @parameter) (unit @storage) ] */ DROP - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; UNIT /* [ unit ] */ ; AMOUNT - /* [ pair (list operation) (unit @storage) ] */ ; + /* [ pair (list operation) unit ] */ ; NONE key_hash - /* [ option key_hash : @amount mutez : unit ] */ ; + /* [ option key_hash : mutez : unit ] */ ; CREATE_CONTRACT { parameter %root unit ; storage unit ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out index aa067134f479..f0a55dc59fc8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out @@ -6,13 +6,13 @@ Gas remaining: 1039988.704 units remaining storage (option address) ; code { /* [ pair (unit @parameter) (unit @storage) ] */ DROP - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; UNIT /* [ unit ] */ ; AMOUNT - /* [ pair (list operation) (unit @storage) ] */ ; + /* [ pair (list operation) unit ] */ ; NONE key_hash - /* [ option key_hash : @amount mutez : unit ] */ ; + /* [ option key_hash : mutez : unit ] */ ; CREATE_CONTRACT { parameter (unit %root) ; storage unit ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out index 3688daf14554..4bb8cbb75d14 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out @@ -6,13 +6,13 @@ Gas remaining: 1039987.516 units remaining storage (option address) ; code { /* [ pair (unit @parameter) (unit @storage) ] */ DROP - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; UNIT /* [ unit ] */ ; AMOUNT - /* [ pair (list operation) (unit @storage) ] */ ; + /* [ pair (list operation) unit ] */ ; NONE key_hash - /* [ option key_hash : @amount mutez : unit ] */ ; + /* [ option key_hash : mutez : unit ] */ ; CREATE_CONTRACT { parameter unit /* [ nat ] */ ; storage unit ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out index 3e72c5fb4797..ff4b824e48a4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039994.373 units remaining { parameter (pair timestamp timestamp) ; storage int ; code { CAR - /* [ @parameter pair timestamp timestamp ] */ ; + /* [ pair timestamp timestamp ] */ ; DUP - /* [ @parameter pair timestamp timestamp : @parameter pair timestamp timestamp ] */ ; + /* [ pair timestamp timestamp : pair timestamp timestamp ] */ ; CAR - /* [ timestamp : @parameter pair timestamp timestamp ] */ ; + /* [ timestamp : pair timestamp timestamp ] */ ; DIP { CDR /* [ timestamp ] */ } /* [ timestamp : timestamp ] */ ; SUB diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out index 0d560d1622e0..e0c28a15aa2b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out @@ -6,147 +6,147 @@ Gas remaining: 1039899.367 units remaining (pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat) ; storage unit ; code { CAR - /* [ @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + /* [ pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DUP - /* [ @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + /* [ pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; UNPAPAPAPAPAPAPAPAPAPAPAPAPAPAPAPAIR ; DIG 0 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 1 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 2 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 3 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 4 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 5 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 6 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 7 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 8 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 9 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 10 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 11 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 12 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 13 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 14 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 15 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 16 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 0 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 1 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 2 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 3 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 4 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 5 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 6 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 7 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 8 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 9 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 10 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 11 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 12 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 13 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 14 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 15 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; DIG 16 /* [ nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat : nat - : @parameter pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; + : pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat ] */ ; PAPAPAPAPAPAPAPAPAPAPAPAPAPAPAPAIR ; ASSERT_CMPEQ ; UNIT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out index f7bd2c275923..7eb0edf56cea 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039991.580 units remaining { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ; storage nat ; code { CAR - /* [ @parameter pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; + /* [ pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; UNPAIR /* [ pair (pair (pair nat nat) nat) nat : nat ] */ ; UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out index a06ff055daa4..7333f45ae023 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039993.958 units remaining { parameter (pair nat nat) ; storage (pair nat nat) ; code { CAR - /* [ @parameter pair nat nat ] */ ; + /* [ pair nat nat ] */ ; UNPAIR /* [ nat : nat ] */ ; DUP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out index 5fa326fd8251..d6d5a4a44411 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039990.690 units remaining { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ; storage nat ; code { CAR - /* [ @parameter pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; + /* [ pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; UNPAIR /* [ pair (pair (pair nat nat) nat) nat : nat ] */ ; UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out index 1a7da15e1dca..866acca93dea 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039993.947 units remaining { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ; storage nat ; code { CAR - /* [ @parameter pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; + /* [ pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; UNPAIR /* [ pair (pair (pair nat nat) nat) nat : nat ] */ ; UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out index 432e6ea15b63..be823b7e5a1a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039992.076 units remaining { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ; storage nat ; code { CAR - /* [ @parameter pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; + /* [ pair (pair (pair (pair nat nat) nat) nat) nat ] */ ; UNPAIR /* [ pair (pair (pair nat nat) nat) nat : nat ] */ ; UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out index 7c081383919f..22bc94ccf549 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out @@ -9,45 +9,42 @@ Gas remaining: 1039978.198 units remaining (option (pair int nat)) (option (pair nat nat))) ; code { CAR - /* [ @parameter pair int int ] */ ; + /* [ pair int int ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int ] */ ; + /* [ pair int int : pair int int ] */ ; UNPAIR - /* [ int : int : @parameter pair int int ] */ ; + /* [ int : int : pair int int ] */ ; ABS - /* [ nat : int : @parameter pair int int ] */ ; - DIP { ABS /* [ nat : @parameter pair int int ] */ } - /* [ nat : nat : @parameter pair int int ] */ ; + /* [ nat : int : pair int int ] */ ; + DIP { ABS /* [ nat : pair int int ] */ } + /* [ nat : nat : pair int int ] */ ; EDIV - /* [ option (pair nat nat) : @parameter pair int int ] */ ; + /* [ option (pair nat nat) : pair int int ] */ ; SWAP - /* [ @parameter pair int int : option (pair nat nat) ] */ ; + /* [ pair int int : option (pair nat nat) ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int : option (pair nat nat) ] */ ; + /* [ pair int int : pair int int : option (pair nat nat) ] */ ; UNPAIR - /* [ int : int : @parameter pair int int : option (pair nat nat) ] */ ; + /* [ int : int : pair int int : option (pair nat nat) ] */ ; ABS - /* [ nat : int : @parameter pair int int : option (pair nat nat) ] */ ; + /* [ nat : int : pair int int : option (pair nat nat) ] */ ; EDIV - /* [ option (pair int nat) : @parameter pair int int : option (pair nat nat) ] */ ; + /* [ option (pair int nat) : pair int int : option (pair nat nat) ] */ ; SWAP - /* [ @parameter pair int int : option (pair int nat) : option (pair nat nat) ] */ ; + /* [ pair int int : option (pair int nat) : option (pair nat nat) ] */ ; DUP - /* [ @parameter pair int int : @parameter pair int int : option (pair int nat) + /* [ pair int int : pair int int : option (pair int nat) : option (pair nat nat) ] */ ; UNPAIR - /* [ int : int : @parameter pair int int : option (pair int nat) - : option (pair nat nat) ] */ ; + /* [ int : int : pair int int : option (pair int nat) : option (pair nat nat) ] */ ; DIP { ABS - /* [ nat : @parameter pair int int : option (pair int nat) - : option (pair nat nat) ] */ } - /* [ int : nat : @parameter pair int int : option (pair int nat) - : option (pair nat nat) ] */ ; + /* [ nat : pair int int : option (pair int nat) : option (pair nat nat) ] */ } + /* [ int : nat : pair int int : option (pair int nat) : option (pair nat nat) ] */ ; EDIV - /* [ option (pair int nat) : @parameter pair int int : option (pair int nat) + /* [ option (pair int nat) : pair int int : option (pair int nat) : option (pair nat nat) ] */ ; SWAP - /* [ @parameter pair int int : option (pair int nat) : option (pair int nat) + /* [ pair int int : option (pair int nat) : option (pair int nat) : option (pair nat nat) ] */ ; UNPAIR /* [ int : int : option (pair int nat) : option (pair int nat) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out index 14e42df958a9..3eb9d8ee8e5f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039987.261 units remaining { parameter (pair mutez (or mutez nat)) ; storage (or (option (pair nat mutez)) (option (pair mutez mutez))) ; code { CAR - /* [ @parameter pair mutez (or mutez nat) ] */ ; + /* [ pair mutez (or mutez nat) ] */ ; UNPAIR /* [ mutez : or mutez nat ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out index 549d8c43a11f..e1136e251fb5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out @@ -5,27 +5,27 @@ Gas remaining: 1039991.097 units remaining { parameter string ; storage string ; code { CAR - /* [ @parameter string ] */ ; + /* [ string ] */ ; LAMBDA string string { PUSH string "_abc" - /* [ string : @arg string ] */ ; + /* [ string : string ] */ ; NIL string - /* [ list string : string : @arg string ] */ ; + /* [ list string : string : string ] */ ; SWAP - /* [ string : list string : @arg string ] */ ; + /* [ string : list string : string ] */ ; CONS - /* [ list string : @arg string ] */ ; + /* [ list string : string ] */ ; SWAP - /* [ @arg string : list string ] */ ; + /* [ string : list string ] */ ; CONS /* [ list string ] */ ; CONCAT /* [ string ] */ } - /* [ lambda string string : @parameter string ] */ ; + /* [ lambda string string : string ] */ ; SWAP - /* [ @parameter string : lambda string string ] */ ; + /* [ string : lambda string string ] */ ; EXEC /* [ string ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out index f499a2848da3..b870c0049f20 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039994.458 units remaining { parameter (list nat) ; storage nat ; code { CAR - /* [ @parameter list nat ] */ ; - IF_CONS { DIP { DROP /* [] */ } /* [ @parameter.hd nat ] */ } { FAIL } ; + /* [ list nat ] */ ; + IF_CONS { DIP { DROP /* [] */ } /* [ nat ] */ } { FAIL } ; NIL operation - /* [ list operation : @parameter.hd nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @parameter.hd) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out index f73f65be9071..b8bc404ba267 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out @@ -8,10 +8,10 @@ Gas remaining: 1039990.479 units remaining /* [ pair (string @parameter) (pair @storage (big_map string string) (option string)) : pair (string @parameter) (pair @storage (big_map string string) (option string)) ] */ ; CAR - /* [ @parameter string + /* [ string : pair (string @parameter) (pair @storage (big_map string string) (option string)) ] */ ; DIP { CDAR ; DUP /* [ big_map string string : big_map string string ] */ } - /* [ @parameter string : big_map string string : big_map string string ] */ ; + /* [ string : big_map string string : big_map string string ] */ ; GET /* [ option string : big_map string string ] */ ; SWAP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out index 4f2d0daec1c4..b81b76b41473 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out @@ -8,10 +8,10 @@ Gas remaining: 1039991.007 units remaining /* [ pair (string @parameter) (pair @storage (option string) (map string string)) : pair (string @parameter) (pair @storage (option string) (map string string)) ] */ ; CAR - /* [ @parameter string + /* [ string : pair (string @parameter) (pair @storage (option string) (map string string)) ] */ ; DIP { CDDR ; DUP /* [ map string string : map string string ] */ } - /* [ @parameter string : map string string : map string string ] */ ; + /* [ string : map string string : map string string ] */ ; GET /* [ option string : map string string ] */ ; PAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out index 9207eb8cb0fd..708e74488eaf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039995.929 units remaining { parameter (pair mutez (pair timestamp int)) ; storage bytes ; code { CAR - /* [ @parameter pair mutez timestamp int ] */ ; + /* [ pair mutez timestamp int ] */ ; PACK - /* [ @parameter.packed bytes ] */ ; + /* [ bytes ] */ ; BLAKE2B /* [ bytes ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out index 4aa56e3c38fb..a264bbc85ae4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { parameter key ; storage (option key_hash) ; code { CAR - /* [ @parameter key ] */ ; + /* [ key ] */ ; HASH_KEY /* [ key_hash ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out index c306d5a30c5c..1d1de3f9d3d5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039996.340 units remaining { parameter string ; storage bytes ; code { CAR - /* [ @parameter string ] */ ; + /* [ string ] */ ; PACK - /* [ @parameter.packed bytes ] */ ; + /* [ bytes ] */ ; BLAKE2B /* [ bytes ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out index 80f2e7d06ed7..98bfeff38a3f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039994.330 units remaining { parameter bool ; storage (option bool) ; code { CAR - /* [ @parameter bool ] */ ; + /* [ bool ] */ ; IF { PUSH bool True /* [ bool ] */ } { PUSH bool False /* [ bool ] */ } ; SOME /* [ option bool ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out index 6e687533cf8b..8b08a2d5ec5e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039995.219 units remaining { parameter (option string) ; storage string ; code { CAR - /* [ @parameter option string ] */ ; - IF_SOME { /* [ @parameter.some string ] */ } { PUSH string "" /* [ string ] */ } ; + /* [ option string ] */ ; + IF_SOME { /* [ string ] */ } { PUSH string "" /* [ string ] */ } ; NIL operation /* [ list operation : string ] */ ; PAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out index 8c62b46c4ee1..f15c4ec76cce 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { parameter nat ; storage (option int) ; code { CAR - /* [ @parameter nat ] */ ; + /* [ nat ] */ ; INT /* [ int ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out index 5ee9362441cb..1908b7dacd7c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out @@ -5,10 +5,10 @@ Gas remaining: 1039996.234 units remaining { parameter (set nat) ; storage unit ; code { UNPAIR - /* [ @parameter set nat : @storage unit ] */ ; + /* [ set nat : unit ] */ ; ITER { FAILWITH /* [] */ } - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out index 4cd6b60f60c2..4acc9ec37267 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { storage (option bytes) ; parameter bytes ; code { CAR - /* [ @parameter bytes ] */ ; + /* [ bytes ] */ ; KECCAK /* [ bytes ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out index 134e09cf31b2..fc31ac5a8cf8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039994.130 units remaining { parameter (or bool string) ; storage (or string bool) ; code { CAR - /* [ @parameter or bool string ] */ ; + /* [ or bool string ] */ ; IF_LEFT { RIGHT string /* [ or string bool ] */ } { LEFT bool /* [ or string bool ] */ } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out index 31affbff7914..fb05172d33b8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.803 units remaining code { DROP /* [] */ ; LEVEL - /* [ @level nat ] */ ; + /* [ nat ] */ ; NIL operation - /* [ list operation : @level nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @level) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out index abbb47996630..4dcfe2d8542f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039995.574 units remaining { parameter (list string) ; storage string ; code { UNPAIR - /* [ @parameter list string : @storage string ] */ ; + /* [ list string : string ] */ ; SWAP - /* [ @storage string : @parameter list string ] */ ; + /* [ string : list string ] */ ; CONS /* [ list string ] */ ; CONCAT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out index e7565c18c81a..70cfda9b4464 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039995.574 units remaining { parameter (list bytes) ; storage bytes ; code { UNPAIR - /* [ @parameter list bytes : @storage bytes ] */ ; + /* [ list bytes : bytes ] */ ; SWAP - /* [ @storage bytes : @parameter list bytes ] */ ; + /* [ bytes : list bytes ] */ ; CONS /* [ list bytes ] */ ; CONCAT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out index f3d28a3c8b5d..f6a546b1ab77 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.880 units remaining { parameter (list string) ; storage (list string) ; code { CAR - /* [ @parameter list string ] */ ; + /* [ list string ] */ ; NIL operation - /* [ list operation : @parameter list string ] */ ; + /* [ list operation : list string ] */ ; PAIR - /* [ pair (list operation) (list @parameter string) ] */ } } + /* [ pair (list operation) (list string) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out index 3791f05f4850..accc65e203af 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.174 units remaining { parameter (list string) ; storage (list string) ; code { CAR - /* [ @parameter list string ] */ ; - MAP { /* [ @parameter.elt string ] */ } + /* [ list string ] */ ; + MAP { /* [ string ] */ } /* [ list string ] */ ; NIL operation /* [ list operation : list string ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out index e108d2f581de..a4f4c5f7d417 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039994.793 units remaining { parameter (list int) ; storage int ; code { CAR - /* [ @parameter list int ] */ ; + /* [ list int ] */ ; PUSH int 1 - /* [ int : @parameter list int ] */ ; + /* [ int : list int ] */ ; SWAP - /* [ @parameter list int : int ] */ ; + /* [ list int : int ] */ ; ITER { MUL /* [ int ] */ } /* [ int ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out index a9bf9d5d8990..4ba9faa600c8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039990.664 units remaining { parameter (list int) ; storage (list int) ; code { CAR - /* [ @parameter list int ] */ ; + /* [ list int ] */ ; PUSH int 0 - /* [ int : @parameter list int ] */ ; + /* [ int : list int ] */ ; SWAP - /* [ @parameter list int : int ] */ ; + /* [ list int : int ] */ ; MAP { DIP { DUP /* [ int : int ] */ } - /* [ @parameter.elt int : int : int ] */ ; + /* [ int : int : int ] */ ; ADD /* [ int : int ] */ ; DIP { PUSH int 1 /* [ int : int ] */ ; ADD /* [ int ] */ } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out index 5df93cac0e3d..d93117b2c73d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.720 units remaining { parameter (list int) ; storage nat ; code { CAR - /* [ @parameter list int ] */ ; + /* [ list int ] */ ; SIZE /* [ nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out index d2256f6e44c3..9cf5eef02158 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out @@ -5,10 +5,10 @@ Gas remaining: 1039996.317 units remaining { parameter bool ; storage unit ; code { UNPAIR - /* [ @parameter bool : @storage unit ] */ ; + /* [ bool : unit ] */ ; LOOP { FAILWITH /* [] */ } - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out index d1ce4870cb2b..9e1ec7ab5b97 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out @@ -5,32 +5,31 @@ Gas remaining: 1039983.876 units remaining { parameter (list string) ; storage (list string) ; code { CAR - /* [ @parameter list string ] */ ; + /* [ list string ] */ ; NIL string - /* [ list string : @parameter list string ] */ ; + /* [ list string : list string ] */ ; SWAP - /* [ @parameter list string : list string ] */ ; + /* [ list string : list string ] */ ; PAIR - /* [ pair (list @parameter string) (list string) ] */ ; + /* [ pair (list string) (list string) ] */ ; LEFT (list string) - /* [ or (pair (list @parameter string) (list string)) (list string) ] */ ; + /* [ or (pair (list string) (list string)) (list string) ] */ ; LOOP_LEFT { DUP - /* [ pair (list @parameter string) (list string) - : pair (list @parameter string) (list string) ] */ ; + /* [ pair (list string) (list string) : pair (list string) (list string) ] */ ; CAR - /* [ @parameter list string : pair (list @parameter string) (list string) ] */ ; + /* [ list string : pair (list string) (list string) ] */ ; DIP { CDR /* [ list string ] */ } - /* [ @parameter list string : list string ] */ ; + /* [ list string : list string ] */ ; IF_CONS { SWAP - /* [ @parameter.tl list string : @parameter.hd string : list string ] */ ; + /* [ list string : string : list string ] */ ; DIP { CONS /* [ list string ] */ } - /* [ @parameter.tl list string : list string ] */ ; + /* [ list string : list string ] */ ; PAIR - /* [ pair (list @parameter.tl string) (list string) ] */ ; + /* [ pair (list string) (list string) ] */ ; LEFT (list string) - /* [ or (pair (list @parameter.tl string) (list string)) (list string) ] */ } + /* [ or (pair (list string) (list string)) (list string) ] */ } { RIGHT (pair (list string) (list string)) /* [ or (pair (list string) (list string)) (list string) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out index 7a1be23a3c38..7182ae06996f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.076 units remaining { parameter (or string nat) ; storage nat ; code { CAR - /* [ @parameter or string nat ] */ ; + /* [ or string nat ] */ ; LOOP_LEFT { FAILWITH /* [] */ } /* [ nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out index 95edb551e4e4..d467decad1cc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.494 units remaining { parameter (map nat nat) ; storage (map nat nat) ; code { CAR - /* [ @parameter map nat nat ] */ ; + /* [ map nat nat ] */ ; NIL operation - /* [ list operation : @parameter map nat nat ] */ ; + /* [ list operation : map nat nat ] */ ; PAIR - /* [ pair (list operation) (map @parameter nat nat) ] */ } } + /* [ pair (list operation) (map nat nat) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out index 667a1fd118eb..f865564d10a0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out @@ -5,38 +5,30 @@ Gas remaining: 1039985.509 units remaining { parameter (map (int :k) (int :e)) ; storage (pair (int :k) (int :e)) ; code { CAR - /* [ @parameter map (int :k) (int :e) ] */ ; + /* [ map (int :k) (int :e) ] */ ; PUSH @acc_e (int :e) 0 - /* [ @acc_e int :e : @parameter map (int :k) (int :e) ] */ ; - PUSH @acc_k - (int :k) - 0 - /* [ @acc_k int :k : @acc_e int :e : @parameter map (int :k) (int :e) ] */ ; + /* [ int :e : map (int :k) (int :e) ] */ ; + PUSH @acc_k (int :k) 0 + /* [ int :k : int :e : map (int :k) (int :e) ] */ ; PAIR % %r - /* [ pair (int :k @acc_k) (int :e %r @acc_e) - : @parameter map (int :k) (int :e) ] */ ; + /* [ pair (int :k) (int :e %r) : map (int :k) (int :e) ] */ ; SWAP - /* [ @parameter map (int :k) (int :e) - : pair (int :k @acc_k) (int :e %r @acc_e) ] */ ; + /* [ map (int :k) (int :e) : pair (int :k) (int :e %r) ] */ ; ITER { DIP { DUP - /* [ pair (int :k @acc_k) (int :e %r @acc_e) - : pair (int :k @acc_k) (int :e %r @acc_e) ] */ ; + /* [ pair (int :k) (int :e %r) : pair (int :k) (int :e %r) ] */ ; CAR - /* [ @acc_k int :k : pair (int :k @acc_k) (int :e %r @acc_e) ] */ ; - DIP { CDR /* [ @acc_e int :e ] */ } - /* [ @acc_k int :k : @acc_e int :e ] */ } - /* [ pair (int :k @key) (int :e @elt) : @acc_k int :k : @acc_e int :e ] */ ; + /* [ int :k : pair (int :k) (int :e %r) ] */ ; + DIP { CDR /* [ int :e ] */ } + /* [ int :k : int :e ] */ } + /* [ pair (int :k @key) (int :e @elt) : int :k : int :e ] */ ; DUP /* [ pair (int :k @key) (int :e @elt) : pair (int :k @key) (int :e @elt) - : @acc_k int :k : @acc_e int :e ] */ ; - DIP { CAR - /* [ @key int :k : @acc_k int :k : @acc_e int :e ] */ ; - ADD - /* [ int :k : @acc_e int :e ] */ } - /* [ pair (int :k @key) (int :e @elt) : int :k : @acc_e int :e ] */ ; + : int :k : int :e ] */ ; + DIP { CAR /* [ int :k : int :k : int :e ] */ ; ADD /* [ int :k : int :e ] */ } + /* [ pair (int :k @key) (int :e @elt) : int :k : int :e ] */ ; SWAP - /* [ int :k : pair (int :k @key) (int :e @elt) : @acc_e int :e ] */ ; - DIP { CDR /* [ @elt int :e : @acc_e int :e ] */ ; ADD /* [ int :e ] */ } + /* [ int :k : pair (int :k @key) (int :e @elt) : int :e ] */ ; + DIP { CDR /* [ int :e : int :e ] */ ; ADD /* [ int :e ] */ } /* [ int :k : int :e ] */ ; PAIR % %r /* [ pair (int :k) (int :e %r) ] */ } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out index 1340f8b3a744..e88ae3f05146 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out @@ -5,16 +5,16 @@ Gas remaining: 1039992.454 units remaining { parameter nat ; storage (map string nat) ; code { UNPAIR - /* [ @parameter nat : @storage map string nat ] */ ; + /* [ nat : map string nat ] */ ; SWAP - /* [ @storage map string nat : @parameter nat ] */ ; + /* [ map string nat : nat ] */ ; MAP { CDR - /* [ @elt nat : @parameter nat ] */ ; - DIP { DUP /* [ @parameter nat : @parameter nat ] */ } - /* [ @elt nat : @parameter nat : @parameter nat ] */ ; + /* [ nat : nat ] */ ; + DIP { DUP /* [ nat : nat ] */ } + /* [ nat : nat : nat ] */ ; ADD - /* [ nat : @parameter nat ] */ } - /* [ map string nat : @parameter nat ] */ ; + /* [ nat : nat ] */ } + /* [ map string nat : nat ] */ ; DIP { DROP /* [] */ } /* [ map string nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out index cfc62c6b5861..b0bfcafecea7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out @@ -5,32 +5,31 @@ Gas remaining: 1039986.934 units remaining { parameter nat ; storage (pair (map string nat) nat) ; code { UNPAIR - /* [ @parameter nat : @storage pair (map string nat) nat ] */ ; + /* [ nat : pair (map string nat) nat ] */ ; SWAP - /* [ @storage pair (map string nat) nat : @parameter nat ] */ ; + /* [ pair (map string nat) nat : nat ] */ ; CAR - /* [ map string nat : @parameter nat ] */ ; - DIP 2 - { PUSH @sum nat 0 /* [ @sum nat ] */ } - /* [ map string nat : @parameter nat : @sum nat ] */ ; + /* [ map string nat : nat ] */ ; + DIP 2 { PUSH @sum nat 0 /* [ nat ] */ } + /* [ map string nat : nat : nat ] */ ; MAP { CDR - /* [ @elt nat : @parameter nat : @sum nat ] */ ; - DIP { DUP /* [ @parameter nat : @parameter nat : @sum nat ] */ } - /* [ @elt nat : @parameter nat : @parameter nat : @sum nat ] */ ; + /* [ nat : nat : nat ] */ ; + DIP { DUP /* [ nat : nat : nat ] */ } + /* [ nat : nat : nat : nat ] */ ; ADD - /* [ nat : @parameter nat : @sum nat ] */ ; + /* [ nat : nat : nat ] */ ; DUP - /* [ nat : nat : @parameter nat : @sum nat ] */ ; + /* [ nat : nat : nat : nat ] */ ; DUG 2 - /* [ nat : @parameter nat : nat : @sum nat ] */ ; - DIP 2 { ADD @sum /* [ @sum nat ] */ } - /* [ nat : @parameter nat : @sum nat ] */ } - /* [ map string nat : @parameter nat : @sum nat ] */ ; - DIP { DROP /* [ @sum nat ] */ } - /* [ map string nat : @sum nat ] */ ; + /* [ nat : nat : nat : nat ] */ ; + DIP 2 { ADD @sum /* [ nat ] */ } + /* [ nat : nat : nat ] */ } + /* [ map string nat : nat : nat ] */ ; + DIP { DROP /* [ nat ] */ } + /* [ map string nat : nat ] */ ; PAIR - /* [ pair (map string nat) (nat @sum) ] */ ; + /* [ pair (map string nat) nat ] */ ; NIL operation - /* [ list operation : pair (map string nat) (nat @sum) ] */ ; + /* [ list operation : pair (map string nat) nat ] */ ; PAIR - /* [ pair (list operation) (map string nat) (nat @sum) ] */ } } + /* [ pair (list operation) (map string nat) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out index 4ae552e9ee46..c7b7f76e84b6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039991.954 units remaining { parameter nat ; storage (pair (map nat nat) (option bool)) ; code { UNPAIR - /* [ @parameter nat : @storage pair (map nat nat) (option bool) ] */ ; + /* [ nat : pair (map nat nat) (option bool) ] */ ; DIP { CAR /* [ map nat nat ] */ ; DUP /* [ map nat nat : map nat nat ] */ } - /* [ @parameter nat : map nat nat : map nat nat ] */ ; + /* [ nat : map nat nat : map nat nat ] */ ; MEM /* [ bool : map nat nat ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out index a9f6e1a8678f..e741df944cef 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039991.954 units remaining { parameter string ; storage (pair (map string nat) (option bool)) ; code { UNPAIR - /* [ @parameter string : @storage pair (map string nat) (option bool) ] */ ; + /* [ string : pair (map string nat) (option bool) ] */ ; DIP { CAR /* [ map string nat ] */ ; DUP /* [ map string nat : map string nat ] */ } - /* [ @parameter string : map string nat : map string nat ] */ ; + /* [ string : map string nat : map string nat ] */ ; MEM /* [ bool : map string nat ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out index 762f71b9e4a0..4e5ff13c44eb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.637 units remaining { parameter (map string nat) ; storage nat ; code { CAR - /* [ @parameter map string nat ] */ ; + /* [ map string nat ] */ ; SIZE /* [ nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out index a1636639be84..32eaeec5fcfe 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out @@ -5,20 +5,16 @@ Gas remaining: 1039990.293 units remaining { parameter (set (pair (nat %n) (pair %p (string %s) (int %i)))) ; storage nat ; code { UNPAIR - /* [ @parameter set (pair (nat %n) (pair %p (string %s) (int %i))) - : @storage nat ] */ ; + /* [ set (pair (nat %n) (pair %p (string %s) (int %i))) : nat ] */ ; SWAP - /* [ @storage nat - : @parameter set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; - PUSH nat - 3 - /* [ nat : @storage nat - : @parameter set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; + /* [ nat : set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; + PUSH nat 3 + /* [ nat : nat : set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; COMPARE - /* [ int : @parameter set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; + /* [ int : set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; GT - /* [ bool : @parameter set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; - IF { /* [ @parameter set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ } + /* [ bool : set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ ; + IF { /* [ set (pair (nat %n) (pair %p (string %s) (int %i))) ] */ } { DROP /* [] */ ; EMPTY_SET (pair nat (pair string int)) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out index f433d84bc71c..30f48b2b3301 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039959.301 units remaining { parameter unit ; storage unit ; code { CAR - /* [ @parameter unit ] */ ; + /* [ unit ] */ ; DROP /* [] */ ; PUSH nat 7987 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out index 8a91c75c362b..934d44cc7f5b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair bls12_381_fr bls12_381_fr) ; storage (option bls12_381_fr) ; code { CAR - /* [ @parameter pair bls12_381_fr bls12_381_fr ] */ ; + /* [ pair bls12_381_fr bls12_381_fr ] */ ; UNPAIR /* [ bls12_381_fr : bls12_381_fr ] */ ; MUL diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out index af8cddeb62d1..e4c03bde3422 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair bls12_381_g1 bls12_381_fr) ; storage (option bls12_381_g1) ; code { CAR - /* [ @parameter pair bls12_381_g1 bls12_381_fr ] */ ; + /* [ pair bls12_381_g1 bls12_381_fr ] */ ; UNPAIR /* [ bls12_381_g1 : bls12_381_fr ] */ ; MUL diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out index 8d2ac845a19a..2aa5b65aa2c1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair bls12_381_g2 bls12_381_fr) ; storage (option bls12_381_g2) ; code { CAR - /* [ @parameter pair bls12_381_g2 bls12_381_fr ] */ ; + /* [ pair bls12_381_g2 bls12_381_fr ] */ ; UNPAIR /* [ bls12_381_g2 : bls12_381_fr ] */ ; MUL diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out index ad738aeb3c9a..928f99a937c6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out @@ -5,24 +5,24 @@ Gas remaining: 1039991.544 units remaining { parameter (or unit unit) ; storage unit ; code { CAR - /* [ @parameter or unit unit ] */ ; + /* [ or unit unit ] */ ; IF_LEFT { PUSH nat 922337203685477580700 - /* [ nat : @parameter.left unit ] */ ; + /* [ nat : unit ] */ ; PUSH mutez 10 - /* [ mutez : nat : @parameter.left unit ] */ ; + /* [ mutez : nat : unit ] */ ; MUL - /* [ mutez : @parameter.left unit ] */ ; + /* [ mutez : unit ] */ ; DROP - /* [ @parameter.left unit ] */ } + /* [ unit ] */ } { PUSH mutez 10 - /* [ mutez : @parameter.right unit ] */ ; + /* [ mutez : unit ] */ ; PUSH nat 922337203685477580700 - /* [ nat : mutez : @parameter.right unit ] */ ; + /* [ nat : mutez : unit ] */ ; MUL - /* [ mutez : @parameter.right unit ] */ ; + /* [ mutez : unit ] */ ; DROP - /* [ @parameter.right unit ] */ } ; + /* [ unit ] */ } ; NIL operation /* [ list operation : unit ] */ ; PAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out index 9cf384f3184d..408c77702291 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out @@ -6,8 +6,8 @@ Gas remaining: 1039996.425 units remaining (or (bytes %bytes) (or (lambda %lambda unit unit) (or (nat %nat) (list %list_nat nat)))) ; storage unit ; code { CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out index 9c284e751822..37edec9875bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039991.653 units remaining { parameter mutez ; storage bls12_381_fr ; code { CAR - /* [ @parameter mutez ] */ ; + /* [ mutez ] */ ; PUSH mutez 1 - /* [ mutez : @parameter mutez ] */ ; + /* [ mutez : mutez ] */ ; SWAP - /* [ @parameter mutez : mutez ] */ ; + /* [ mutez : mutez ] */ ; EDIV /* [ option (pair nat mutez) ] */ ; ASSERT_SOME ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out index 560c536a06e8..f6165c43af14 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.361 units remaining { parameter (or int nat) ; storage int ; code { CAR - /* [ @parameter or int nat ] */ ; + /* [ or int nat ] */ ; IF_LEFT { NEG /* [ int ] */ } { NEG /* [ int ] */ } ; NIL operation /* [ list operation : int ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out index 15d9345e793e..2b4b2cd34c4a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { parameter bls12_381_fr ; storage (option bls12_381_fr) ; code { CAR - /* [ @parameter bls12_381_fr ] */ ; + /* [ bls12_381_fr ] */ ; NEG /* [ bls12_381_fr ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out index 7b94dec1bbec..6731ef323362 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { parameter bls12_381_g1 ; storage (option bls12_381_g1) ; code { CAR - /* [ @parameter bls12_381_g1 ] */ ; + /* [ bls12_381_g1 ] */ ; NEG /* [ bls12_381_g1 ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out index 33b0e288b23e..7d143177dd82 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { parameter bls12_381_g2 ; storage (option bls12_381_g2) ; code { CAR - /* [ @parameter bls12_381_g2 ] */ ; + /* [ bls12_381_g2 ] */ ; NEG /* [ bls12_381_g2 ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out index e1e6b07b9bfc..9b6744eac461 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039997.267 units remaining { parameter unit ; storage unit ; code { CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out index cbac38ac95b1..736a7ad2f66e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { parameter bool ; storage (option bool) ; code { CAR - /* [ @parameter bool ] */ ; + /* [ bool ] */ ; NOT /* [ bool ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out index 209a98cae3b3..3fd8b510e4be 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039994.585 units remaining { parameter (or int nat) ; storage (option int) ; code { CAR - /* [ @parameter or int nat ] */ ; + /* [ or int nat ] */ ; IF_LEFT { NOT /* [ int ] */ } { NOT /* [ int ] */ } ; SOME /* [ option int ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out index dae493616004..7cf3920c6281 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039993.625 units remaining { parameter (pair bool bool) ; storage (option bool) ; code { CAR - /* [ @parameter pair bool bool ] */ ; + /* [ pair bool bool ] */ ; DUP - /* [ @parameter pair bool bool : @parameter pair bool bool ] */ ; + /* [ pair bool bool : pair bool bool ] */ ; CAR - /* [ bool : @parameter pair bool bool ] */ ; + /* [ bool : pair bool bool ] */ ; SWAP - /* [ @parameter pair bool bool : bool ] */ ; + /* [ pair bool bool : bool ] */ ; CDR /* [ bool : bool ] */ ; OR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out index 62b84d5ed543..d678551abb59 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.329 units remaining { parameter (pair nat nat) ; storage (option nat) ; code { CAR - /* [ @parameter pair nat nat ] */ ; + /* [ pair nat nat ] */ ; UNPAIR /* [ nat : nat ] */ ; OR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out index acc17962c4f1..24196000717d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.374 units remaining { parameter (big_map int int) ; storage (big_map int int) ; code { CAR - /* [ @parameter big_map int int ] */ ; + /* [ big_map int int ] */ ; NIL operation - /* [ list operation : @parameter big_map int int ] */ ; + /* [ list operation : big_map int int ] */ ; PAIR - /* [ pair (list operation) (big_map @parameter int int) ] */ } } + /* [ pair (list operation) (big_map int int) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out index 7b44a4f9b7b1..af9e0fa761fc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out @@ -5,17 +5,17 @@ Gas remaining: 1039986.390 units remaining { parameter (pair (pair (pair string (list int)) (set nat)) bytes) ; storage unit ; code { CAR - /* [ @parameter pair (pair (pair string (list int)) (set nat)) bytes ] */ ; + /* [ pair (pair (pair string (list int)) (set nat)) bytes ] */ ; UNPAIR /* [ pair (pair string (list int)) (set nat) : bytes ] */ ; DIP { DUP /* [ bytes : bytes ] */ } /* [ pair (pair string (list int)) (set nat) : bytes : bytes ] */ ; PACK - /* [ @packed bytes : bytes : bytes ] */ ; + /* [ bytes : bytes : bytes ] */ ; ASSERT_CMPEQ ; UNPACK (pair (pair string (list int)) (set nat)) - /* [ @unpacked option (pair (pair string (list int)) (set nat)) ] */ ; + /* [ option (pair (pair string (list int)) (set nat)) ] */ ; ASSERT_SOME ; DROP /* [] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out index 24bac27623c7..9656d1b93188 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out @@ -5,22 +5,20 @@ Gas remaining: 1039885.614 units remaining { parameter (pair int nat string bytes mutez bool key_hash timestamp address) ; storage unit ; code { CAR - /* [ @parameter pair int nat string bytes mutez bool key_hash timestamp address ] */ ; + /* [ pair int nat string bytes mutez bool key_hash timestamp address ] */ ; DUP - /* [ @parameter pair int nat string bytes mutez bool key_hash timestamp address - : @parameter pair int nat string bytes mutez bool key_hash timestamp address ] */ ; + /* [ pair int nat string bytes mutez bool key_hash timestamp address + : pair int nat string bytes mutez bool key_hash timestamp address ] */ ; CAR - /* [ int - : @parameter pair int nat string bytes mutez bool key_hash timestamp address ] */ ; + /* [ int : pair int nat string bytes mutez bool key_hash timestamp address ] */ ; DIP { UNPAIR /* [ int : pair nat string bytes mutez bool key_hash timestamp address ] */ } /* [ int : int : pair nat string bytes mutez bool key_hash timestamp address ] */ ; PACK - /* [ @packed bytes : int - : pair nat string bytes mutez bool key_hash timestamp address ] */ ; + /* [ bytes : int : pair nat string bytes mutez bool key_hash timestamp address ] */ ; UNPACK int - /* [ @packed.unpacked option int : int + /* [ option int : int : pair nat string bytes mutez bool key_hash timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; @@ -32,11 +30,10 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ nat : pair string bytes mutez bool key_hash timestamp address ] */ } /* [ nat : nat : pair string bytes mutez bool key_hash timestamp address ] */ ; PACK - /* [ @packed bytes : nat - : pair string bytes mutez bool key_hash timestamp address ] */ ; + /* [ bytes : nat : pair string bytes mutez bool key_hash timestamp address ] */ ; UNPACK nat - /* [ @packed.unpacked option nat : nat + /* [ option nat : nat : pair string bytes mutez bool key_hash timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; @@ -48,11 +45,10 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ string : pair bytes mutez bool key_hash timestamp address ] */ } /* [ string : string : pair bytes mutez bool key_hash timestamp address ] */ ; PACK - /* [ @packed bytes : string : pair bytes mutez bool key_hash timestamp address ] */ ; + /* [ bytes : string : pair bytes mutez bool key_hash timestamp address ] */ ; UNPACK string - /* [ @packed.unpacked option string : string - : pair bytes mutez bool key_hash timestamp address ] */ ; + /* [ option string : string : pair bytes mutez bool key_hash timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; DUP @@ -63,11 +59,10 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ bytes : pair mutez bool key_hash timestamp address ] */ } /* [ bytes : bytes : pair mutez bool key_hash timestamp address ] */ ; PACK - /* [ @packed bytes : bytes : pair mutez bool key_hash timestamp address ] */ ; + /* [ bytes : bytes : pair mutez bool key_hash timestamp address ] */ ; UNPACK bytes - /* [ @packed.unpacked option bytes : bytes - : pair mutez bool key_hash timestamp address ] */ ; + /* [ option bytes : bytes : pair mutez bool key_hash timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; DUP @@ -78,11 +73,9 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ mutez : pair bool key_hash timestamp address ] */ } /* [ mutez : mutez : pair bool key_hash timestamp address ] */ ; PACK - /* [ @packed bytes : mutez : pair bool key_hash timestamp address ] */ ; - UNPACK - mutez - /* [ @packed.unpacked option mutez : mutez - : pair bool key_hash timestamp address ] */ ; + /* [ bytes : mutez : pair bool key_hash timestamp address ] */ ; + UNPACK mutez + /* [ option mutez : mutez : pair bool key_hash timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; DUP @@ -93,10 +86,9 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ bool : pair key_hash timestamp address ] */ } /* [ bool : bool : pair key_hash timestamp address ] */ ; PACK - /* [ @packed bytes : bool : pair key_hash timestamp address ] */ ; - UNPACK - bool - /* [ @packed.unpacked option bool : bool : pair key_hash timestamp address ] */ ; + /* [ bytes : bool : pair key_hash timestamp address ] */ ; + UNPACK bool + /* [ option bool : bool : pair key_hash timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; DUP @@ -106,10 +98,9 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ key_hash : pair timestamp address ] */ } /* [ key_hash : key_hash : pair timestamp address ] */ ; PACK - /* [ @packed bytes : key_hash : pair timestamp address ] */ ; - UNPACK - key_hash - /* [ @packed.unpacked option key_hash : key_hash : pair timestamp address ] */ ; + /* [ bytes : key_hash : pair timestamp address ] */ ; + UNPACK key_hash + /* [ option key_hash : key_hash : pair timestamp address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; DUP @@ -119,49 +110,49 @@ Gas remaining: 1039885.614 units remaining DIP { UNPAIR /* [ timestamp : address ] */ } /* [ timestamp : timestamp : address ] */ ; PACK - /* [ @packed bytes : timestamp : address ] */ ; + /* [ bytes : timestamp : address ] */ ; UNPACK timestamp - /* [ @packed.unpacked option timestamp : timestamp : address ] */ ; + /* [ option timestamp : timestamp : address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; DUP /* [ address : address ] */ ; PACK - /* [ @packed bytes : address ] */ ; + /* [ bytes : address ] */ ; UNPACK address - /* [ @packed.unpacked option address : address ] */ ; + /* [ option address : address ] */ ; ASSERT_SOME ; ASSERT_CMPEQ ; PUSH int 0 /* [ int ] */ ; PACK - /* [ @packed bytes ] */ ; + /* [ bytes ] */ ; UNPACK nat - /* [ @packed.unpacked option nat ] */ ; + /* [ option nat ] */ ; ASSERT_SOME ; DROP /* [] */ ; PUSH int -1 /* [ int ] */ ; PACK - /* [ @packed bytes ] */ ; + /* [ bytes ] */ ; UNPACK nat - /* [ @packed.unpacked option nat ] */ ; + /* [ option nat ] */ ; ASSERT_NONE ; PUSH bytes 0x /* [ bytes ] */ ; UNPACK nat - /* [ @unpacked option nat ] */ ; + /* [ option nat ] */ ; ASSERT_NONE ; PUSH bytes 0x04 /* [ bytes ] */ ; UNPACK nat - /* [ @unpacked option nat ] */ ; + /* [ option nat ] */ ; ASSERT_NONE ; PUSH bytes 0x05 /* [ bytes ] */ ; UNPACK nat - /* [ @unpacked option nat ] */ ; + /* [ option nat ] */ ; ASSERT_NONE ; UNIT /* [ unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out index 65b65eb188d4..fa8d73ac9b5c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out @@ -15,7 +15,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes)) ; storage unit ; code { CAR - /* [ @parameter pair key + /* [ pair key unit signature (option signature) @@ -26,7 +26,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; DUP - /* [ @parameter pair key + /* [ pair key unit signature (option signature) @@ -36,7 +36,7 @@ Gas remaining: 1039871.738 units remaining (or key_hash timestamp) (map int string) (lambda string bytes) - : @parameter pair key + : pair key unit signature (option signature) @@ -48,7 +48,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; CAR /* [ key - : @parameter pair key + : pair key unit signature (option signature) @@ -80,7 +80,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : key + /* [ bytes : key : pair unit signature (option signature) @@ -91,7 +91,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair unit signature (option signature) @@ -103,7 +103,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; UNPACK key - /* [ @packed.unpacked option key + /* [ option key : pair unit signature (option signature) @@ -115,7 +115,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair unit signature (option signature) @@ -125,7 +125,7 @@ Gas remaining: 1039871.738 units remaining (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair unit signature (option signature) @@ -186,7 +186,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : unit + /* [ bytes : unit : pair signature (option signature) (list unit) @@ -196,7 +196,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair signature (option signature) (list unit) @@ -207,7 +207,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; UNPACK unit - /* [ @packed.unpacked option unit + /* [ option unit : pair signature (option signature) (list unit) @@ -218,7 +218,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair signature (option signature) (list unit) @@ -227,7 +227,7 @@ Gas remaining: 1039871.738 units remaining (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair signature (option signature) (list unit) @@ -282,7 +282,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : signature + /* [ bytes : signature : pair (option signature) (list unit) (set bool) @@ -291,7 +291,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair (option signature) (list unit) (set bool) @@ -301,7 +301,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; UNPACK signature - /* [ @packed.unpacked option signature + /* [ option signature : pair (option signature) (list unit) (set bool) @@ -311,7 +311,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair (option signature) (list unit) (set bool) @@ -319,7 +319,7 @@ Gas remaining: 1039871.738 units remaining (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair (option signature) (list unit) (set bool) @@ -368,7 +368,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : option signature + /* [ bytes : option signature : pair (list unit) (set bool) (pair int int) @@ -376,7 +376,7 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair (list unit) (set bool) (pair int int) @@ -385,7 +385,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; UNPACK (option signature) - /* [ @packed.unpacked option (option signature) + /* [ option (option signature) : pair (list unit) (set bool) (pair int int) @@ -394,14 +394,14 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair (list unit) (set bool) (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair (list unit) (set bool) (pair int int) @@ -444,14 +444,14 @@ Gas remaining: 1039871.738 units remaining (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : list unit + /* [ bytes : list unit : pair (set bool) (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair (set bool) (pair int int) (or key_hash timestamp) @@ -459,7 +459,7 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; UNPACK (list unit) - /* [ @packed.unpacked option (list unit) + /* [ option (list unit) : pair (set bool) (pair int int) (or key_hash timestamp) @@ -467,13 +467,13 @@ Gas remaining: 1039871.738 units remaining (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair (set bool) (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair (set bool) (pair int int) (or key_hash timestamp) @@ -504,20 +504,20 @@ Gas remaining: 1039871.738 units remaining /* [ set bool : set bool : pair (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : set bool + /* [ bytes : set bool : pair (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; UNPACK (set bool) - /* [ @packed.unpacked option (set bool) + /* [ option (set bool) : pair (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair (pair int int) (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; ASSERT_CMPEQ ; DUP @@ -532,20 +532,20 @@ Gas remaining: 1039871.738 units remaining /* [ pair int int : pair int int : pair (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : pair int int + /* [ bytes : pair int int : pair (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes + /* [ bytes : pair (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; UNPACK (pair int int) - /* [ @packed.unpacked option (pair int int) + /* [ option (pair int int) : pair (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes + /* [ bytes : pair (or key_hash timestamp) (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes + /* [ bytes : bytes : pair (or key_hash timestamp) (map int string) (lambda string bytes) ] */ ; ASSERT_CMPEQ ; DUP @@ -559,20 +559,18 @@ Gas remaining: 1039871.738 units remaining /* [ or key_hash timestamp : or key_hash timestamp : pair (map int string) (lambda string bytes) ] */ ; PACK - /* [ @packed bytes : or key_hash timestamp + /* [ bytes : or key_hash timestamp : pair (map int string) (lambda string bytes) ] */ ; DIP { PACK - /* [ @packed bytes : pair (map int string) (lambda string bytes) ] */ ; + /* [ bytes : pair (map int string) (lambda string bytes) ] */ ; UNPACK (or key_hash timestamp) - /* [ @packed.unpacked option (or key_hash timestamp) + /* [ option (or key_hash timestamp) : pair (map int string) (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes - : pair (map int string) (lambda string bytes) ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes - : pair (map int string) (lambda string bytes) ] */ ; + /* [ bytes : pair (map int string) (lambda string bytes) ] */ } + /* [ bytes : bytes : pair (map int string) (lambda string bytes) ] */ ; ASSERT_CMPEQ ; DUP /* [ pair (map int string) (lambda string bytes) @@ -582,29 +580,28 @@ Gas remaining: 1039871.738 units remaining DIP { UNPAIR /* [ map int string : lambda string bytes ] */ } /* [ map int string : map int string : lambda string bytes ] */ ; PACK - /* [ @packed bytes : map int string : lambda string bytes ] */ ; + /* [ bytes : map int string : lambda string bytes ] */ ; DIP { PACK - /* [ @packed bytes : lambda string bytes ] */ ; - UNPACK - (map int string) - /* [ @packed.unpacked option (map int string) : lambda string bytes ] */ ; + /* [ bytes : lambda string bytes ] */ ; + UNPACK (map int string) + /* [ option (map int string) : lambda string bytes ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes : lambda string bytes ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes : lambda string bytes ] */ ; + /* [ bytes : lambda string bytes ] */ } + /* [ bytes : bytes : lambda string bytes ] */ ; ASSERT_CMPEQ ; DUP /* [ lambda string bytes : lambda string bytes ] */ ; PACK - /* [ @packed bytes : lambda string bytes ] */ ; + /* [ bytes : lambda string bytes ] */ ; DIP { PACK - /* [ @packed bytes ] */ ; + /* [ bytes ] */ ; UNPACK (lambda string bytes) - /* [ @packed.unpacked option (lambda string bytes) ] */ ; + /* [ option (lambda string bytes) ] */ ; ASSERT_SOME ; PACK - /* [ @packed.unpacked.some.packed bytes ] */ } - /* [ @packed bytes : @packed.unpacked.some.packed bytes ] */ ; + /* [ bytes ] */ } + /* [ bytes : bytes ] */ ; ASSERT_CMPEQ ; UNIT /* [ unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out index a00f9863b529..94da0387de94 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.649 units remaining { parameter (pair bool bool) ; storage (option (pair bool bool)) ; code { CAR - /* [ @parameter pair bool bool ] */ ; + /* [ pair bool bool ] */ ; SOME /* [ option (pair bool bool) ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out index bbe35404c5e0..9e3d820ae309 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039995.709 units remaining { parameter (list (pair bls12_381_g1 bls12_381_g2)) ; storage (option bool) ; code { CAR - /* [ @parameter list (pair bls12_381_g1 bls12_381_g2) ] */ ; + /* [ list (pair bls12_381_g1 bls12_381_g2) ] */ ; PAIRING_CHECK /* [ bool ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out index 694b5801898e..31dc4c344209 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out @@ -12,9 +12,9 @@ Gas remaining: 1039992.874 units remaining SWAP /* [ pair (nat @parameter) (nat @storage) : lambda (pair nat nat) nat ] */ ; UNPAIR - /* [ @parameter nat : @storage nat : lambda (pair nat nat) nat ] */ ; + /* [ nat : nat : lambda (pair nat nat) nat ] */ ; DIP { APPLY /* [ lambda nat nat ] */ } - /* [ @parameter nat : lambda nat nat ] */ ; + /* [ nat : lambda nat nat ] */ ; EXEC /* [ nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out index fe43c13c58c2..d5bee849665f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039986.241 units remaining { parameter int ; storage (list int) ; code { UNPAIR @p @s - /* [ @p int : @s list int ] */ ; + /* [ int : list int ] */ ; LAMBDA (pair int (pair int int)) int @@ -17,19 +17,19 @@ Gas remaining: 1039986.241 units remaining /* [ int : int ] */ ; MUL /* [ int ] */ } - /* [ lambda (pair int int int) int : @p int : @s list int ] */ ; + /* [ lambda (pair int int int) int : int : list int ] */ ; SWAP - /* [ @p int : lambda (pair int int int) int : @s list int ] */ ; + /* [ int : lambda (pair int int int) int : list int ] */ ; APPLY - /* [ lambda (pair int int) int : @s list int ] */ ; + /* [ lambda (pair int int) int : list int ] */ ; PUSH int 3 - /* [ int : lambda (pair int int) int : @s list int ] */ ; + /* [ int : lambda (pair int int) int : list int ] */ ; APPLY - /* [ lambda int int : @s list int ] */ ; + /* [ lambda int int : list int ] */ ; SWAP - /* [ @s list int : lambda int int ] */ ; + /* [ list int : lambda int int ] */ ; MAP { DIP { DUP /* [ lambda int int : lambda int int ] */ } - /* [ @s.elt int : lambda int int : lambda int int ] */ ; + /* [ int : lambda int int : lambda int int ] */ ; EXEC /* [ int : lambda int int ] */ } /* [ list int : lambda int int ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out index 0fef718ad0de..13484ffe93f8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out @@ -5,16 +5,16 @@ Gas remaining: 1039994.321 units remaining { parameter (contract unit) ; storage unit ; code { UNPAIR - /* [ @parameter contract unit : @storage unit ] */ ; + /* [ contract unit : unit ] */ ; AMOUNT - /* [ @amount mutez : @parameter contract unit : @storage unit ] */ ; + /* [ mutez : contract unit : unit ] */ ; UNIT - /* [ unit : @amount mutez : @parameter contract unit : @storage unit ] */ ; + /* [ unit : mutez : contract unit : unit ] */ ; TRANSFER_TOKENS - /* [ operation : @storage unit ] */ ; - DIP { NIL operation /* [ list operation : @storage unit ] */ } - /* [ operation : list operation : @storage unit ] */ ; + /* [ operation : unit ] */ ; + DIP { NIL operation /* [ list operation : unit ] */ } + /* [ operation : list operation : unit ] */ ; CONS - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out index e1b6e0e42dc3..b981ed5fd164 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039994.173 units remaining { parameter (list string) ; storage (list string) ; code { CAR - /* [ @parameter list string ] */ ; + /* [ list string ] */ ; NIL string - /* [ list string : @parameter list string ] */ ; + /* [ list string : list string ] */ ; SWAP - /* [ @parameter list string : list string ] */ ; + /* [ list string : list string ] */ ; ITER { CONS /* [ list string ] */ } /* [ list string ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out index a933dde91d78..90deb8d0ee62 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out @@ -5,25 +5,25 @@ Gas remaining: 1039987.683 units remaining { parameter (list string) ; storage (list string) ; code { CAR - /* [ @parameter list string ] */ ; + /* [ list string ] */ ; NIL string - /* [ list string : @parameter list string ] */ ; + /* [ list string : list string ] */ ; SWAP - /* [ @parameter list string : list string ] */ ; + /* [ list string : list string ] */ ; PUSH bool True - /* [ bool : @parameter list string : list string ] */ ; + /* [ bool : list string : list string ] */ ; LOOP { IF_CONS { SWAP - /* [ @parameter.tl list string : @parameter.hd string : list string ] */ ; + /* [ list string : string : list string ] */ ; DIP { CONS /* [ list string ] */ } - /* [ @parameter.tl list string : list string ] */ ; + /* [ list string : list string ] */ ; PUSH bool True - /* [ bool : @parameter.tl list string : list string ] */ } + /* [ bool : list string : list string ] */ } { NIL string /* [ list string : list string ] */ ; PUSH bool False /* [ bool : list string : list string ] */ } } - /* [ @parameter list string : list string ] */ ; + /* [ list string : list string ] */ ; DROP /* [ list string ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out index 1e6704e390a4..4c086d8ba2f0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.757 units remaining code { DROP /* [] */ ; SAPLING_EMPTY_STATE 8 - /* [ @sapling sapling_state 8 ] */ ; + /* [ sapling_state 8 ] */ ; NIL operation - /* [ list operation : @sapling sapling_state 8 ] */ ; + /* [ list operation : sapling_state 8 ] */ ; PAIR - /* [ pair (list operation) (sapling_state @sapling 8) ] */ } } + /* [ pair (list operation) (sapling_state 8) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out index 20c61753d79b..c8fa2465d351 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out @@ -7,10 +7,10 @@ Gas remaining: 1039996.340 units remaining code { DROP /* [] */ ; SELF - /* [ @self contract unit ] */ ; + /* [ contract unit ] */ ; ADDRESS - /* [ @self.address address ] */ ; + /* [ address ] */ ; NIL operation - /* [ list operation : @self.address address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self.address) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out index 85a78babbfd1..49f29fea1d29 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out @@ -9,16 +9,16 @@ Gas remaining: 1039988.984 units remaining LAMBDA unit address - { DROP /* [] */ ; SELF_ADDRESS /* [ @self address ] */ } + { DROP /* [] */ ; SELF_ADDRESS /* [ address ] */ } /* [ lambda unit address ] */ ; UNIT /* [ unit : lambda unit address ] */ ; EXEC /* [ address ] */ ; SELF - /* [ @self contract unit : address ] */ ; + /* [ contract unit : address ] */ ; ADDRESS - /* [ @self.address address : address ] */ ; + /* [ address : address ] */ ; ASSERT_CMPEQ ; UNIT /* [ unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out index 39965ce34426..cd5019522f12 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out @@ -5,34 +5,34 @@ Gas remaining: 1039985.607 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 3 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "fib" nat - /* [ @parameter.contract option nat : @parameter address ] */ ; + /* [ option nat : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SELF_ADDRESS - /* [ @self address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @self address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @self address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @self address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @self address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out index edf400d78179..746018980266 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out @@ -5,32 +5,32 @@ Gas remaining: 1039986.090 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "id" string - /* [ @parameter.contract option string : @parameter address ] */ ; + /* [ option string : address ] */ ; ASSERT_NONE ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SELF_ADDRESS - /* [ @self address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @self address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @self address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @self address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @self address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out index 0397ca311322..617936b48252 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out @@ -5,35 +5,34 @@ Gas remaining: 1039985.432 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "id" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "id" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SELF_ADDRESS - /* [ @self address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @self address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @self address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @self address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @self address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out index b56362023bc1..def66072a7f4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out @@ -5,36 +5,36 @@ Gas remaining: 1039985.135 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 3 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "fib" nat - /* [ @parameter.contract option nat : @parameter address ] */ ; + /* [ option nat : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SELF - /* [ @self contract address : operation ] */ ; + /* [ contract address : operation ] */ ; ADDRESS - /* [ @self.address address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @self.address address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @self.address address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @self.address address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @self.address address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self.address) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out index f0e96b982f28..9496c6c3b44f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out @@ -5,35 +5,34 @@ Gas remaining: 1039985.527 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "nonexistent" - string - /* [ @parameter.contract option string : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "nonexistent" string + /* [ option string : address ] */ ; ASSERT_NONE ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SELF - /* [ @self contract address : operation ] */ ; + /* [ contract address : operation ] */ ; ADDRESS - /* [ @self.address address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @self.address address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @self.address address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @self.address address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @self.address address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self.address) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out index 1eabb808db0e..344a0011b6a1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out @@ -5,37 +5,36 @@ Gas remaining: 1039984.961 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "id" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "id" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SELF - /* [ @self contract address : operation ] */ ; + /* [ contract address : operation ] */ ; ADDRESS - /* [ @self.address address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @self.address address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @self.address address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @self.address address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @self.address address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @self.address) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out index a930dfbb008d..5b31d4f735d5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out @@ -7,21 +7,21 @@ Gas remaining: 1039988.615 units remaining code { DROP /* [] */ ; SELF - /* [ @self contract unit ] */ ; + /* [ contract unit ] */ ; DROP /* [] */ ; SELF %A - /* [ @self contract nat ] */ ; + /* [ contract nat ] */ ; DROP /* [] */ ; SELF %default - /* [ @self contract unit ] */ ; + /* [ contract unit ] */ ; PACK - /* [ @self.packed bytes ] */ ; + /* [ bytes ] */ ; SELF - /* [ @self contract unit : @self.packed bytes ] */ ; + /* [ contract unit : bytes ] */ ; PACK - /* [ @self.packed bytes : @self.packed bytes ] */ ; + /* [ bytes : bytes ] */ ; ASSERT_CMPEQ ; UNIT /* [ unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out index b2c618af8252..41cd05c68ad0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out @@ -7,59 +7,59 @@ Gas remaining: 1039967.216 units remaining code { DROP /* [] */ ; SELF %A - /* [ @self contract nat ] */ ; + /* [ contract nat ] */ ; PACK @Apacked - /* [ @Apacked bytes ] */ ; + /* [ bytes ] */ ; SELF %default - /* [ @self contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) - : @Apacked bytes ] */ ; + /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) + : bytes ] */ ; PACK @defpacked - /* [ @defpacked bytes : @Apacked bytes ] */ ; + /* [ bytes : bytes ] */ ; DUP - /* [ @defpacked bytes : @defpacked bytes : @Apacked bytes ] */ ; - DIP { SWAP /* [ @Apacked bytes : @defpacked bytes ] */ } - /* [ @defpacked bytes : @Apacked bytes : @defpacked bytes ] */ ; + /* [ bytes : bytes : bytes ] */ ; + DIP { SWAP /* [ bytes : bytes ] */ } + /* [ bytes : bytes : bytes ] */ ; ASSERT_CMPNEQ ; SELF - /* [ @self contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) - : @defpacked bytes ] */ ; + /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) + : bytes ] */ ; PACK @selfpacked - /* [ @selfpacked bytes : @defpacked bytes ] */ ; + /* [ bytes : bytes ] */ ; ASSERT_CMPEQ ; SELF %A - /* [ @self contract nat ] */ ; + /* [ contract nat ] */ ; CAST (contract nat) - /* [ @self contract nat ] */ ; + /* [ contract nat ] */ ; DROP /* [] */ ; SELF %B - /* [ @self contract bool ] */ ; + /* [ contract bool ] */ ; CAST (contract bool) - /* [ @self contract bool ] */ ; + /* [ contract bool ] */ ; DROP /* [] */ ; SELF %maybe_C - /* [ @self contract (or (unit %Z) (string %C)) ] */ ; + /* [ contract (or (unit %Z) (string %C)) ] */ ; CAST (contract (or unit string)) - /* [ @self contract (or unit string) ] */ ; + /* [ contract (or unit string) ] */ ; DROP /* [] */ ; SELF %Z - /* [ @self contract unit ] */ ; + /* [ contract unit ] */ ; CAST (contract unit) - /* [ @self contract unit ] */ ; + /* [ contract unit ] */ ; DROP /* [] */ ; SELF - /* [ @self contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; CAST (contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C)))) - /* [ @self contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; DROP /* [] */ ; SELF %default - /* [ @self contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; CAST (contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C)))) - /* [ @self contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; + /* [ contract (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ] */ ; DROP /* [] */ ; UNIT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out index 13306e183250..f266979f0d2e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.803 units remaining code { DROP /* [] */ ; SENDER - /* [ @sender address ] */ ; + /* [ address ] */ ; NIL operation - /* [ list operation : @sender address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @sender) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out index c43e1af7419c..ae57014a5da9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out @@ -5,34 +5,34 @@ Gas remaining: 1039985.607 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 3 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "fib" nat - /* [ @parameter.contract option nat : @parameter address ] */ ; + /* [ option nat : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SENDER - /* [ @sender address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @sender address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @sender address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @sender address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @sender address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @sender) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out index 2a5f17948262..f6f3014bed5e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out @@ -5,32 +5,32 @@ Gas remaining: 1039986.090 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; + /* [ nat : address : address ] */ ; VIEW "id" string - /* [ @parameter.contract option string : @parameter address ] */ ; + /* [ option string : address ] */ ; ASSERT_NONE ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SENDER - /* [ @sender address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @sender address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @sender address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @sender address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @sender address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @sender) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out index dd8ce3c3c4df..85d670b17904 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out @@ -5,35 +5,34 @@ Gas remaining: 1039985.432 units remaining { parameter address ; storage address ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; DUP - /* [ @parameter address : @parameter address ] */ ; + /* [ address : address ] */ ; PUSH nat 0 - /* [ nat : @parameter address : @parameter address ] */ ; - VIEW "id" - (pair nat nat) - /* [ @parameter.contract option (pair nat nat) : @parameter address ] */ ; + /* [ nat : address : address ] */ ; + VIEW "id" (pair nat nat) + /* [ option (pair nat nat) : address ] */ ; ASSERT_SOME ; DROP - /* [ @parameter address ] */ ; + /* [ address ] */ ; CONTRACT nat - /* [ @parameter.contract option (contract nat) ] */ ; + /* [ option (contract nat) ] */ ; ASSERT_SOME ; PUSH mutez 1500 - /* [ mutez : @parameter.contract.some contract nat ] */ ; + /* [ mutez : contract nat ] */ ; PUSH nat 0 - /* [ nat : mutez : @parameter.contract.some contract nat ] */ ; + /* [ nat : mutez : contract nat ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; SENDER - /* [ @sender address : operation ] */ ; + /* [ address : operation ] */ ; SWAP - /* [ operation : @sender address ] */ ; + /* [ operation : address ] */ ; NIL operation - /* [ list operation : operation : @sender address ] */ ; + /* [ list operation : operation : address ] */ ; SWAP - /* [ operation : list operation : @sender address ] */ ; + /* [ operation : list operation : address ] */ ; CONS - /* [ list operation : @sender address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @sender) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out index 5cd6196905fd..421679abb6e9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out @@ -5,12 +5,12 @@ Gas remaining: 1039995.476 units remaining { parameter (option key_hash) ; storage unit ; code { UNPAIR - /* [ @parameter option key_hash : @storage unit ] */ ; + /* [ option key_hash : unit ] */ ; SET_DELEGATE - /* [ operation : @storage unit ] */ ; - DIP { NIL operation /* [ list operation : @storage unit ] */ } - /* [ operation : list operation : @storage unit ] */ ; + /* [ operation : unit ] */ ; + DIP { NIL operation /* [ list operation : unit ] */ } + /* [ operation : list operation : unit ] */ ; CONS - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out index c23de89b0cbc..06ee5f76c931 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.880 units remaining { parameter (set string) ; storage (set string) ; code { CAR - /* [ @parameter set string ] */ ; + /* [ set string ] */ ; NIL operation - /* [ list operation : @parameter set string ] */ ; + /* [ list operation : set string ] */ ; PAIR - /* [ pair (list operation) (set @parameter string) ] */ } } + /* [ pair (list operation) (set string) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out index 557343e23292..7be78c7ad6f1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039994.793 units remaining { parameter (set int) ; storage int ; code { CAR - /* [ @parameter set int ] */ ; + /* [ set int ] */ ; PUSH int 0 - /* [ int : @parameter set int ] */ ; + /* [ int : set int ] */ ; SWAP - /* [ @parameter set int : int ] */ ; + /* [ set int : int ] */ ; ITER { ADD /* [ int ] */ } /* [ int ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out index 9915de41f35a..f218d06ece12 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out @@ -12,11 +12,11 @@ Gas remaining: 1039988.400 units remaining : pair (string @parameter) (pair @storage (set string) (option bool)) : pair (string @parameter) (pair @storage (set string) (option bool)) ] */ ; CAR - /* [ @parameter string + /* [ string : pair (string @parameter) (pair @storage (set string) (option bool)) : pair (string @parameter) (pair @storage (set string) (option bool)) ] */ ; DIP { CDAR } - /* [ @parameter string : set string + /* [ string : set string : pair (string @parameter) (pair @storage (set string) (option bool)) ] */ ; MEM /* [ bool diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out index 56486e319ec7..da56a47991e0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.720 units remaining { parameter (set int) ; storage nat ; code { CAR - /* [ @parameter set int ] */ ; + /* [ set int ] */ ; SIZE /* [ nat ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out index 3712c9fcfa23..6cc41f18a4f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.037 units remaining { storage (option bytes) ; parameter bytes ; code { CAR - /* [ @parameter bytes ] */ ; + /* [ bytes ] */ ; SHA3 /* [ bytes ] */ ; SOME diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out index 017c8d622ef7..07199a261f82 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039993.299 units remaining { parameter (or (pair nat nat) (pair nat nat)) ; storage (option nat) ; code { CAR - /* [ @parameter or (pair nat nat) (pair nat nat) ] */ ; + /* [ or (pair nat nat) (pair nat nat) ] */ ; IF_LEFT { UNPAIR /* [ nat : nat ] */ ; LSL /* [ nat ] */ } { UNPAIR /* [ nat : nat ] */ ; LSR /* [ nat ] */ } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out index 91998251bacc..9852bd98dc1c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out @@ -5,16 +5,16 @@ Gas remaining: 1039992.627 units remaining { parameter (pair nat nat) ; storage (option string) ; code { UNPAIR - /* [ @parameter pair nat nat : @storage option string ] */ ; + /* [ pair nat nat : option string ] */ ; SWAP - /* [ @storage option string : @parameter pair nat nat ] */ ; + /* [ option string : pair nat nat ] */ ; IF_SOME { SWAP - /* [ @parameter pair nat nat : @storage.some string ] */ ; + /* [ pair nat nat : string ] */ ; UNPAIR - /* [ nat : nat : @storage.some string ] */ ; + /* [ nat : nat : string ] */ ; SLICE - /* [ @storage.some.slice option string ] */ } + /* [ option string ] */ } { DROP /* [] */ ; NONE string /* [ option string ] */ } ; NIL operation /* [ list operation : option string ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out index 3a99320e8ad0..acfe24dfaba6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out @@ -5,16 +5,16 @@ Gas remaining: 1039992.627 units remaining { parameter (pair nat nat) ; storage (option bytes) ; code { UNPAIR - /* [ @parameter pair nat nat : @storage option bytes ] */ ; + /* [ pair nat nat : option bytes ] */ ; SWAP - /* [ @storage option bytes : @parameter pair nat nat ] */ ; + /* [ option bytes : pair nat nat ] */ ; IF_SOME { SWAP - /* [ @parameter pair nat nat : @storage.some bytes ] */ ; + /* [ pair nat nat : bytes ] */ ; UNPAIR - /* [ nat : nat : @storage.some bytes ] */ ; + /* [ nat : nat : bytes ] */ ; SLICE - /* [ @storage.some.slice option bytes ] */ } + /* [ option bytes ] */ } { DROP /* [] */ ; NONE bytes /* [ option bytes ] */ } ; NIL operation /* [ list operation : option bytes ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out index f3a7054373dc..e09315842bb7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out @@ -23,19 +23,16 @@ Gas remaining: 1039935.257 units remaining /* [ option nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; IF_SOME - { /* [ @some nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ } + { /* [ nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ } { FAIL } ; PUSH nat 128 - /* [ nat : @some nat : bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ nat : nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; SLICE @payload - /* [ @payload option bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ option bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_SOME ; DUP - /* [ @payload.some bytes : @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; DIP { DIP { DUP /* [ pair (pair @parameter bytes signature) (key @storage) : pair (pair @parameter bytes signature) (key @storage) ] */ ; @@ -47,20 +44,15 @@ Gas remaining: 1039935.257 units remaining 0 /* [ nat : nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; SLICE - /* [ @slice option bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ option bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_SOME } - /* [ @payload.some bytes : @slice.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; SHA256 - /* [ bytes : @slice.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_CMPEQ } - /* [ @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; DUP - /* [ @payload.some bytes : @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; DIP { DIP { DUP /* [ pair (pair @parameter bytes signature) (key @storage) : pair (pair @parameter bytes signature) (key @storage) ] */ ; @@ -72,20 +64,15 @@ Gas remaining: 1039935.257 units remaining 32 /* [ nat : nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; SLICE - /* [ @slice option bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ option bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_SOME } - /* [ @payload.some bytes : @slice.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; BLAKE2B - /* [ bytes : @slice.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_CMPEQ } - /* [ @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; DUP - /* [ @payload.some bytes : @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; DIP { DIP { DUP /* [ pair (pair @parameter bytes signature) (key @storage) : pair (pair @parameter bytes signature) (key @storage) ] */ ; @@ -97,60 +84,54 @@ Gas remaining: 1039935.257 units remaining 64 /* [ nat : nat : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; SLICE - /* [ @slice option bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ option bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_SOME } - /* [ @payload.some bytes : @slice.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; SHA512 - /* [ bytes : @slice.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT_CMPEQ } - /* [ @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; DIP { DUP /* [ pair (pair @parameter bytes signature) (key @storage) : pair (pair @parameter bytes signature) (key @storage) ] */ ; CDR - /* [ @storage key : pair (pair @parameter bytes signature) (key @storage) ] */ ; + /* [ key : pair (pair @parameter bytes signature) (key @storage) ] */ ; DIP { DUP /* [ pair (pair @parameter bytes signature) (key @storage) : pair (pair @parameter bytes signature) (key @storage) ] */ ; CADR } - /* [ @storage key : signature - : pair (pair @parameter bytes signature) (key @storage) ] */ } - /* [ @payload.some bytes : @storage key : signature + /* [ key : signature : pair (pair @parameter bytes signature) (key @storage) ] */ } + /* [ bytes : key : signature : pair (pair @parameter bytes signature) (key @storage) ] */ ; SWAP - /* [ @storage key : @payload.some bytes : signature + /* [ key : bytes : signature : pair (pair @parameter bytes signature) (key @storage) ] */ ; DIP { SWAP - /* [ signature : @payload.some bytes - : pair (pair @parameter bytes signature) (key @storage) ] */ } - /* [ @storage key : signature : @payload.some bytes + /* [ signature : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ } + /* [ key : signature : bytes : pair (pair @parameter bytes signature) (key @storage) ] */ ; CHECK_SIGNATURE /* [ bool : pair (pair @parameter bytes signature) (key @storage) ] */ ; ASSERT ; CDR - /* [ @storage key ] */ ; + /* [ key ] */ ; DUP - /* [ @storage key : @storage key ] */ ; + /* [ key : key ] */ ; HASH_KEY - /* [ key_hash : @storage key ] */ ; + /* [ key_hash : key ] */ ; IMPLICIT_ACCOUNT - /* [ contract unit : @storage key ] */ ; + /* [ contract unit : key ] */ ; BALANCE - /* [ @balance mutez : contract unit : @storage key ] */ ; + /* [ mutez : contract unit : key ] */ ; UNIT - /* [ unit : @balance mutez : contract unit : @storage key ] */ ; + /* [ unit : mutez : contract unit : key ] */ ; TRANSFER_TOKENS - /* [ operation : @storage key ] */ ; + /* [ operation : key ] */ ; NIL operation - /* [ list operation : operation : @storage key ] */ ; + /* [ list operation : operation : key ] */ ; SWAP - /* [ operation : list operation : @storage key ] */ ; + /* [ operation : list operation : key ] */ ; CONS - /* [ list operation : @storage key ] */ ; + /* [ list operation : key ] */ ; PAIR - /* [ pair (list operation) (key @storage) ] */ } } + /* [ pair (list operation) key ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out index 2dda854b966b..5988f8799723 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.803 units remaining code { DROP /* [] */ ; SOURCE - /* [ @source address ] */ ; + /* [ address ] */ ; NIL operation - /* [ list operation : @source address ] */ ; + /* [ list operation : address ] */ ; PAIR - /* [ pair (list operation) (address @source) ] */ } } + /* [ pair (list operation) address ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out index 996fc728d9a6..046f01cc6310 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out @@ -5,59 +5,58 @@ Gas remaining: 1039970.057 units remaining { parameter bytes ; storage (list bytes) ; code { UNPAIR - /* [ @parameter bytes : @storage list bytes ] */ ; + /* [ bytes : list bytes ] */ ; DIP { NIL bytes - /* [ list bytes : @storage list bytes ] */ ; + /* [ list bytes : list bytes ] */ ; SWAP - /* [ @storage list bytes : list bytes ] */ ; + /* [ list bytes : list bytes ] */ ; ITER { CONS /* [ list bytes ] */ } /* [ list bytes ] */ } - /* [ @parameter bytes : list bytes ] */ ; + /* [ bytes : list bytes ] */ ; DUP - /* [ @parameter bytes : @parameter bytes : list bytes ] */ ; + /* [ bytes : bytes : list bytes ] */ ; SIZE - /* [ nat : @parameter bytes : list bytes ] */ ; + /* [ nat : bytes : list bytes ] */ ; PUSH nat 0 - /* [ nat : nat : @parameter bytes : list bytes ] */ ; + /* [ nat : nat : bytes : list bytes ] */ ; CMPNEQ ; - DIP { PUSH @index nat 0 /* [ @index nat : @parameter bytes : list bytes ] */ } - /* [ bool : @index nat : @parameter bytes : list bytes ] */ ; + DIP { PUSH @index nat 0 /* [ nat : bytes : list bytes ] */ } + /* [ bool : nat : bytes : list bytes ] */ ; LOOP { PAIR - /* [ pair (nat @index) (bytes @parameter) : list bytes ] */ ; + /* [ pair nat bytes : list bytes ] */ ; DUP - /* [ pair (nat @index) (bytes @parameter) : pair (nat @index) (bytes @parameter) - : list bytes ] */ ; + /* [ pair nat bytes : pair nat bytes : list bytes ] */ ; DIP { UNPAIR - /* [ @index nat : @parameter bytes : list bytes ] */ ; - DIP { PUSH nat 1 /* [ nat : @parameter bytes : list bytes ] */ } - /* [ @index nat : nat : @parameter bytes : list bytes ] */ ; + /* [ nat : bytes : list bytes ] */ ; + DIP { PUSH nat 1 /* [ nat : bytes : list bytes ] */ } + /* [ nat : nat : bytes : list bytes ] */ ; SLICE - /* [ @parameter.slice option bytes : list bytes ] */ ; + /* [ option bytes : list bytes ] */ ; ASSERT_SOME ; CONS @storage - /* [ @storage list bytes ] */ } - /* [ pair (nat @index) (bytes @parameter) : @storage list bytes ] */ ; + /* [ list bytes ] */ } + /* [ pair nat bytes : list bytes ] */ ; UNPAIR - /* [ @index nat : @parameter bytes : @storage list bytes ] */ ; + /* [ nat : bytes : list bytes ] */ ; PUSH nat 1 - /* [ nat : @index nat : @parameter bytes : @storage list bytes ] */ ; + /* [ nat : nat : bytes : list bytes ] */ ; ADD @index - /* [ @index nat : @parameter bytes : @storage list bytes ] */ ; + /* [ nat : bytes : list bytes ] */ ; DUP - /* [ @index nat : @index nat : @parameter bytes : @storage list bytes ] */ ; - DIP { DIP { DUP /* [ @parameter bytes : @parameter bytes : @storage list bytes ] */ } - /* [ @index nat : @parameter bytes : @parameter bytes : @storage list bytes ] */ ; + /* [ nat : nat : bytes : list bytes ] */ ; + DIP { DIP { DUP /* [ bytes : bytes : list bytes ] */ } + /* [ nat : bytes : bytes : list bytes ] */ ; SWAP - /* [ @parameter bytes : @index nat : @parameter bytes : @storage list bytes ] */ ; + /* [ bytes : nat : bytes : list bytes ] */ ; SIZE - /* [ nat : @index nat : @parameter bytes : @storage list bytes ] */ ; + /* [ nat : nat : bytes : list bytes ] */ ; CMPNEQ } - /* [ @index nat : bool : @parameter bytes : @storage list bytes ] */ ; + /* [ nat : bool : bytes : list bytes ] */ ; SWAP - /* [ bool : @index nat : @parameter bytes : @storage list bytes ] */ } - /* [ @index nat : @parameter bytes : list bytes ] */ ; + /* [ bool : nat : bytes : list bytes ] */ } + /* [ nat : bytes : list bytes ] */ ; DROP - /* [ @parameter bytes : list bytes ] */ ; + /* [ bytes : list bytes ] */ ; DROP /* [ list bytes ] */ ; NIL bytes diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out index 299964b064d4..fe0abf63c8a3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out @@ -5,59 +5,58 @@ Gas remaining: 1039970.057 units remaining { parameter string ; storage (list string) ; code { UNPAIR - /* [ @parameter string : @storage list string ] */ ; + /* [ string : list string ] */ ; DIP { NIL string - /* [ list string : @storage list string ] */ ; + /* [ list string : list string ] */ ; SWAP - /* [ @storage list string : list string ] */ ; + /* [ list string : list string ] */ ; ITER { CONS /* [ list string ] */ } /* [ list string ] */ } - /* [ @parameter string : list string ] */ ; + /* [ string : list string ] */ ; DUP - /* [ @parameter string : @parameter string : list string ] */ ; + /* [ string : string : list string ] */ ; SIZE - /* [ nat : @parameter string : list string ] */ ; + /* [ nat : string : list string ] */ ; PUSH nat 0 - /* [ nat : nat : @parameter string : list string ] */ ; + /* [ nat : nat : string : list string ] */ ; CMPNEQ ; - DIP { PUSH @index nat 0 /* [ @index nat : @parameter string : list string ] */ } - /* [ bool : @index nat : @parameter string : list string ] */ ; + DIP { PUSH @index nat 0 /* [ nat : string : list string ] */ } + /* [ bool : nat : string : list string ] */ ; LOOP { PAIR - /* [ pair (nat @index) (string @parameter) : list string ] */ ; + /* [ pair nat string : list string ] */ ; DUP - /* [ pair (nat @index) (string @parameter) - : pair (nat @index) (string @parameter) : list string ] */ ; + /* [ pair nat string : pair nat string : list string ] */ ; DIP { UNPAIR - /* [ @index nat : @parameter string : list string ] */ ; - DIP { PUSH nat 1 /* [ nat : @parameter string : list string ] */ } - /* [ @index nat : nat : @parameter string : list string ] */ ; + /* [ nat : string : list string ] */ ; + DIP { PUSH nat 1 /* [ nat : string : list string ] */ } + /* [ nat : nat : string : list string ] */ ; SLICE - /* [ @parameter.slice option string : list string ] */ ; + /* [ option string : list string ] */ ; ASSERT_SOME ; CONS @storage - /* [ @storage list string ] */ } - /* [ pair (nat @index) (string @parameter) : @storage list string ] */ ; + /* [ list string ] */ } + /* [ pair nat string : list string ] */ ; UNPAIR - /* [ @index nat : @parameter string : @storage list string ] */ ; + /* [ nat : string : list string ] */ ; PUSH nat 1 - /* [ nat : @index nat : @parameter string : @storage list string ] */ ; + /* [ nat : nat : string : list string ] */ ; ADD @index - /* [ @index nat : @parameter string : @storage list string ] */ ; + /* [ nat : string : list string ] */ ; DUP - /* [ @index nat : @index nat : @parameter string : @storage list string ] */ ; - DIP { DIP { DUP /* [ @parameter string : @parameter string : @storage list string ] */ } - /* [ @index nat : @parameter string : @parameter string : @storage list string ] */ ; + /* [ nat : nat : string : list string ] */ ; + DIP { DIP { DUP /* [ string : string : list string ] */ } + /* [ nat : string : string : list string ] */ ; SWAP - /* [ @parameter string : @index nat : @parameter string : @storage list string ] */ ; + /* [ string : nat : string : list string ] */ ; SIZE - /* [ nat : @index nat : @parameter string : @storage list string ] */ ; + /* [ nat : nat : string : list string ] */ ; CMPNEQ } - /* [ @index nat : bool : @parameter string : @storage list string ] */ ; + /* [ nat : bool : string : list string ] */ ; SWAP - /* [ bool : @index nat : @parameter string : @storage list string ] */ } - /* [ @index nat : @parameter string : list string ] */ ; + /* [ bool : nat : string : list string ] */ } + /* [ nat : string : list string ] */ ; DROP - /* [ @parameter string : list string ] */ ; + /* [ string : list string ] */ ; DROP /* [ list string ] */ ; NIL string diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out index e35be568dc5c..0ce379704283 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.500 units remaining { parameter bls12_381_fr ; storage (option bls12_381_fr) ; code { CAR - /* [ @parameter bls12_381_fr ] */ ; + /* [ bls12_381_fr ] */ ; SOME /* [ option bls12_381_fr ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out index 6099a85699f1..221602a62b81 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.500 units remaining { parameter bls12_381_g1 ; storage (option bls12_381_g1) ; code { CAR - /* [ @parameter bls12_381_g1 ] */ ; + /* [ bls12_381_g1 ] */ ; SOME /* [ option bls12_381_g1 ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out index b5e37ea7239b..5296f8c2d283 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.500 units remaining { parameter bls12_381_g2 ; storage (option bls12_381_g2) ; code { CAR - /* [ @parameter bls12_381_g2 ] */ ; + /* [ bls12_381_g2 ] */ ; SOME /* [ option bls12_381_g2 ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out index 7fdb4c654e87..63ada8111cee 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039997.267 units remaining { parameter string ; storage string ; code { CAR - /* [ @parameter string ] */ ; + /* [ string ] */ ; NIL operation - /* [ list operation : @parameter string ] */ ; + /* [ list operation : string ] */ ; PAIR - /* [ pair (list operation) (string @parameter) ] */ } } + /* [ pair (list operation) string ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out index 30ac26404478..84a7ccf3899e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.803 units remaining code { DROP /* [] */ ; NOW - /* [ @now timestamp ] */ ; + /* [ timestamp ] */ ; NIL operation - /* [ list operation : @now timestamp ] */ ; + /* [ list operation : timestamp ] */ ; PAIR - /* [ pair (list operation) (timestamp @now) ] */ } } + /* [ pair (list operation) timestamp ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out index 5075f31f218c..ebe457e16a8e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.500 units remaining { parameter string ; storage (option string) ; code { CAR - /* [ @parameter string ] */ ; + /* [ string ] */ ; SOME /* [ option string ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out index 87b04ad96ca2..1e2fc89bc90b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039994.373 units remaining { parameter (pair timestamp int) ; storage timestamp ; code { CAR - /* [ @parameter pair timestamp int ] */ ; + /* [ pair timestamp int ] */ ; DUP - /* [ @parameter pair timestamp int : @parameter pair timestamp int ] */ ; + /* [ pair timestamp int : pair timestamp int ] */ ; CAR - /* [ timestamp : @parameter pair timestamp int ] */ ; + /* [ timestamp : pair timestamp int ] */ ; DIP { CDR /* [ int ] */ } /* [ timestamp : int ] */ ; SUB diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out index c79680066486..79400d7b938f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out @@ -5,12 +5,11 @@ Gas remaining: 1039984.961 units remaining { parameter (pair (set string) (set string)) ; storage bool ; code { CAR - /* [ @parameter pair (set string) (set string) ] */ ; + /* [ pair (set string) (set string) ] */ ; DUP - /* [ @parameter pair (set string) (set string) - : @parameter pair (set string) (set string) ] */ ; + /* [ pair (set string) (set string) : pair (set string) (set string) ] */ ; CDR - /* [ set string : @parameter pair (set string) (set string) ] */ ; + /* [ set string : pair (set string) (set string) ] */ ; DIP { CAR /* [ set string ] */ } /* [ set string : set string ] */ ; PUSH bool True @@ -30,7 +29,7 @@ Gas remaining: 1039984.961 units remaining DIP { CDR /* [ set string ] */ } /* [ bool : set string ] */ } /* [ set string : bool : set string ] */ } - /* [ @elt string : set string : bool : set string ] */ ; + /* [ string : set string : bool : set string ] */ ; MEM /* [ bool : bool : set string ] */ ; AND diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out index 9c4eb7ea1293..e00f14c16632 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out @@ -5,33 +5,32 @@ Gas remaining: 1039986.225 units remaining { parameter (pair mutez mutez) ; storage (option (pair mutez mutez)) ; code { CAR - /* [ @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez ] */ ; DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez - : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez : pair mutez mutez ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez : @parameter pair mutez mutez ] */ ; - DIP { CDR /* [ mutez : @parameter pair mutez mutez ] */ } - /* [ mutez : mutez : @parameter pair mutez mutez ] */ ; + /* [ mutez : pair mutez mutez : pair mutez mutez ] */ ; + DIP { CDR /* [ mutez : pair mutez mutez ] */ } + /* [ mutez : mutez : pair mutez mutez ] */ ; ADD - /* [ mutez : @parameter pair mutez mutez ] */ ; + /* [ mutez : pair mutez mutez ] */ ; DIP { DUP - /* [ @parameter pair mutez mutez : @parameter pair mutez mutez ] */ ; + /* [ pair mutez mutez : pair mutez mutez ] */ ; CAR - /* [ mutez : @parameter pair mutez mutez ] */ ; + /* [ mutez : pair mutez mutez ] */ ; DIP { CDR /* [ mutez ] */ } /* [ mutez : mutez ] */ ; SUB_MUTEZ /* [ option mutez ] */ ; ASSERT_SOME } - /* [ mutez : @some mutez ] */ ; + /* [ mutez : mutez ] */ ; PAIR - /* [ pair mutez (mutez @some) ] */ ; + /* [ pair mutez mutez ] */ ; SOME - /* [ option (pair mutez (mutez @some)) ] */ ; + /* [ option (pair mutez mutez) ] */ ; NIL operation - /* [ list operation : option (pair mutez (mutez @some)) ] */ ; + /* [ list operation : option (pair mutez mutez) ] */ ; PAIR - /* [ pair (list operation) (option (pair mutez (mutez @some))) ] */ } } + /* [ pair (list operation) (option (pair mutez mutez)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out index 9688ae1d5f68..dfadec2cbd6b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.963 units remaining { parameter unit ; storage (ticket nat) ; code { CDR - /* [ @storage ticket nat ] */ ; + /* [ ticket nat ] */ ; NIL operation - /* [ list operation : @storage ticket nat ] */ ; + /* [ list operation : ticket nat ] */ ; PAIR - /* [ pair (list operation) (ticket @storage nat) ] */ } } + /* [ pair (list operation) (ticket nat) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out index 555a5cfec705..95a2d194dafc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out @@ -5,20 +5,20 @@ Gas remaining: 1039992.430 units remaining { parameter nat ; storage (big_map unit (ticket nat)) ; code { UNPAIR - /* [ @parameter nat : @storage big_map unit (ticket nat) ] */ ; + /* [ nat : big_map unit (ticket nat) ] */ ; PUSH nat 1 - /* [ nat : @parameter nat : @storage big_map unit (ticket nat) ] */ ; + /* [ nat : nat : big_map unit (ticket nat) ] */ ; SWAP - /* [ @parameter nat : nat : @storage big_map unit (ticket nat) ] */ ; + /* [ nat : nat : big_map unit (ticket nat) ] */ ; TICKET - /* [ ticket nat : @storage big_map unit (ticket nat) ] */ ; + /* [ ticket nat : big_map unit (ticket nat) ] */ ; SOME - /* [ option (ticket nat) : @storage big_map unit (ticket nat) ] */ ; + /* [ option (ticket nat) : big_map unit (ticket nat) ] */ ; UNIT - /* [ unit : option (ticket nat) : @storage big_map unit (ticket nat) ] */ ; + /* [ unit : option (ticket nat) : big_map unit (ticket nat) ] */ ; UPDATE - /* [ @storage big_map unit (ticket nat) ] */ ; + /* [ big_map unit (ticket nat) ] */ ; NIL operation - /* [ list operation : @storage big_map unit (ticket nat) ] */ ; + /* [ list operation : big_map unit (ticket nat) ] */ ; PAIR - /* [ pair (list operation) (big_map @storage unit (ticket nat)) ] */ } } + /* [ pair (list operation) (big_map unit (ticket nat)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out index e2c08374c716..83c9b6aaad5c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039990.843 units remaining { parameter (ticket nat) ; storage (option (ticket nat)) ; code { UNPAIR - /* [ @parameter ticket nat : @storage option (ticket nat) ] */ ; + /* [ ticket nat : option (ticket nat) ] */ ; SWAP - /* [ @storage option (ticket nat) : @parameter ticket nat ] */ ; + /* [ option (ticket nat) : ticket nat ] */ ; IF_NONE - { /* [ @parameter ticket nat ] */ } + { /* [ ticket nat ] */ } { PAIR - /* [ pair (ticket @storage.some nat) (ticket @parameter nat) ] */ ; + /* [ pair (ticket nat) (ticket nat) ] */ ; JOIN_TICKETS /* [ option (ticket nat) ] */ ; ASSERT_SOME } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out index 1eec23d26817..9b518b2320ac 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out @@ -5,9 +5,9 @@ Gas remaining: 1039984.150 units remaining { parameter (ticket nat) ; storage address ; code { CAR - /* [ @parameter ticket nat ] */ ; + /* [ ticket nat ] */ ; READ_TICKET - /* [ pair address nat nat : @parameter ticket nat ] */ ; + /* [ pair address nat nat : ticket nat ] */ ; DIP { DROP /* [] */ } /* [ pair address nat nat ] */ ; UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out index 345768898ca1..c5b65922c7be 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039978.358 units remaining { parameter (ticket nat) ; storage unit ; code { CAR - /* [ @parameter ticket nat ] */ ; + /* [ ticket nat ] */ ; PUSH (pair nat nat) (Pair 1 2) - /* [ pair nat nat : @parameter ticket nat ] */ ; + /* [ pair nat nat : ticket nat ] */ ; SWAP - /* [ @parameter ticket nat : pair nat nat ] */ ; + /* [ ticket nat : pair nat nat ] */ ; SPLIT_TICKET /* [ option (pair (ticket nat) (ticket nat)) ] */ ; ASSERT_SOME ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out index 61e625230df9..f9409f9c0882 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out @@ -5,8 +5,8 @@ Gas remaining: 1039996.494 units remaining { parameter (option (ticket nat)) ; storage (option (ticket nat)) ; code { CAR - /* [ @parameter option (ticket nat) ] */ ; + /* [ option (ticket nat) ] */ ; NIL operation - /* [ list operation : @parameter option (ticket nat) ] */ ; + /* [ list operation : option (ticket nat) ] */ ; PAIR - /* [ pair (list operation) (option @parameter (ticket nat)) ] */ } } + /* [ pair (list operation) (option (ticket nat)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out index 81153b033c31..2d268f8eee43 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039996.114 units remaining { parameter (ticket nat) ; storage (option (ticket nat)) ; code { CAR - /* [ @parameter ticket nat ] */ ; + /* [ ticket nat ] */ ; SOME /* [ option (ticket nat) ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out index f053bec748bf..37bdafc1c8f1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out @@ -5,20 +5,20 @@ Gas remaining: 1039987.194 units remaining { parameter (pair (pair address nat) nat) ; storage unit ; code { CAR - /* [ @parameter pair (pair address nat) nat ] */ ; + /* [ pair (pair address nat) nat ] */ ; UNPAIR /* [ pair address nat : nat ] */ ; UNPAIR /* [ address : nat : nat ] */ ; CONTRACT (ticket nat) - /* [ @contract option (contract (ticket nat)) : nat : nat ] */ ; + /* [ option (contract (ticket nat)) : nat : nat ] */ ; ASSERT_SOME ; DIP { TICKET /* [ ticket nat ] */ } - /* [ @contract.some contract (ticket nat) : ticket nat ] */ ; + /* [ contract (ticket nat) : ticket nat ] */ ; SWAP - /* [ ticket nat : @contract.some contract (ticket nat) ] */ ; - DIP { PUSH mutez 0 /* [ mutez : @contract.some contract (ticket nat) ] */ } - /* [ ticket nat : mutez : @contract.some contract (ticket nat) ] */ ; + /* [ ticket nat : contract (ticket nat) ] */ ; + DIP { PUSH mutez 0 /* [ mutez : contract (ticket nat) ] */ } + /* [ ticket nat : mutez : contract (ticket nat) ] */ ; TRANSFER_TOKENS /* [ operation ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out index 95d2978631e9..3e14e5a603ec 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out @@ -5,33 +5,30 @@ Gas remaining: 1039987.710 units remaining { parameter address ; storage nat ; code { UNPAIR - /* [ @parameter address : @storage nat ] */ ; - DIP { DUP /* [ @storage nat : @storage nat ] */ } - /* [ @parameter address : @storage nat : @storage nat ] */ ; + /* [ address : nat ] */ ; + DIP { DUP /* [ nat : nat ] */ } + /* [ address : nat : nat ] */ ; SWAP - /* [ @storage nat : @parameter address : @storage nat ] */ ; + /* [ nat : address : nat ] */ ; PUSH nat 1 - /* [ nat : @storage nat : @parameter address : @storage nat ] */ ; + /* [ nat : nat : address : nat ] */ ; SWAP - /* [ @storage nat : nat : @parameter address : @storage nat ] */ ; + /* [ nat : nat : address : nat ] */ ; TICKET - /* [ ticket nat : @parameter address : @storage nat ] */ ; - DIP { CONTRACT - (ticket nat) - /* [ @parameter.contract option (contract (ticket nat)) : @storage nat ] */ ; + /* [ ticket nat : address : nat ] */ ; + DIP { CONTRACT (ticket nat) + /* [ option (contract (ticket nat)) : nat ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @parameter.contract.some contract (ticket nat) : @storage nat ] */ } - /* [ ticket nat : mutez : @parameter.contract.some contract (ticket nat) - : @storage nat ] */ ; + PUSH mutez 0 + /* [ mutez : contract (ticket nat) : nat ] */ } + /* [ ticket nat : mutez : contract (ticket nat) : nat ] */ ; TRANSFER_TOKENS - /* [ operation : @storage nat ] */ ; + /* [ operation : nat ] */ ; NIL operation - /* [ list operation : operation : @storage nat ] */ ; + /* [ list operation : operation : nat ] */ ; SWAP - /* [ operation : list operation : @storage nat ] */ ; + /* [ operation : list operation : nat ] */ ; CONS - /* [ list operation : @storage nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @storage) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out index 9514fc033cd4..bb136dfd5911 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out @@ -7,8 +7,8 @@ Gas remaining: 1039996.803 units remaining code { DROP /* [] */ ; AMOUNT - /* [ @amount mutez ] */ ; + /* [ mutez ] */ ; NIL operation - /* [ list operation : @amount mutez ] */ ; + /* [ list operation : mutez ] */ ; PAIR - /* [ pair (list operation) (mutez @amount) ] */ } } + /* [ pair (list operation) mutez ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out index 4b684753933b..9d58fef3a5b6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039993.170 units remaining { parameter (contract unit) ; storage unit ; code { CAR - /* [ @parameter contract unit ] */ ; + /* [ contract unit ] */ ; DIP { UNIT /* [ unit ] */ } - /* [ @parameter contract unit : unit ] */ ; + /* [ contract unit : unit ] */ ; PUSH mutez 100000000 - /* [ mutez : @parameter contract unit : unit ] */ ; + /* [ mutez : contract unit : unit ] */ ; UNIT - /* [ unit : mutez : @parameter contract unit : unit ] */ ; + /* [ unit : mutez : contract unit : unit ] */ ; TRANSFER_TOKENS /* [ operation : unit ] */ ; NIL operation diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out index 6310ddbbee2c..a2184775c101 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039992.541 units remaining { parameter (pair nat nat nat) ; storage nat ; code { CAR - /* [ @parameter pair nat nat nat ] */ ; + /* [ pair nat nat nat ] */ ; UNPAIR 3 /* [ nat : nat : nat ] */ ; PUSH nat 100 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out index 29499a9bcee2..bfbac44cce76 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out @@ -6,7 +6,7 @@ Gas remaining: 1039991.231 units remaining parameter (map string (option string)) ; code { UNPAPAIR ; ITER { UNPAIR - /* [ @key string : @elt option string : big_map string string : unit ] */ ; + /* [ string : option string : big_map string string : unit ] */ ; UPDATE /* [ big_map string string : unit ] */ } /* [ big_map string string : unit ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out index 3e997b177154..963772716386 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039984.190 units remaining { parameter (pair (ticket nat) nat) ; storage address ; code { CAR - /* [ @parameter pair (ticket nat) nat ] */ ; + /* [ pair (ticket nat) nat ] */ ; UNPAIR /* [ ticket nat : nat ] */ ; READ_TICKET diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out index 0155a98ca519..3675169d674b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out @@ -5,105 +5,88 @@ Gas remaining: 1039966.683 units remaining { parameter (pair address address) ; storage nat ; code { UNPAIR - /* [ @parameter pair address address : @storage nat ] */ ; - DIP { DUP /* [ @storage nat : @storage nat ] */ } - /* [ @parameter pair address address : @storage nat : @storage nat ] */ ; + /* [ pair address address : nat ] */ ; + DIP { DUP /* [ nat : nat ] */ } + /* [ pair address address : nat : nat ] */ ; SWAP - /* [ @storage nat : @parameter pair address address : @storage nat ] */ ; - PUSH nat - 5 - /* [ nat : @storage nat : @parameter pair address address : @storage nat ] */ ; + /* [ nat : pair address address : nat ] */ ; + PUSH nat 5 + /* [ nat : nat : pair address address : nat ] */ ; SWAP - /* [ @storage nat : nat : @parameter pair address address : @storage nat ] */ ; + /* [ nat : nat : pair address address : nat ] */ ; TICKET - /* [ ticket nat : @parameter pair address address : @storage nat ] */ ; - PUSH nat - 2 - /* [ nat : ticket nat : @parameter pair address address : @storage nat ] */ ; - PUSH nat - 3 - /* [ nat : nat : ticket nat : @parameter pair address address : @storage nat ] */ ; + /* [ ticket nat : pair address address : nat ] */ ; + PUSH nat 2 + /* [ nat : ticket nat : pair address address : nat ] */ ; + PUSH nat 3 + /* [ nat : nat : ticket nat : pair address address : nat ] */ ; PAIR - /* [ pair nat nat : ticket nat : @parameter pair address address - : @storage nat ] */ ; + /* [ pair nat nat : ticket nat : pair address address : nat ] */ ; SWAP - /* [ ticket nat : pair nat nat : @parameter pair address address - : @storage nat ] */ ; + /* [ ticket nat : pair nat nat : pair address address : nat ] */ ; SPLIT_TICKET - /* [ option (pair (ticket nat) (ticket nat)) : @parameter pair address address - : @storage nat ] */ ; + /* [ option (pair (ticket nat) (ticket nat)) : pair address address : nat ] */ ; ASSERT_SOME ; UNPAIR - /* [ ticket nat : ticket nat : @parameter pair address address : @storage nat ] */ ; + /* [ ticket nat : ticket nat : pair address address : nat ] */ ; DIP { DIP { DUP - /* [ @parameter pair address address : @parameter pair address address - : @storage nat ] */ ; + /* [ pair address address : pair address address : nat ] */ ; CAR - /* [ address : @parameter pair address address : @storage nat ] */ ; + /* [ address : pair address address : nat ] */ ; CONTRACT (pair (ticket nat) nat) - /* [ @contract option (contract (pair (ticket nat) nat)) - : @parameter pair address address : @storage nat ] */ ; + /* [ option (contract (pair (ticket nat) nat)) : pair address address : nat ] */ ; ASSERT_SOME ; PUSH mutez 0 - /* [ mutez : @contract.some contract (pair (ticket nat) nat) - : @parameter pair address address : @storage nat ] */ } - /* [ ticket nat : mutez : @contract.some contract (pair (ticket nat) nat) - : @parameter pair address address : @storage nat ] */ ; + /* [ mutez : contract (pair (ticket nat) nat) : pair address address : nat ] */ } + /* [ ticket nat : mutez : contract (pair (ticket nat) nat) + : pair address address : nat ] */ ; PUSH nat 2 - /* [ nat : ticket nat : mutez : @contract.some contract (pair (ticket nat) nat) - : @parameter pair address address : @storage nat ] */ ; + /* [ nat : ticket nat : mutez : contract (pair (ticket nat) nat) + : pair address address : nat ] */ ; SWAP - /* [ ticket nat : nat : mutez : @contract.some contract (pair (ticket nat) nat) - : @parameter pair address address : @storage nat ] */ ; + /* [ ticket nat : nat : mutez : contract (pair (ticket nat) nat) + : pair address address : nat ] */ ; PAIR - /* [ pair (ticket nat) nat : mutez - : @contract.some contract (pair (ticket nat) nat) - : @parameter pair address address : @storage nat ] */ } + /* [ pair (ticket nat) nat : mutez : contract (pair (ticket nat) nat) + : pair address address : nat ] */ } /* [ ticket nat : pair (ticket nat) nat : mutez - : @contract.some contract (pair (ticket nat) nat) - : @parameter pair address address : @storage nat ] */ ; - DIP { TRANSFER_TOKENS - /* [ operation : @parameter pair address address : @storage nat ] */ } - /* [ ticket nat : operation : @parameter pair address address : @storage nat ] */ ; + : contract (pair (ticket nat) nat) : pair address address : nat ] */ ; + DIP { TRANSFER_TOKENS /* [ operation : pair address address : nat ] */ } + /* [ ticket nat : operation : pair address address : nat ] */ ; SWAP - /* [ operation : ticket nat : @parameter pair address address : @storage nat ] */ ; + /* [ operation : ticket nat : pair address address : nat ] */ ; DIP { DIP { CDR - /* [ address : @storage nat ] */ ; + /* [ address : nat ] */ ; CONTRACT (pair (ticket nat) nat) - /* [ @contract option (contract (pair (ticket nat) nat)) : @storage nat ] */ ; + /* [ option (contract (pair (ticket nat) nat)) : nat ] */ ; ASSERT_SOME ; - PUSH mutez - 0 - /* [ mutez : @contract.some contract (pair (ticket nat) nat) : @storage nat ] */ } - /* [ ticket nat : mutez : @contract.some contract (pair (ticket nat) nat) - : @storage nat ] */ ; + PUSH mutez 0 + /* [ mutez : contract (pair (ticket nat) nat) : nat ] */ } + /* [ ticket nat : mutez : contract (pair (ticket nat) nat) : nat ] */ ; PUSH nat 3 - /* [ nat : ticket nat : mutez : @contract.some contract (pair (ticket nat) nat) - : @storage nat ] */ ; + /* [ nat : ticket nat : mutez : contract (pair (ticket nat) nat) : nat ] */ ; SWAP - /* [ ticket nat : nat : mutez : @contract.some contract (pair (ticket nat) nat) - : @storage nat ] */ ; + /* [ ticket nat : nat : mutez : contract (pair (ticket nat) nat) : nat ] */ ; PAIR - /* [ pair (ticket nat) nat : mutez - : @contract.some contract (pair (ticket nat) nat) : @storage nat ] */ } + /* [ pair (ticket nat) nat : mutez : contract (pair (ticket nat) nat) : nat ] */ } /* [ operation : pair (ticket nat) nat : mutez - : @contract.some contract (pair (ticket nat) nat) : @storage nat ] */ ; - DIP { TRANSFER_TOKENS /* [ operation : @storage nat ] */ } - /* [ operation : operation : @storage nat ] */ ; + : contract (pair (ticket nat) nat) : nat ] */ ; + DIP { TRANSFER_TOKENS /* [ operation : nat ] */ } + /* [ operation : operation : nat ] */ ; NIL operation - /* [ list operation : operation : operation : @storage nat ] */ ; + /* [ list operation : operation : operation : nat ] */ ; SWAP - /* [ operation : list operation : operation : @storage nat ] */ ; + /* [ operation : list operation : operation : nat ] */ ; CONS - /* [ list operation : operation : @storage nat ] */ ; + /* [ list operation : operation : nat ] */ ; SWAP - /* [ operation : list operation : @storage nat ] */ ; + /* [ operation : list operation : nat ] */ ; CONS - /* [ list operation : @storage nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @storage) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out index 5d1080722e5b..590912e0ae72 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out @@ -5,14 +5,14 @@ Gas remaining: 1039993.990 units remaining { parameter (pair nat address) ; storage nat ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; UNPAIR /* [ nat : address ] */ ; VIEW "fib" nat - /* [ @contract option nat ] */ ; + /* [ option nat ] */ ; IF_SOME { NIL operation - /* [ list operation : @contract.some nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @contract.some) ] */ } + /* [ pair (list operation) nat ] */ } { FAIL } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out index d31506306346..f41d7a56e5de 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out @@ -5,18 +5,18 @@ Gas remaining: 1039992.695 units remaining { parameter (pair nat address) ; storage nat ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; DUP - /* [ @parameter pair nat address : @parameter pair nat address ] */ ; + /* [ pair nat address : pair nat address ] */ ; CDR - /* [ address : @parameter pair nat address ] */ ; + /* [ address : pair nat address ] */ ; SWAP - /* [ @parameter pair nat address : address ] */ ; + /* [ pair nat address : address ] */ ; VIEW "is_twenty" nat - /* [ @contract option nat ] */ ; + /* [ option nat ] */ ; IF_SOME { NIL operation - /* [ list operation : @contract.some nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @contract.some) ] */ } + /* [ pair (list operation) nat ] */ } { FAIL } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out index 11e1ddacc79d..bf4ddbc5db55 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039993.770 units remaining { parameter (pair nat address) ; storage nat ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; UNPAIR /* [ nat : address ] */ ; VIEW "add" nat - /* [ @contract option nat ] */ ; - IF_SOME { /* [ @contract.some nat ] */ } { FAIL } ; + /* [ option nat ] */ ; + IF_SOME { /* [ nat ] */ } { FAIL } ; NIL operation - /* [ list operation : @contract.some nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @contract.some) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out index 7d99627248c4..50989bad3caa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039993.750 units remaining { parameter (pair nat address) ; storage nat ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; UNPAIR /* [ nat : address ] */ ; VIEW "const" nat - /* [ @contract option nat ] */ ; - IF_SOME { /* [ @contract.some nat ] */ } { FAIL } ; + /* [ option nat ] */ ; + IF_SOME { /* [ nat ] */ } { FAIL } ; NIL operation - /* [ list operation : @contract.some nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @contract.some) ] */ } } + /* [ pair (list operation) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out index bb1d7a6f55ea..f63595e87513 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out @@ -5,13 +5,13 @@ Gas remaining: 1039992.989 units remaining { parameter (pair nat address) ; storage (pair nat nat) ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; UNPAIR /* [ nat : address ] */ ; VIEW "id" (pair nat nat) - /* [ @contract option (pair nat nat) ] */ ; - IF_SOME { /* [ @contract.some pair nat nat ] */ } { FAIL } ; + /* [ option (pair nat nat) ] */ ; + IF_SOME { /* [ pair nat nat ] */ } { FAIL } ; NIL operation - /* [ list operation : @contract.some pair nat nat ] */ ; + /* [ list operation : pair nat nat ] */ ; PAIR - /* [ pair (list operation) (pair @contract.some nat nat) ] */ } } + /* [ pair (list operation) nat nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out index 81ba4d8e08e9..644d5603f526 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out @@ -11,7 +11,7 @@ Gas remaining: 1039342.059 units remaining PUSH nat 0 /* [ nat : address ] */ ; VIEW "test" bool - /* [ @contract option bool ] */ ; + /* [ option bool ] */ ; IF_SOME { DROP /* [] */ ; PUSH bool True /* [ bool ] */ } { PUSH bool False /* [ bool ] */ } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out index b04fd5a68bbf..dabad0ace439 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039993.059 units remaining { parameter (pair nat address) ; storage bool ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; UNPAIR /* [ nat : address ] */ ; VIEW "not_exist" bool - /* [ @contract option bool ] */ ; + /* [ option bool ] */ ; IF_SOME { DROP /* [] */ ; PUSH bool True /* [ bool ] */ } { PUSH bool False /* [ bool ] */ } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out index 01516f516b0b..49344d4359a3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out @@ -5,15 +5,14 @@ Gas remaining: 1039992.390 units remaining { parameter address ; storage (option (pair (pair mutez mutez) (pair (pair address address) address))) ; code { CAR - /* [ @parameter address ] */ ; + /* [ address ] */ ; UNIT - /* [ unit : @parameter address ] */ ; + /* [ unit : address ] */ ; VIEW "step_constants" (pair (pair mutez mutez) (pair (pair address address) address)) - /* [ @parameter.contract option (pair (pair mutez mutez) (pair address address) address) ] */ ; + /* [ option (pair (pair mutez mutez) (pair address address) address) ] */ ; NIL operation /* [ list operation - : @parameter.contract option (pair (pair mutez mutez) (pair address address) address) ] */ ; + : option (pair (pair mutez mutez) (pair address address) address) ] */ ; PAIR - /* [ pair (list operation) - (option @parameter.contract (pair (pair mutez mutez) (pair address address) address)) ] */ } } + /* [ pair (list operation) (option (pair (pair mutez mutez) (pair address address) address)) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out index 54ee05b9ea05..b15e69394e47 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039993.119 units remaining { parameter (pair int address) ; storage nat ; code { CAR - /* [ @parameter pair int address ] */ ; + /* [ pair int address ] */ ; UNPAIR /* [ int : address ] */ ; VIEW "add" nat - /* [ @contract option nat ] */ ; + /* [ option nat ] */ ; IF_SOME { DROP /* [] */ ; PUSH nat 1 /* [ nat ] */ } { PUSH nat 0 /* [ nat ] */ } ; NIL operation /* [ list operation : nat ] */ ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out index 2446efd852c0..9ca270c4dd2a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039993.119 units remaining { parameter (pair nat address) ; storage bool ; code { CAR - /* [ @parameter pair nat address ] */ ; + /* [ pair nat address ] */ ; UNPAIR /* [ nat : address ] */ ; VIEW "add" bool - /* [ @contract option bool ] */ ; + /* [ option bool ] */ ; IF_SOME { DROP /* [] */ ; PUSH bool True /* [ bool ] */ } { PUSH bool False /* [ bool ] */ } ; diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out index 885059ebcbb2..6a7c9ff621d6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out @@ -12,22 +12,22 @@ Gas remaining: 1039987.709 units remaining DUP /* [ address : address ] */ ; VIEW "loop" never - /* [ @contract option never ] */ ; + /* [ option never ] */ ; ASSERT_SOME } ; code { CDR - /* [ @storage unit ] */ ; + /* [ unit ] */ ; SELF - /* [ @self contract unit : @storage unit ] */ ; + /* [ contract unit : unit ] */ ; ADDRESS - /* [ @self.address address : @storage unit ] */ ; + /* [ address : unit ] */ ; DUP - /* [ @self.address address : @self.address address : @storage unit ] */ ; + /* [ address : address : unit ] */ ; VIEW "loop" never - /* [ @self.address.contract option never : @storage unit ] */ ; + /* [ option never : unit ] */ ; ASSERT_SOME ; DROP - /* [ @storage unit ] */ ; + /* [ unit ] */ ; NIL operation - /* [ list operation : @storage unit ] */ ; + /* [ list operation : unit ] */ ; PAIR - /* [ pair (list operation) (unit @storage) ] */ } } + /* [ pair (list operation) unit ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out index e7524896502d..8b451841aa08 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out @@ -5,11 +5,11 @@ Gas remaining: 1039942.437 units remaining { parameter nat ; storage nat ; code { CAR - /* [ @parameter nat ] */ ; + /* [ nat ] */ ; NIL operation - /* [ list operation : @parameter nat ] */ ; + /* [ list operation : nat ] */ ; PAIR - /* [ pair (list operation) (nat @parameter) ] */ } ; + /* [ pair (list operation) nat ] */ } ; view "add" nat nat { UNPAIR /* [ nat : nat ] */ ; ADD /* [ nat ] */ } ; view "id" nat (pair nat nat) { /* [ pair nat nat ] */ } ; view "test_failwith" nat (pair nat nat) { FAILWITH /* [] */ } ; @@ -19,28 +19,23 @@ Gas remaining: 1039942.437 units remaining { DROP /* [] */ ; SOURCE - /* [ @source address ] */ ; + /* [ address ] */ ; SENDER - /* [ @sender address : @source address ] */ ; + /* [ address : address ] */ ; SELF_ADDRESS - /* [ @self address : @sender address : @source address ] */ ; + /* [ address : address : address ] */ ; PAIR - /* [ pair (address @self) (address @sender) : @source address ] */ ; + /* [ pair address address : address ] */ ; PAIR - /* [ pair (pair (address @self) (address @sender)) (address @source) ] */ ; + /* [ pair (pair address address) address ] */ ; BALANCE - /* [ @balance mutez - : pair (pair (address @self) (address @sender)) (address @source) ] */ ; + /* [ mutez : pair (pair address address) address ] */ ; AMOUNT - /* [ @amount mutez : @balance mutez - : pair (pair (address @self) (address @sender)) (address @source) ] */ ; + /* [ mutez : mutez : pair (pair address address) address ] */ ; PAIR - /* [ pair (mutez @amount) (mutez @balance) - : pair (pair (address @self) (address @sender)) (address @source) ] */ ; + /* [ pair mutez mutez : pair (pair address address) address ] */ ; PAIR - /* [ pair (pair (mutez @amount) (mutez @balance)) - (pair (address @self) (address @sender)) - (address @source) ] */ } ; + /* [ pair (pair mutez mutez) (pair address address) address ] */ } ; view "succ" (pair nat address) nat @@ -61,7 +56,7 @@ Gas remaining: 1039942.437 units remaining SWAP /* [ pair nat address : address ] */ ; VIEW "is_twenty" nat - /* [ @contract option nat ] */ ; + /* [ option nat ] */ ; ASSERT_SOME } ; view "is_twenty" (pair nat address) @@ -86,7 +81,7 @@ Gas remaining: 1039942.437 units remaining SWAP /* [ pair nat address : address ] */ ; VIEW "succ" nat - /* [ @contract option nat ] */ ; + /* [ option nat ] */ ; ASSERT_SOME } } ; view "fib" nat @@ -122,27 +117,27 @@ Gas remaining: 1039942.437 units remaining ABS /* [ nat : nat ] */ ; SELF_ADDRESS - /* [ @self address : nat : nat ] */ ; + /* [ address : nat : nat ] */ ; SWAP - /* [ nat : @self address : nat ] */ ; + /* [ nat : address : nat ] */ ; VIEW "fib" nat - /* [ @self.contract option nat : nat ] */ ; + /* [ option nat : nat ] */ ; IF_SOME { SWAP - /* [ nat : @self.contract.some nat ] */ ; + /* [ nat : nat ] */ ; PUSH nat 2 - /* [ nat : nat : @self.contract.some nat ] */ ; + /* [ nat : nat : nat ] */ ; SWAP - /* [ nat : nat : @self.contract.some nat ] */ ; + /* [ nat : nat : nat ] */ ; SUB - /* [ int : @self.contract.some nat ] */ ; + /* [ int : nat ] */ ; ABS - /* [ nat : @self.contract.some nat ] */ ; + /* [ nat : nat ] */ ; SELF_ADDRESS - /* [ @self address : nat : @self.contract.some nat ] */ ; + /* [ address : nat : nat ] */ ; SWAP - /* [ nat : @self address : @self.contract.some nat ] */ ; + /* [ nat : address : nat ] */ ; VIEW "fib" nat - /* [ @self.contract option nat : @self.contract.some nat ] */ ; + /* [ option nat : nat ] */ ; IF_SOME { ADD /* [ nat ] */ } { FAIL } } { FAIL } } } } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out index 4c08c883b349..ec0b0777e8f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039994.233 units remaining { parameter key ; storage (pair nat nat) ; code { CAR - /* [ @parameter key ] */ ; + /* [ key ] */ ; HASH_KEY /* [ key_hash ] */ ; VOTING_POWER diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out index c2b140d9e105..f70dba64c63a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out @@ -5,7 +5,7 @@ Gas remaining: 1039990.984 units remaining { parameter (or (pair bool bool) (pair nat nat)) ; storage (option (or bool nat)) ; code { CAR - /* [ @parameter or (pair bool bool) (pair nat nat) ] */ ; + /* [ or (pair bool bool) (pair nat nat) ] */ ; IF_LEFT { UNPAIR /* [ bool : bool ] */ ; XOR /* [ bool ] */ ; LEFT nat /* [ or bool nat ] */ } { UNPAIR /* [ nat : nat ] */ ; XOR /* [ nat ] */ ; RIGHT bool /* [ or bool nat ] */ } ; diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" index aae20b94b857..d7d62b06ef58 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" @@ -11,15 +11,15 @@ trace - location: 13 (remaining gas: 1039989.246 units remaining) [ (Pair "hello" (Some 4) {}) ] - location: 13 (remaining gas: 1039989.236 units remaining) - [ "hello" @parameter - (Pair (Some 4) {}) @storage ] + [ "hello" + (Pair (Some 4) {}) ] - location: 14 (remaining gas: 1039989.221 units remaining) - [ (Pair (Some 4) {}) @storage ] + [ (Pair (Some 4) {}) ] - location: 16 (remaining gas: 1039989.211 units remaining) [ (Some 4) {} ] - location: 14 (remaining gas: 1039989.181 units remaining) - [ "hello" @parameter + [ "hello" (Some 4) {} ] - location: 17 (remaining gas: 1039988.109 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" index 0afc0ef64a38..72939f4a082f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" @@ -11,15 +11,15 @@ trace - location: 13 (remaining gas: 1039987.916 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039987.906 units remaining) - [ "hello" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039987.891 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.881 units remaining) [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.851 units remaining) - [ "hello" @parameter + [ "hello" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039986.774 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" index 5303b7731aa1..4e5bcf4372b4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" @@ -12,15 +12,15 @@ trace - location: 13 (remaining gas: 1039987.946 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039987.936 units remaining) - [ "hi" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hi" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039987.921 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.911 units remaining) [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.881 units remaining) - [ "hi" @parameter + [ "hi" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039986.906 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" index 8cfde8f84d43..e2c009ca36ff 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" @@ -12,15 +12,15 @@ trace - location: 13 (remaining gas: 1039987.042 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039987.032 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039987.017 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039987.007 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039986.977 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039986.033 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" index 5aabcf80d182..74d56b8f1ebd 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" @@ -12,15 +12,15 @@ trace - location: 13 (remaining gas: 1039987.042 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039987.032 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039987.017 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039987.007 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039986.977 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039986.033 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" index ee13385e8fa8..c0ab6d621483 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" @@ -11,15 +11,15 @@ trace - location: 13 (remaining gas: 1039988.016 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039988.006 units remaining) - [ "hello" @parameter - (Pair None { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair None { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039987.991 units remaining) - [ (Pair None { Elt "hello" 4 }) @storage ] + [ (Pair None { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.981 units remaining) [ None { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.951 units remaining) - [ "hello" @parameter + [ "hello" None { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039986.874 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" index fd8748b10e18..5259001789e2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" @@ -11,15 +11,15 @@ trace - location: 13 (remaining gas: 1039989.346 units remaining) [ (Pair "hello" None {}) ] - location: 13 (remaining gas: 1039989.336 units remaining) - [ "hello" @parameter - (Pair None {}) @storage ] + [ "hello" + (Pair None {}) ] - location: 14 (remaining gas: 1039989.321 units remaining) - [ (Pair None {}) @storage ] + [ (Pair None {}) ] - location: 16 (remaining gas: 1039989.311 units remaining) [ None {} ] - location: 14 (remaining gas: 1039989.281 units remaining) - [ "hello" @parameter + [ "hello" None {} ] - location: 17 (remaining gas: 1039988.209 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" index 9ff919b10bc8..4550d805fc7f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" @@ -15,19 +15,19 @@ trace [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 13 (remaining gas: 1039983.933 units remaining) - [ "1" @parameter + [ "1" (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 14 (remaining gas: 1039983.918 units remaining) [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 17 (remaining gas: 1039983.908 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 18 (remaining gas: 1039983.898 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - location: 19 (remaining gas: 1039983.888 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 14 (remaining gas: 1039983.858 units remaining) - [ "1" @parameter + [ "1" { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 20 (remaining gas: 1039982.948 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" index f341609a78d9..50c6e12614f8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" @@ -14,19 +14,19 @@ trace [ (Pair "" { Elt "hello" "hi" } None) (Pair "" { Elt "hello" "hi" } None) ] - location: 13 (remaining gas: 1039985.011 units remaining) - [ "" @parameter + [ "" (Pair "" { Elt "hello" "hi" } None) ] - location: 14 (remaining gas: 1039984.996 units remaining) [ (Pair "" { Elt "hello" "hi" } None) ] - location: 17 (remaining gas: 1039984.986 units remaining) - [ (Pair { Elt "hello" "hi" } None) @storage ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 18 (remaining gas: 1039984.976 units remaining) [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039984.966 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039984.936 units remaining) - [ "" @parameter + [ "" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039984.061 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" index 691126987046..f59faa698da5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" @@ -14,19 +14,19 @@ trace [ (Pair "hello" { Elt "hello" "hi" } None) (Pair "hello" { Elt "hello" "hi" } None) ] - location: 13 (remaining gas: 1039984.961 units remaining) - [ "hello" @parameter + [ "hello" (Pair "hello" { Elt "hello" "hi" } None) ] - location: 14 (remaining gas: 1039984.946 units remaining) [ (Pair "hello" { Elt "hello" "hi" } None) ] - location: 17 (remaining gas: 1039984.936 units remaining) - [ (Pair { Elt "hello" "hi" } None) @storage ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 18 (remaining gas: 1039984.926 units remaining) [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039984.916 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039984.886 units remaining) - [ "hello" @parameter + [ "hello" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039983.840 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" index 7ee5ee693db7..7d4e9dd6f516 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" @@ -12,15 +12,15 @@ trace - location: 15 (remaining gas: 1039984.639 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.629 units remaining) - [ {} @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.614 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.604 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.574 units remaining) - [ {} @parameter + [ {} { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.574 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" index 2867c663f04f..edf538c68577 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" @@ -12,15 +12,15 @@ trace - location: 15 (remaining gas: 1039984.121 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.111 units remaining) - [ { Elt "1" (Some "two") } @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ { Elt "1" (Some "two") } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.096 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.086 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.056 units remaining) - [ { Elt "1" (Some "two") } @parameter + [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.056 units remaining) @@ -28,8 +28,8 @@ trace { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039984.046 units remaining) - [ "1" @key - (Some "two") @elt + [ "1" + (Some "two") { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.111 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" index 52c313969477..5a01c495a269 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" @@ -12,15 +12,15 @@ trace - location: 15 (remaining gas: 1039984.121 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.111 units remaining) - [ { Elt "1" (Some "two") } @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ { Elt "1" (Some "two") } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.096 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.086 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.056 units remaining) - [ { Elt "1" (Some "two") } @parameter + [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.056 units remaining) @@ -28,8 +28,8 @@ trace { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039984.046 units remaining) - [ "1" @key - (Some "two") @elt + [ "1" + (Some "two") { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.111 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" index fe7c9dddd356..07ca29e9bf8f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" @@ -13,15 +13,15 @@ trace - location: 15 (remaining gas: 1039984.101 units remaining) [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.091 units remaining) - [ { Elt "3" (Some "three") } @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ { Elt "3" (Some "three") } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.076 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.066 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.036 units remaining) - [ { Elt "3" (Some "three") } @parameter + [ { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.036 units remaining) @@ -29,8 +29,8 @@ trace { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039984.026 units remaining) - [ "3" @key - (Some "three") @elt + [ "3" + (Some "three") { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.091 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" index 091b7c8e8c38..5d841a4f18ac 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" @@ -13,15 +13,15 @@ trace - location: 15 (remaining gas: 1039984.265 units remaining) [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.255 units remaining) - [ { Elt "3" None } @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ { Elt "3" None } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.240 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.230 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.200 units remaining) - [ { Elt "3" None } @parameter + [ { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.200 units remaining) @@ -29,8 +29,8 @@ trace { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039984.190 units remaining) - [ "3" @key - None @elt + [ "3" + None { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.255 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" index 70da675f534e..960d8f38b50e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" @@ -12,15 +12,15 @@ trace - location: 15 (remaining gas: 1039984.265 units remaining) [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.255 units remaining) - [ { Elt "2" None } @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ { Elt "2" None } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.240 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.230 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.200 units remaining) - [ { Elt "2" None } @parameter + [ { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.200 units remaining) @@ -28,8 +28,8 @@ trace { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039984.190 units remaining) - [ "2" @key - None @elt + [ "2" + None { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.255 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out index 6d009a603e72..1086ac40e938 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 500000 @balance ] + [ 500000 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 500000 @balance ] + 500000 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 500000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out index ccb352f57259..37b7098d60d3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 0 @balance ] + [ 0 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 0 @balance ] + 0 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out index ada3367dbece..026c5b66fed4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 1000000000 @balance ] + [ 1000000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 1000000000 @balance ] + 1000000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 1000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out index ef9ddc0a9f7b..181e955e1274 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 1000000 @balance ] + [ 1000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 1000000 @balance ] + 1000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 1000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out index 110df0240161..af71c77770ba 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 1 @balance ] + [ 1 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 1 @balance ] + 1 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out index ffba2cea49c9..1da47dccfa92 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 5000000 @balance ] + [ 5000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 5000000 @balance ] + 5000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 5000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out index baaa6592db67..e668b6c00341 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 8000000000000000000 @balance ] + [ 8000000000000000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 8000000000000000000 @balance ] + 8000000000000000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 8000000000000000000) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" index cae82ac9e939..d1176a9ba960 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" @@ -15,35 +15,35 @@ trace [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039916.583 units remaining) - [ (Right (Right (Right (Left { Pair "3" "three" })))) @parameter - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Right (Right (Left { Pair "3" "three" })))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039916.573 units remaining) - [ (Right (Right (Left { Pair "3" "three" }))) @parameter.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Right (Left { Pair "3" "three" }))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039916.563 units remaining) - [ (Right (Left { Pair "3" "three" })) @parameter.right.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Left { Pair "3" "three" })) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 65 (remaining gas: 1039916.553 units remaining) - [ (Left { Pair "3" "three" }) @parameter.right.right.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left { Pair "3" "three" }) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 108 (remaining gas: 1039916.543 units remaining) - [ { Pair "3" "three" } @parameter.right.right.right.add - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ { Pair "3" "three" } + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 110 (remaining gas: 1039916.528 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 113 (remaining gas: 1039916.518 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 113 (remaining gas: 1039916.503 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 119 (remaining gas: 1039916.493 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - location: 110 (remaining gas: 1039916.463 units remaining) - [ { Pair "3" "three" } @parameter.right.right.right.add + [ { Pair "3" "three" } { Elt "1" "one" } { Elt "2" "two" } ] - location: 120 (remaining gas: 1039916.463 units remaining) - [ (Pair "3" "three") @parameter.right.right.right.add.elt + [ (Pair "3" "three") { Elt "1" "one" } { Elt "2" "two" } ] - location: 122 (remaining gas: 1039916.453 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" index 418259d81e2f..d545e5435b2e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" @@ -13,17 +13,17 @@ trace - location: 43 (remaining gas: 1039917.501 units remaining) [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039917.491 units remaining) - [ (Left Unit) @parameter - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left Unit) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039917.481 units remaining) - [ Unit @parameter.swap - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ Unit + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 46 (remaining gas: 1039917.471 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 48 (remaining gas: 1039917.461 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 48 (remaining gas: 1039917.446 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 54 (remaining gas: 1039917.436 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" index 752265f82719..6506a10c744d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" @@ -14,17 +14,17 @@ trace [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039913.787 units remaining) - [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) @parameter - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039913.777 units remaining) - [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) @parameter.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039913.767 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 62 (remaining gas: 1039913.757 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage - (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) + (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 63 (remaining gas: 1039913.747 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 60 (remaining gas: 1039913.732 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" index 8f8cec507e40..4918b5e8fe40 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" @@ -10,17 +10,17 @@ trace - location: 43 (remaining gas: 1039916.861 units remaining) [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039916.851 units remaining) - [ (Right (Left (Right Unit))) @parameter - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Left (Right Unit))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039916.841 units remaining) - [ (Left (Right Unit)) @parameter.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Right Unit)) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039916.831 units remaining) - [ (Right Unit) @parameter.right.reset - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right Unit) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 62 (remaining gas: 1039916.821 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage - (Right Unit) @parameter.right.reset ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) + (Right Unit) ] - location: 63 (remaining gas: 1039916.811 units remaining) [ (Right Unit) ] - location: 60 (remaining gas: 1039916.796 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" index 4c2b092cfcea..8489cdc827b8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" @@ -14,35 +14,35 @@ trace [ (Pair (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039916.847 units remaining) - [ (Right (Right (Right (Right { "1" })))) @parameter - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Right (Right (Right { "1" })))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039916.837 units remaining) - [ (Right (Right (Right { "1" }))) @parameter.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Right (Right { "1" }))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039916.827 units remaining) - [ (Right (Right { "1" })) @parameter.right.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right (Right { "1" })) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 65 (remaining gas: 1039916.817 units remaining) - [ (Right { "1" }) @parameter.right.right.right - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Right { "1" }) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 108 (remaining gas: 1039916.807 units remaining) - [ { "1" } @parameter.right.right.right.rem - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ { "1" } + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 131 (remaining gas: 1039916.792 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 134 (remaining gas: 1039916.782 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 134 (remaining gas: 1039916.767 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 140 (remaining gas: 1039916.757 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - location: 131 (remaining gas: 1039916.727 units remaining) - [ { "1" } @parameter.right.right.right.rem + [ { "1" } { Elt "1" "one" } { Elt "2" "two" } ] - location: 141 (remaining gas: 1039916.727 units remaining) - [ "1" @parameter.right.right.right.rem.elt + [ "1" { Elt "1" "one" } { Elt "2" "two" } ] - location: 143 (remaining gas: 1039916.712 units remaining) @@ -53,7 +53,7 @@ trace { Elt "1" "one" } { Elt "2" "two" } ] - location: 143 (remaining gas: 1039916.667 units remaining) - [ "1" @parameter.right.right.right.rem.elt + [ "1" None { Elt "1" "one" } { Elt "2" "two" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" index 98075dafe6ad..5bd8c2bf4332 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" @@ -13,27 +13,27 @@ trace - location: 43 (remaining gas: 1039919.139 units remaining) [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - location: 43 (remaining gas: 1039919.129 units remaining) - [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) @parameter - (Right Unit) @storage ] + [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) + (Right Unit) ] - location: 44 (remaining gas: 1039919.119 units remaining) - [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) @parameter.right - (Right Unit) @storage ] + [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) + (Right Unit) ] - location: 60 (remaining gas: 1039919.109 units remaining) - [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) @parameter.right.right - (Right Unit) @storage ] + [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) + (Right Unit) ] - location: 65 (remaining gas: 1039919.099 units remaining) - [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) @parameter.right.right.import - (Right Unit) @storage ] + [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) + (Right Unit) ] - location: 67 (remaining gas: 1039919.084 units remaining) - [ (Right Unit) @storage ] + [ (Right Unit) ] - location: 70 (remaining gas: 1039919.074 units remaining) - [ Unit @storage.right ] + [ Unit ] - location: 70 (remaining gas: 1039919.059 units remaining) - [ Unit @storage.right ] + [ Unit ] - location: 76 (remaining gas: 1039919.049 units remaining) [ ] - location: 67 (remaining gas: 1039919.019 units remaining) - [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) @parameter.right.right.import ] + [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ] - location: 77 (remaining gas: 1039919.009 units remaining) [ { Pair "foo" "bar" } { Pair "gaz" "baz" } ] @@ -47,7 +47,7 @@ trace {} { Pair "gaz" "baz" } ] - location: 83 (remaining gas: 1039918.949 units remaining) - [ (Pair "foo" "bar") @elt + [ (Pair "foo" "bar") {} { Pair "gaz" "baz" } ] - location: 85 (remaining gas: 1039918.939 units remaining) @@ -87,7 +87,7 @@ trace {} { Elt "foo" "bar" } ] - location: 96 (remaining gas: 1039917.796 units remaining) - [ (Pair "gaz" "baz") @elt + [ (Pair "gaz" "baz") {} { Elt "foo" "bar" } ] - location: 98 (remaining gas: 1039917.786 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out index f4a1ff783a14..f6a3132a50eb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out @@ -38,28 +38,28 @@ trace "hello") ] - location: 13 (remaining gas: 1039651.580 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 14 (remaining gas: 1039651.570 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 15 (remaining gas: 1039651.560 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 16 (remaining gas: 1039651.545 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -69,13 +69,13 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 19 (remaining gas: 1039651.044 units remaining) - [ 0x05010000000568656c6c6f @packed + [ 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 16 (remaining gas: 1039651.014 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -84,14 +84,14 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 20 (remaining gas: 1039650.974 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -110,11 +110,11 @@ trace "hello") ] - location: 28 (remaining gas: 1039585.127 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage ] + "hello") ] - location: 29 (remaining gas: 1039585.112 units remaining) [ {} (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage ] + "hello") ] - location: 31 (remaining gas: 1039585.097 units remaining) [ (Pair {} "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" @@ -166,28 +166,28 @@ trace "abcd") ] - location: 13 (remaining gas: 1039651.590 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 14 (remaining gas: 1039651.580 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 15 (remaining gas: 1039651.570 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 16 (remaining gas: 1039651.555 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] @@ -197,13 +197,13 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 19 (remaining gas: 1039651.087 units remaining) - [ 0x05010000000461626364 @packed + [ 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 16 (remaining gas: 1039651.057 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] @@ -212,14 +212,14 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 20 (remaining gas: 1039651.017 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out index ede7027720d4..e2bb06cdf526 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out @@ -10,16 +10,16 @@ trace - location: 7 (remaining gas: 1039988.319 units remaining) [ (Pair 0 Unit) ] - location: 7 (remaining gas: 1039988.309 units remaining) - [ 0 @parameter ] + [ 0 ] - location: 8 (remaining gas: 1039988.299 units remaining) - [ 0 @parameter - 0 @parameter ] + [ 0 + 0 ] - location: 9 (remaining gas: 1039988.259 units remaining) [ 0 - 0 @parameter ] + 0 ] - location: 10 (remaining gas: 1039988.234 units remaining) [ 0 - 0 @parameter ] + 0 ] - location: 11 (remaining gas: 1039988.199 units remaining) [ 0 ] - location: 13 (remaining gas: 1039988.184 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out index 937df447fd41..e0c421e74861 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out @@ -10,16 +10,16 @@ trace - location: 7 (remaining gas: 1039988.319 units remaining) [ (Pair 12039123919239192312931 Unit) ] - location: 7 (remaining gas: 1039988.309 units remaining) - [ 12039123919239192312931 @parameter ] + [ 12039123919239192312931 ] - location: 8 (remaining gas: 1039988.299 units remaining) - [ 12039123919239192312931 @parameter - 12039123919239192312931 @parameter ] + [ 12039123919239192312931 + 12039123919239192312931 ] - location: 9 (remaining gas: 1039988.259 units remaining) [ -12039123919239192312931 - 12039123919239192312931 @parameter ] + 12039123919239192312931 ] - location: 10 (remaining gas: 1039988.234 units remaining) [ 12039123919239192312931 - 12039123919239192312931 @parameter ] + 12039123919239192312931 ] - location: 11 (remaining gas: 1039988.199 units remaining) [ 0 ] - location: 13 (remaining gas: 1039988.184 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out index f7188878da90..fff9d94664ef 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out @@ -10,16 +10,16 @@ trace - location: 7 (remaining gas: 1039988.319 units remaining) [ (Pair 948 Unit) ] - location: 7 (remaining gas: 1039988.309 units remaining) - [ 948 @parameter ] + [ 948 ] - location: 8 (remaining gas: 1039988.299 units remaining) - [ 948 @parameter - 948 @parameter ] + [ 948 + 948 ] - location: 9 (remaining gas: 1039988.259 units remaining) [ -948 - 948 @parameter ] + 948 ] - location: 10 (remaining gas: 1039988.234 units remaining) [ 948 - 948 @parameter ] + 948 ] - location: 11 (remaining gas: 1039988.199 units remaining) [ 0 ] - location: 13 (remaining gas: 1039988.184 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out index d090d1d013a0..81c0677e14e9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out @@ -10,202 +10,202 @@ trace - location: 7 (remaining gas: 1039925.003 units remaining) [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039924.993 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 8 (remaining gas: 1039924.983 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 11 (remaining gas: 1039924.973 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 14 (remaining gas: 1039924.918 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 15 (remaining gas: 1039924.908 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 20 (remaining gas: 1039924.873 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 21 (remaining gas: 1039924.858 units remaining) [ True - Unit @parameter ] + Unit ] - location: 22 (remaining gas: 1039924.848 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 22 (remaining gas: 1039924.833 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 28 (remaining gas: 1039924.823 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 31 (remaining gas: 1039924.813 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 34 (remaining gas: 1039924.758 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 35 (remaining gas: 1039924.748 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 40 (remaining gas: 1039924.713 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 41 (remaining gas: 1039924.698 units remaining) [ True - Unit @parameter ] + Unit ] - location: 42 (remaining gas: 1039924.688 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 42 (remaining gas: 1039924.673 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 48 (remaining gas: 1039924.663 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 51 (remaining gas: 1039924.653 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 54 (remaining gas: 1039924.598 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 55 (remaining gas: 1039924.588 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 60 (remaining gas: 1039924.553 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 61 (remaining gas: 1039924.538 units remaining) [ True - Unit @parameter ] + Unit ] - location: 62 (remaining gas: 1039924.528 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 62 (remaining gas: 1039924.513 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 68 (remaining gas: 1039924.503 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 71 (remaining gas: 1039924.493 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 74 (remaining gas: 1039924.438 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 75 (remaining gas: 1039924.428 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 80 (remaining gas: 1039924.393 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 81 (remaining gas: 1039924.378 units remaining) [ True - Unit @parameter ] + Unit ] - location: 82 (remaining gas: 1039924.368 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 82 (remaining gas: 1039924.353 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 88 (remaining gas: 1039924.343 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 91 (remaining gas: 1039924.333 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 94 (remaining gas: 1039924.278 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 95 (remaining gas: 1039924.268 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 100 (remaining gas: 1039924.233 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 101 (remaining gas: 1039924.218 units remaining) [ True - Unit @parameter ] + Unit ] - location: 102 (remaining gas: 1039924.208 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 102 (remaining gas: 1039924.193 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 108 (remaining gas: 1039924.183 units remaining) [ 60 - Unit @parameter ] + Unit ] - location: 111 (remaining gas: 1039924.173 units remaining) [ "2019-09-09T12:08:37Z" 60 - Unit @parameter ] + Unit ] - location: 114 (remaining gas: 1039924.118 units remaining) [ "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 115 (remaining gas: 1039924.108 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 120 (remaining gas: 1039924.073 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 121 (remaining gas: 1039924.058 units remaining) [ True - Unit @parameter ] + Unit ] - location: 122 (remaining gas: 1039924.048 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 122 (remaining gas: 1039924.033 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 128 (remaining gas: 1039924.023 units remaining) [ "2019-09-09T12:08:37Z" - Unit @parameter ] + Unit ] - location: 131 (remaining gas: 1039924.013 units remaining) [ 60 "2019-09-09T12:08:37Z" - Unit @parameter ] + Unit ] - location: 134 (remaining gas: 1039923.958 units remaining) [ "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 135 (remaining gas: 1039923.948 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 140 (remaining gas: 1039923.913 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 141 (remaining gas: 1039923.898 units remaining) [ True - Unit @parameter ] + Unit ] - location: 142 (remaining gas: 1039923.888 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 142 (remaining gas: 1039923.873 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 148 (remaining gas: 1039923.863 units remaining) [ 1000 - Unit @parameter ] + Unit ] - location: 151 (remaining gas: 1039923.853 units remaining) [ 1000 1000 - Unit @parameter ] + Unit ] - location: 154 (remaining gas: 1039923.833 units remaining) [ 2000 - Unit @parameter ] + Unit ] - location: 155 (remaining gas: 1039923.823 units remaining) [ 2000 2000 - Unit @parameter ] + Unit ] - location: 160 (remaining gas: 1039923.788 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 161 (remaining gas: 1039923.773 units remaining) [ True - Unit @parameter ] + Unit ] - location: 162 (remaining gas: 1039923.763 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 162 (remaining gas: 1039923.748 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 168 (remaining gas: 1039923.733 units remaining) [ {} - Unit @parameter ] + Unit ] - location: 170 (remaining gas: 1039923.718 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out index cf792ab0852a..e8078892e396 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out @@ -13,7 +13,7 @@ trace None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out index 8fe15117d3b0..23fbcb9c5aa2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out @@ -13,7 +13,7 @@ trace None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out index 52c3ec343bd0..b637f3a2ef10 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out @@ -13,7 +13,7 @@ trace None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out index 7f09aa50adc2..790d95b9c385 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out @@ -13,7 +13,7 @@ trace None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0100000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000 ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" index 13f8f38f73b0..7ad05509fa04 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.553 units remaining) [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair -100 "1970-01-01T00:01:40Z") ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") @parameter - (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair -100 "1970-01-01T00:01:40Z") + (Pair -100 "1970-01-01T00:01:40Z") ] - location: 12 (remaining gas: 1039990.523 units remaining) [ -100 - (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + (Pair -100 "1970-01-01T00:01:40Z") ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair -100 "1970-01-01T00:01:40Z") ] - location: 15 (remaining gas: 1039990.498 units remaining) [ "1970-01-01T00:01:40Z" ] - location: 13 (remaining gas: 1039990.468 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" index fd4c17e1860d..2f84092b1d09 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.453 units remaining) [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ] - location: 10 (remaining gas: 1039990.443 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + [ (Pair 0 "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039990.433 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") @parameter - (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + [ (Pair 0 "1970-01-01T00:00:00Z") + (Pair 0 "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039990.423 units remaining) [ 0 - (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + (Pair 0 "1970-01-01T00:00:00Z") ] - location: 13 (remaining gas: 1039990.408 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + [ (Pair 0 "1970-01-01T00:00:00Z") ] - location: 15 (remaining gas: 1039990.398 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 13 (remaining gas: 1039990.368 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" index 079c5d2474d8..cd54c3c5422d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.553 units remaining) [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair 100 "1970-01-01T00:01:40Z") ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") @parameter - (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair 100 "1970-01-01T00:01:40Z") + (Pair 100 "1970-01-01T00:01:40Z") ] - location: 12 (remaining gas: 1039990.523 units remaining) [ 100 - (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + (Pair 100 "1970-01-01T00:01:40Z") ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair 100 "1970-01-01T00:01:40Z") ] - location: 15 (remaining gas: 1039990.498 units remaining) [ "1970-01-01T00:01:40Z" ] - location: 13 (remaining gas: 1039990.468 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" index 920b936e4c6f..2ecbae14a5fa 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.453 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ] - location: 10 (remaining gas: 1039990.443 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + [ (Pair "1970-01-01T00:00:00Z" 0) ] - location: 11 (remaining gas: 1039990.433 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) @parameter - (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + [ (Pair "1970-01-01T00:00:00Z" 0) + (Pair "1970-01-01T00:00:00Z" 0) ] - location: 12 (remaining gas: 1039990.423 units remaining) [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + (Pair "1970-01-01T00:00:00Z" 0) ] - location: 13 (remaining gas: 1039990.408 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + [ (Pair "1970-01-01T00:00:00Z" 0) ] - location: 15 (remaining gas: 1039990.398 units remaining) [ 0 ] - location: 13 (remaining gas: 1039990.368 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" index e7e2be2f1ab7..951cae1f288c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.553 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter - (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 12 (remaining gas: 1039990.523 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 15 (remaining gas: 1039990.498 units remaining) [ -100 ] - location: 13 (remaining gas: 1039990.468 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" index 672cee52756d..ccd1b962d0e8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.553 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter - (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 12 (remaining gas: 1039990.523 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 15 (remaining gas: 1039990.498 units remaining) [ 100 ] - location: 13 (remaining gas: 1039990.468 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" index 7fc26b1c3be0..e280de38f1f0 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" @@ -10,9 +10,9 @@ trace - location: 9 (remaining gas: 1039343.609 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ] - location: 9 (remaining gas: 1039343.599 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 10 (remaining gas: 1039343.589 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.address ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 11 (remaining gas: 1039343.574 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 12 (remaining gas: 1039343.559 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out index 657578e19a8b..bee19dea562b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out @@ -10,22 +10,22 @@ trace - location: 10 (remaining gas: 1039991.303 units remaining) [ (Pair (Pair False False) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair False False) @param ] + [ (Pair False False) ] - location: 11 (remaining gas: 1039991.283 units remaining) [ False False ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ False @and ] + [ False ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some False) @res ] + [ (Some False) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} @noop - (Some False) @res ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039991.218 units remaining) [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} @x - (Some False) @y ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039991.193 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out index d6711f561109..0cca8c86d49a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out @@ -10,22 +10,22 @@ trace - location: 10 (remaining gas: 1039991.303 units remaining) [ (Pair (Pair False True) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair False True) @param ] + [ (Pair False True) ] - location: 11 (remaining gas: 1039991.283 units remaining) [ False True ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ False @and ] + [ False ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some False) @res ] + [ (Some False) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} @noop - (Some False) @res ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039991.218 units remaining) [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} @x - (Some False) @y ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039991.193 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out index 5a0108993b0c..274ee1e111b9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out @@ -10,22 +10,22 @@ trace - location: 10 (remaining gas: 1039991.303 units remaining) [ (Pair (Pair True False) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair True False) @param ] + [ (Pair True False) ] - location: 11 (remaining gas: 1039991.283 units remaining) [ True False ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ False @and ] + [ False ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some False) @res ] + [ (Some False) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} @noop - (Some False) @res ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039991.218 units remaining) [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} @x - (Some False) @y ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039991.193 units remaining) [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out index cda077a9211b..9aacb64a523e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out @@ -10,22 +10,22 @@ trace - location: 10 (remaining gas: 1039991.303 units remaining) [ (Pair (Pair True True) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair True True) @param ] + [ (Pair True True) ] - location: 11 (remaining gas: 1039991.283 units remaining) [ True True ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ True @and ] + [ True ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some True) @res ] + [ (Some True) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} @noop - (Some True) @res ] + [ {} + (Some True) ] - location: 16 (remaining gas: 1039991.218 units remaining) [ (Pair {} (Some True)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} @x - (Some True) @y ] + [ {} + (Some True) ] - location: 18 (remaining gas: 1039991.193 units remaining) [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out index 1732abd8d786..cfe6aa0f79aa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out @@ -86,7 +86,7 @@ trace - location: 88 (remaining gas: 1039959.811 units remaining) [ Unit ] - location: 89 (remaining gas: 1039959.796 units remaining) - [ {} @noop + [ {} Unit ] - location: 91 (remaining gas: 1039959.781 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out index 0a222bbbf73f..4c5abc838739 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039993.804 units remaining) [ (Pair (Pair False False) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair False False) @parameter ] + [ (Pair False False) ] - location: 10 (remaining gas: 1039993.784 units remaining) [ False False ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ False @and ] + [ False ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} @noop - False @and ] + [ {} + False ] - location: 14 (remaining gas: 1039993.734 units remaining) [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out index fe52321b0eb5..ef555e8253b6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039993.804 units remaining) [ (Pair (Pair False True) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair False True) @parameter ] + [ (Pair False True) ] - location: 10 (remaining gas: 1039993.784 units remaining) [ False True ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ False @and ] + [ False ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} @noop - False @and ] + [ {} + False ] - location: 14 (remaining gas: 1039993.734 units remaining) [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out index 027b3ae2df7b..b654eef473b3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039993.804 units remaining) [ (Pair (Pair True False) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair True False) @parameter ] + [ (Pair True False) ] - location: 10 (remaining gas: 1039993.784 units remaining) [ True False ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ False @and ] + [ False ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} @noop - False @and ] + [ {} + False ] - location: 14 (remaining gas: 1039993.734 units remaining) [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out index cae30faf656a..63ef601a1971 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039993.804 units remaining) [ (Pair (Pair True True) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair True True) @parameter ] + [ (Pair True True) ] - location: 10 (remaining gas: 1039993.784 units remaining) [ True True ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ True @and ] + [ True ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} @noop - True @and ] + [ {} + True ] - location: 14 (remaining gas: 1039993.734 units remaining) [ (Pair {} True) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out index 4ec4409a7880..1a20af3830ed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 4000000000000 @balance ] + [ 4000000000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) [ {} - 4000000000000 @balance ] + 4000000000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) [ (Pair {} 4000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out index 05fea4c7deab..8dd7f60a8a02 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out @@ -11,17 +11,17 @@ trace - location: 12 (remaining gas: 1039987.011 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 @parameter - (Pair { Elt 0 1 } None) @storage ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 0 1 } None) @storage ] + [ (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039986.966 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 @parameter + [ 1 { Elt 0 1 } { Elt 0 1 } ] - location: 17 (remaining gas: 1039986.163 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out index c0ff888fe350..2ace6b8de4fd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out @@ -11,17 +11,17 @@ trace - location: 12 (remaining gas: 1039987.011 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 @parameter - (Pair { Elt 0 1 } None) @storage ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 0 1 } None) @storage ] + [ (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039986.966 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 @parameter + [ 1 { Elt 0 1 } { Elt 0 1 } ] - location: 17 (remaining gas: 1039986.163 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out index 296cbadc1e30..e9cc9b980648 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out @@ -11,17 +11,17 @@ trace - location: 12 (remaining gas: 1039987.011 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 @parameter - (Pair { Elt 1 0 } None) @storage ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 1 0 } None) @storage ] + [ (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039986.966 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 @parameter + [ 1 { Elt 1 0 } { Elt 1 0 } ] - location: 17 (remaining gas: 1039986.163 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out index 9f838d790639..21fdc5a44722 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out @@ -11,17 +11,17 @@ trace - location: 12 (remaining gas: 1039987.011 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 @parameter - (Pair { Elt 1 0 } None) @storage ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 1 0 } None) @storage ] + [ (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039986.966 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 @parameter + [ 1 { Elt 1 0 } { Elt 1 0 } ] - location: 17 (remaining gas: 1039986.163 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out index 5385ec20c90c..a2facc759a15 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.980 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 1 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 1 @parameter + [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out index be28e05f4c3b..772b053b45cb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.980 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 1 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 1 @parameter + [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out index 4130208d2d88..4e0e0c3669d5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.980 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 2 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 2 @parameter + [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out index 5217cf8659d9..3eb04b7638c7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.980 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 2 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 2 @parameter + [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out index 75598f66bd48..70dfe5d4de5a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.980 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 3 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 3 @parameter + [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out index c37338e47460..953b10d7c0bf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.980 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 3 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 3 @parameter + [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out index c85bba5b1fcd..e6139cb929d8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.004 units remaining) [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039987.994 units remaining) - [ 1 @parameter - (Pair {} None) @storage ] + [ 1 + (Pair {} None) ] - location: 13 (remaining gas: 1039987.979 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039987.969 units remaining) [ {} ] - location: 16 (remaining gas: 1039987.959 units remaining) [ {} {} ] - location: 13 (remaining gas: 1039987.929 units remaining) - [ 1 @parameter + [ 1 {} {} ] - location: 17 (remaining gas: 1039987.158 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out index f23ff9f87eff..d0348a66efdb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.004 units remaining) [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039987.994 units remaining) - [ 1 @parameter - (Pair {} None) @storage ] + [ 1 + (Pair {} None) ] - location: 13 (remaining gas: 1039987.979 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039987.969 units remaining) [ {} ] - location: 16 (remaining gas: 1039987.959 units remaining) [ {} {} ] - location: 13 (remaining gas: 1039987.929 units remaining) - [ 1 @parameter + [ 1 {} {} ] - location: 17 (remaining gas: 1039987.158 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" index 3d964a04f882..65b757d5b6f3 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.438 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.428 units remaining) - [ "baz" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "baz" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039985.413 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.403 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.393 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.363 units remaining) - [ "baz" @parameter + [ "baz" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.384 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" index 527bc1e843b1..a1cfb1a0356e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.438 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.428 units remaining) - [ "foo" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "foo" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039985.413 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.403 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.393 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.363 units remaining) - [ "foo" @parameter + [ "foo" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.384 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" index 0b0d9cb61db1..47519a488914 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" @@ -12,17 +12,17 @@ trace - location: 12 (remaining gas: 1039985.438 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.428 units remaining) - [ "bar" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "bar" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039985.413 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.403 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.393 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.363 units remaining) - [ "bar" @parameter + [ "bar" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.384 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" index dde108643236..86a1d85a153f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" @@ -11,17 +11,17 @@ trace - location: 12 (remaining gas: 1039986.718 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - location: 12 (remaining gas: 1039986.708 units remaining) - [ "foo" @parameter - (Pair { Elt "foo" 0 } None) @storage ] + [ "foo" + (Pair { Elt "foo" 0 } None) ] - location: 13 (remaining gas: 1039986.693 units remaining) - [ (Pair { Elt "foo" 0 } None) @storage ] + [ (Pair { Elt "foo" 0 } None) ] - location: 15 (remaining gas: 1039986.683 units remaining) [ { Elt "foo" 0 } ] - location: 16 (remaining gas: 1039986.673 units remaining) [ { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 13 (remaining gas: 1039986.643 units remaining) - [ "foo" @parameter + [ "foo" { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 17 (remaining gas: 1039985.665 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" index a40f92e3e023..189205480a8f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" @@ -11,17 +11,17 @@ trace - location: 12 (remaining gas: 1039986.718 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - location: 12 (remaining gas: 1039986.708 units remaining) - [ "bar" @parameter - (Pair { Elt "foo" 1 } None) @storage ] + [ "bar" + (Pair { Elt "foo" 1 } None) ] - location: 13 (remaining gas: 1039986.693 units remaining) - [ (Pair { Elt "foo" 1 } None) @storage ] + [ (Pair { Elt "foo" 1 } None) ] - location: 15 (remaining gas: 1039986.683 units remaining) [ { Elt "foo" 1 } ] - location: 16 (remaining gas: 1039986.673 units remaining) [ { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 13 (remaining gas: 1039986.643 units remaining) - [ "bar" @parameter + [ "bar" { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 17 (remaining gas: 1039985.665 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" index e9a324141457..5e3d574dfcc2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.960 units remaining) [ (Pair "bar" {} None) ] - location: 12 (remaining gas: 1039987.950 units remaining) - [ "bar" @parameter - (Pair {} None) @storage ] + [ "bar" + (Pair {} None) ] - location: 13 (remaining gas: 1039987.935 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039987.925 units remaining) [ {} ] - location: 16 (remaining gas: 1039987.915 units remaining) [ {} {} ] - location: 13 (remaining gas: 1039987.885 units remaining) - [ "bar" @parameter + [ "bar" {} {} ] - location: 17 (remaining gas: 1039986.909 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out index eb868df5d61b..f3e30eb4557e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out @@ -10,7 +10,7 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 @parameter ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.663 units remaining) [ 0 ] - location: 9 (remaining gas: 1039994.648 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out index ad241f67a99e..c63e99c05e8a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out @@ -10,7 +10,7 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.663 units remaining) [ 1 ] - location: 9 (remaining gas: 1039994.648 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out index cf089b22cd0d..bb0afa1cf60e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out @@ -10,7 +10,7 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 @parameter ] + [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 ] - location: 8 (remaining gas: 1039994.663 units remaining) [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - location: 9 (remaining gas: 1039994.648 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out index d54048b19abe..915b57fa5d8d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out @@ -10,7 +10,7 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 @parameter ] + [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 ] - location: 8 (remaining gas: 1039994.663 units remaining) [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - location: 9 (remaining gas: 1039994.648 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out index d4f5346ae612..5be3e74fdf74 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out @@ -10,18 +10,18 @@ trace - location: 7 (remaining gas: 1039989.509 units remaining) [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039989.499 units remaining) - [ 0x1000000000000000000000000000000000000000000000000000000000000000 @parameter ] + [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039989.374 units remaining) [ 16 ] - location: 9 (remaining gas: 1039989.359 units remaining) [ (Some 16) ] - location: 11 (remaining gas: 1039989.349 units remaining) - [ 16 @some ] + [ 16 ] - location: 11 (remaining gas: 1039989.334 units remaining) - [ 16 @some ] + [ 16 ] - location: 17 (remaining gas: 1039989.324 units remaining) [ 1 - 16 @some ] + 16 ] - location: 20 (remaining gas: 1039989.324 units remaining) [ 16 ] - location: 21 (remaining gas: 1039989.309 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out index 7e39bddf1f64..387a4f7064f5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ -42 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -42 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 9 (remaining gas: 1039994.442 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out index 6cd0e9d2d04e..738d40e31bba 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out index 59a132eda338..24d8968a891d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ -1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 9 (remaining gas: 1039994.442 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out index cb81e9f5483b..65f8e7bc477c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.458 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.443 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out index b4d66dadff37..15438080a4fd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out @@ -11,8 +11,8 @@ trace [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out index 220a889511c3..adb62b5a4249 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out index b330f905f106..df94be6244a2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out @@ -11,8 +11,8 @@ trace [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out index 2a3f54919ba2..aa1e80460d4c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out @@ -11,8 +11,8 @@ trace [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out index 13726b58b437..f15cd6ebd6bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out @@ -11,8 +11,8 @@ trace [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out index 5797ed6ed91f..769c1e5856ed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out @@ -11,8 +11,8 @@ trace [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out index cfae22527572..6c429511be2f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out index 580a6d0c8da0..db9d2d80514f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.458 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.443 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out index 085a1a13a8b8..b2f90efdfd3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out @@ -11,8 +11,8 @@ trace [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out index 91cc91961796..9c166a387d3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out @@ -10,8 +10,8 @@ trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out index a2ea7307569b..ef105dd0e4f8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out @@ -11,8 +11,8 @@ trace [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out index 726fad68f944..4903c56a5aac 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out @@ -11,8 +11,8 @@ trace [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out index 5a4da9147c97..68ccd215ece9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out @@ -11,8 +11,8 @@ trace [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out index 77c801c86eca..592484dd8c1d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out @@ -11,8 +11,8 @@ trace [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out index 3d6a10fbbe4a..212e1a80fa10 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 2 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 2 ] - location: 9 (remaining gas: 1039993.849 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out index 7a8e188b2f69..cb44a73d5978 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ -1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - -1 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + -1 ] - location: 9 (remaining gas: 1039993.849 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 10 (remaining gas: 1039993.834 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out index de0518280249..0bda3c16a07f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 0 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0 ] - location: 9 (remaining gas: 1039993.850 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.835 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out index 2d0ae2aebb78..d539b95b0f33 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ -42 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -42 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - -42 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + -42 ] - location: 9 (remaining gas: 1039993.849 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 10 (remaining gas: 1039993.834 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out index a88942ce3ea3..6c42a7331d39 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 1 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 1 ] - location: 9 (remaining gas: 1039993.849 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out index 463c1a47acce..2c173ef748f7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out @@ -11,11 +11,11 @@ trace [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out index 9e19fbbf8f42..7afaf42c9ad5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out @@ -11,11 +11,11 @@ trace [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage - 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter ] + [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f + 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out index 25993e0cda90..603b3ec223ee 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out @@ -11,11 +11,11 @@ trace [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage - 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter ] + [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f + 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out index 77fa93ead25b..9888f5e5fd6b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out @@ -11,11 +11,11 @@ trace [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out index 3765ae739d9e..3756e52b0e36 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out @@ -11,11 +11,11 @@ trace [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out index da6ebc044642..08d0622e6cf3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out @@ -11,11 +11,11 @@ trace [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out index c5a7bed0e0a4..017a16d6a608 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 0 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0 ] - location: 9 (remaining gas: 1039993.850 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.835 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out index 6e51b8330a04..609b05c2a8e8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 1 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 1 ] - location: 9 (remaining gas: 1039993.849 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out index 1b91d6f4ef80..d537cd5a0499 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out @@ -10,11 +10,11 @@ trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 2 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 2 ] - location: 9 (remaining gas: 1039993.849 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out index af9a44e6db86..0b364f13980f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out @@ -11,11 +11,11 @@ trace [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage - 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter ] + [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f + 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out index ad4bf80dea2a..df944c3ab6a3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out @@ -11,11 +11,11 @@ trace [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage - 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter ] + [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f + 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out index 685ac407c566..8fd31556a2c6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out @@ -11,11 +11,11 @@ trace [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out index 0b4c408cde92..ba2c2fce328b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out @@ -11,11 +11,11 @@ trace [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - location: 9 (remaining gas: 1039993.816 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out index 6bc908aef73e..58ffce67093a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039994.492 units remaining) [ (Pair (Pair 34 17) 0) ] - location: 9 (remaining gas: 1039994.482 units remaining) - [ (Pair 34 17) @parameter ] + [ (Pair 34 17) ] - location: 10 (remaining gas: 1039994.472 units remaining) [ 34 ] - location: 11 (remaining gas: 1039994.457 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out index e46d2cd3d380..14ffec712826 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039994.492 units remaining) [ (Pair (Pair 34 17) 0) ] - location: 9 (remaining gas: 1039994.482 units remaining) - [ (Pair 34 17) @parameter ] + [ (Pair 34 17) ] - location: 10 (remaining gas: 1039994.472 units remaining) [ 17 ] - location: 11 (remaining gas: 1039994.457 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out index 47490e6e44f7..58fa69c425c7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out @@ -10,107 +10,107 @@ trace - location: 11 (remaining gas: 1039950.642 units remaining) [ (Pair (Pair 1 4 2 Unit) Unit) ] - location: 11 (remaining gas: 1039950.632 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 12 (remaining gas: 1039950.622 units remaining) - [ (Pair 1 4 2 Unit) @parameter - (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 13 (remaining gas: 1039950.612 units remaining) [ 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 14 (remaining gas: 1039950.602 units remaining) [ 1 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 19 (remaining gas: 1039950.567 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 20 (remaining gas: 1039950.552 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 21 (remaining gas: 1039950.542 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 21 (remaining gas: 1039950.527 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 27 (remaining gas: 1039950.517 units remaining) - [ (Pair 1 4 2 Unit) @parameter - (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 28 (remaining gas: 1039950.487 units remaining) [ 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 30 (remaining gas: 1039950.477 units remaining) [ 1 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 35 (remaining gas: 1039950.442 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 36 (remaining gas: 1039950.427 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 37 (remaining gas: 1039950.417 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 37 (remaining gas: 1039950.402 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 43 (remaining gas: 1039950.392 units remaining) - [ (Pair 1 4 2 Unit) @parameter - (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 44 (remaining gas: 1039950.361 units remaining) [ 4 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 46 (remaining gas: 1039950.351 units remaining) [ 4 4 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 51 (remaining gas: 1039950.316 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 52 (remaining gas: 1039950.301 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 53 (remaining gas: 1039950.291 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 53 (remaining gas: 1039950.276 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 59 (remaining gas: 1039950.266 units remaining) - [ (Pair 1 4 2 Unit) @parameter - (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 60 (remaining gas: 1039950.234 units remaining) [ 2 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 62 (remaining gas: 1039950.224 units remaining) [ 2 2 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 67 (remaining gas: 1039950.189 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 68 (remaining gas: 1039950.174 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 69 (remaining gas: 1039950.164 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 69 (remaining gas: 1039950.149 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 75 (remaining gas: 1039950.139 units remaining) - [ (Pair 1 4 2 Unit) @parameter - (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 76 (remaining gas: 1039950.106 units remaining) [ Unit - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 78 (remaining gas: 1039950.096 units remaining) [ Unit Unit - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 81 (remaining gas: 1039950.086 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 82 (remaining gas: 1039950.071 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 83 (remaining gas: 1039950.061 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 83 (remaining gas: 1039950.046 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 89 (remaining gas: 1039950.036 units remaining) [ ] - location: 90 (remaining gas: 1039950.026 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" index 54cb24962bcb..76af827bac8d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" @@ -10,10 +10,10 @@ trace - location: 16 (remaining gas: 1039985.116 units remaining) [ (Pair (Pair 1 4 2 Unit) None) ] - location: 16 (remaining gas: 1039985.106 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 17 (remaining gas: 1039985.096 units remaining) [ 2 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 20 (remaining gas: 1039985.055 units remaining) [ (Pair 2 4 2 Unit) ] - location: 22 (remaining gas: 1039985.045 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out index adac3cc91aa0..4d57d85ea67d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out @@ -10,10 +10,10 @@ trace - location: 11 (remaining gas: 1039985.453 units remaining) [ (Pair Unit 1 4 2 Unit) ] - location: 11 (remaining gas: 1039985.443 units remaining) - [ (Pair 1 4 2 Unit) @storage ] + [ (Pair 1 4 2 Unit) ] - location: 12 (remaining gas: 1039985.433 units remaining) [ 2 - (Pair 1 4 2 Unit) @storage ] + (Pair 1 4 2 Unit) ] - location: 15 (remaining gas: 1039985.392 units remaining) [ (Pair 2 4 2 Unit) ] - location: 17 (remaining gas: 1039985.382 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out index d16cff47c88c..ec75cfebb8cb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out @@ -15,297 +15,297 @@ trace - location: 10 (remaining gas: 1039962.637 units remaining) [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ] - location: 10 (remaining gas: 1039962.627 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 11 (remaining gas: 1039962.612 units remaining) [ {} - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 14 (remaining gas: 1039962.597 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 16 (remaining gas: 1039962.587 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.587 units remaining) - [ -9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.572 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.557 units remaining) - [ -1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.542 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.527 units remaining) - [ 0 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.512 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.497 units remaining) - [ 1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.482 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.467 units remaining) - [ 9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.452 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.437 units remaining) [ { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 14 (remaining gas: 1039962.407 units remaining) [ {} { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 20 (remaining gas: 1039962.397 units remaining) [ { False ; False ; True ; False ; False } {} - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 21 (remaining gas: 1039962.382 units remaining) [ { { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 22 (remaining gas: 1039962.367 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 24 (remaining gas: 1039962.357 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.357 units remaining) - [ -9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.342 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.327 units remaining) - [ -1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.312 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.297 units remaining) - [ 0 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.282 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.267 units remaining) - [ 1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.252 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.237 units remaining) - [ 9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.222 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.207 units remaining) [ { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 22 (remaining gas: 1039962.177 units remaining) [ { { False ; False ; True ; False ; False } } { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 28 (remaining gas: 1039962.167 units remaining) [ { True ; True ; False ; True ; True } { { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 29 (remaining gas: 1039962.152 units remaining) [ { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 30 (remaining gas: 1039962.137 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 32 (remaining gas: 1039962.127 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.127 units remaining) - [ -9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.112 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.097 units remaining) - [ -1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.082 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.067 units remaining) - [ 0 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.052 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.037 units remaining) - [ 1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.022 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.007 units remaining) - [ 9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039961.992 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039961.977 units remaining) [ { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 30 (remaining gas: 1039961.947 units remaining) [ { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 36 (remaining gas: 1039961.937 units remaining) [ { True ; True ; True ; False ; False } { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 37 (remaining gas: 1039961.922 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 38 (remaining gas: 1039961.907 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 40 (remaining gas: 1039961.897 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.897 units remaining) - [ -9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.882 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.867 units remaining) - [ -1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.852 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.837 units remaining) - [ 0 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.822 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.807 units remaining) - [ 1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.792 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.777 units remaining) - [ 9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.762 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.747 units remaining) [ { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 38 (remaining gas: 1039961.717 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 44 (remaining gas: 1039961.707 units remaining) [ { True ; True ; False ; False ; False } { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 45 (remaining gas: 1039961.692 units remaining) [ { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 46 (remaining gas: 1039961.677 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 48 (remaining gas: 1039961.667 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.667 units remaining) - [ -9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.652 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.637 units remaining) - [ -1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.622 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.607 units remaining) - [ 0 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.592 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.577 units remaining) - [ 1 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.562 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.547 units remaining) - [ 9999999 @parameter.elt - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.532 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.517 units remaining) [ { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 46 (remaining gas: 1039961.487 units remaining) [ { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 52 (remaining gas: 1039961.477 units remaining) [ { False ; False ; True ; True ; True } { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 53 (remaining gas: 1039961.462 units remaining) [ { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 54 (remaining gas: 1039961.447 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 56 (remaining gas: 1039961.447 units remaining) - [ -9999999 @parameter.elt ] + [ -9999999 ] - location: 58 (remaining gas: 1039961.432 units remaining) [ False ] - location: 56 (remaining gas: 1039961.417 units remaining) - [ -1 @parameter.elt ] + [ -1 ] - location: 58 (remaining gas: 1039961.402 units remaining) [ False ] - location: 56 (remaining gas: 1039961.387 units remaining) - [ 0 @parameter.elt ] + [ 0 ] - location: 58 (remaining gas: 1039961.372 units remaining) [ False ] - location: 56 (remaining gas: 1039961.357 units remaining) - [ 1 @parameter.elt ] + [ 1 ] - location: 58 (remaining gas: 1039961.342 units remaining) [ True ] - location: 56 (remaining gas: 1039961.327 units remaining) - [ 9999999 @parameter.elt ] + [ 9999999 ] - location: 58 (remaining gas: 1039961.312 units remaining) [ True ] - location: 56 (remaining gas: 1039961.297 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" index d5c4945e75f5..28986a4e8a4e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" @@ -10,12 +10,12 @@ trace - location: 9 (remaining gas: 1039992.305 units remaining) [ (Pair { "World!" } {}) ] - location: 9 (remaining gas: 1039992.295 units remaining) - [ { "World!" } @parameter ] + [ { "World!" } ] - location: 10 (remaining gas: 1039992.295 units remaining) - [ "World!" @parameter.elt ] + [ "World!" ] - location: 12 (remaining gas: 1039992.285 units remaining) - [ "Hello " @hello - "World!" @parameter.elt ] + [ "Hello " + "World!" ] - location: 15 (remaining gas: 1039992.220 units remaining) [ "Hello World!" ] - location: 10 (remaining gas: 1039992.205 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" index 164cc56b6725..92d059004c15 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" @@ -10,19 +10,19 @@ trace - location: 9 (remaining gas: 1039992.151 units remaining) [ (Pair { "test1" ; "test2" } {}) ] - location: 9 (remaining gas: 1039992.141 units remaining) - [ { "test1" ; "test2" } @parameter ] + [ { "test1" ; "test2" } ] - location: 10 (remaining gas: 1039992.141 units remaining) - [ "test1" @parameter.elt ] + [ "test1" ] - location: 12 (remaining gas: 1039992.131 units remaining) - [ "Hello " @hello - "test1" @parameter.elt ] + [ "Hello " + "test1" ] - location: 15 (remaining gas: 1039992.066 units remaining) [ "Hello test1" ] - location: 10 (remaining gas: 1039992.051 units remaining) - [ "test2" @parameter.elt ] + [ "test2" ] - location: 12 (remaining gas: 1039992.041 units remaining) - [ "Hello " @hello - "test2" @parameter.elt ] + [ "Hello " + "test2" ] - location: 15 (remaining gas: 1039991.976 units remaining) [ "Hello test2" ] - location: 10 (remaining gas: 1039991.961 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out index 03c995e40093..f43586da20f2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039992.479 units remaining) [ (Pair {} {}) ] - location: 9 (remaining gas: 1039992.469 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039992.469 units remaining) [ {} ] - location: 16 (remaining gas: 1039992.454 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out index ade5bca29772..d24d76a16eb5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out @@ -10,19 +10,19 @@ trace - location: 9 (remaining gas: 1039992.398 units remaining) [ (Pair { 0xab ; 0xcd } {}) ] - location: 9 (remaining gas: 1039992.388 units remaining) - [ { 0xab ; 0xcd } @parameter ] + [ { 0xab ; 0xcd } ] - location: 10 (remaining gas: 1039992.388 units remaining) - [ 0xab @parameter.elt ] + [ 0xab ] - location: 12 (remaining gas: 1039992.378 units remaining) [ 0xff - 0xab @parameter.elt ] + 0xab ] - location: 15 (remaining gas: 1039992.313 units remaining) [ 0xffab ] - location: 10 (remaining gas: 1039992.298 units remaining) - [ 0xcd @parameter.elt ] + [ 0xcd ] - location: 12 (remaining gas: 1039992.288 units remaining) [ 0xff - 0xcd @parameter.elt ] + 0xcd ] - location: 15 (remaining gas: 1039992.223 units remaining) [ 0xffcd ] - location: 10 (remaining gas: 1039992.208 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out index 0f51e46efd7f..df03ec93fae6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out @@ -10,12 +10,12 @@ trace - location: 9 (remaining gas: 1039992.498 units remaining) [ (Pair { 0xcd } {}) ] - location: 9 (remaining gas: 1039992.488 units remaining) - [ { 0xcd } @parameter ] + [ { 0xcd } ] - location: 10 (remaining gas: 1039992.488 units remaining) - [ 0xcd @parameter.elt ] + [ 0xcd ] - location: 12 (remaining gas: 1039992.478 units remaining) [ 0xff - 0xcd @parameter.elt ] + 0xcd ] - location: 15 (remaining gas: 1039992.413 units remaining) [ 0xffcd ] - location: 10 (remaining gas: 1039992.398 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out index 95028609f01d..0612eb4df578 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039992.598 units remaining) [ (Pair {} {}) ] - location: 9 (remaining gas: 1039992.588 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039992.588 units remaining) [ {} ] - location: 16 (remaining gas: 1039992.573 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" index 7cbbb9b85a55..bd2733d92a20 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" @@ -10,26 +10,26 @@ trace - location: 8 (remaining gas: 1039987.037 units remaining) [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ] - location: 8 (remaining gas: 1039987.027 units remaining) - [ { "Hello" ; " " ; "World" ; "!" } @parameter ] + [ { "Hello" ; " " ; "World" ; "!" } ] - location: 9 (remaining gas: 1039987.017 units remaining) [ "" - { "Hello" ; " " ; "World" ; "!" } @parameter ] + { "Hello" ; " " ; "World" ; "!" } ] - location: 12 (remaining gas: 1039987.007 units remaining) - [ { "Hello" ; " " ; "World" ; "!" } @parameter + [ { "Hello" ; " " ; "World" ; "!" } "" ] - location: 13 (remaining gas: 1039987.007 units remaining) - [ "Hello" @parameter.elt + [ "Hello" "" ] - location: 15 (remaining gas: 1039986.997 units remaining) [ "" - "Hello" @parameter.elt ] + "Hello" ] - location: 16 (remaining gas: 1039986.982 units remaining) - [ "Hello" @parameter.elt ] + [ "Hello" ] - location: 18 (remaining gas: 1039986.967 units remaining) [ {} - "Hello" @parameter.elt ] + "Hello" ] - location: 20 (remaining gas: 1039986.957 units remaining) - [ "Hello" @parameter.elt + [ "Hello" {} ] - location: 21 (remaining gas: 1039986.942 units remaining) [ { "Hello" } ] @@ -41,18 +41,18 @@ trace - location: 23 (remaining gas: 1039986.777 units remaining) [ "Hello" ] - location: 13 (remaining gas: 1039986.762 units remaining) - [ " " @parameter.elt + [ " " "Hello" ] - location: 15 (remaining gas: 1039986.752 units remaining) [ "Hello" - " " @parameter.elt ] + " " ] - location: 16 (remaining gas: 1039986.737 units remaining) - [ " " @parameter.elt ] + [ " " ] - location: 18 (remaining gas: 1039986.722 units remaining) [ {} - " " @parameter.elt ] + " " ] - location: 20 (remaining gas: 1039986.712 units remaining) - [ " " @parameter.elt + [ " " {} ] - location: 21 (remaining gas: 1039986.697 units remaining) [ { " " } ] @@ -64,18 +64,18 @@ trace - location: 23 (remaining gas: 1039986.532 units remaining) [ "Hello " ] - location: 13 (remaining gas: 1039986.517 units remaining) - [ "World" @parameter.elt + [ "World" "Hello " ] - location: 15 (remaining gas: 1039986.507 units remaining) [ "Hello " - "World" @parameter.elt ] + "World" ] - location: 16 (remaining gas: 1039986.492 units remaining) - [ "World" @parameter.elt ] + [ "World" ] - location: 18 (remaining gas: 1039986.477 units remaining) [ {} - "World" @parameter.elt ] + "World" ] - location: 20 (remaining gas: 1039986.467 units remaining) - [ "World" @parameter.elt + [ "World" {} ] - location: 21 (remaining gas: 1039986.452 units remaining) [ { "World" } ] @@ -87,18 +87,18 @@ trace - location: 23 (remaining gas: 1039986.286 units remaining) [ "Hello World" ] - location: 13 (remaining gas: 1039986.271 units remaining) - [ "!" @parameter.elt + [ "!" "Hello World" ] - location: 15 (remaining gas: 1039986.261 units remaining) [ "Hello World" - "!" @parameter.elt ] + "!" ] - location: 16 (remaining gas: 1039986.246 units remaining) - [ "!" @parameter.elt ] + [ "!" ] - location: 18 (remaining gas: 1039986.231 units remaining) [ {} - "!" @parameter.elt ] + "!" ] - location: 20 (remaining gas: 1039986.221 units remaining) - [ "!" @parameter.elt + [ "!" {} ] - location: 21 (remaining gas: 1039986.206 units remaining) [ { "!" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" index 697e1e362fdf..ac946b1f451b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" @@ -10,26 +10,26 @@ trace - location: 8 (remaining gas: 1039987.241 units remaining) [ (Pair { "a" ; "b" ; "c" } "") ] - location: 8 (remaining gas: 1039987.231 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 9 (remaining gas: 1039987.221 units remaining) [ "" - { "a" ; "b" ; "c" } @parameter ] + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039987.211 units remaining) - [ { "a" ; "b" ; "c" } @parameter + [ { "a" ; "b" ; "c" } "" ] - location: 13 (remaining gas: 1039987.211 units remaining) - [ "a" @parameter.elt + [ "a" "" ] - location: 15 (remaining gas: 1039987.201 units remaining) [ "" - "a" @parameter.elt ] + "a" ] - location: 16 (remaining gas: 1039987.186 units remaining) - [ "a" @parameter.elt ] + [ "a" ] - location: 18 (remaining gas: 1039987.171 units remaining) [ {} - "a" @parameter.elt ] + "a" ] - location: 20 (remaining gas: 1039987.161 units remaining) - [ "a" @parameter.elt + [ "a" {} ] - location: 21 (remaining gas: 1039987.146 units remaining) [ { "a" } ] @@ -41,18 +41,18 @@ trace - location: 23 (remaining gas: 1039986.981 units remaining) [ "a" ] - location: 13 (remaining gas: 1039986.966 units remaining) - [ "b" @parameter.elt + [ "b" "a" ] - location: 15 (remaining gas: 1039986.956 units remaining) [ "a" - "b" @parameter.elt ] + "b" ] - location: 16 (remaining gas: 1039986.941 units remaining) - [ "b" @parameter.elt ] + [ "b" ] - location: 18 (remaining gas: 1039986.926 units remaining) [ {} - "b" @parameter.elt ] + "b" ] - location: 20 (remaining gas: 1039986.916 units remaining) - [ "b" @parameter.elt + [ "b" {} ] - location: 21 (remaining gas: 1039986.901 units remaining) [ { "b" } ] @@ -64,18 +64,18 @@ trace - location: 23 (remaining gas: 1039986.736 units remaining) [ "ab" ] - location: 13 (remaining gas: 1039986.721 units remaining) - [ "c" @parameter.elt + [ "c" "ab" ] - location: 15 (remaining gas: 1039986.711 units remaining) [ "ab" - "c" @parameter.elt ] + "c" ] - location: 16 (remaining gas: 1039986.696 units remaining) - [ "c" @parameter.elt ] + [ "c" ] - location: 18 (remaining gas: 1039986.681 units remaining) [ {} - "c" @parameter.elt ] + "c" ] - location: 20 (remaining gas: 1039986.671 units remaining) - [ "c" @parameter.elt + [ "c" {} ] - location: 21 (remaining gas: 1039986.656 units remaining) [ { "c" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" index a288f9c22b21..486f5213dd67 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" @@ -10,12 +10,12 @@ trace - location: 8 (remaining gas: 1039987.613 units remaining) [ (Pair {} "") ] - location: 8 (remaining gas: 1039987.603 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039987.593 units remaining) [ "" - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039987.583 units remaining) - [ {} @parameter + [ {} "" ] - location: 13 (remaining gas: 1039987.583 units remaining) [ "" ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out index f7408d14e7c3..94dc28981e20 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out @@ -10,8 +10,8 @@ trace - location: 8 (remaining gas: 1039994.045 units remaining) [ (Pair 99 { -5 ; 10 }) ] - location: 8 (remaining gas: 1039994.035 units remaining) - [ 99 @parameter - { -5 ; 10 } @storage ] + [ 99 + { -5 ; 10 } ] - location: 9 (remaining gas: 1039994.020 units remaining) [ { 99 ; -5 ; 10 } ] - location: 10 (remaining gas: 1039994.005 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out index a042c0520ff4..b7d44136d77b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out @@ -10,8 +10,8 @@ trace - location: 8 (remaining gas: 1039994.145 units remaining) [ (Pair -5 { 10 }) ] - location: 8 (remaining gas: 1039994.135 units remaining) - [ -5 @parameter - { 10 } @storage ] + [ -5 + { 10 } ] - location: 9 (remaining gas: 1039994.120 units remaining) [ { -5 ; 10 } ] - location: 10 (remaining gas: 1039994.105 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out index 4c24eb1233c7..2a7e61e51875 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out @@ -10,8 +10,8 @@ trace - location: 8 (remaining gas: 1039994.245 units remaining) [ (Pair 10 {}) ] - location: 8 (remaining gas: 1039994.235 units remaining) - [ 10 @parameter - {} @storage ] + [ 10 + {} ] - location: 9 (remaining gas: 1039994.220 units remaining) [ { 10 } ] - location: 10 (remaining gas: 1039994.205 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" index 1507eccd0609..8b9eba75d3b5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" @@ -10,15 +10,15 @@ trace - location: 12 (remaining gas: 1039963.179 units remaining) [ (Pair (Pair { "A" } { "B" }) None) ] - location: 12 (remaining gas: 1039963.169 units remaining) - [ (Pair { "A" } { "B" }) @parameter ] + [ (Pair { "A" } { "B" }) ] - location: 13 (remaining gas: 1039963.159 units remaining) - [ (Pair { "A" } { "B" }) @parameter - (Pair { "A" } { "B" }) @parameter ] + [ (Pair { "A" } { "B" }) + (Pair { "A" } { "B" }) ] - location: 14 (remaining gas: 1039963.149 units remaining) [ { "A" } - (Pair { "A" } { "B" }) @parameter ] + (Pair { "A" } { "B" }) ] - location: 15 (remaining gas: 1039963.134 units remaining) - [ (Pair { "A" } { "B" }) @parameter ] + [ (Pair { "A" } { "B" }) ] - location: 17 (remaining gas: 1039963.124 units remaining) [ { "B" } ] - location: 15 (remaining gas: 1039963.094 units remaining) @@ -33,7 +33,7 @@ trace {} { "B" } ] - location: 21 (remaining gas: 1039962.864 units remaining) - [ "A" @elt + [ "A" {} { "B" } ] - location: 23 (remaining gas: 1039962.849 units remaining) @@ -44,7 +44,7 @@ trace (Pair "A" {}) { "B" } ] - location: 25 (remaining gas: 1039962.829 units remaining) - [ "A" @elt + [ "A" (Pair "A" {}) { "B" } ] - location: 26 (remaining gas: 1039962.814 units remaining) @@ -54,16 +54,16 @@ trace [ {} { "B" } ] - location: 26 (remaining gas: 1039962.774 units remaining) - [ "A" @elt + [ "A" {} { "B" } ] - location: 29 (remaining gas: 1039962.764 units remaining) [ True - "A" @elt + "A" {} { "B" } ] - location: 32 (remaining gas: 1039962.754 units remaining) - [ "A" @elt + [ "A" True {} { "B" } ] @@ -88,7 +88,7 @@ trace [ { "B" } (Pair { "A" } True) ] - location: 40 (remaining gas: 1039962.494 units remaining) - [ "B" @elt + [ "B" (Pair { "A" } True) ] - location: 42 (remaining gas: 1039962.479 units remaining) [ (Pair "B" { "A" } True) ] @@ -100,7 +100,7 @@ trace (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - location: 45 (remaining gas: 1039962.449 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - location: 46 (remaining gas: 1039962.434 units remaining) @@ -126,7 +126,7 @@ trace { "A" } True ] - location: 46 (remaining gas: 1039962.309 units remaining) - [ "B" @elt + [ "B" { "A" } { "A" } True ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" index 03e5c1dab0ed..371c9aa80bf5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" @@ -10,15 +10,15 @@ trace - location: 12 (remaining gas: 1039962.499 units remaining) [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ] - location: 12 (remaining gas: 1039962.489 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 13 (remaining gas: 1039962.479 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter - (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) + (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 14 (remaining gas: 1039962.469 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } - (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 15 (remaining gas: 1039962.454 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 17 (remaining gas: 1039962.444 units remaining) [ { "B" ; "C" ; "asdf" } ] - location: 15 (remaining gas: 1039962.414 units remaining) @@ -33,7 +33,7 @@ trace {} { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039962.184 units remaining) - [ "B" @elt + [ "B" {} { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039962.169 units remaining) @@ -44,7 +44,7 @@ trace (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039962.149 units remaining) - [ "B" @elt + [ "B" (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039962.134 units remaining) @@ -54,16 +54,16 @@ trace [ {} { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039962.094 units remaining) - [ "B" @elt + [ "B" {} { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039962.084 units remaining) [ True - "B" @elt + "B" {} { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039962.074 units remaining) - [ "B" @elt + [ "B" True {} { "B" ; "C" ; "asdf" } ] @@ -71,7 +71,7 @@ trace [ { "B" } { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039961.859 units remaining) - [ "B" @elt + [ "B" { "B" } { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039961.844 units remaining) @@ -82,7 +82,7 @@ trace (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039961.824 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.809 units remaining) @@ -92,16 +92,16 @@ trace [ { "B" } { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.769 units remaining) - [ "B" @elt + [ "B" { "B" } { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039961.759 units remaining) [ True - "B" @elt + "B" { "B" } { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039961.749 units remaining) - [ "B" @elt + [ "B" True { "B" } { "B" ; "C" ; "asdf" } ] @@ -109,7 +109,7 @@ trace [ { "B" } { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039961.464 units remaining) - [ "asdf" @elt + [ "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039961.449 units remaining) @@ -120,7 +120,7 @@ trace (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039961.429 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.414 units remaining) @@ -130,16 +130,16 @@ trace [ { "B" } { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.374 units remaining) - [ "asdf" @elt + [ "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039961.364 units remaining) [ True - "asdf" @elt + "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039961.354 units remaining) - [ "asdf" @elt + [ "asdf" True { "B" } { "B" ; "C" ; "asdf" } ] @@ -147,7 +147,7 @@ trace [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039961.069 units remaining) - [ "C" @elt + [ "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039961.054 units remaining) @@ -158,7 +158,7 @@ trace (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039961.034 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.019 units remaining) @@ -168,16 +168,16 @@ trace [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039960.979 units remaining) - [ "C" @elt + [ "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039960.969 units remaining) [ True - "C" @elt + "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039960.959 units remaining) - [ "C" @elt + [ "C" True { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] @@ -202,7 +202,7 @@ trace [ { "B" ; "C" ; "asdf" } (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.559 units remaining) - [ "B" @elt + [ "B" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.544 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] @@ -214,7 +214,7 @@ trace (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039960.514 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039960.499 units remaining) @@ -240,7 +240,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039960.374 units remaining) - [ "B" @elt + [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -267,7 +267,7 @@ trace - location: 63 (remaining gas: 1039960.054 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.039 units remaining) - [ "C" @elt + [ "C" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.024 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] @@ -279,7 +279,7 @@ trace (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.994 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.979 units remaining) @@ -305,7 +305,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039959.854 units remaining) - [ "C" @elt + [ "C" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -332,7 +332,7 @@ trace - location: 63 (remaining gas: 1039959.534 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039959.519 units remaining) - [ "asdf" @elt + [ "asdf" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039959.504 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] @@ -344,7 +344,7 @@ trace (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.474 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.459 units remaining) @@ -370,7 +370,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039959.334 units remaining) - [ "asdf" @elt + [ "asdf" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" index 165553eab027..0e797d9d170e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" @@ -10,15 +10,15 @@ trace - location: 12 (remaining gas: 1039962.499 units remaining) [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ] - location: 12 (remaining gas: 1039962.489 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 13 (remaining gas: 1039962.479 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter - (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) + (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 14 (remaining gas: 1039962.469 units remaining) [ { "B" ; "C" ; "asdf" } - (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 15 (remaining gas: 1039962.454 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 17 (remaining gas: 1039962.444 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } ] - location: 15 (remaining gas: 1039962.414 units remaining) @@ -33,7 +33,7 @@ trace {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039962.184 units remaining) - [ "B" @elt + [ "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 23 (remaining gas: 1039962.169 units remaining) @@ -44,7 +44,7 @@ trace (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039962.149 units remaining) - [ "B" @elt + [ "B" (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039962.134 units remaining) @@ -54,16 +54,16 @@ trace [ {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039962.094 units remaining) - [ "B" @elt + [ "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039962.084 units remaining) [ True - "B" @elt + "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039962.074 units remaining) - [ "B" @elt + [ "B" True {} { "B" ; "B" ; "asdf" ; "C" } ] @@ -71,7 +71,7 @@ trace [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039961.859 units remaining) - [ "C" @elt + [ "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 23 (remaining gas: 1039961.844 units remaining) @@ -82,7 +82,7 @@ trace (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039961.824 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.809 units remaining) @@ -92,16 +92,16 @@ trace [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.769 units remaining) - [ "C" @elt + [ "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039961.759 units remaining) [ True - "C" @elt + "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039961.749 units remaining) - [ "C" @elt + [ "C" True { "B" } { "B" ; "B" ; "asdf" ; "C" } ] @@ -109,7 +109,7 @@ trace [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039961.464 units remaining) - [ "asdf" @elt + [ "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 23 (remaining gas: 1039961.449 units remaining) @@ -120,7 +120,7 @@ trace (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039961.429 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.414 units remaining) @@ -130,16 +130,16 @@ trace [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.374 units remaining) - [ "asdf" @elt + [ "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039961.364 units remaining) [ True - "asdf" @elt + "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039961.354 units remaining) - [ "asdf" @elt + [ "asdf" True { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] @@ -164,7 +164,7 @@ trace [ { "B" ; "B" ; "asdf" ; "C" } (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.954 units remaining) - [ "B" @elt + [ "B" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.939 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] @@ -176,7 +176,7 @@ trace (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039960.909 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039960.894 units remaining) @@ -202,7 +202,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039960.769 units remaining) - [ "B" @elt + [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -229,7 +229,7 @@ trace - location: 63 (remaining gas: 1039960.449 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.434 units remaining) - [ "B" @elt + [ "B" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.419 units remaining) [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] @@ -241,7 +241,7 @@ trace (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039960.389 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039960.374 units remaining) @@ -267,7 +267,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039960.249 units remaining) - [ "B" @elt + [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -294,7 +294,7 @@ trace - location: 63 (remaining gas: 1039959.929 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039959.914 units remaining) - [ "asdf" @elt + [ "asdf" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039959.899 units remaining) [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] @@ -306,7 +306,7 @@ trace (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.869 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.854 units remaining) @@ -332,7 +332,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039959.729 units remaining) - [ "asdf" @elt + [ "asdf" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -359,7 +359,7 @@ trace - location: 63 (remaining gas: 1039959.409 units remaining) [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039959.394 units remaining) - [ "C" @elt + [ "C" (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039959.379 units remaining) [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] @@ -371,7 +371,7 @@ trace (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.349 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.334 units remaining) @@ -397,7 +397,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039959.209 units remaining) - [ "C" @elt + [ "C" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" index 619995e7ce0d..4dc4eb6a6835 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" @@ -10,15 +10,15 @@ trace - location: 12 (remaining gas: 1039963.179 units remaining) [ (Pair (Pair { "B" } { "B" }) None) ] - location: 12 (remaining gas: 1039963.169 units remaining) - [ (Pair { "B" } { "B" }) @parameter ] + [ (Pair { "B" } { "B" }) ] - location: 13 (remaining gas: 1039963.159 units remaining) - [ (Pair { "B" } { "B" }) @parameter - (Pair { "B" } { "B" }) @parameter ] + [ (Pair { "B" } { "B" }) + (Pair { "B" } { "B" }) ] - location: 14 (remaining gas: 1039963.149 units remaining) [ { "B" } - (Pair { "B" } { "B" }) @parameter ] + (Pair { "B" } { "B" }) ] - location: 15 (remaining gas: 1039963.134 units remaining) - [ (Pair { "B" } { "B" }) @parameter ] + [ (Pair { "B" } { "B" }) ] - location: 17 (remaining gas: 1039963.124 units remaining) [ { "B" } ] - location: 15 (remaining gas: 1039963.094 units remaining) @@ -33,7 +33,7 @@ trace {} { "B" } ] - location: 21 (remaining gas: 1039962.864 units remaining) - [ "B" @elt + [ "B" {} { "B" } ] - location: 23 (remaining gas: 1039962.849 units remaining) @@ -44,7 +44,7 @@ trace (Pair "B" {}) { "B" } ] - location: 25 (remaining gas: 1039962.829 units remaining) - [ "B" @elt + [ "B" (Pair "B" {}) { "B" } ] - location: 26 (remaining gas: 1039962.814 units remaining) @@ -54,16 +54,16 @@ trace [ {} { "B" } ] - location: 26 (remaining gas: 1039962.774 units remaining) - [ "B" @elt + [ "B" {} { "B" } ] - location: 29 (remaining gas: 1039962.764 units remaining) [ True - "B" @elt + "B" {} { "B" } ] - location: 32 (remaining gas: 1039962.754 units remaining) - [ "B" @elt + [ "B" True {} { "B" } ] @@ -88,7 +88,7 @@ trace [ { "B" } (Pair { "B" } True) ] - location: 40 (remaining gas: 1039962.494 units remaining) - [ "B" @elt + [ "B" (Pair { "B" } True) ] - location: 42 (remaining gas: 1039962.479 units remaining) [ (Pair "B" { "B" } True) ] @@ -100,7 +100,7 @@ trace (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - location: 45 (remaining gas: 1039962.449 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - location: 46 (remaining gas: 1039962.434 units remaining) @@ -126,7 +126,7 @@ trace { "B" } True ] - location: 46 (remaining gas: 1039962.309 units remaining) - [ "B" @elt + [ "B" { "B" } { "B" } True ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" index 9bd7f859c138..e02f80d28ca9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" @@ -10,15 +10,15 @@ trace - location: 12 (remaining gas: 1039963.179 units remaining) [ (Pair (Pair { "c" } { "B" }) None) ] - location: 12 (remaining gas: 1039963.169 units remaining) - [ (Pair { "c" } { "B" }) @parameter ] + [ (Pair { "c" } { "B" }) ] - location: 13 (remaining gas: 1039963.159 units remaining) - [ (Pair { "c" } { "B" }) @parameter - (Pair { "c" } { "B" }) @parameter ] + [ (Pair { "c" } { "B" }) + (Pair { "c" } { "B" }) ] - location: 14 (remaining gas: 1039963.149 units remaining) [ { "c" } - (Pair { "c" } { "B" }) @parameter ] + (Pair { "c" } { "B" }) ] - location: 15 (remaining gas: 1039963.134 units remaining) - [ (Pair { "c" } { "B" }) @parameter ] + [ (Pair { "c" } { "B" }) ] - location: 17 (remaining gas: 1039963.124 units remaining) [ { "B" } ] - location: 15 (remaining gas: 1039963.094 units remaining) @@ -33,7 +33,7 @@ trace {} { "B" } ] - location: 21 (remaining gas: 1039962.864 units remaining) - [ "c" @elt + [ "c" {} { "B" } ] - location: 23 (remaining gas: 1039962.849 units remaining) @@ -44,7 +44,7 @@ trace (Pair "c" {}) { "B" } ] - location: 25 (remaining gas: 1039962.829 units remaining) - [ "c" @elt + [ "c" (Pair "c" {}) { "B" } ] - location: 26 (remaining gas: 1039962.814 units remaining) @@ -54,16 +54,16 @@ trace [ {} { "B" } ] - location: 26 (remaining gas: 1039962.774 units remaining) - [ "c" @elt + [ "c" {} { "B" } ] - location: 29 (remaining gas: 1039962.764 units remaining) [ True - "c" @elt + "c" {} { "B" } ] - location: 32 (remaining gas: 1039962.754 units remaining) - [ "c" @elt + [ "c" True {} { "B" } ] @@ -88,7 +88,7 @@ trace [ { "B" } (Pair { "c" } True) ] - location: 40 (remaining gas: 1039962.494 units remaining) - [ "B" @elt + [ "B" (Pair { "c" } True) ] - location: 42 (remaining gas: 1039962.479 units remaining) [ (Pair "B" { "c" } True) ] @@ -100,7 +100,7 @@ trace (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - location: 45 (remaining gas: 1039962.449 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - location: 46 (remaining gas: 1039962.434 units remaining) @@ -126,7 +126,7 @@ trace { "c" } True ] - location: 46 (remaining gas: 1039962.309 units remaining) - [ "B" @elt + [ "B" { "c" } { "c" } True ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out index 72f041197566..aaaa1e914204 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out @@ -10,15 +10,15 @@ trace - location: 12 (remaining gas: 1039963.427 units remaining) [ (Pair (Pair {} {}) None) ] - location: 12 (remaining gas: 1039963.417 units remaining) - [ (Pair {} {}) @parameter ] + [ (Pair {} {}) ] - location: 13 (remaining gas: 1039963.407 units remaining) - [ (Pair {} {}) @parameter - (Pair {} {}) @parameter ] + [ (Pair {} {}) + (Pair {} {}) ] - location: 14 (remaining gas: 1039963.397 units remaining) [ {} - (Pair {} {}) @parameter ] + (Pair {} {}) ] - location: 15 (remaining gas: 1039963.382 units remaining) - [ (Pair {} {}) @parameter ] + [ (Pair {} {}) ] - location: 17 (remaining gas: 1039963.372 units remaining) [ {} ] - location: 15 (remaining gas: 1039963.342 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" index 0b17bfce6676..fa78a318c1e0 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" @@ -10,13 +10,13 @@ trace - location: 7 (remaining gas: 1039340.345 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] - location: 7 (remaining gas: 1039340.335 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 8 (remaining gas: 1039340.085 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter.contract ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 11 (remaining gas: 1039340.075 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.contract.some ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 11 (remaining gas: 1039340.060 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.contract.some ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 17 (remaining gas: 1039340.050 units remaining) [ ] - location: 18 (remaining gas: 1039340.040 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" index 972ac54980cf..d19c0feb319b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" @@ -20,11 +20,11 @@ emitted operations - location: 9 (remaining gas: 1039984.174 units remaining) [ Unit ] - location: 10 (remaining gas: 1039984.159 units remaining) - [ 50000 @amount + [ 50000 Unit ] - location: 11 (remaining gas: 1039984.144 units remaining) [ None - 50000 @amount + 50000 Unit ] - location: 13 (remaining gas: 1039983.538 units remaining) [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" index 5478dabbccce..66ca6f53cf99 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.353 units remaining) [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039991.343 units remaining) - [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 10 (remaining gas: 1039991.333 units remaining) - [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter - (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") + (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039991.323 units remaining) [ "1970-01-01T00:03:20Z" - (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] + (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039991.308 units remaining) - [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 14 (remaining gas: 1039991.298 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 12 (remaining gas: 1039991.268 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out index a772e0dfe57a..a433c1e26dd1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.553 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039991.523 units remaining) [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 14 (remaining gas: 1039991.498 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 12 (remaining gas: 1039991.468 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out index 3d5e09835074..0c2965f5dd3c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.553 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 11 (remaining gas: 1039991.523 units remaining) [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") @parameter ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 14 (remaining gas: 1039991.498 units remaining) [ "1970-01-01T00:00:01Z" ] - location: 12 (remaining gas: 1039991.468 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out index 117d98909ce7..0c31e3da2c51 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.553 units remaining) [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter - (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") + (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039991.523 units remaining) [ "1970-01-01T00:00:01Z" - (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] + (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") @parameter ] + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 14 (remaining gas: 1039991.498 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 12 (remaining gas: 1039991.468 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out index c025a7303144..bc3fd2b0914a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out @@ -10,107 +10,107 @@ trace - location: 24 (remaining gas: 1039868.707 units remaining) [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ] - location: 24 (remaining gas: 1039868.697 units remaining) - [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 25 (remaining gas: 1039868.687 units remaining) - [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 27 (remaining gas: 1039868.677 units remaining) [ 17 (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 28 (remaining gas: 1039868.662 units remaining) [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 30 (remaining gas: 1039868.652 units remaining) [ 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 28 (remaining gas: 1039868.622 units remaining) [ 17 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.574 units remaining) [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 34 (remaining gas: 1039868.564 units remaining) [ 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.539 units remaining) [ 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.480 units remaining) [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 38 (remaining gas: 1039868.470 units remaining) [ 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.445 units remaining) [ 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.435 units remaining) [ 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.374 units remaining) [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 42 (remaining gas: 1039868.364 units remaining) [ 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.339 units remaining) [ 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.329 units remaining) [ 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.319 units remaining) [ 16 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) [ 17 16 @@ -118,7 +118,7 @@ trace 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) [ 17 16 @@ -126,32 +126,32 @@ trace 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.257 units remaining) [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 46 (remaining gas: 1039868.247 units remaining) [ 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.222 units remaining) [ 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.212 units remaining) [ 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.202 units remaining) [ 15 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.192 units remaining) [ 16 15 @@ -159,7 +159,7 @@ trace 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) [ 17 16 @@ -168,7 +168,7 @@ trace 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) [ 17 16 @@ -177,32 +177,32 @@ trace 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.128 units remaining) [ (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 50 (remaining gas: 1039868.118 units remaining) [ 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.093 units remaining) [ 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.083 units remaining) [ 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.073 units remaining) [ 14 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.063 units remaining) [ 15 14 @@ -210,7 +210,7 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.053 units remaining) [ 16 15 @@ -219,7 +219,7 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) [ 17 16 @@ -229,7 +229,7 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) [ 17 16 @@ -239,32 +239,32 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.988 units remaining) [ (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 54 (remaining gas: 1039867.978 units remaining) [ 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.953 units remaining) [ 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.943 units remaining) [ 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.933 units remaining) [ 13 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.923 units remaining) [ 14 13 @@ -272,7 +272,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.913 units remaining) [ 15 14 @@ -281,7 +281,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.903 units remaining) [ 16 15 @@ -291,7 +291,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) [ 17 16 @@ -302,7 +302,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) [ 17 16 @@ -313,32 +313,32 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.835 units remaining) [ (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 58 (remaining gas: 1039867.825 units remaining) [ 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.800 units remaining) [ 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.790 units remaining) [ 11 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.780 units remaining) [ 12 11 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.770 units remaining) [ 13 12 @@ -346,7 +346,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.760 units remaining) [ 14 13 @@ -355,7 +355,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.750 units remaining) [ 15 14 @@ -365,7 +365,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.740 units remaining) [ 16 15 @@ -376,7 +376,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) [ 17 16 @@ -388,7 +388,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) [ 17 16 @@ -400,32 +400,32 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.671 units remaining) [ (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 62 (remaining gas: 1039867.661 units remaining) [ 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.636 units remaining) [ 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.626 units remaining) [ 10 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.616 units remaining) [ 11 10 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.606 units remaining) [ 12 11 @@ -433,7 +433,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.596 units remaining) [ 13 12 @@ -442,7 +442,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.586 units remaining) [ 14 13 @@ -452,7 +452,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.576 units remaining) [ 15 14 @@ -463,7 +463,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.566 units remaining) [ 16 15 @@ -475,7 +475,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) [ 17 16 @@ -488,7 +488,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) [ 17 16 @@ -501,32 +501,32 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.495 units remaining) [ (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 66 (remaining gas: 1039867.485 units remaining) [ 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.460 units remaining) [ 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.450 units remaining) [ 9 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.440 units remaining) [ 10 9 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.430 units remaining) [ 11 10 @@ -534,7 +534,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.420 units remaining) [ 12 11 @@ -543,7 +543,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.410 units remaining) [ 13 12 @@ -553,7 +553,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.400 units remaining) [ 14 13 @@ -564,7 +564,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.390 units remaining) [ 15 14 @@ -576,7 +576,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.380 units remaining) [ 16 15 @@ -589,7 +589,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) [ 17 16 @@ -603,7 +603,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) [ 17 16 @@ -617,32 +617,32 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.308 units remaining) [ (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 70 (remaining gas: 1039867.298 units remaining) [ 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.273 units remaining) [ 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.263 units remaining) [ 8 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.253 units remaining) [ 9 8 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.243 units remaining) [ 10 9 @@ -650,7 +650,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.233 units remaining) [ 11 10 @@ -659,7 +659,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.223 units remaining) [ 12 11 @@ -669,7 +669,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.213 units remaining) [ 13 12 @@ -680,7 +680,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.203 units remaining) [ 14 13 @@ -692,7 +692,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.193 units remaining) [ 15 14 @@ -705,7 +705,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.183 units remaining) [ 16 15 @@ -719,7 +719,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) [ 17 16 @@ -734,7 +734,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) [ 17 16 @@ -749,32 +749,32 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.109 units remaining) [ (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 74 (remaining gas: 1039867.099 units remaining) [ 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.074 units remaining) [ 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.064 units remaining) [ 7 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.054 units remaining) [ 8 7 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.044 units remaining) [ 9 8 @@ -782,7 +782,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.034 units remaining) [ 10 9 @@ -791,7 +791,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.024 units remaining) [ 11 10 @@ -801,7 +801,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.014 units remaining) [ 12 11 @@ -812,7 +812,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.004 units remaining) [ 13 12 @@ -824,7 +824,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.994 units remaining) [ 14 13 @@ -837,7 +837,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.984 units remaining) [ 15 14 @@ -851,7 +851,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.974 units remaining) [ 16 15 @@ -866,7 +866,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) [ 17 16 @@ -882,7 +882,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) [ 17 16 @@ -898,32 +898,32 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.899 units remaining) [ (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 78 (remaining gas: 1039866.889 units remaining) [ 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.864 units remaining) [ 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.854 units remaining) [ 6 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.844 units remaining) [ 7 6 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.834 units remaining) [ 8 7 @@ -931,7 +931,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.824 units remaining) [ 9 8 @@ -940,7 +940,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.814 units remaining) [ 10 9 @@ -950,7 +950,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.804 units remaining) [ 11 10 @@ -961,7 +961,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.794 units remaining) [ 12 11 @@ -973,7 +973,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.784 units remaining) [ 13 12 @@ -986,7 +986,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.774 units remaining) [ 14 13 @@ -1000,7 +1000,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.764 units remaining) [ 15 14 @@ -1015,7 +1015,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.754 units remaining) [ 16 15 @@ -1031,7 +1031,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) [ 17 16 @@ -1048,7 +1048,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) [ 17 16 @@ -1065,32 +1065,32 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.677 units remaining) [ (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 82 (remaining gas: 1039866.667 units remaining) [ 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.642 units remaining) [ 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.632 units remaining) [ 5 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.622 units remaining) [ 6 5 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.612 units remaining) [ 7 6 @@ -1098,7 +1098,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.602 units remaining) [ 8 7 @@ -1107,7 +1107,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.592 units remaining) [ 9 8 @@ -1117,7 +1117,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.582 units remaining) [ 10 9 @@ -1128,7 +1128,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.572 units remaining) [ 11 10 @@ -1140,7 +1140,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.562 units remaining) [ 12 11 @@ -1153,7 +1153,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.552 units remaining) [ 13 12 @@ -1167,7 +1167,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.542 units remaining) [ 14 13 @@ -1182,7 +1182,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.532 units remaining) [ 15 14 @@ -1198,7 +1198,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.522 units remaining) [ 16 15 @@ -1215,7 +1215,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) [ 17 16 @@ -1233,7 +1233,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) [ 17 16 @@ -1251,32 +1251,32 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.444 units remaining) [ (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 86 (remaining gas: 1039866.434 units remaining) [ 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.409 units remaining) [ 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.399 units remaining) [ 4 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.389 units remaining) [ 5 4 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.379 units remaining) [ 6 5 @@ -1284,7 +1284,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.369 units remaining) [ 7 6 @@ -1293,7 +1293,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.359 units remaining) [ 8 7 @@ -1303,7 +1303,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.349 units remaining) [ 9 8 @@ -1314,7 +1314,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.339 units remaining) [ 10 9 @@ -1326,7 +1326,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.329 units remaining) [ 11 10 @@ -1339,7 +1339,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.319 units remaining) [ 12 11 @@ -1353,7 +1353,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.309 units remaining) [ 13 12 @@ -1368,7 +1368,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.299 units remaining) [ 14 13 @@ -1384,7 +1384,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.289 units remaining) [ 15 14 @@ -1401,7 +1401,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.279 units remaining) [ 16 15 @@ -1419,7 +1419,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) [ 17 16 @@ -1438,7 +1438,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) [ 17 16 @@ -1457,7 +1457,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 87 (remaining gas: 1039866.209 units remaining) [ 17 16 @@ -1476,7 +1476,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 89 (remaining gas: 1039866.143 units remaining) [ 16 17 @@ -1495,7 +1495,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 91 (remaining gas: 1039866.070 units remaining) [ 15 16 @@ -1514,7 +1514,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 93 (remaining gas: 1039865.991 units remaining) [ 14 15 @@ -1533,7 +1533,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 95 (remaining gas: 1039865.904 units remaining) [ 13 14 @@ -1552,7 +1552,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 97 (remaining gas: 1039865.811 units remaining) [ 12 13 @@ -1571,7 +1571,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 99 (remaining gas: 1039865.711 units remaining) [ 11 12 @@ -1590,7 +1590,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 101 (remaining gas: 1039865.605 units remaining) [ 10 11 @@ -1609,7 +1609,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 103 (remaining gas: 1039865.491 units remaining) [ 9 10 @@ -1628,7 +1628,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 105 (remaining gas: 1039865.371 units remaining) [ 8 9 @@ -1647,7 +1647,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 107 (remaining gas: 1039865.244 units remaining) [ 7 8 @@ -1666,7 +1666,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 109 (remaining gas: 1039865.111 units remaining) [ 6 7 @@ -1685,7 +1685,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 111 (remaining gas: 1039864.970 units remaining) [ 5 6 @@ -1704,7 +1704,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 113 (remaining gas: 1039864.823 units remaining) [ 4 5 @@ -1723,7 +1723,7 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 115 (remaining gas: 1039864.669 units remaining) [ 3 4 @@ -1742,7 +1742,7 @@ trace 17 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 117 (remaining gas: 1039864.509 units remaining) [ 2 3 @@ -1761,7 +1761,7 @@ trace 16 17 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 119 (remaining gas: 1039864.341 units remaining) [ 1 2 @@ -1780,7 +1780,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 121 (remaining gas: 1039864.281 units remaining) [ 1 2 @@ -1799,7 +1799,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 123 (remaining gas: 1039864.215 units remaining) [ 2 1 @@ -1818,7 +1818,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 125 (remaining gas: 1039864.142 units remaining) [ 3 2 @@ -1837,7 +1837,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 127 (remaining gas: 1039864.063 units remaining) [ 4 3 @@ -1856,7 +1856,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 129 (remaining gas: 1039863.976 units remaining) [ 5 4 @@ -1875,7 +1875,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 131 (remaining gas: 1039863.883 units remaining) [ 6 5 @@ -1894,7 +1894,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 133 (remaining gas: 1039863.783 units remaining) [ 7 6 @@ -1913,7 +1913,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 135 (remaining gas: 1039863.677 units remaining) [ 8 7 @@ -1932,7 +1932,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 137 (remaining gas: 1039863.563 units remaining) [ 9 8 @@ -1951,7 +1951,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 139 (remaining gas: 1039863.443 units remaining) [ 10 9 @@ -1970,7 +1970,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 141 (remaining gas: 1039863.316 units remaining) [ 11 10 @@ -1989,7 +1989,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 143 (remaining gas: 1039863.183 units remaining) [ 12 11 @@ -2008,7 +2008,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 145 (remaining gas: 1039863.042 units remaining) [ 13 12 @@ -2027,7 +2027,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 147 (remaining gas: 1039862.895 units remaining) [ 14 13 @@ -2046,7 +2046,7 @@ trace 15 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 149 (remaining gas: 1039862.741 units remaining) [ 15 14 @@ -2065,7 +2065,7 @@ trace 1 16 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 151 (remaining gas: 1039862.581 units remaining) [ 16 15 @@ -2084,7 +2084,7 @@ trace 2 1 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 153 (remaining gas: 1039862.413 units remaining) [ 17 16 @@ -2103,36 +2103,36 @@ trace 3 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.345 units remaining) [ 2 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 159 (remaining gas: 1039862.330 units remaining) [ (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.305 units remaining) [ 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.295 units remaining) [ 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.285 units remaining) [ 5 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.275 units remaining) [ 6 5 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.265 units remaining) [ 7 6 @@ -2140,7 +2140,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.255 units remaining) [ 8 7 @@ -2149,7 +2149,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.245 units remaining) [ 9 8 @@ -2159,7 +2159,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.235 units remaining) [ 10 9 @@ -2170,7 +2170,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.225 units remaining) [ 11 10 @@ -2182,7 +2182,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.215 units remaining) [ 12 11 @@ -2195,7 +2195,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.205 units remaining) [ 13 12 @@ -2209,7 +2209,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.195 units remaining) [ 14 13 @@ -2224,7 +2224,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.185 units remaining) [ 15 14 @@ -2240,7 +2240,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.175 units remaining) [ 16 15 @@ -2257,7 +2257,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) [ 17 16 @@ -2275,7 +2275,7 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) [ 17 16 @@ -2293,36 +2293,36 @@ trace 4 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.098 units remaining) [ 3 (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 163 (remaining gas: 1039862.083 units remaining) [ (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.058 units remaining) [ 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.048 units remaining) [ 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.038 units remaining) [ 6 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.028 units remaining) [ 7 6 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.018 units remaining) [ 8 7 @@ -2330,7 +2330,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.008 units remaining) [ 9 8 @@ -2339,7 +2339,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.998 units remaining) [ 10 9 @@ -2349,7 +2349,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.988 units remaining) [ 11 10 @@ -2360,7 +2360,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.978 units remaining) [ 12 11 @@ -2372,7 +2372,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.968 units remaining) [ 13 12 @@ -2385,7 +2385,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.958 units remaining) [ 14 13 @@ -2399,7 +2399,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.948 units remaining) [ 15 14 @@ -2414,7 +2414,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.938 units remaining) [ 16 15 @@ -2430,7 +2430,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) [ 17 16 @@ -2447,7 +2447,7 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) [ 17 16 @@ -2464,36 +2464,36 @@ trace 5 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.863 units remaining) [ 4 (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 167 (remaining gas: 1039861.848 units remaining) [ (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.823 units remaining) [ 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.813 units remaining) [ 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.803 units remaining) [ 7 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.793 units remaining) [ 8 7 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.783 units remaining) [ 9 8 @@ -2501,7 +2501,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.773 units remaining) [ 10 9 @@ -2510,7 +2510,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.763 units remaining) [ 11 10 @@ -2520,7 +2520,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.753 units remaining) [ 12 11 @@ -2531,7 +2531,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.743 units remaining) [ 13 12 @@ -2543,7 +2543,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.733 units remaining) [ 14 13 @@ -2556,7 +2556,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.723 units remaining) [ 15 14 @@ -2570,7 +2570,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.713 units remaining) [ 16 15 @@ -2585,7 +2585,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) [ 17 16 @@ -2601,7 +2601,7 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) [ 17 16 @@ -2617,36 +2617,36 @@ trace 6 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.639 units remaining) [ 5 (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 171 (remaining gas: 1039861.624 units remaining) [ (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.599 units remaining) [ 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.589 units remaining) [ 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.579 units remaining) [ 8 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.569 units remaining) [ 9 8 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.559 units remaining) [ 10 9 @@ -2654,7 +2654,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.549 units remaining) [ 11 10 @@ -2663,7 +2663,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.539 units remaining) [ 12 11 @@ -2673,7 +2673,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.529 units remaining) [ 13 12 @@ -2684,7 +2684,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.519 units remaining) [ 14 13 @@ -2696,7 +2696,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.509 units remaining) [ 15 14 @@ -2709,7 +2709,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.499 units remaining) [ 16 15 @@ -2723,7 +2723,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) [ 17 16 @@ -2738,7 +2738,7 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) [ 17 16 @@ -2753,36 +2753,36 @@ trace 7 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.427 units remaining) [ 6 (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 175 (remaining gas: 1039861.412 units remaining) [ (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.387 units remaining) [ 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.377 units remaining) [ 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.367 units remaining) [ 9 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.357 units remaining) [ 10 9 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.347 units remaining) [ 11 10 @@ -2790,7 +2790,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.337 units remaining) [ 12 11 @@ -2799,7 +2799,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.327 units remaining) [ 13 12 @@ -2809,7 +2809,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.317 units remaining) [ 14 13 @@ -2820,7 +2820,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.307 units remaining) [ 15 14 @@ -2832,7 +2832,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.297 units remaining) [ 16 15 @@ -2845,7 +2845,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) [ 17 16 @@ -2859,7 +2859,7 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) [ 17 16 @@ -2873,36 +2873,36 @@ trace 8 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.226 units remaining) [ 7 (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 179 (remaining gas: 1039861.211 units remaining) [ (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.186 units remaining) [ 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.176 units remaining) [ 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.166 units remaining) [ 10 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.156 units remaining) [ 11 10 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.146 units remaining) [ 12 11 @@ -2910,7 +2910,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.136 units remaining) [ 13 12 @@ -2919,7 +2919,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.126 units remaining) [ 14 13 @@ -2929,7 +2929,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.116 units remaining) [ 15 14 @@ -2940,7 +2940,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.106 units remaining) [ 16 15 @@ -2952,7 +2952,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) [ 17 16 @@ -2965,7 +2965,7 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) [ 17 16 @@ -2978,36 +2978,36 @@ trace 9 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039861.037 units remaining) [ 8 (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 183 (remaining gas: 1039861.022 units remaining) [ (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.997 units remaining) [ 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.987 units remaining) [ 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.977 units remaining) [ 11 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.967 units remaining) [ 12 11 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.957 units remaining) [ 13 12 @@ -3015,7 +3015,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.947 units remaining) [ 14 13 @@ -3024,7 +3024,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.937 units remaining) [ 15 14 @@ -3034,7 +3034,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.927 units remaining) [ 16 15 @@ -3045,7 +3045,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) [ 17 16 @@ -3057,7 +3057,7 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) [ 17 16 @@ -3069,36 +3069,36 @@ trace 10 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.859 units remaining) [ 9 (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 187 (remaining gas: 1039860.844 units remaining) [ (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.819 units remaining) [ 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.809 units remaining) [ 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.799 units remaining) [ 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.789 units remaining) [ 13 12 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.779 units remaining) [ 14 13 @@ -3106,7 +3106,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.769 units remaining) [ 15 14 @@ -3115,7 +3115,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.759 units remaining) [ 16 15 @@ -3125,7 +3125,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) [ 17 16 @@ -3136,7 +3136,7 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) [ 17 16 @@ -3147,36 +3147,36 @@ trace 11 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.694 units remaining) [ 10 (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 191 (remaining gas: 1039860.679 units remaining) [ (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.654 units remaining) [ 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.644 units remaining) [ 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.634 units remaining) [ 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.624 units remaining) [ 14 13 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.614 units remaining) [ 15 14 @@ -3184,7 +3184,7 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.604 units remaining) [ 16 15 @@ -3193,7 +3193,7 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) [ 17 16 @@ -3203,7 +3203,7 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) [ 17 16 @@ -3213,36 +3213,36 @@ trace 12 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.540 units remaining) [ 11 (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 195 (remaining gas: 1039860.525 units remaining) [ (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.500 units remaining) [ 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.490 units remaining) [ 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.480 units remaining) [ 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.470 units remaining) [ 15 14 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.460 units remaining) [ 16 15 @@ -3250,7 +3250,7 @@ trace 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) [ 17 16 @@ -3259,7 +3259,7 @@ trace 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) [ 17 16 @@ -3268,36 +3268,36 @@ trace 13 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.398 units remaining) [ 12 (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 199 (remaining gas: 1039860.383 units remaining) [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.358 units remaining) [ 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.348 units remaining) [ 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.338 units remaining) [ 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.328 units remaining) [ 16 15 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) [ 17 16 @@ -3305,7 +3305,7 @@ trace 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) [ 17 16 @@ -3313,106 +3313,106 @@ trace 14 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.267 units remaining) [ 13 (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 203 (remaining gas: 1039860.252 units remaining) [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.227 units remaining) [ 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.217 units remaining) [ 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.207 units remaining) [ 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) [ 17 16 15 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.148 units remaining) [ 14 (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 207 (remaining gas: 1039860.133 units remaining) [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.108 units remaining) [ 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.098 units remaining) [ 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) [ 17 16 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039860.040 units remaining) [ 15 (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 211 (remaining gas: 1039860.025 units remaining) [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039860 units remaining) [ 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) [ 17 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) [ 17 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 212 (remaining gas: 1039859.975 units remaining) [ 16 (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 214 (remaining gas: 1039859.960 units remaining) [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 212 (remaining gas: 1039859.930 units remaining) [ 17 (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 215 (remaining gas: 1039859.915 units remaining) [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) @parameter ] + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 218 (remaining gas: 1039859.160 units remaining) [ 0 ] - location: 219 (remaining gas: 1039859.145 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out index 7626b5532bc3..67c801c0862b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out @@ -10,107 +10,107 @@ trace - location: 24 (remaining gas: 1039868.707 units remaining) [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ] - location: 24 (remaining gas: 1039868.697 units remaining) - [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 25 (remaining gas: 1039868.687 units remaining) - [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 27 (remaining gas: 1039868.677 units remaining) [ 2 (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 28 (remaining gas: 1039868.662 units remaining) [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 30 (remaining gas: 1039868.652 units remaining) [ 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 28 (remaining gas: 1039868.622 units remaining) [ 2 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.574 units remaining) [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 34 (remaining gas: 1039868.564 units remaining) [ 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.539 units remaining) [ 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.480 units remaining) [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 38 (remaining gas: 1039868.470 units remaining) [ 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.445 units remaining) [ 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.435 units remaining) [ 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.374 units remaining) [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 42 (remaining gas: 1039868.364 units remaining) [ 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.339 units remaining) [ 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.329 units remaining) [ 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.319 units remaining) [ 3 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) [ 2 3 @@ -118,7 +118,7 @@ trace 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) [ 2 3 @@ -126,32 +126,32 @@ trace 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.257 units remaining) [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 46 (remaining gas: 1039868.247 units remaining) [ 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.222 units remaining) [ 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.212 units remaining) [ 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.202 units remaining) [ 12 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.192 units remaining) [ 3 12 @@ -159,7 +159,7 @@ trace 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) [ 2 3 @@ -168,7 +168,7 @@ trace 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) [ 2 3 @@ -177,32 +177,32 @@ trace 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.128 units remaining) [ (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 50 (remaining gas: 1039868.118 units remaining) [ 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.093 units remaining) [ 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.083 units remaining) [ 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.073 units remaining) [ 16 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.063 units remaining) [ 12 16 @@ -210,7 +210,7 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.053 units remaining) [ 3 12 @@ -219,7 +219,7 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) [ 2 3 @@ -229,7 +229,7 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) [ 2 3 @@ -239,32 +239,32 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.988 units remaining) [ (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 54 (remaining gas: 1039867.978 units remaining) [ 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.953 units remaining) [ 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.943 units remaining) [ 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.933 units remaining) [ 10 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.923 units remaining) [ 16 10 @@ -272,7 +272,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.913 units remaining) [ 12 16 @@ -281,7 +281,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.903 units remaining) [ 3 12 @@ -291,7 +291,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) [ 2 3 @@ -302,7 +302,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) [ 2 3 @@ -313,32 +313,32 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.835 units remaining) [ (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 58 (remaining gas: 1039867.825 units remaining) [ 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.800 units remaining) [ 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.790 units remaining) [ 19 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.780 units remaining) [ 14 19 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.770 units remaining) [ 10 14 @@ -346,7 +346,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.760 units remaining) [ 16 10 @@ -355,7 +355,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.750 units remaining) [ 12 16 @@ -365,7 +365,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.740 units remaining) [ 3 12 @@ -376,7 +376,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) [ 2 3 @@ -388,7 +388,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) [ 2 3 @@ -400,32 +400,32 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.671 units remaining) [ (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 62 (remaining gas: 1039867.661 units remaining) [ 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.636 units remaining) [ 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.626 units remaining) [ 9 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.616 units remaining) [ 19 9 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.606 units remaining) [ 14 19 @@ -433,7 +433,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.596 units remaining) [ 10 14 @@ -442,7 +442,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.586 units remaining) [ 16 10 @@ -452,7 +452,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.576 units remaining) [ 12 16 @@ -463,7 +463,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.566 units remaining) [ 3 12 @@ -475,7 +475,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) [ 2 3 @@ -488,7 +488,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) [ 2 3 @@ -501,32 +501,32 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.495 units remaining) [ (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 66 (remaining gas: 1039867.485 units remaining) [ 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.460 units remaining) [ 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.450 units remaining) [ 18 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.440 units remaining) [ 9 18 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.430 units remaining) [ 19 9 @@ -534,7 +534,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.420 units remaining) [ 14 19 @@ -543,7 +543,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.410 units remaining) [ 10 14 @@ -553,7 +553,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.400 units remaining) [ 16 10 @@ -564,7 +564,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.390 units remaining) [ 12 16 @@ -576,7 +576,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.380 units remaining) [ 3 12 @@ -589,7 +589,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) [ 2 3 @@ -603,7 +603,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) [ 2 3 @@ -617,32 +617,32 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.308 units remaining) [ (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 70 (remaining gas: 1039867.298 units remaining) [ 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.273 units remaining) [ 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.263 units remaining) [ 6 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.253 units remaining) [ 18 6 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.243 units remaining) [ 9 18 @@ -650,7 +650,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.233 units remaining) [ 19 9 @@ -659,7 +659,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.223 units remaining) [ 14 19 @@ -669,7 +669,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.213 units remaining) [ 10 14 @@ -680,7 +680,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.203 units remaining) [ 16 10 @@ -692,7 +692,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.193 units remaining) [ 12 16 @@ -705,7 +705,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.183 units remaining) [ 3 12 @@ -719,7 +719,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) [ 2 3 @@ -734,7 +734,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) [ 2 3 @@ -749,32 +749,32 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.109 units remaining) [ (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 74 (remaining gas: 1039867.099 units remaining) [ 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.074 units remaining) [ 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.064 units remaining) [ 8 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.054 units remaining) [ 6 8 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.044 units remaining) [ 18 6 @@ -782,7 +782,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.034 units remaining) [ 9 18 @@ -791,7 +791,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.024 units remaining) [ 19 9 @@ -801,7 +801,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.014 units remaining) [ 14 19 @@ -812,7 +812,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.004 units remaining) [ 10 14 @@ -824,7 +824,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.994 units remaining) [ 16 10 @@ -837,7 +837,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.984 units remaining) [ 12 16 @@ -851,7 +851,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.974 units remaining) [ 3 12 @@ -866,7 +866,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) [ 2 3 @@ -882,7 +882,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) [ 2 3 @@ -898,32 +898,32 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.899 units remaining) [ (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 78 (remaining gas: 1039866.889 units remaining) [ 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.864 units remaining) [ 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.854 units remaining) [ 11 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.844 units remaining) [ 8 11 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.834 units remaining) [ 6 8 @@ -931,7 +931,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.824 units remaining) [ 18 6 @@ -940,7 +940,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.814 units remaining) [ 9 18 @@ -950,7 +950,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.804 units remaining) [ 19 9 @@ -961,7 +961,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.794 units remaining) [ 14 19 @@ -973,7 +973,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.784 units remaining) [ 10 14 @@ -986,7 +986,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.774 units remaining) [ 16 10 @@ -1000,7 +1000,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.764 units remaining) [ 12 16 @@ -1015,7 +1015,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.754 units remaining) [ 3 12 @@ -1031,7 +1031,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) [ 2 3 @@ -1048,7 +1048,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) [ 2 3 @@ -1065,32 +1065,32 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.677 units remaining) [ (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 82 (remaining gas: 1039866.667 units remaining) [ 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.642 units remaining) [ 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.632 units remaining) [ 4 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.622 units remaining) [ 11 4 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.612 units remaining) [ 8 11 @@ -1098,7 +1098,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.602 units remaining) [ 6 8 @@ -1107,7 +1107,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.592 units remaining) [ 18 6 @@ -1117,7 +1117,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.582 units remaining) [ 9 18 @@ -1128,7 +1128,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.572 units remaining) [ 19 9 @@ -1140,7 +1140,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.562 units remaining) [ 14 19 @@ -1153,7 +1153,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.552 units remaining) [ 10 14 @@ -1167,7 +1167,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.542 units remaining) [ 16 10 @@ -1182,7 +1182,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.532 units remaining) [ 12 16 @@ -1198,7 +1198,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.522 units remaining) [ 3 12 @@ -1215,7 +1215,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) [ 2 3 @@ -1233,7 +1233,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) [ 2 3 @@ -1251,32 +1251,32 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.444 units remaining) [ (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 86 (remaining gas: 1039866.434 units remaining) [ 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.409 units remaining) [ 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.399 units remaining) [ 13 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.389 units remaining) [ 4 13 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.379 units remaining) [ 11 4 @@ -1284,7 +1284,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.369 units remaining) [ 8 11 @@ -1293,7 +1293,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.359 units remaining) [ 6 8 @@ -1303,7 +1303,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.349 units remaining) [ 18 6 @@ -1314,7 +1314,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.339 units remaining) [ 9 18 @@ -1326,7 +1326,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.329 units remaining) [ 19 9 @@ -1339,7 +1339,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.319 units remaining) [ 14 19 @@ -1353,7 +1353,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.309 units remaining) [ 10 14 @@ -1368,7 +1368,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.299 units remaining) [ 16 10 @@ -1384,7 +1384,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.289 units remaining) [ 12 16 @@ -1401,7 +1401,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.279 units remaining) [ 3 12 @@ -1419,7 +1419,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) [ 2 3 @@ -1438,7 +1438,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) [ 2 3 @@ -1457,7 +1457,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 87 (remaining gas: 1039866.209 units remaining) [ 2 3 @@ -1476,7 +1476,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 89 (remaining gas: 1039866.143 units remaining) [ 3 2 @@ -1495,7 +1495,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 91 (remaining gas: 1039866.070 units remaining) [ 12 3 @@ -1514,7 +1514,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 93 (remaining gas: 1039865.991 units remaining) [ 16 12 @@ -1533,7 +1533,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 95 (remaining gas: 1039865.904 units remaining) [ 10 16 @@ -1552,7 +1552,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 97 (remaining gas: 1039865.811 units remaining) [ 14 10 @@ -1571,7 +1571,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 99 (remaining gas: 1039865.711 units remaining) [ 19 14 @@ -1590,7 +1590,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 101 (remaining gas: 1039865.605 units remaining) [ 9 19 @@ -1609,7 +1609,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 103 (remaining gas: 1039865.491 units remaining) [ 18 9 @@ -1628,7 +1628,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 105 (remaining gas: 1039865.371 units remaining) [ 6 18 @@ -1647,7 +1647,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 107 (remaining gas: 1039865.244 units remaining) [ 8 6 @@ -1666,7 +1666,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 109 (remaining gas: 1039865.111 units remaining) [ 11 8 @@ -1685,7 +1685,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 111 (remaining gas: 1039864.970 units remaining) [ 4 11 @@ -1704,7 +1704,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 113 (remaining gas: 1039864.823 units remaining) [ 13 4 @@ -1723,7 +1723,7 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 115 (remaining gas: 1039864.669 units remaining) [ 15 13 @@ -1742,7 +1742,7 @@ trace 2 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 117 (remaining gas: 1039864.509 units remaining) [ 5 15 @@ -1761,7 +1761,7 @@ trace 3 2 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 119 (remaining gas: 1039864.341 units remaining) [ 1 5 @@ -1780,7 +1780,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 121 (remaining gas: 1039864.281 units remaining) [ 1 5 @@ -1799,7 +1799,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 123 (remaining gas: 1039864.215 units remaining) [ 5 1 @@ -1818,7 +1818,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 125 (remaining gas: 1039864.142 units remaining) [ 15 5 @@ -1837,7 +1837,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 127 (remaining gas: 1039864.063 units remaining) [ 13 15 @@ -1856,7 +1856,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 129 (remaining gas: 1039863.976 units remaining) [ 4 13 @@ -1875,7 +1875,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 131 (remaining gas: 1039863.883 units remaining) [ 11 4 @@ -1894,7 +1894,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 133 (remaining gas: 1039863.783 units remaining) [ 8 11 @@ -1913,7 +1913,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 135 (remaining gas: 1039863.677 units remaining) [ 6 8 @@ -1932,7 +1932,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 137 (remaining gas: 1039863.563 units remaining) [ 18 6 @@ -1951,7 +1951,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 139 (remaining gas: 1039863.443 units remaining) [ 9 18 @@ -1970,7 +1970,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 141 (remaining gas: 1039863.316 units remaining) [ 19 9 @@ -1989,7 +1989,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 143 (remaining gas: 1039863.183 units remaining) [ 14 19 @@ -2008,7 +2008,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 145 (remaining gas: 1039863.042 units remaining) [ 10 14 @@ -2027,7 +2027,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 147 (remaining gas: 1039862.895 units remaining) [ 16 10 @@ -2046,7 +2046,7 @@ trace 12 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 149 (remaining gas: 1039862.741 units remaining) [ 12 16 @@ -2065,7 +2065,7 @@ trace 1 3 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 151 (remaining gas: 1039862.581 units remaining) [ 3 12 @@ -2084,7 +2084,7 @@ trace 5 1 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 153 (remaining gas: 1039862.413 units remaining) [ 2 3 @@ -2103,36 +2103,36 @@ trace 15 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.345 units remaining) [ 5 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 159 (remaining gas: 1039862.330 units remaining) [ (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.305 units remaining) [ 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.295 units remaining) [ 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.285 units remaining) [ 4 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.275 units remaining) [ 11 4 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.265 units remaining) [ 8 11 @@ -2140,7 +2140,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.255 units remaining) [ 6 8 @@ -2149,7 +2149,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.245 units remaining) [ 18 6 @@ -2159,7 +2159,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.235 units remaining) [ 9 18 @@ -2170,7 +2170,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.225 units remaining) [ 19 9 @@ -2182,7 +2182,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.215 units remaining) [ 14 19 @@ -2195,7 +2195,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.205 units remaining) [ 10 14 @@ -2209,7 +2209,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.195 units remaining) [ 16 10 @@ -2224,7 +2224,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.185 units remaining) [ 12 16 @@ -2240,7 +2240,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.175 units remaining) [ 3 12 @@ -2257,7 +2257,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) [ 2 3 @@ -2275,7 +2275,7 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) [ 2 3 @@ -2293,36 +2293,36 @@ trace 13 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.098 units remaining) [ 15 (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 163 (remaining gas: 1039862.083 units remaining) [ (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.058 units remaining) [ 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.048 units remaining) [ 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.038 units remaining) [ 11 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.028 units remaining) [ 8 11 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.018 units remaining) [ 6 8 @@ -2330,7 +2330,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.008 units remaining) [ 18 6 @@ -2339,7 +2339,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.998 units remaining) [ 9 18 @@ -2349,7 +2349,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.988 units remaining) [ 19 9 @@ -2360,7 +2360,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.978 units remaining) [ 14 19 @@ -2372,7 +2372,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.968 units remaining) [ 10 14 @@ -2385,7 +2385,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.958 units remaining) [ 16 10 @@ -2399,7 +2399,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.948 units remaining) [ 12 16 @@ -2414,7 +2414,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.938 units remaining) [ 3 12 @@ -2430,7 +2430,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) [ 2 3 @@ -2447,7 +2447,7 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) [ 2 3 @@ -2464,36 +2464,36 @@ trace 4 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.863 units remaining) [ 13 (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 167 (remaining gas: 1039861.848 units remaining) [ (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.823 units remaining) [ 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.813 units remaining) [ 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.803 units remaining) [ 8 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.793 units remaining) [ 6 8 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.783 units remaining) [ 18 6 @@ -2501,7 +2501,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.773 units remaining) [ 9 18 @@ -2510,7 +2510,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.763 units remaining) [ 19 9 @@ -2520,7 +2520,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.753 units remaining) [ 14 19 @@ -2531,7 +2531,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.743 units remaining) [ 10 14 @@ -2543,7 +2543,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.733 units remaining) [ 16 10 @@ -2556,7 +2556,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.723 units remaining) [ 12 16 @@ -2570,7 +2570,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.713 units remaining) [ 3 12 @@ -2585,7 +2585,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) [ 2 3 @@ -2601,7 +2601,7 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) [ 2 3 @@ -2617,36 +2617,36 @@ trace 11 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.639 units remaining) [ 4 (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 171 (remaining gas: 1039861.624 units remaining) [ (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.599 units remaining) [ 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.589 units remaining) [ 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.579 units remaining) [ 6 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.569 units remaining) [ 18 6 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.559 units remaining) [ 9 18 @@ -2654,7 +2654,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.549 units remaining) [ 19 9 @@ -2663,7 +2663,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.539 units remaining) [ 14 19 @@ -2673,7 +2673,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.529 units remaining) [ 10 14 @@ -2684,7 +2684,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.519 units remaining) [ 16 10 @@ -2696,7 +2696,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.509 units remaining) [ 12 16 @@ -2709,7 +2709,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.499 units remaining) [ 3 12 @@ -2723,7 +2723,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) [ 2 3 @@ -2738,7 +2738,7 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) [ 2 3 @@ -2753,36 +2753,36 @@ trace 8 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.427 units remaining) [ 11 (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 175 (remaining gas: 1039861.412 units remaining) [ (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.387 units remaining) [ 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.377 units remaining) [ 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.367 units remaining) [ 18 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.357 units remaining) [ 9 18 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.347 units remaining) [ 19 9 @@ -2790,7 +2790,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.337 units remaining) [ 14 19 @@ -2799,7 +2799,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.327 units remaining) [ 10 14 @@ -2809,7 +2809,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.317 units remaining) [ 16 10 @@ -2820,7 +2820,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.307 units remaining) [ 12 16 @@ -2832,7 +2832,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.297 units remaining) [ 3 12 @@ -2845,7 +2845,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) [ 2 3 @@ -2859,7 +2859,7 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) [ 2 3 @@ -2873,36 +2873,36 @@ trace 6 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.226 units remaining) [ 8 (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 179 (remaining gas: 1039861.211 units remaining) [ (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.186 units remaining) [ 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.176 units remaining) [ 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.166 units remaining) [ 9 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.156 units remaining) [ 19 9 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.146 units remaining) [ 14 19 @@ -2910,7 +2910,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.136 units remaining) [ 10 14 @@ -2919,7 +2919,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.126 units remaining) [ 16 10 @@ -2929,7 +2929,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.116 units remaining) [ 12 16 @@ -2940,7 +2940,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.106 units remaining) [ 3 12 @@ -2952,7 +2952,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) [ 2 3 @@ -2965,7 +2965,7 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) [ 2 3 @@ -2978,36 +2978,36 @@ trace 18 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039861.037 units remaining) [ 6 (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 183 (remaining gas: 1039861.022 units remaining) [ (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.997 units remaining) [ 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.987 units remaining) [ 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.977 units remaining) [ 19 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.967 units remaining) [ 14 19 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.957 units remaining) [ 10 14 @@ -3015,7 +3015,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.947 units remaining) [ 16 10 @@ -3024,7 +3024,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.937 units remaining) [ 12 16 @@ -3034,7 +3034,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.927 units remaining) [ 3 12 @@ -3045,7 +3045,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) [ 2 3 @@ -3057,7 +3057,7 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) [ 2 3 @@ -3069,36 +3069,36 @@ trace 9 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.859 units remaining) [ 18 (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 187 (remaining gas: 1039860.844 units remaining) [ (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.819 units remaining) [ 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.809 units remaining) [ 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.799 units remaining) [ 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.789 units remaining) [ 10 14 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.779 units remaining) [ 16 10 @@ -3106,7 +3106,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.769 units remaining) [ 12 16 @@ -3115,7 +3115,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.759 units remaining) [ 3 12 @@ -3125,7 +3125,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) [ 2 3 @@ -3136,7 +3136,7 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) [ 2 3 @@ -3147,36 +3147,36 @@ trace 19 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.694 units remaining) [ 9 (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 191 (remaining gas: 1039860.679 units remaining) [ (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.654 units remaining) [ 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.644 units remaining) [ 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.634 units remaining) [ 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.624 units remaining) [ 16 10 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.614 units remaining) [ 12 16 @@ -3184,7 +3184,7 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.604 units remaining) [ 3 12 @@ -3193,7 +3193,7 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) [ 2 3 @@ -3203,7 +3203,7 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) [ 2 3 @@ -3213,36 +3213,36 @@ trace 14 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.540 units remaining) [ 19 (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 195 (remaining gas: 1039860.525 units remaining) [ (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.500 units remaining) [ 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.490 units remaining) [ 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.480 units remaining) [ 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.470 units remaining) [ 12 16 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.460 units remaining) [ 3 12 @@ -3250,7 +3250,7 @@ trace 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) [ 2 3 @@ -3259,7 +3259,7 @@ trace 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) [ 2 3 @@ -3268,36 +3268,36 @@ trace 10 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.398 units remaining) [ 14 (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 199 (remaining gas: 1039860.383 units remaining) [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.358 units remaining) [ 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.348 units remaining) [ 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.338 units remaining) [ 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.328 units remaining) [ 3 12 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) [ 2 3 @@ -3305,7 +3305,7 @@ trace 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) [ 2 3 @@ -3313,106 +3313,106 @@ trace 16 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.267 units remaining) [ 10 (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 203 (remaining gas: 1039860.252 units remaining) [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.227 units remaining) [ 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.217 units remaining) [ 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.207 units remaining) [ 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) [ 2 3 12 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.148 units remaining) [ 16 (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 207 (remaining gas: 1039860.133 units remaining) [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.108 units remaining) [ 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.098 units remaining) [ 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) [ 2 3 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039860.040 units remaining) [ 12 (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 211 (remaining gas: 1039860.025 units remaining) [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039860 units remaining) [ 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) [ 2 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) [ 2 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 212 (remaining gas: 1039859.975 units remaining) [ 3 (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 214 (remaining gas: 1039859.960 units remaining) [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 212 (remaining gas: 1039859.930 units remaining) [ 2 (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 215 (remaining gas: 1039859.915 units remaining) [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) @parameter ] + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 218 (remaining gas: 1039859.160 units remaining) [ 0 ] - location: 219 (remaining gas: 1039859.145 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out index 78489da73487..e1d10184f32e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out @@ -10,7 +10,7 @@ trace - location: 15 (remaining gas: 1039987.170 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039987.160 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039987.150 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out index 21760dc1b1b2..b98b2ee007dc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out @@ -10,7 +10,7 @@ trace - location: 11 (remaining gas: 1039990.758 units remaining) [ (Pair (Pair 1 1) 0 0) ] - location: 11 (remaining gas: 1039990.748 units remaining) - [ (Pair 1 1) @parameter ] + [ (Pair 1 1) ] - location: 12 (remaining gas: 1039990.738 units remaining) [ 1 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out index adcc139b3256..615354dba801 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out @@ -10,7 +10,7 @@ trace - location: 11 (remaining gas: 1039990.758 units remaining) [ (Pair (Pair 15 9) 0 0) ] - location: 11 (remaining gas: 1039990.748 units remaining) - [ (Pair 15 9) @parameter ] + [ (Pair 15 9) ] - location: 12 (remaining gas: 1039990.738 units remaining) [ 15 9 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out index 007a99604870..a4e1e7b56614 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out @@ -10,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.010 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039986 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039985.990 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out index 9aea3cf105b4..991924cbeb95 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out @@ -10,7 +10,7 @@ trace - location: 15 (remaining gas: 1039990.347 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039990.337 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039990.327 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out index a5468a9f883f..fd9a9d358608 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out @@ -10,7 +10,7 @@ trace - location: 15 (remaining gas: 1039987.936 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039987.926 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) @parameter ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039987.916 units remaining) [ (Pair (Pair (Pair 1 2) 3) 4) 5 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out index 9ce24ab1396f..c46413e02a2f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out @@ -10,90 +10,90 @@ trace - location: 25 (remaining gas: 1039969.963 units remaining) [ (Pair (Pair -8 2) None None None None) ] - location: 25 (remaining gas: 1039969.953 units remaining) - [ (Pair -8 2) @parameter ] + [ (Pair -8 2) ] - location: 26 (remaining gas: 1039969.943 units remaining) - [ (Pair -8 2) @parameter - (Pair -8 2) @parameter ] + [ (Pair -8 2) + (Pair -8 2) ] - location: 27 (remaining gas: 1039969.933 units remaining) [ -8 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 28 (remaining gas: 1039969.908 units remaining) [ 8 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 29 (remaining gas: 1039969.893 units remaining) [ 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 31 (remaining gas: 1039969.868 units remaining) [ 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 29 (remaining gas: 1039969.838 units remaining) [ 8 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 32 (remaining gas: 1039969.698 units remaining) [ (Some (Pair 4 0)) - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 33 (remaining gas: 1039969.688 units remaining) - [ (Pair -8 2) @parameter + [ (Pair -8 2) (Some (Pair 4 0)) ] - location: 34 (remaining gas: 1039969.678 units remaining) - [ (Pair -8 2) @parameter - (Pair -8 2) @parameter + [ (Pair -8 2) + (Pair -8 2) (Some (Pair 4 0)) ] - location: 35 (remaining gas: 1039969.668 units remaining) [ -8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) ] - location: 36 (remaining gas: 1039969.643 units remaining) [ 8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) ] - location: 37 (remaining gas: 1039969.503 units remaining) [ (Some (Pair 4 0)) - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) ] - location: 38 (remaining gas: 1039969.493 units remaining) - [ (Pair -8 2) @parameter + [ (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 39 (remaining gas: 1039969.483 units remaining) - [ (Pair -8 2) @parameter - (Pair -8 2) @parameter + [ (Pair -8 2) + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 40 (remaining gas: 1039969.473 units remaining) [ -8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 41 (remaining gas: 1039969.458 units remaining) [ 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 43 (remaining gas: 1039969.433 units remaining) [ 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 41 (remaining gas: 1039969.403 units remaining) [ -8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 44 (remaining gas: 1039969.263 units remaining) [ (Some (Pair -4 0)) - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 45 (remaining gas: 1039969.253 units remaining) - [ (Pair -8 2) @parameter + [ (Pair -8 2) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out index 626382a6b90b..295db124ac92 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out @@ -10,90 +10,90 @@ trace - location: 25 (remaining gas: 1039969.963 units remaining) [ (Pair (Pair 10 -3) None None None None) ] - location: 25 (remaining gas: 1039969.953 units remaining) - [ (Pair 10 -3) @parameter ] + [ (Pair 10 -3) ] - location: 26 (remaining gas: 1039969.943 units remaining) - [ (Pair 10 -3) @parameter - (Pair 10 -3) @parameter ] + [ (Pair 10 -3) + (Pair 10 -3) ] - location: 27 (remaining gas: 1039969.933 units remaining) [ 10 -3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 28 (remaining gas: 1039969.908 units remaining) [ 10 -3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 29 (remaining gas: 1039969.893 units remaining) [ -3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 31 (remaining gas: 1039969.868 units remaining) [ 3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 29 (remaining gas: 1039969.838 units remaining) [ 10 3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 32 (remaining gas: 1039969.698 units remaining) [ (Some (Pair 3 1)) - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 33 (remaining gas: 1039969.688 units remaining) - [ (Pair 10 -3) @parameter + [ (Pair 10 -3) (Some (Pair 3 1)) ] - location: 34 (remaining gas: 1039969.678 units remaining) - [ (Pair 10 -3) @parameter - (Pair 10 -3) @parameter + [ (Pair 10 -3) + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 35 (remaining gas: 1039969.668 units remaining) [ 10 -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 36 (remaining gas: 1039969.643 units remaining) [ 10 -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 37 (remaining gas: 1039969.503 units remaining) [ (Some (Pair -3 1)) - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 38 (remaining gas: 1039969.493 units remaining) - [ (Pair 10 -3) @parameter + [ (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 39 (remaining gas: 1039969.483 units remaining) - [ (Pair 10 -3) @parameter - (Pair 10 -3) @parameter + [ (Pair 10 -3) + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 40 (remaining gas: 1039969.473 units remaining) [ 10 -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 41 (remaining gas: 1039969.458 units remaining) [ -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 43 (remaining gas: 1039969.433 units remaining) [ 3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 41 (remaining gas: 1039969.403 units remaining) [ 10 3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 44 (remaining gas: 1039969.263 units remaining) [ (Some (Pair 3 1)) - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 45 (remaining gas: 1039969.253 units remaining) - [ (Pair 10 -3) @parameter + [ (Pair 10 -3) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out index fb582e136653..0c9837dca3a3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out @@ -10,90 +10,90 @@ trace - location: 25 (remaining gas: 1039969.963 units remaining) [ (Pair (Pair 10 0) None None None None) ] - location: 25 (remaining gas: 1039969.953 units remaining) - [ (Pair 10 0) @parameter ] + [ (Pair 10 0) ] - location: 26 (remaining gas: 1039969.943 units remaining) - [ (Pair 10 0) @parameter - (Pair 10 0) @parameter ] + [ (Pair 10 0) + (Pair 10 0) ] - location: 27 (remaining gas: 1039969.933 units remaining) [ 10 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 28 (remaining gas: 1039969.908 units remaining) [ 10 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 29 (remaining gas: 1039969.893 units remaining) [ 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 31 (remaining gas: 1039969.868 units remaining) [ 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 29 (remaining gas: 1039969.838 units remaining) [ 10 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 32 (remaining gas: 1039969.698 units remaining) [ None - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 33 (remaining gas: 1039969.688 units remaining) - [ (Pair 10 0) @parameter + [ (Pair 10 0) None ] - location: 34 (remaining gas: 1039969.678 units remaining) - [ (Pair 10 0) @parameter - (Pair 10 0) @parameter + [ (Pair 10 0) + (Pair 10 0) None ] - location: 35 (remaining gas: 1039969.668 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None ] - location: 36 (remaining gas: 1039969.643 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None ] - location: 37 (remaining gas: 1039969.503 units remaining) [ None - (Pair 10 0) @parameter + (Pair 10 0) None ] - location: 38 (remaining gas: 1039969.493 units remaining) - [ (Pair 10 0) @parameter + [ (Pair 10 0) None None ] - location: 39 (remaining gas: 1039969.483 units remaining) - [ (Pair 10 0) @parameter - (Pair 10 0) @parameter + [ (Pair 10 0) + (Pair 10 0) None None ] - location: 40 (remaining gas: 1039969.473 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 41 (remaining gas: 1039969.458 units remaining) [ 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 43 (remaining gas: 1039969.433 units remaining) [ 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 41 (remaining gas: 1039969.403 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 44 (remaining gas: 1039969.263 units remaining) [ None - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 45 (remaining gas: 1039969.253 units remaining) - [ (Pair 10 0) @parameter + [ (Pair 10 0) None None None ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out index d8a004851857..d03218b92527 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 10 (Left 0)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Left 0)) @parameter ] + [ (Pair 10 (Left 0)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 10 (Left 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out index b9c1cac3b8bc..0b8dd05a2c3e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 10 (Left 10)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Left 10)) @parameter ] + [ (Pair 10 (Left 10)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 10 (Left 10) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out index 8adc56d6e4b7..f656456cfffe 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 10 (Left 3)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Left 3)) @parameter ] + [ (Pair 10 (Left 3)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 10 (Left 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out index dcca0592d2b1..0891eabab011 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 10 (Right 0)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Right 0)) @parameter ] + [ (Pair 10 (Right 0)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 10 (Right 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out index 1184780d0ef7..0ea0e02fe85c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 10 (Right 10)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Right 10)) @parameter ] + [ (Pair 10 (Right 10)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 10 (Right 10) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out index 1d586277c188..6bc3b0df798d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 10 (Right 3)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Right 3)) @parameter ] + [ (Pair 10 (Right 3)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 10 (Right 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out index 40874a273725..63713ec9ab71 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out @@ -10,7 +10,7 @@ trace - location: 19 (remaining gas: 1039981.901 units remaining) [ (Pair (Pair 5 (Right 10)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 5 (Right 10)) @parameter ] + [ (Pair 5 (Right 10)) ] - location: 20 (remaining gas: 1039981.881 units remaining) [ 5 (Right 10) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" index 61b1f0576eda..3c63fd948e1f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" @@ -10,29 +10,29 @@ trace - location: 7 (remaining gas: 1039987.134 units remaining) [ (Pair "" "?") ] - location: 7 (remaining gas: 1039987.124 units remaining) - [ "" @parameter ] + [ "" ] - location: 8 (remaining gas: 1039987.114 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } - "" @parameter ] + "" ] - location: 22 (remaining gas: 1039987.104 units remaining) - [ "" @parameter + [ "" { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - location: 12 (remaining gas: 1039987.094 units remaining) [ "_abc" - "" @arg ] + "" ] - location: 15 (remaining gas: 1039987.079 units remaining) [ {} "_abc" - "" @arg ] + "" ] - location: 17 (remaining gas: 1039987.069 units remaining) [ "_abc" {} - "" @arg ] + "" ] - location: 18 (remaining gas: 1039987.054 units remaining) [ { "_abc" } - "" @arg ] + "" ] - location: 19 (remaining gas: 1039987.044 units remaining) - [ "" @arg + [ "" { "_abc" } ] - location: 20 (remaining gas: 1039987.029 units remaining) [ { "" ; "_abc" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" index e6ba28d59b96..809363aa4c97 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" @@ -10,29 +10,29 @@ trace - location: 7 (remaining gas: 1039987.094 units remaining) [ (Pair "test" "?") ] - location: 7 (remaining gas: 1039987.084 units remaining) - [ "test" @parameter ] + [ "test" ] - location: 8 (remaining gas: 1039987.074 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } - "test" @parameter ] + "test" ] - location: 22 (remaining gas: 1039987.064 units remaining) - [ "test" @parameter + [ "test" { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - location: 12 (remaining gas: 1039987.054 units remaining) [ "_abc" - "test" @arg ] + "test" ] - location: 15 (remaining gas: 1039987.039 units remaining) [ {} "_abc" - "test" @arg ] + "test" ] - location: 17 (remaining gas: 1039987.029 units remaining) [ "_abc" {} - "test" @arg ] + "test" ] - location: 18 (remaining gas: 1039987.014 units remaining) [ { "_abc" } - "test" @arg ] + "test" ] - location: 19 (remaining gas: 1039987.004 units remaining) - [ "test" @arg + [ "test" { "_abc" } ] - location: 20 (remaining gas: 1039986.989 units remaining) [ { "test" ; "_abc" } ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out index 6921491792a6..83f84401ca7e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out @@ -10,21 +10,21 @@ trace - location: 8 (remaining gas: 1039991.033 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] - location: 8 (remaining gas: 1039991.023 units remaining) - [ { 1 ; 2 ; 3 ; 4 } @parameter ] + [ { 1 ; 2 ; 3 ; 4 } ] - location: 9 (remaining gas: 1039991.013 units remaining) - [ 1 @parameter.hd - { 2 ; 3 ; 4 } @parameter.tl ] + [ 1 + { 2 ; 3 ; 4 } ] - location: 11 (remaining gas: 1039990.998 units remaining) - [ { 2 ; 3 ; 4 } @parameter.tl ] + [ { 2 ; 3 ; 4 } ] - location: 13 (remaining gas: 1039990.988 units remaining) [ ] - location: 11 (remaining gas: 1039990.958 units remaining) - [ 1 @parameter.hd ] + [ 1 ] - location: 9 (remaining gas: 1039990.943 units remaining) - [ 1 @parameter.hd ] + [ 1 ] - location: 18 (remaining gas: 1039990.928 units remaining) [ {} - 1 @parameter.hd ] + 1 ] - location: 20 (remaining gas: 1039990.913 units remaining) [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out index 63cb3e7a46a8..aee64d547d32 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out @@ -10,21 +10,21 @@ trace - location: 8 (remaining gas: 1039991.333 units remaining) [ (Pair { 4 } 111) ] - location: 8 (remaining gas: 1039991.323 units remaining) - [ { 4 } @parameter ] + [ { 4 } ] - location: 9 (remaining gas: 1039991.313 units remaining) - [ 4 @parameter.hd - {} @parameter.tl ] + [ 4 + {} ] - location: 11 (remaining gas: 1039991.298 units remaining) - [ {} @parameter.tl ] + [ {} ] - location: 13 (remaining gas: 1039991.288 units remaining) [ ] - location: 11 (remaining gas: 1039991.258 units remaining) - [ 4 @parameter.hd ] + [ 4 ] - location: 9 (remaining gas: 1039991.243 units remaining) - [ 4 @parameter.hd ] + [ 4 ] - location: 18 (remaining gas: 1039991.228 units remaining) [ {} - 4 @parameter.hd ] + 4 ] - location: 20 (remaining gas: 1039991.213 units remaining) [ (Pair {} 4) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" index afafdcbd2b32..80c5813fb374 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.746 units remaining) [ (Pair "hello" (Some 4) {}) ] - location: 13 (remaining gas: 1039989.736 units remaining) - [ "hello" @parameter - (Pair (Some 4) {}) @storage ] + [ "hello" + (Pair (Some 4) {}) ] - location: 14 (remaining gas: 1039989.721 units remaining) - [ (Pair (Some 4) {}) @storage ] + [ (Pair (Some 4) {}) ] - location: 16 (remaining gas: 1039989.711 units remaining) [ (Some 4) {} ] - location: 14 (remaining gas: 1039989.681 units remaining) - [ "hello" @parameter + [ "hello" (Some 4) {} ] - location: 17 (remaining gas: 1039989.496 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" index 22e749a743ff..38555de5e32e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.362 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039989.352 units remaining) - [ "hi" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hi" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039989.337 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039989.327 units remaining) [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039989.297 units remaining) - [ "hi" @parameter + [ "hi" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039989.007 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" index 93e57596cd07..0d59859b7386 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.332 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039989.322 units remaining) - [ "hello" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039989.307 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039989.297 units remaining) [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039989.267 units remaining) - [ "hello" @parameter + [ "hello" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039988.977 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" index 2c6fa2d4e23e..0d516b3b8719 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.033 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039989.023 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039989.008 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039988.998 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039988.968 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039988.573 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" index d56a5c50c667..07bde688a19b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.033 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039989.023 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039989.008 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039988.998 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039988.968 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039988.573 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" index a82c82688e51..55750ee46d42 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.432 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039989.422 units remaining) - [ "hello" @parameter - (Pair None { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair None { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039989.407 units remaining) - [ (Pair None { Elt "hello" 4 }) @storage ] + [ (Pair None { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039989.397 units remaining) [ None { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039989.367 units remaining) - [ "hello" @parameter + [ "hello" None { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039989.077 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" index 1065de7c274c..0fe838d7a2d2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" @@ -10,15 +10,15 @@ trace - location: 13 (remaining gas: 1039989.846 units remaining) [ (Pair "hello" None {}) ] - location: 13 (remaining gas: 1039989.836 units remaining) - [ "hello" @parameter - (Pair None {}) @storage ] + [ "hello" + (Pair None {}) ] - location: 14 (remaining gas: 1039989.821 units remaining) - [ (Pair None {}) @storage ] + [ (Pair None {}) ] - location: 16 (remaining gas: 1039989.811 units remaining) [ None {} ] - location: 14 (remaining gas: 1039989.781 units remaining) - [ "hello" @parameter + [ "hello" None {} ] - location: 17 (remaining gas: 1039989.596 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" index a3e8efcddedf..0af169aa3a81 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" @@ -13,19 +13,19 @@ trace [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 13 (remaining gas: 1039986.527 units remaining) - [ "1" @parameter + [ "1" (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 14 (remaining gas: 1039986.512 units remaining) [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 17 (remaining gas: 1039986.502 units remaining) - [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) @storage ] + [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 18 (remaining gas: 1039986.492 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - location: 19 (remaining gas: 1039986.482 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 14 (remaining gas: 1039986.452 units remaining) - [ "1" @parameter + [ "1" { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 20 (remaining gas: 1039986.267 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" index 5e1729a8bf9f..23ea6d60b099 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" @@ -13,19 +13,19 @@ trace [ (Pair "" None { Elt "hello" "hi" }) (Pair "" None { Elt "hello" "hi" }) ] - location: 13 (remaining gas: 1039987.030 units remaining) - [ "" @parameter + [ "" (Pair "" None { Elt "hello" "hi" }) ] - location: 14 (remaining gas: 1039987.015 units remaining) [ (Pair "" None { Elt "hello" "hi" }) ] - location: 17 (remaining gas: 1039987.005 units remaining) - [ (Pair None { Elt "hello" "hi" }) @storage ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 18 (remaining gas: 1039986.995 units remaining) [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039986.985 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039986.955 units remaining) - [ "" @parameter + [ "" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039986.805 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" index 79981a66732e..d15efb73b718 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" @@ -13,19 +13,19 @@ trace [ (Pair "hello" None { Elt "hello" "hi" }) (Pair "hello" None { Elt "hello" "hi" }) ] - location: 13 (remaining gas: 1039986.980 units remaining) - [ "hello" @parameter + [ "hello" (Pair "hello" None { Elt "hello" "hi" }) ] - location: 14 (remaining gas: 1039986.965 units remaining) [ (Pair "hello" None { Elt "hello" "hi" }) ] - location: 17 (remaining gas: 1039986.955 units remaining) - [ (Pair None { Elt "hello" "hi" }) @storage ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 18 (remaining gas: 1039986.945 units remaining) [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039986.935 units remaining) [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039986.905 units remaining) - [ "hello" @parameter + [ "hello" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039986.755 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" index 5f22787f5fb4..f800fb08ec96 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039668.957 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ] - location: 8 (remaining gas: 1039668.947 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter ] + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - location: 9 (remaining gas: 1039668.292 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 10 (remaining gas: 1039668.277 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" index b1e4ce7ff630..a385023af562 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039668.957 units remaining) [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ] - location: 8 (remaining gas: 1039668.947 units remaining) - [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" @parameter ] + [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" ] - location: 9 (remaining gas: 1039668.292 units remaining) [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ] - location: 10 (remaining gas: 1039668.277 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" index e392b2468b99..ed0093d77896 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" @@ -10,9 +10,9 @@ trace - location: 7 (remaining gas: 1039994.241 units remaining) [ (Pair "12345" 0x00) ] - location: 7 (remaining gas: 1039994.231 units remaining) - [ "12345" @parameter ] + [ "12345" ] - location: 8 (remaining gas: 1039993.740 units remaining) - [ 0x0501000000053132333435 @parameter.packed ] + [ 0x0501000000053132333435 ] - location: 9 (remaining gas: 1039993.298 units remaining) [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - location: 10 (remaining gas: 1039993.283 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" index 0b11155a863f..3eeab4cf2a13 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" @@ -10,9 +10,9 @@ trace - location: 7 (remaining gas: 1039994.221 units remaining) [ (Pair "abcdefg" 0x00) ] - location: 7 (remaining gas: 1039994.211 units remaining) - [ "abcdefg" @parameter ] + [ "abcdefg" ] - location: 8 (remaining gas: 1039993.654 units remaining) - [ 0x05010000000761626364656667 @parameter.packed ] + [ 0x05010000000761626364656667 ] - location: 9 (remaining gas: 1039993.210 units remaining) [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - location: 10 (remaining gas: 1039993.195 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out index 818551dc8ba2..65bc46d8f53d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039991.305 units remaining) [ (Pair False None) ] - location: 8 (remaining gas: 1039991.295 units remaining) - [ False @parameter ] + [ False ] - location: 9 (remaining gas: 1039991.285 units remaining) [ ] - location: 15 (remaining gas: 1039991.275 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out index 6b30d3dc95bf..ac0ecede9c1f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039991.305 units remaining) [ (Pair True None) ] - location: 8 (remaining gas: 1039991.295 units remaining) - [ True @parameter ] + [ True ] - location: 9 (remaining gas: 1039991.285 units remaining) [ ] - location: 11 (remaining gas: 1039991.275 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" index a1ace0e9246b..b8dfcab8f042 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.411 units remaining) [ (Pair (Some "hello") "?") ] - location: 8 (remaining gas: 1039992.401 units remaining) - [ (Some "hello") @parameter ] + [ (Some "hello") ] - location: 10 (remaining gas: 1039992.391 units remaining) [ "hello" ] - location: 10 (remaining gas: 1039992.376 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" index 920b3103fe1c..c9aeb55c20ec 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.575 units remaining) [ (Pair None "?") ] - location: 8 (remaining gas: 1039992.565 units remaining) - [ None @parameter ] + [ None ] - location: 10 (remaining gas: 1039992.555 units remaining) [ ] - location: 12 (remaining gas: 1039992.545 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out index 76e6f6aded66..f7af5422bdde 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair 0 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 0 @parameter ] + [ 0 ] - location: 9 (remaining gas: 1039993.932 units remaining) [ 0 ] - location: 10 (remaining gas: 1039993.917 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out index dfb28bcb113d..2daa1a980a2d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair 1 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 1 @parameter ] + [ 1 ] - location: 9 (remaining gas: 1039993.932 units remaining) [ 1 ] - location: 10 (remaining gas: 1039993.917 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out index 6cc138ec8251..9e1c33548e1a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair 9999 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 9999 @parameter ] + [ 9999 ] - location: 9 (remaining gas: 1039993.932 units remaining) [ 9999 ] - location: 10 (remaining gas: 1039993.917 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out index a33a5cc790a2..bcf4f56a9049 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 0x48656c6c6f2c20776f726c6421 @parameter ] + [ 0x48656c6c6f2c20776f726c6421 ] - location: 9 (remaining gas: 1039992.490 units remaining) [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ] - location: 10 (remaining gas: 1039992.475 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" index f652f79b32e6..b6314ede3cca 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" @@ -10,9 +10,9 @@ trace - location: 11 (remaining gas: 1039990.926 units remaining) [ (Pair (Left True) (Left "X")) ] - location: 11 (remaining gas: 1039990.916 units remaining) - [ (Left True) @parameter ] + [ (Left True) ] - location: 12 (remaining gas: 1039990.906 units remaining) - [ True @parameter.left ] + [ True ] - location: 14 (remaining gas: 1039990.891 units remaining) [ (Right True) ] - location: 12 (remaining gas: 1039990.876 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" index 94499ce64e3d..be4206f95581 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" @@ -10,9 +10,9 @@ trace - location: 11 (remaining gas: 1039990.902 units remaining) [ (Pair (Right "a") (Left "X")) ] - location: 11 (remaining gas: 1039990.892 units remaining) - [ (Right "a") @parameter ] + [ (Right "a") ] - location: 12 (remaining gas: 1039990.882 units remaining) - [ "a" @parameter.right ] + [ "a" ] - location: 17 (remaining gas: 1039990.867 units remaining) [ (Left "a") ] - location: 12 (remaining gas: 1039990.852 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out index 944c166a4cac..ae0044aef76b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039994.923 units remaining) - [ 1 @level ] + [ 1 ] - location: 9 (remaining gas: 1039994.908 units remaining) [ {} - 1 @level ] + 1 ] - location: 11 (remaining gas: 1039994.893 units remaining) [ (Pair {} 1) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" index e3cf626ffd35..71d995345101 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" @@ -10,11 +10,11 @@ trace - location: 8 (remaining gas: 1039992.898 units remaining) [ (Pair { "d" ; "e" ; "f" } "abc") ] - location: 8 (remaining gas: 1039992.888 units remaining) - [ { "d" ; "e" ; "f" } @parameter - "abc" @storage ] + [ { "d" ; "e" ; "f" } + "abc" ] - location: 9 (remaining gas: 1039992.878 units remaining) - [ "abc" @storage - { "d" ; "e" ; "f" } @parameter ] + [ "abc" + { "d" ; "e" ; "f" } ] - location: 10 (remaining gas: 1039992.863 units remaining) [ { "abc" ; "d" ; "e" ; "f" } ] - location: 11 (remaining gas: 1039992.723 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" index 468d01c11255..bde91d38bab1 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" @@ -10,11 +10,11 @@ trace - location: 8 (remaining gas: 1039993.270 units remaining) [ (Pair {} "abc") ] - location: 8 (remaining gas: 1039993.260 units remaining) - [ {} @parameter - "abc" @storage ] + [ {} + "abc" ] - location: 9 (remaining gas: 1039993.250 units remaining) - [ "abc" @storage - {} @parameter ] + [ "abc" + {} ] - location: 10 (remaining gas: 1039993.235 units remaining) [ { "abc" } ] - location: 11 (remaining gas: 1039993.125 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out index 0d192b844ced..60eca6eb14de 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out @@ -10,11 +10,11 @@ trace - location: 8 (remaining gas: 1039993.014 units remaining) [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ] - location: 8 (remaining gas: 1039993.004 units remaining) - [ { 0x00 ; 0x11 ; 0x00 } @parameter - 0x @storage ] + [ { 0x00 ; 0x11 ; 0x00 } + 0x ] - location: 9 (remaining gas: 1039992.994 units remaining) - [ 0x @storage - { 0x00 ; 0x11 ; 0x00 } @parameter ] + [ 0x + { 0x00 ; 0x11 ; 0x00 } ] - location: 10 (remaining gas: 1039992.979 units remaining) [ { 0x ; 0x00 ; 0x11 ; 0x00 } ] - location: 11 (remaining gas: 1039992.839 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out index e5d230310943..183bb534914e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out @@ -10,11 +10,11 @@ trace - location: 8 (remaining gas: 1039993.314 units remaining) [ (Pair {} 0x) ] - location: 8 (remaining gas: 1039993.304 units remaining) - [ {} @parameter - 0x @storage ] + [ {} + 0x ] - location: 9 (remaining gas: 1039993.294 units remaining) - [ 0x @storage - {} @parameter ] + [ 0x + {} ] - location: 10 (remaining gas: 1039993.279 units remaining) [ { 0x } ] - location: 11 (remaining gas: 1039993.169 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out index bd9ff7700800..30bfcfc39bb4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out @@ -10,11 +10,11 @@ trace - location: 8 (remaining gas: 1039993.014 units remaining) [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ] - location: 8 (remaining gas: 1039993.004 units remaining) - [ { 0xcd ; 0xef ; 0x00 } @parameter - 0x00ab @storage ] + [ { 0xcd ; 0xef ; 0x00 } + 0x00ab ] - location: 9 (remaining gas: 1039992.994 units remaining) - [ 0x00ab @storage - { 0xcd ; 0xef ; 0x00 } @parameter ] + [ 0x00ab + { 0xcd ; 0xef ; 0x00 } ] - location: 10 (remaining gas: 1039992.979 units remaining) [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ] - location: 11 (remaining gas: 1039992.839 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out index fb8a6d91a050..6ba8ad2d6cb2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out @@ -10,11 +10,11 @@ trace - location: 8 (remaining gas: 1039993.314 units remaining) [ (Pair {} 0xabcd) ] - location: 8 (remaining gas: 1039993.304 units remaining) - [ {} @parameter - 0xabcd @storage ] + [ {} + 0xabcd ] - location: 9 (remaining gas: 1039993.294 units remaining) - [ 0xabcd @storage - {} @parameter ] + [ 0xabcd + {} ] - location: 10 (remaining gas: 1039993.279 units remaining) [ { 0xabcd } ] - location: 11 (remaining gas: 1039993.169 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" index 671280cc2269..a0012cd4b7b6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" @@ -10,10 +10,10 @@ trace - location: 9 (remaining gas: 1039994.539 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - location: 9 (remaining gas: 1039994.529 units remaining) - [ { "1" ; "2" ; "3" } @parameter ] + [ { "1" ; "2" ; "3" } ] - location: 10 (remaining gas: 1039994.514 units remaining) [ {} - { "1" ; "2" ; "3" } @parameter ] + { "1" ; "2" ; "3" } ] - location: 12 (remaining gas: 1039994.499 units remaining) [ (Pair {} { "1" ; "2" ; "3" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 7f52cf403799..fb905b75e416 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -10,10 +10,10 @@ trace - location: 9 (remaining gas: 1039994.539 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - location: 9 (remaining gas: 1039994.529 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039994.514 units remaining) [ {} - { "a" ; "b" ; "c" } @parameter ] + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039994.499 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" index 06aca68d24d8..1e996e5fa5c0 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" @@ -10,10 +10,10 @@ trace - location: 9 (remaining gas: 1039994.911 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039994.901 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039994.886 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039994.871 units remaining) [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" index bcd18ebca46d..7cda833ccbd2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039993.518 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - location: 9 (remaining gas: 1039993.508 units remaining) - [ { "1" ; "2" ; "3" } @parameter ] + [ { "1" ; "2" ; "3" } ] - location: 10 (remaining gas: 1039993.508 units remaining) [ "1" ] - location: 10 (remaining gas: 1039993.493 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 09650132f0d0..8b5d6c57de5e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039993.518 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - location: 9 (remaining gas: 1039993.508 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039993.508 units remaining) [ "a" ] - location: 10 (remaining gas: 1039993.493 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" index 1b1a49bc17a7..e8cef350193e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039993.890 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039993.880 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039993.880 units remaining) [ {} ] - location: 12 (remaining gas: 1039993.865 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out index b9bbc7467d99..db1f2c635b29 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out @@ -10,25 +10,25 @@ trace - location: 8 (remaining gas: 1039991.873 units remaining) [ (Pair { 10 ; 2 ; 1 } 0) ] - location: 8 (remaining gas: 1039991.863 units remaining) - [ { 10 ; 2 ; 1 } @parameter ] + [ { 10 ; 2 ; 1 } ] - location: 9 (remaining gas: 1039991.853 units remaining) [ 1 - { 10 ; 2 ; 1 } @parameter ] + { 10 ; 2 ; 1 } ] - location: 12 (remaining gas: 1039991.843 units remaining) - [ { 10 ; 2 ; 1 } @parameter + [ { 10 ; 2 ; 1 } 1 ] - location: 13 (remaining gas: 1039991.843 units remaining) - [ 10 @parameter.elt + [ 10 1 ] - location: 15 (remaining gas: 1039991.739 units remaining) [ 10 ] - location: 13 (remaining gas: 1039991.724 units remaining) - [ 2 @parameter.elt + [ 2 10 ] - location: 15 (remaining gas: 1039991.620 units remaining) [ 20 ] - location: 13 (remaining gas: 1039991.605 units remaining) - [ 1 @parameter.elt + [ 1 20 ] - location: 15 (remaining gas: 1039991.501 units remaining) [ 20 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out index 0c2110324464..367f7ba2a8f1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out @@ -10,25 +10,25 @@ trace - location: 8 (remaining gas: 1039991.873 units remaining) [ (Pair { 3 ; 6 ; 9 } 0) ] - location: 8 (remaining gas: 1039991.863 units remaining) - [ { 3 ; 6 ; 9 } @parameter ] + [ { 3 ; 6 ; 9 } ] - location: 9 (remaining gas: 1039991.853 units remaining) [ 1 - { 3 ; 6 ; 9 } @parameter ] + { 3 ; 6 ; 9 } ] - location: 12 (remaining gas: 1039991.843 units remaining) - [ { 3 ; 6 ; 9 } @parameter + [ { 3 ; 6 ; 9 } 1 ] - location: 13 (remaining gas: 1039991.843 units remaining) - [ 3 @parameter.elt + [ 3 1 ] - location: 15 (remaining gas: 1039991.739 units remaining) [ 3 ] - location: 13 (remaining gas: 1039991.724 units remaining) - [ 6 @parameter.elt + [ 6 3 ] - location: 15 (remaining gas: 1039991.620 units remaining) [ 18 ] - location: 13 (remaining gas: 1039991.605 units remaining) - [ 9 @parameter.elt + [ 9 18 ] - location: 15 (remaining gas: 1039991.501 units remaining) [ 162 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out index d58229d8087c..f975e57d503b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039985.969 units remaining) [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ] - location: 9 (remaining gas: 1039985.959 units remaining) - [ { 1 ; 1 ; 1 ; 1 } @parameter ] + [ { 1 ; 1 ; 1 ; 1 } ] - location: 10 (remaining gas: 1039985.949 units remaining) [ 0 - { 1 ; 1 ; 1 ; 1 } @parameter ] + { 1 ; 1 ; 1 ; 1 } ] - location: 13 (remaining gas: 1039985.939 units remaining) - [ { 1 ; 1 ; 1 ; 1 } @parameter + [ { 1 ; 1 ; 1 ; 1 } 0 ] - location: 14 (remaining gas: 1039985.939 units remaining) - [ 1 @parameter.elt + [ 1 0 ] - location: 16 (remaining gas: 1039985.924 units remaining) [ 0 ] @@ -26,7 +26,7 @@ trace [ 0 0 ] - location: 16 (remaining gas: 1039985.884 units remaining) - [ 1 @parameter.elt + [ 1 0 0 ] - location: 19 (remaining gas: 1039985.829 units remaining) @@ -43,7 +43,7 @@ trace [ 1 1 ] - location: 14 (remaining gas: 1039985.704 units remaining) - [ 1 @parameter.elt + [ 1 1 ] - location: 16 (remaining gas: 1039985.689 units remaining) [ 1 ] @@ -51,7 +51,7 @@ trace [ 1 1 ] - location: 16 (remaining gas: 1039985.649 units remaining) - [ 1 @parameter.elt + [ 1 1 1 ] - location: 19 (remaining gas: 1039985.594 units remaining) @@ -68,7 +68,7 @@ trace [ 2 2 ] - location: 14 (remaining gas: 1039985.469 units remaining) - [ 1 @parameter.elt + [ 1 2 ] - location: 16 (remaining gas: 1039985.454 units remaining) [ 2 ] @@ -76,7 +76,7 @@ trace [ 2 2 ] - location: 16 (remaining gas: 1039985.414 units remaining) - [ 1 @parameter.elt + [ 1 2 2 ] - location: 19 (remaining gas: 1039985.359 units remaining) @@ -93,7 +93,7 @@ trace [ 3 3 ] - location: 14 (remaining gas: 1039985.234 units remaining) - [ 1 @parameter.elt + [ 1 3 ] - location: 16 (remaining gas: 1039985.219 units remaining) [ 3 ] @@ -101,7 +101,7 @@ trace [ 3 3 ] - location: 16 (remaining gas: 1039985.179 units remaining) - [ 1 @parameter.elt + [ 1 3 3 ] - location: 19 (remaining gas: 1039985.124 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out index e8fa6f9e5829..31e06d8b1e16 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039985.969 units remaining) [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ] - location: 9 (remaining gas: 1039985.959 units remaining) - [ { 1 ; 2 ; 3 ; 0 } @parameter ] + [ { 1 ; 2 ; 3 ; 0 } ] - location: 10 (remaining gas: 1039985.949 units remaining) [ 0 - { 1 ; 2 ; 3 ; 0 } @parameter ] + { 1 ; 2 ; 3 ; 0 } ] - location: 13 (remaining gas: 1039985.939 units remaining) - [ { 1 ; 2 ; 3 ; 0 } @parameter + [ { 1 ; 2 ; 3 ; 0 } 0 ] - location: 14 (remaining gas: 1039985.939 units remaining) - [ 1 @parameter.elt + [ 1 0 ] - location: 16 (remaining gas: 1039985.924 units remaining) [ 0 ] @@ -26,7 +26,7 @@ trace [ 0 0 ] - location: 16 (remaining gas: 1039985.884 units remaining) - [ 1 @parameter.elt + [ 1 0 0 ] - location: 19 (remaining gas: 1039985.829 units remaining) @@ -43,7 +43,7 @@ trace [ 1 1 ] - location: 14 (remaining gas: 1039985.704 units remaining) - [ 2 @parameter.elt + [ 2 1 ] - location: 16 (remaining gas: 1039985.689 units remaining) [ 1 ] @@ -51,7 +51,7 @@ trace [ 1 1 ] - location: 16 (remaining gas: 1039985.649 units remaining) - [ 2 @parameter.elt + [ 2 1 1 ] - location: 19 (remaining gas: 1039985.594 units remaining) @@ -68,7 +68,7 @@ trace [ 3 2 ] - location: 14 (remaining gas: 1039985.469 units remaining) - [ 3 @parameter.elt + [ 3 2 ] - location: 16 (remaining gas: 1039985.454 units remaining) [ 2 ] @@ -76,7 +76,7 @@ trace [ 2 2 ] - location: 16 (remaining gas: 1039985.414 units remaining) - [ 3 @parameter.elt + [ 3 2 2 ] - location: 19 (remaining gas: 1039985.359 units remaining) @@ -93,7 +93,7 @@ trace [ 5 3 ] - location: 14 (remaining gas: 1039985.234 units remaining) - [ 0 @parameter.elt + [ 0 3 ] - location: 16 (remaining gas: 1039985.219 units remaining) [ 3 ] @@ -101,7 +101,7 @@ trace [ 3 3 ] - location: 16 (remaining gas: 1039985.179 units remaining) - [ 0 @parameter.elt + [ 0 3 3 ] - location: 19 (remaining gas: 1039985.124 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out index 8126482fdea5..1b1de1382389 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out @@ -10,12 +10,12 @@ trace - location: 9 (remaining gas: 1039986.369 units remaining) [ (Pair {} { 0 }) ] - location: 9 (remaining gas: 1039986.359 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039986.349 units remaining) [ 0 - {} @parameter ] + {} ] - location: 13 (remaining gas: 1039986.339 units remaining) - [ {} @parameter + [ {} 0 ] - location: 14 (remaining gas: 1039986.339 units remaining) [ {} diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out index 4bc54d048e6b..31cb3b9633fb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.220 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - location: 8 (remaining gas: 1039994.210 units remaining) - [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } @parameter ] + [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - location: 9 (remaining gas: 1039994.195 units remaining) [ 6 ] - location: 10 (remaining gas: 1039994.180 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out index 30c496cd634a..ddbb611ef939 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.520 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039994.510 units remaining) - [ { 1 ; 2 ; 3 } @parameter ] + [ { 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039994.495 units remaining) [ 3 ] - location: 10 (remaining gas: 1039994.480 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out index 9ed0db624fc0..11e89dfc0a47 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.720 units remaining) [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039994.710 units remaining) - [ { 1 } @parameter ] + [ { 1 } ] - location: 9 (remaining gas: 1039994.695 units remaining) [ 1 ] - location: 10 (remaining gas: 1039994.680 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out index 2e1b7d6bae63..b0075b0afd81 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.820 units remaining) [ (Pair {} 111) ] - location: 8 (remaining gas: 1039994.810 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039994.795 units remaining) [ 0 ] - location: 10 (remaining gas: 1039994.780 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 42aba5f99a81..48cef89f59fb 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -10,12 +10,12 @@ trace - location: 9 (remaining gas: 1039977.710 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039977.700 units remaining) - [ { "c" ; "b" ; "a" } @parameter ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039977.685 units remaining) [ {} - { "c" ; "b" ; "a" } @parameter ] + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039977.675 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 13 (remaining gas: 1039977.660 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] @@ -27,30 +27,30 @@ trace [ (Pair { "c" ; "b" ; "a" } {}) (Pair { "c" ; "b" ; "a" } {}) ] - location: 20 (remaining gas: 1039977.625 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } (Pair { "c" ; "b" ; "a" } {}) ] - location: 21 (remaining gas: 1039977.610 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] - location: 23 (remaining gas: 1039977.600 units remaining) [ {} ] - location: 21 (remaining gas: 1039977.570 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 24 (remaining gas: 1039977.560 units remaining) - [ "c" @parameter.hd - { "b" ; "a" } @parameter.tl + [ "c" + { "b" ; "a" } {} ] - location: 26 (remaining gas: 1039977.550 units remaining) - [ { "b" ; "a" } @parameter.tl - "c" @parameter.hd + [ { "b" ; "a" } + "c" {} ] - location: 27 (remaining gas: 1039977.535 units remaining) - [ "c" @parameter.hd + [ "c" {} ] - location: 29 (remaining gas: 1039977.520 units remaining) [ { "c" } ] - location: 27 (remaining gas: 1039977.490 units remaining) - [ { "b" ; "a" } @parameter.tl + [ { "b" ; "a" } { "c" } ] - location: 30 (remaining gas: 1039977.475 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] @@ -64,30 +64,30 @@ trace [ (Pair { "b" ; "a" } { "c" }) (Pair { "b" ; "a" } { "c" }) ] - location: 20 (remaining gas: 1039977.410 units remaining) - [ { "b" ; "a" } @parameter + [ { "b" ; "a" } (Pair { "b" ; "a" } { "c" }) ] - location: 21 (remaining gas: 1039977.395 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] - location: 23 (remaining gas: 1039977.385 units remaining) [ { "c" } ] - location: 21 (remaining gas: 1039977.355 units remaining) - [ { "b" ; "a" } @parameter + [ { "b" ; "a" } { "c" } ] - location: 24 (remaining gas: 1039977.345 units remaining) - [ "b" @parameter.hd - { "a" } @parameter.tl + [ "b" + { "a" } { "c" } ] - location: 26 (remaining gas: 1039977.335 units remaining) - [ { "a" } @parameter.tl - "b" @parameter.hd + [ { "a" } + "b" { "c" } ] - location: 27 (remaining gas: 1039977.320 units remaining) - [ "b" @parameter.hd + [ "b" { "c" } ] - location: 29 (remaining gas: 1039977.305 units remaining) [ { "b" ; "c" } ] - location: 27 (remaining gas: 1039977.275 units remaining) - [ { "a" } @parameter.tl + [ { "a" } { "b" ; "c" } ] - location: 30 (remaining gas: 1039977.260 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] @@ -101,30 +101,30 @@ trace [ (Pair { "a" } { "b" ; "c" }) (Pair { "a" } { "b" ; "c" }) ] - location: 20 (remaining gas: 1039977.195 units remaining) - [ { "a" } @parameter + [ { "a" } (Pair { "a" } { "b" ; "c" }) ] - location: 21 (remaining gas: 1039977.180 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] - location: 23 (remaining gas: 1039977.170 units remaining) [ { "b" ; "c" } ] - location: 21 (remaining gas: 1039977.140 units remaining) - [ { "a" } @parameter + [ { "a" } { "b" ; "c" } ] - location: 24 (remaining gas: 1039977.130 units remaining) - [ "a" @parameter.hd - {} @parameter.tl + [ "a" + {} { "b" ; "c" } ] - location: 26 (remaining gas: 1039977.120 units remaining) - [ {} @parameter.tl - "a" @parameter.hd + [ {} + "a" { "b" ; "c" } ] - location: 27 (remaining gas: 1039977.105 units remaining) - [ "a" @parameter.hd + [ "a" { "b" ; "c" } ] - location: 29 (remaining gas: 1039977.090 units remaining) [ { "a" ; "b" ; "c" } ] - location: 27 (remaining gas: 1039977.060 units remaining) - [ {} @parameter.tl + [ {} { "a" ; "b" ; "c" } ] - location: 30 (remaining gas: 1039977.045 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] @@ -138,14 +138,14 @@ trace [ (Pair {} { "a" ; "b" ; "c" }) (Pair {} { "a" ; "b" ; "c" }) ] - location: 20 (remaining gas: 1039976.980 units remaining) - [ {} @parameter + [ {} (Pair {} { "a" ; "b" ; "c" }) ] - location: 21 (remaining gas: 1039976.965 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - location: 23 (remaining gas: 1039976.955 units remaining) [ { "a" ; "b" ; "c" } ] - location: 21 (remaining gas: 1039976.925 units remaining) - [ {} @parameter + [ {} { "a" ; "b" ; "c" } ] - location: 24 (remaining gas: 1039976.915 units remaining) [ { "a" ; "b" ; "c" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" index 0d9e5e62b30c..a21e3c0f099a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" @@ -10,12 +10,12 @@ trace - location: 9 (remaining gas: 1039978.082 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039978.072 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039978.057 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039978.047 units remaining) - [ {} @parameter + [ {} {} ] - location: 13 (remaining gas: 1039978.032 units remaining) [ (Pair {} {}) ] @@ -27,14 +27,14 @@ trace [ (Pair {} {}) (Pair {} {}) ] - location: 20 (remaining gas: 1039977.997 units remaining) - [ {} @parameter + [ {} (Pair {} {}) ] - location: 21 (remaining gas: 1039977.982 units remaining) [ (Pair {} {}) ] - location: 23 (remaining gas: 1039977.972 units remaining) [ {} ] - location: 21 (remaining gas: 1039977.942 units remaining) - [ {} @parameter + [ {} {} ] - location: 24 (remaining gas: 1039977.932 units remaining) [ {} ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out index 1cc204338982..7ae28a043fa3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out @@ -10,10 +10,10 @@ trace - location: 11 (remaining gas: 1039993.699 units remaining) [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ] - location: 11 (remaining gas: 1039993.689 units remaining) - [ { Elt 0 0 ; Elt 3 4 } @parameter ] + [ { Elt 0 0 ; Elt 3 4 } ] - location: 12 (remaining gas: 1039993.674 units remaining) [ {} - { Elt 0 0 ; Elt 3 4 } @parameter ] + { Elt 0 0 ; Elt 3 4 } ] - location: 14 (remaining gas: 1039993.659 units remaining) [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out index 5516cbb30f0f..f85745c8299f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out @@ -10,10 +10,10 @@ trace - location: 11 (remaining gas: 1039994.154 units remaining) [ (Pair { Elt 0 0 } {}) ] - location: 11 (remaining gas: 1039994.144 units remaining) - [ { Elt 0 0 } @parameter ] + [ { Elt 0 0 } ] - location: 12 (remaining gas: 1039994.129 units remaining) [ {} - { Elt 0 0 } @parameter ] + { Elt 0 0 } ] - location: 14 (remaining gas: 1039994.114 units remaining) [ (Pair {} { Elt 0 0 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out index 758703e23140..230c2e7ed159 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out @@ -10,10 +10,10 @@ trace - location: 11 (remaining gas: 1039994.154 units remaining) [ (Pair { Elt 0 1 } {}) ] - location: 11 (remaining gas: 1039994.144 units remaining) - [ { Elt 0 1 } @parameter ] + [ { Elt 0 1 } ] - location: 12 (remaining gas: 1039994.129 units remaining) [ {} - { Elt 0 1 } @parameter ] + { Elt 0 1 } ] - location: 14 (remaining gas: 1039994.114 units remaining) [ (Pair {} { Elt 0 1 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out index 71c6fa423100..4cb25109ad68 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out @@ -10,19 +10,19 @@ trace - location: 11 (remaining gas: 1039978.509 units remaining) [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ] - location: 11 (remaining gas: 1039978.499 units remaining) - [ { Elt 0 100 ; Elt 2 100 } @parameter ] + [ { Elt 0 100 ; Elt 2 100 } ] - location: 12 (remaining gas: 1039978.489 units remaining) - [ 0 @acc_e - { Elt 0 100 ; Elt 2 100 } @parameter ] + [ 0 + { Elt 0 100 ; Elt 2 100 } ] - location: 15 (remaining gas: 1039978.479 units remaining) - [ 0 @acc_k - 0 @acc_e - { Elt 0 100 ; Elt 2 100 } @parameter ] + [ 0 + 0 + { Elt 0 100 ; Elt 2 100 } ] - location: 18 (remaining gas: 1039978.464 units remaining) [ (Pair 0 0) - { Elt 0 100 ; Elt 2 100 } @parameter ] + { Elt 0 100 ; Elt 2 100 } ] - location: 19 (remaining gas: 1039978.454 units remaining) - [ { Elt 0 100 ; Elt 2 100 } @parameter + [ { Elt 0 100 ; Elt 2 100 } (Pair 0 0) ] - location: 20 (remaining gas: 1039978.454 units remaining) [ (Pair 0 100) @@ -33,49 +33,49 @@ trace [ (Pair 0 0) (Pair 0 0) ] - location: 25 (remaining gas: 1039978.419 units remaining) - [ 0 @acc_k + [ 0 (Pair 0 0) ] - location: 26 (remaining gas: 1039978.404 units remaining) [ (Pair 0 0) ] - location: 28 (remaining gas: 1039978.394 units remaining) - [ 0 @acc_e ] + [ 0 ] - location: 26 (remaining gas: 1039978.364 units remaining) - [ 0 @acc_k - 0 @acc_e ] + [ 0 + 0 ] - location: 22 (remaining gas: 1039978.334 units remaining) [ (Pair 0 100) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 29 (remaining gas: 1039978.324 units remaining) [ (Pair 0 100) (Pair 0 100) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 30 (remaining gas: 1039978.309 units remaining) [ (Pair 0 100) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 32 (remaining gas: 1039978.299 units remaining) - [ 0 @key - 0 @acc_k - 0 @acc_e ] + [ 0 + 0 + 0 ] - location: 33 (remaining gas: 1039978.244 units remaining) [ 0 - 0 @acc_e ] + 0 ] - location: 30 (remaining gas: 1039978.214 units remaining) [ (Pair 0 100) 0 - 0 @acc_e ] + 0 ] - location: 34 (remaining gas: 1039978.204 units remaining) [ 0 (Pair 0 100) - 0 @acc_e ] + 0 ] - location: 35 (remaining gas: 1039978.189 units remaining) [ (Pair 0 100) - 0 @acc_e ] + 0 ] - location: 37 (remaining gas: 1039978.179 units remaining) - [ 100 @elt - 0 @acc_e ] + [ 100 + 0 ] - location: 38 (remaining gas: 1039978.124 units remaining) [ 100 ] - location: 35 (remaining gas: 1039978.094 units remaining) @@ -92,49 +92,49 @@ trace [ (Pair 0 100) (Pair 0 100) ] - location: 25 (remaining gas: 1039978.029 units remaining) - [ 0 @acc_k + [ 0 (Pair 0 100) ] - location: 26 (remaining gas: 1039978.014 units remaining) [ (Pair 0 100) ] - location: 28 (remaining gas: 1039978.004 units remaining) - [ 100 @acc_e ] + [ 100 ] - location: 26 (remaining gas: 1039977.974 units remaining) - [ 0 @acc_k - 100 @acc_e ] + [ 0 + 100 ] - location: 22 (remaining gas: 1039977.944 units remaining) [ (Pair 2 100) - 0 @acc_k - 100 @acc_e ] + 0 + 100 ] - location: 29 (remaining gas: 1039977.934 units remaining) [ (Pair 2 100) (Pair 2 100) - 0 @acc_k - 100 @acc_e ] + 0 + 100 ] - location: 30 (remaining gas: 1039977.919 units remaining) [ (Pair 2 100) - 0 @acc_k - 100 @acc_e ] + 0 + 100 ] - location: 32 (remaining gas: 1039977.909 units remaining) - [ 2 @key - 0 @acc_k - 100 @acc_e ] + [ 2 + 0 + 100 ] - location: 33 (remaining gas: 1039977.854 units remaining) [ 2 - 100 @acc_e ] + 100 ] - location: 30 (remaining gas: 1039977.824 units remaining) [ (Pair 2 100) 2 - 100 @acc_e ] + 100 ] - location: 34 (remaining gas: 1039977.814 units remaining) [ 2 (Pair 2 100) - 100 @acc_e ] + 100 ] - location: 35 (remaining gas: 1039977.799 units remaining) [ (Pair 2 100) - 100 @acc_e ] + 100 ] - location: 37 (remaining gas: 1039977.789 units remaining) - [ 100 @elt - 100 @acc_e ] + [ 100 + 100 ] - location: 38 (remaining gas: 1039977.734 units remaining) [ 200 ] - location: 35 (remaining gas: 1039977.704 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out index 5f3e5827a671..1150a5a6e645 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out @@ -10,19 +10,19 @@ trace - location: 11 (remaining gas: 1039978.509 units remaining) [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ] - location: 11 (remaining gas: 1039978.499 units remaining) - [ { Elt 1 1 ; Elt 2 100 } @parameter ] + [ { Elt 1 1 ; Elt 2 100 } ] - location: 12 (remaining gas: 1039978.489 units remaining) - [ 0 @acc_e - { Elt 1 1 ; Elt 2 100 } @parameter ] + [ 0 + { Elt 1 1 ; Elt 2 100 } ] - location: 15 (remaining gas: 1039978.479 units remaining) - [ 0 @acc_k - 0 @acc_e - { Elt 1 1 ; Elt 2 100 } @parameter ] + [ 0 + 0 + { Elt 1 1 ; Elt 2 100 } ] - location: 18 (remaining gas: 1039978.464 units remaining) [ (Pair 0 0) - { Elt 1 1 ; Elt 2 100 } @parameter ] + { Elt 1 1 ; Elt 2 100 } ] - location: 19 (remaining gas: 1039978.454 units remaining) - [ { Elt 1 1 ; Elt 2 100 } @parameter + [ { Elt 1 1 ; Elt 2 100 } (Pair 0 0) ] - location: 20 (remaining gas: 1039978.454 units remaining) [ (Pair 1 1) @@ -33,49 +33,49 @@ trace [ (Pair 0 0) (Pair 0 0) ] - location: 25 (remaining gas: 1039978.419 units remaining) - [ 0 @acc_k + [ 0 (Pair 0 0) ] - location: 26 (remaining gas: 1039978.404 units remaining) [ (Pair 0 0) ] - location: 28 (remaining gas: 1039978.394 units remaining) - [ 0 @acc_e ] + [ 0 ] - location: 26 (remaining gas: 1039978.364 units remaining) - [ 0 @acc_k - 0 @acc_e ] + [ 0 + 0 ] - location: 22 (remaining gas: 1039978.334 units remaining) [ (Pair 1 1) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 29 (remaining gas: 1039978.324 units remaining) [ (Pair 1 1) (Pair 1 1) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 30 (remaining gas: 1039978.309 units remaining) [ (Pair 1 1) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 32 (remaining gas: 1039978.299 units remaining) - [ 1 @key - 0 @acc_k - 0 @acc_e ] + [ 1 + 0 + 0 ] - location: 33 (remaining gas: 1039978.244 units remaining) [ 1 - 0 @acc_e ] + 0 ] - location: 30 (remaining gas: 1039978.214 units remaining) [ (Pair 1 1) 1 - 0 @acc_e ] + 0 ] - location: 34 (remaining gas: 1039978.204 units remaining) [ 1 (Pair 1 1) - 0 @acc_e ] + 0 ] - location: 35 (remaining gas: 1039978.189 units remaining) [ (Pair 1 1) - 0 @acc_e ] + 0 ] - location: 37 (remaining gas: 1039978.179 units remaining) - [ 1 @elt - 0 @acc_e ] + [ 1 + 0 ] - location: 38 (remaining gas: 1039978.124 units remaining) [ 1 ] - location: 35 (remaining gas: 1039978.094 units remaining) @@ -92,49 +92,49 @@ trace [ (Pair 1 1) (Pair 1 1) ] - location: 25 (remaining gas: 1039978.029 units remaining) - [ 1 @acc_k + [ 1 (Pair 1 1) ] - location: 26 (remaining gas: 1039978.014 units remaining) [ (Pair 1 1) ] - location: 28 (remaining gas: 1039978.004 units remaining) - [ 1 @acc_e ] + [ 1 ] - location: 26 (remaining gas: 1039977.974 units remaining) - [ 1 @acc_k - 1 @acc_e ] + [ 1 + 1 ] - location: 22 (remaining gas: 1039977.944 units remaining) [ (Pair 2 100) - 1 @acc_k - 1 @acc_e ] + 1 + 1 ] - location: 29 (remaining gas: 1039977.934 units remaining) [ (Pair 2 100) (Pair 2 100) - 1 @acc_k - 1 @acc_e ] + 1 + 1 ] - location: 30 (remaining gas: 1039977.919 units remaining) [ (Pair 2 100) - 1 @acc_k - 1 @acc_e ] + 1 + 1 ] - location: 32 (remaining gas: 1039977.909 units remaining) - [ 2 @key - 1 @acc_k - 1 @acc_e ] + [ 2 + 1 + 1 ] - location: 33 (remaining gas: 1039977.854 units remaining) [ 3 - 1 @acc_e ] + 1 ] - location: 30 (remaining gas: 1039977.824 units remaining) [ (Pair 2 100) 3 - 1 @acc_e ] + 1 ] - location: 34 (remaining gas: 1039977.814 units remaining) [ 3 (Pair 2 100) - 1 @acc_e ] + 1 ] - location: 35 (remaining gas: 1039977.799 units remaining) [ (Pair 2 100) - 1 @acc_e ] + 1 ] - location: 37 (remaining gas: 1039977.789 units remaining) - [ 100 @elt - 1 @acc_e ] + [ 100 + 1 ] - location: 38 (remaining gas: 1039977.734 units remaining) [ 101 ] - location: 35 (remaining gas: 1039977.704 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" index 45a0b08fe131..87857063f8b2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" @@ -10,52 +10,52 @@ trace - location: 9 (remaining gas: 1039988.041 units remaining) [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ] - location: 9 (remaining gas: 1039988.031 units remaining) - [ 15 @parameter - { Elt "bar" 5 ; Elt "foo" 1 } @storage ] + [ 15 + { Elt "bar" 5 ; Elt "foo" 1 } ] - location: 10 (remaining gas: 1039988.021 units remaining) - [ { Elt "bar" 5 ; Elt "foo" 1 } @storage - 15 @parameter ] + [ { Elt "bar" 5 ; Elt "foo" 1 } + 15 ] - location: 11 (remaining gas: 1039988.021 units remaining) [ (Pair "bar" 5) - 15 @parameter ] + 15 ] - location: 13 (remaining gas: 1039988.011 units remaining) - [ 5 @elt - 15 @parameter ] + [ 5 + 15 ] - location: 14 (remaining gas: 1039987.996 units remaining) - [ 15 @parameter ] + [ 15 ] - location: 16 (remaining gas: 1039987.986 units remaining) - [ 15 @parameter - 15 @parameter ] + [ 15 + 15 ] - location: 14 (remaining gas: 1039987.956 units remaining) - [ 5 @elt - 15 @parameter - 15 @parameter ] + [ 5 + 15 + 15 ] - location: 17 (remaining gas: 1039987.901 units remaining) [ 20 - 15 @parameter ] + 15 ] - location: 11 (remaining gas: 1039987.886 units remaining) [ (Pair "foo" 1) - 15 @parameter ] + 15 ] - location: 13 (remaining gas: 1039987.876 units remaining) - [ 1 @elt - 15 @parameter ] + [ 1 + 15 ] - location: 14 (remaining gas: 1039987.861 units remaining) - [ 15 @parameter ] + [ 15 ] - location: 16 (remaining gas: 1039987.851 units remaining) - [ 15 @parameter - 15 @parameter ] + [ 15 + 15 ] - location: 14 (remaining gas: 1039987.821 units remaining) - [ 1 @elt - 15 @parameter - 15 @parameter ] + [ 1 + 15 + 15 ] - location: 17 (remaining gas: 1039987.766 units remaining) [ 16 - 15 @parameter ] + 15 ] - location: 11 (remaining gas: 1039987.751 units remaining) [ { Elt "bar" 20 ; Elt "foo" 16 } - 15 @parameter ] + 15 ] - location: 18 (remaining gas: 1039987.736 units remaining) - [ 15 @parameter ] + [ 15 ] - location: 20 (remaining gas: 1039987.726 units remaining) [ ] - location: 18 (remaining gas: 1039987.696 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" index cc2688e73312..655c363584b5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" @@ -10,34 +10,34 @@ trace - location: 9 (remaining gas: 1039988.540 units remaining) [ (Pair 10 { Elt "foo" 1 }) ] - location: 9 (remaining gas: 1039988.530 units remaining) - [ 10 @parameter - { Elt "foo" 1 } @storage ] + [ 10 + { Elt "foo" 1 } ] - location: 10 (remaining gas: 1039988.520 units remaining) - [ { Elt "foo" 1 } @storage - 10 @parameter ] + [ { Elt "foo" 1 } + 10 ] - location: 11 (remaining gas: 1039988.520 units remaining) [ (Pair "foo" 1) - 10 @parameter ] + 10 ] - location: 13 (remaining gas: 1039988.510 units remaining) - [ 1 @elt - 10 @parameter ] + [ 1 + 10 ] - location: 14 (remaining gas: 1039988.495 units remaining) - [ 10 @parameter ] + [ 10 ] - location: 16 (remaining gas: 1039988.485 units remaining) - [ 10 @parameter - 10 @parameter ] + [ 10 + 10 ] - location: 14 (remaining gas: 1039988.455 units remaining) - [ 1 @elt - 10 @parameter - 10 @parameter ] + [ 1 + 10 + 10 ] - location: 17 (remaining gas: 1039988.400 units remaining) [ 11 - 10 @parameter ] + 10 ] - location: 11 (remaining gas: 1039988.385 units remaining) [ { Elt "foo" 11 } - 10 @parameter ] + 10 ] - location: 18 (remaining gas: 1039988.370 units remaining) - [ 10 @parameter ] + [ 10 ] - location: 20 (remaining gas: 1039988.360 units remaining) [ ] - location: 18 (remaining gas: 1039988.330 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out index 004b2b813b2f..f5c60c85a481 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out @@ -10,16 +10,16 @@ trace - location: 9 (remaining gas: 1039988.934 units remaining) [ (Pair 10 {}) ] - location: 9 (remaining gas: 1039988.924 units remaining) - [ 10 @parameter - {} @storage ] + [ 10 + {} ] - location: 10 (remaining gas: 1039988.914 units remaining) - [ {} @storage - 10 @parameter ] + [ {} + 10 ] - location: 11 (remaining gas: 1039988.914 units remaining) [ {} - 10 @parameter ] + 10 ] - location: 18 (remaining gas: 1039988.899 units remaining) - [ 10 @parameter ] + [ 10 ] - location: 20 (remaining gas: 1039988.889 units remaining) [ ] - location: 18 (remaining gas: 1039988.859 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out index 71b56c541e2b..7c19df198ceb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.154 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039988.144 units remaining) - [ 1 @parameter - (Pair { Elt 0 1 } None) @storage ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 13 (remaining gas: 1039988.129 units remaining) - [ (Pair { Elt 0 1 } None) @storage ] + [ (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039988.119 units remaining) [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039988.109 units remaining) [ { Elt 0 1 } { Elt 0 1 } ] - location: 13 (remaining gas: 1039988.079 units remaining) - [ 1 @parameter + [ 1 { Elt 0 1 } { Elt 0 1 } ] - location: 17 (remaining gas: 1039987.929 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out index 33429cbd645d..112cc660911f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.154 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039988.144 units remaining) - [ 1 @parameter - (Pair { Elt 1 0 } None) @storage ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 13 (remaining gas: 1039988.129 units remaining) - [ (Pair { Elt 1 0 } None) @storage ] + [ (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039988.119 units remaining) [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039988.109 units remaining) [ { Elt 1 0 } { Elt 1 0 } ] - location: 13 (remaining gas: 1039988.079 units remaining) - [ 1 @parameter + [ 1 { Elt 1 0 } { Elt 1 0 } ] - location: 17 (remaining gas: 1039987.929 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out index 19559535b594..d77284435423 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.699 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039987.689 units remaining) - [ 1 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039987.674 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039987.664 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039987.654 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039987.624 units remaining) - [ 1 @parameter + [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039987.439 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out index c9686740323b..7be6a7ac230e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.699 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039987.689 units remaining) - [ 2 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039987.674 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039987.664 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039987.654 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039987.624 units remaining) - [ 2 @parameter + [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039987.439 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out index 616ef564fe76..30c9112baaa2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.699 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039987.689 units remaining) - [ 3 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039987.674 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039987.664 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039987.654 units remaining) [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039987.624 units remaining) - [ 3 @parameter + [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039987.439 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out index a64b4746bd44..8e3894a348a8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.504 units remaining) [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039988.494 units remaining) - [ 1 @parameter - (Pair {} None) @storage ] + [ 1 + (Pair {} None) ] - location: 13 (remaining gas: 1039988.479 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039988.469 units remaining) [ {} ] - location: 16 (remaining gas: 1039988.459 units remaining) [ {} {} ] - location: 13 (remaining gas: 1039988.429 units remaining) - [ 1 @parameter + [ 1 {} {} ] - location: 17 (remaining gas: 1039988.314 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" index 3d0a4784ead0..c90067d0fbcf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.567 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039987.557 units remaining) - [ "bar" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "bar" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039987.542 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039987.532 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039987.522 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039987.492 units remaining) - [ "bar" @parameter + [ "bar" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039987.307 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" index 2a05c52806e0..1711e929a0b2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.567 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039987.557 units remaining) - [ "foo" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "foo" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039987.542 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039987.532 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039987.522 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039987.492 units remaining) - [ "foo" @parameter + [ "foo" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039987.307 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" index 0e0b584393ec..aa11b1f42f79 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039987.567 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039987.557 units remaining) - [ "baz" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "baz" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039987.542 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039987.532 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039987.522 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039987.492 units remaining) - [ "baz" @parameter + [ "baz" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039987.307 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" index de2b939dbfd1..f027be34db16 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.066 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - location: 12 (remaining gas: 1039988.056 units remaining) - [ "foo" @parameter - (Pair { Elt "foo" 0 } None) @storage ] + [ "foo" + (Pair { Elt "foo" 0 } None) ] - location: 13 (remaining gas: 1039988.041 units remaining) - [ (Pair { Elt "foo" 0 } None) @storage ] + [ (Pair { Elt "foo" 0 } None) ] - location: 15 (remaining gas: 1039988.031 units remaining) [ { Elt "foo" 0 } ] - location: 16 (remaining gas: 1039988.021 units remaining) [ { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 13 (remaining gas: 1039987.991 units remaining) - [ "foo" @parameter + [ "foo" { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 17 (remaining gas: 1039987.841 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" index e1b29a7d7697..51ff7af99288 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.066 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - location: 12 (remaining gas: 1039988.056 units remaining) - [ "bar" @parameter - (Pair { Elt "foo" 1 } None) @storage ] + [ "bar" + (Pair { Elt "foo" 1 } None) ] - location: 13 (remaining gas: 1039988.041 units remaining) - [ (Pair { Elt "foo" 1 } None) @storage ] + [ (Pair { Elt "foo" 1 } None) ] - location: 15 (remaining gas: 1039988.031 units remaining) [ { Elt "foo" 1 } ] - location: 16 (remaining gas: 1039988.021 units remaining) [ { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 13 (remaining gas: 1039987.991 units remaining) - [ "bar" @parameter + [ "bar" { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 17 (remaining gas: 1039987.841 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" index 0cdb9b578045..38000ca0768f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" @@ -10,17 +10,17 @@ trace - location: 12 (remaining gas: 1039988.460 units remaining) [ (Pair "bar" {} None) ] - location: 12 (remaining gas: 1039988.450 units remaining) - [ "bar" @parameter - (Pair {} None) @storage ] + [ "bar" + (Pair {} None) ] - location: 13 (remaining gas: 1039988.435 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039988.425 units remaining) [ {} ] - location: 16 (remaining gas: 1039988.415 units remaining) [ {} {} ] - location: 13 (remaining gas: 1039988.385 units remaining) - [ "bar" @parameter + [ "bar" {} {} ] - location: 17 (remaining gas: 1039988.270 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" index 3211daaf0f67..ba3ede7a5493 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.503 units remaining) [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } 111) ] - location: 9 (remaining gas: 1039991.493 units remaining) - [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } @parameter ] + [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } ] - location: 10 (remaining gas: 1039991.478 units remaining) [ 6 ] - location: 11 (remaining gas: 1039991.463 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" index 73481c07ce5a..8310f15e2661 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039993.290 units remaining) [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ] - location: 9 (remaining gas: 1039993.280 units remaining) - [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } @parameter ] + [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } ] - location: 10 (remaining gas: 1039993.265 units remaining) [ 3 ] - location: 11 (remaining gas: 1039993.250 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" index 5d843fbb77e5..60c751d37f3a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039994.318 units remaining) [ (Pair { Elt "a" 1 } 111) ] - location: 9 (remaining gas: 1039994.308 units remaining) - [ { Elt "a" 1 } @parameter ] + [ { Elt "a" 1 } ] - location: 10 (remaining gas: 1039994.293 units remaining) [ 1 ] - location: 11 (remaining gas: 1039994.278 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out index 4c7e53e3c349..1fcc8b627c3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039994.692 units remaining) [ (Pair {} 111) ] - location: 9 (remaining gas: 1039994.682 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039994.667 units remaining) [ 0 ] - location: 11 (remaining gas: 1039994.652 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out index e4f24bbb88cc..5d345cdc2f69 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out @@ -10,7 +10,7 @@ trace - location: 7 (remaining gas: 1039944.576 units remaining) [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039944.566 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 8 (remaining gas: 1039944.556 units remaining) [ ] - location: 9 (remaining gas: 1039944.546 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out index 8e8ed7d9a552..b106914476bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out @@ -10,19 +10,19 @@ trace - location: 7 (remaining gas: 1039987.713 units remaining) [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039987.703 units remaining) - [ 257 @parameter ] + [ 257 ] - location: 8 (remaining gas: 1039987.693 units remaining) [ 1 - 257 @parameter ] + 257 ] - location: 11 (remaining gas: 1039987.683 units remaining) - [ 257 @parameter + [ 257 1 ] - location: 12 (remaining gas: 1039987.543 units remaining) [ (Some (Pair 257 0)) ] - location: 14 (remaining gas: 1039987.533 units remaining) - [ (Pair 257 0) @some ] + [ (Pair 257 0) ] - location: 14 (remaining gas: 1039987.518 units remaining) - [ (Pair 257 0) @some ] + [ (Pair 257 0) ] - location: 20 (remaining gas: 1039987.508 units remaining) [ 257 ] - location: 21 (remaining gas: 1039987.498 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out index 1a6d40470f65..18773f0bd250 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out @@ -10,19 +10,19 @@ trace - location: 7 (remaining gas: 1039987.713 units remaining) [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039987.703 units remaining) - [ 16 @parameter ] + [ 16 ] - location: 8 (remaining gas: 1039987.693 units remaining) [ 1 - 16 @parameter ] + 16 ] - location: 11 (remaining gas: 1039987.683 units remaining) - [ 16 @parameter + [ 16 1 ] - location: 12 (remaining gas: 1039987.543 units remaining) [ (Some (Pair 16 0)) ] - location: 14 (remaining gas: 1039987.533 units remaining) - [ (Pair 16 0) @some ] + [ (Pair 16 0) ] - location: 14 (remaining gas: 1039987.518 units remaining) - [ (Pair 16 0) @some ] + [ (Pair 16 0) ] - location: 20 (remaining gas: 1039987.508 units remaining) [ 16 ] - location: 21 (remaining gas: 1039987.498 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out index 9e5bd340ad03..8c176e5f2eb5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out @@ -10,9 +10,9 @@ trace - location: 9 (remaining gas: 1039992.641 units remaining) [ (Pair (Left -2) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Left -2) @parameter ] + [ (Left -2) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ -2 @parameter.left ] + [ -2 ] - location: 12 (remaining gas: 1039992.581 units remaining) [ 2 ] - location: 10 (remaining gas: 1039992.566 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out index 18af9bc67230..6fa2b91327e0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out @@ -10,9 +10,9 @@ trace - location: 9 (remaining gas: 1039992.641 units remaining) [ (Pair (Left 0) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Left 0) @parameter ] + [ (Left 0) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 0 @parameter.left ] + [ 0 ] - location: 12 (remaining gas: 1039992.581 units remaining) [ 0 ] - location: 10 (remaining gas: 1039992.566 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out index 2aa2e14a7e67..067fdeb43910 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out @@ -10,9 +10,9 @@ trace - location: 9 (remaining gas: 1039992.641 units remaining) [ (Pair (Left 2) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Left 2) @parameter ] + [ (Left 2) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 2 @parameter.left ] + [ 2 ] - location: 12 (remaining gas: 1039992.581 units remaining) [ -2 ] - location: 10 (remaining gas: 1039992.566 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out index 186989f5cd78..046d77c81096 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out @@ -10,9 +10,9 @@ trace - location: 9 (remaining gas: 1039992.641 units remaining) [ (Pair (Right 0) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Right 0) @parameter ] + [ (Right 0) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 0 @parameter.right ] + [ 0 ] - location: 14 (remaining gas: 1039992.581 units remaining) [ 0 ] - location: 10 (remaining gas: 1039992.566 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out index e9f9426f4963..131c8218a598 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out @@ -10,9 +10,9 @@ trace - location: 9 (remaining gas: 1039992.641 units remaining) [ (Pair (Right 2) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Right 2) @parameter ] + [ (Right 2) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 2 @parameter.right ] + [ 2 ] - location: 14 (remaining gas: 1039992.581 units remaining) [ -2 ] - location: 10 (remaining gas: 1039992.566 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out index 15fccbf8397a..705a78df93be 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair False None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ False @parameter ] + [ False ] - location: 9 (remaining gas: 1039993.937 units remaining) [ True ] - location: 10 (remaining gas: 1039993.922 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out index ee4bde7b71f1..f1a2055b36b8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair True None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ True @parameter ] + [ True ] - location: 9 (remaining gas: 1039993.937 units remaining) [ False ] - location: 10 (remaining gas: 1039993.922 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out index 17c73e6d2971..027bc9dd1389 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Left -8) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left -8) @parameter ] + [ (Left -8) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ -8 @parameter.left ] + [ -8 ] - location: 13 (remaining gas: 1039991.570 units remaining) [ 7 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out index 05d3145bcd75..5c977428a71c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Left -9) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left -9) @parameter ] + [ (Left -9) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ -9 @parameter.left ] + [ -9 ] - location: 13 (remaining gas: 1039991.570 units remaining) [ 8 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out index d17d87a63feb..e1063d1d8dce 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Left 0) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left 0) @parameter ] + [ (Left 0) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 0 @parameter.left ] + [ 0 ] - location: 13 (remaining gas: 1039991.570 units remaining) [ -1 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out index d680b61e82f1..fc0b8aaed267 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Left 7) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left 7) @parameter ] + [ (Left 7) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 7 @parameter.left ] + [ 7 ] - location: 13 (remaining gas: 1039991.570 units remaining) [ -8 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out index b93b0bebf9ee..69b10e9314e0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Left 8) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left 8) @parameter ] + [ (Left 8) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 8 @parameter.left ] + [ 8 ] - location: 13 (remaining gas: 1039991.570 units remaining) [ -9 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out index 30efcc95105b..46a79e7f2bd4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Right 0) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Right 0) @parameter ] + [ (Right 0) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 0 @parameter.right ] + [ 0 ] - location: 15 (remaining gas: 1039991.570 units remaining) [ -1 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out index be1ca7215a65..b8df3be05003 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Right 7) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Right 7) @parameter ] + [ (Right 7) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 7 @parameter.right ] + [ 7 ] - location: 15 (remaining gas: 1039991.570 units remaining) [ -8 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out index a6274cb349d5..22b4db9f10a1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out @@ -10,9 +10,9 @@ trace - location: 10 (remaining gas: 1039991.640 units remaining) [ (Pair (Right 8) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Right 8) @parameter ] + [ (Right 8) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 8 @parameter.right ] + [ 8 ] - location: 15 (remaining gas: 1039991.570 units remaining) [ -9 ] - location: 11 (remaining gas: 1039991.555 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out index 8548902e0564..504a0a83784f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.715 units remaining) [ (Pair (Pair False False) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair False False) @parameter ] + [ (Pair False False) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair False False) @parameter - (Pair False False) @parameter ] + [ (Pair False False) + (Pair False False) ] - location: 12 (remaining gas: 1039990.685 units remaining) [ False - (Pair False False) @parameter ] + (Pair False False) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair False False) @parameter + [ (Pair False False) False ] - location: 14 (remaining gas: 1039990.665 units remaining) [ False diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out index a7083dcdad66..a69727294757 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.715 units remaining) [ (Pair (Pair False True) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair False True) @parameter ] + [ (Pair False True) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair False True) @parameter - (Pair False True) @parameter ] + [ (Pair False True) + (Pair False True) ] - location: 12 (remaining gas: 1039990.685 units remaining) [ False - (Pair False True) @parameter ] + (Pair False True) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair False True) @parameter + [ (Pair False True) False ] - location: 14 (remaining gas: 1039990.665 units remaining) [ True diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out index 1221a5791fe2..a648b4357548 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.715 units remaining) [ (Pair (Pair True False) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair True False) @parameter ] + [ (Pair True False) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair True False) @parameter - (Pair True False) @parameter ] + [ (Pair True False) + (Pair True False) ] - location: 12 (remaining gas: 1039990.685 units remaining) [ True - (Pair True False) @parameter ] + (Pair True False) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair True False) @parameter + [ (Pair True False) True ] - location: 14 (remaining gas: 1039990.665 units remaining) [ False diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out index 042aa9a6cb7a..7bc0539caeea 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out @@ -10,15 +10,15 @@ trace - location: 10 (remaining gas: 1039990.715 units remaining) [ (Pair (Pair True True) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair True True) @parameter ] + [ (Pair True True) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair True True) @parameter - (Pair True True) @parameter ] + [ (Pair True True) + (Pair True True) ] - location: 12 (remaining gas: 1039990.685 units remaining) [ True - (Pair True True) @parameter ] + (Pair True True) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair True True) @parameter + [ (Pair True True) True ] - location: 14 (remaining gas: 1039990.665 units remaining) [ True diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out index 597d4bd394ae..ab5913c76c8b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039992.824 units remaining) [ (Pair (Pair 0 8) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 0 8) @parameter ] + [ (Pair 0 8) ] - location: 11 (remaining gas: 1039992.804 units remaining) [ 0 8 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out index 65dc7444f722..6490633766f3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039992.824 units remaining) [ (Pair (Pair 14 1) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 14 1) @parameter ] + [ (Pair 14 1) ] - location: 11 (remaining gas: 1039992.804 units remaining) [ 14 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out index 901552a8e7a5..49bf8f478395 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039992.824 units remaining) [ (Pair (Pair 15 4) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 15 4) @parameter ] + [ (Pair 15 4) ] - location: 11 (remaining gas: 1039992.804 units remaining) [ 15 4 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out index 46366fed5e84..a0ad9e92ed6e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039992.824 units remaining) [ (Pair (Pair 4 8) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 4 8) @parameter ] + [ (Pair 4 8) ] - location: 11 (remaining gas: 1039992.804 units remaining) [ 4 8 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out index 6fc5e9a59123..4a6a9901361c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039992.824 units remaining) [ (Pair (Pair 7 7) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 7 7) @parameter ] + [ (Pair 7 7) ] - location: 11 (remaining gas: 1039992.804 units remaining) [ 7 7 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out index 7c6ca939cc24..e8f565308a2a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039992.824 units remaining) [ (Pair (Pair 8 0) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 8 0) @parameter ] + [ (Pair 8 0) ] - location: 11 (remaining gas: 1039992.804 units remaining) [ 8 0 ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" index a4e99908e258..0c1780cfa0cf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" @@ -27,7 +27,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 17 (remaining gas: 1039185.285 units remaining) [ (Pair -1 1 @@ -37,7 +37,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair -1 1 "foobar" @@ -46,7 +46,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 18 (remaining gas: 1039185.275 units remaining) [ -1 (Pair -1 @@ -57,7 +57,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 19 (remaining gas: 1039185.260 units remaining) [ (Pair -1 1 @@ -67,7 +67,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 21 (remaining gas: 1039185.250 units remaining) [ -1 (Pair 1 @@ -90,7 +90,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 22 (remaining gas: 1039184.993 units remaining) - [ 0x050041 @packed + [ 0x050041 -1 (Pair 1 "foobar" @@ -101,7 +101,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 23 (remaining gas: 1039184.573 units remaining) - [ (Some -1) @packed.unpacked + [ (Some -1) -1 (Pair 1 "foobar" @@ -112,7 +112,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.563 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -123,7 +123,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.548 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -227,7 +227,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 47 (remaining gas: 1039184.171 units remaining) - [ 0x050001 @packed + [ 0x050001 1 (Pair "foobar" 0x00aabbcc @@ -237,7 +237,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 48 (remaining gas: 1039183.751 units remaining) - [ (Some 1) @packed.unpacked + [ (Some 1) 1 (Pair "foobar" 0x00aabbcc @@ -247,7 +247,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.741 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -257,7 +257,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.726 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -350,7 +350,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 72 (remaining gas: 1039183.052 units remaining) - [ 0x050100000006666f6f626172 @packed + [ 0x050100000006666f6f626172 "foobar" (Pair 0x00aabbcc 1000 @@ -359,7 +359,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 73 (remaining gas: 1039182.377 units remaining) - [ (Some "foobar") @packed.unpacked + [ (Some "foobar") "foobar" (Pair 0x00aabbcc 1000 @@ -368,7 +368,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.367 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -377,7 +377,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.352 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -459,7 +459,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 97 (remaining gas: 1039181.744 units remaining) - [ 0x050a0000000400aabbcc @packed + [ 0x050a0000000400aabbcc 0x00aabbcc (Pair 1000 False @@ -467,7 +467,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 98 (remaining gas: 1039181.183 units remaining) - [ (Some 0x00aabbcc) @packed.unpacked + [ (Some 0x00aabbcc) 0x00aabbcc (Pair 1000 False @@ -475,7 +475,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.173 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -483,7 +483,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.158 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -554,28 +554,28 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 122 (remaining gas: 1039180.748 units remaining) - [ 0x0500a80f @packed + [ 0x0500a80f 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 123 (remaining gas: 1039180.308 units remaining) - [ (Some 1000) @packed.unpacked + [ (Some 1000) 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.298 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.283 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -635,25 +635,25 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 147 (remaining gas: 1039179.906 units remaining) - [ 0x050303 @packed + [ 0x050303 False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 148 (remaining gas: 1039179.486 units remaining) - [ (Some False) @packed.unpacked + [ (Some False) False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.476 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.461 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -700,19 +700,19 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 172 (remaining gas: 1039178.221 units remaining) - [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 173 (remaining gas: 1039177.268 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.258 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.243 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 184 (remaining gas: 1039177.207 units remaining) @@ -741,19 +741,19 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 197 (remaining gas: 1039176.733 units remaining) - [ 0x050095bbb0d70b @packed + [ 0x050095bbb0d70b "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 198 (remaining gas: 1039176.233 units remaining) - [ (Some "2019-09-09T08:35:33Z") @packed.unpacked + [ (Some "2019-09-09T08:35:33Z") "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.223 units remaining) - [ "2019-09-09T08:35:33Z" @packed.unpacked.some + [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.208 units remaining) - [ "2019-09-09T08:35:33Z" @packed.unpacked.some + [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 209 (remaining gas: 1039176.173 units remaining) @@ -770,16 +770,16 @@ trace [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 218 (remaining gas: 1039165.170 units remaining) - [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 219 (remaining gas: 1038514.247 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.237 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.222 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 230 (remaining gas: 1038514.186 units remaining) [ 0 ] @@ -792,21 +792,21 @@ trace - location: 238 (remaining gas: 1038514.136 units remaining) [ 0 ] - location: 241 (remaining gas: 1038513.909 units remaining) - [ 0x050000 @packed ] + [ 0x050000 ] - location: 242 (remaining gas: 1038513.489 units remaining) - [ (Some 0) @packed.unpacked ] + [ (Some 0) ] - location: 245 (remaining gas: 1038513.479 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 245 (remaining gas: 1038513.464 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 251 (remaining gas: 1038513.454 units remaining) [ ] - location: 252 (remaining gas: 1038513.444 units remaining) [ -1 ] - location: 255 (remaining gas: 1038513.217 units remaining) - [ 0x050041 @packed ] + [ 0x050041 ] - location: 256 (remaining gas: 1038416.897 units remaining) - [ None @packed.unpacked ] + [ None ] - location: 259 (remaining gas: 1038416.887 units remaining) [ ] - location: 259 (remaining gas: 1038416.872 units remaining) @@ -814,7 +814,7 @@ trace - location: 265 (remaining gas: 1038416.862 units remaining) [ 0x ] - location: 268 (remaining gas: 1038416.602 units remaining) - [ None @unpacked ] + [ None ] - location: 271 (remaining gas: 1038416.592 units remaining) [ ] - location: 271 (remaining gas: 1038416.577 units remaining) @@ -822,7 +822,7 @@ trace - location: 277 (remaining gas: 1038416.567 units remaining) [ 0x04 ] - location: 280 (remaining gas: 1038416.287 units remaining) - [ None @unpacked ] + [ None ] - location: 283 (remaining gas: 1038416.277 units remaining) [ ] - location: 283 (remaining gas: 1038416.262 units remaining) @@ -830,7 +830,7 @@ trace - location: 289 (remaining gas: 1038416.252 units remaining) [ 0x05 ] - location: 292 (remaining gas: 1038415.972 units remaining) - [ None @unpacked ] + [ None ] - location: 295 (remaining gas: 1038415.962 units remaining) [ ] - location: 295 (remaining gas: 1038415.947 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" index b4a03f3df038..eb4ffcb76224 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" @@ -27,7 +27,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 17 (remaining gas: 1039185.285 units remaining) [ (Pair -1 1 @@ -37,7 +37,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair -1 1 "foobar" @@ -46,7 +46,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 18 (remaining gas: 1039185.275 units remaining) [ -1 (Pair -1 @@ -57,7 +57,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 19 (remaining gas: 1039185.260 units remaining) [ (Pair -1 1 @@ -67,7 +67,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 21 (remaining gas: 1039185.250 units remaining) [ -1 (Pair 1 @@ -90,7 +90,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 22 (remaining gas: 1039184.993 units remaining) - [ 0x050041 @packed + [ 0x050041 -1 (Pair 1 "foobar" @@ -101,7 +101,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 23 (remaining gas: 1039184.573 units remaining) - [ (Some -1) @packed.unpacked + [ (Some -1) -1 (Pair 1 "foobar" @@ -112,7 +112,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.563 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -123,7 +123,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.548 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -227,7 +227,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 47 (remaining gas: 1039184.171 units remaining) - [ 0x050001 @packed + [ 0x050001 1 (Pair "foobar" 0x00aabbcc @@ -237,7 +237,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 48 (remaining gas: 1039183.751 units remaining) - [ (Some 1) @packed.unpacked + [ (Some 1) 1 (Pair "foobar" 0x00aabbcc @@ -247,7 +247,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.741 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -257,7 +257,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.726 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -350,7 +350,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 72 (remaining gas: 1039183.052 units remaining) - [ 0x050100000006666f6f626172 @packed + [ 0x050100000006666f6f626172 "foobar" (Pair 0x00aabbcc 1000 @@ -359,7 +359,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 73 (remaining gas: 1039182.377 units remaining) - [ (Some "foobar") @packed.unpacked + [ (Some "foobar") "foobar" (Pair 0x00aabbcc 1000 @@ -368,7 +368,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.367 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -377,7 +377,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.352 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -459,7 +459,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 97 (remaining gas: 1039181.744 units remaining) - [ 0x050a0000000400aabbcc @packed + [ 0x050a0000000400aabbcc 0x00aabbcc (Pair 1000 False @@ -467,7 +467,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 98 (remaining gas: 1039181.183 units remaining) - [ (Some 0x00aabbcc) @packed.unpacked + [ (Some 0x00aabbcc) 0x00aabbcc (Pair 1000 False @@ -475,7 +475,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.173 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -483,7 +483,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.158 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -554,28 +554,28 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 122 (remaining gas: 1039180.748 units remaining) - [ 0x0500a80f @packed + [ 0x0500a80f 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 123 (remaining gas: 1039180.308 units remaining) - [ (Some 1000) @packed.unpacked + [ (Some 1000) 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.298 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.283 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -635,25 +635,25 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 147 (remaining gas: 1039179.906 units remaining) - [ 0x050303 @packed + [ 0x050303 False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 148 (remaining gas: 1039179.486 units remaining) - [ (Some False) @packed.unpacked + [ (Some False) False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.476 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.461 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -700,19 +700,19 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 172 (remaining gas: 1039178.221 units remaining) - [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 173 (remaining gas: 1039177.268 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.258 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.243 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 184 (remaining gas: 1039177.207 units remaining) @@ -741,19 +741,19 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 197 (remaining gas: 1039176.733 units remaining) - [ 0x050095bbb0d70b @packed + [ 0x050095bbb0d70b "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 198 (remaining gas: 1039176.233 units remaining) - [ (Some "2019-09-09T08:35:33Z") @packed.unpacked + [ (Some "2019-09-09T08:35:33Z") "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.223 units remaining) - [ "2019-09-09T08:35:33Z" @packed.unpacked.some + [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.208 units remaining) - [ "2019-09-09T08:35:33Z" @packed.unpacked.some + [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 209 (remaining gas: 1039176.173 units remaining) @@ -770,16 +770,16 @@ trace [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 218 (remaining gas: 1039165.170 units remaining) - [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 219 (remaining gas: 1038514.247 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.237 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.222 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 230 (remaining gas: 1038514.186 units remaining) [ 0 ] @@ -792,21 +792,21 @@ trace - location: 238 (remaining gas: 1038514.136 units remaining) [ 0 ] - location: 241 (remaining gas: 1038513.909 units remaining) - [ 0x050000 @packed ] + [ 0x050000 ] - location: 242 (remaining gas: 1038513.489 units remaining) - [ (Some 0) @packed.unpacked ] + [ (Some 0) ] - location: 245 (remaining gas: 1038513.479 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 245 (remaining gas: 1038513.464 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 251 (remaining gas: 1038513.454 units remaining) [ ] - location: 252 (remaining gas: 1038513.444 units remaining) [ -1 ] - location: 255 (remaining gas: 1038513.217 units remaining) - [ 0x050041 @packed ] + [ 0x050041 ] - location: 256 (remaining gas: 1038416.897 units remaining) - [ None @packed.unpacked ] + [ None ] - location: 259 (remaining gas: 1038416.887 units remaining) [ ] - location: 259 (remaining gas: 1038416.872 units remaining) @@ -814,7 +814,7 @@ trace - location: 265 (remaining gas: 1038416.862 units remaining) [ 0x ] - location: 268 (remaining gas: 1038416.602 units remaining) - [ None @unpacked ] + [ None ] - location: 271 (remaining gas: 1038416.592 units remaining) [ ] - location: 271 (remaining gas: 1038416.577 units remaining) @@ -822,7 +822,7 @@ trace - location: 277 (remaining gas: 1038416.567 units remaining) [ 0x04 ] - location: 280 (remaining gas: 1038416.287 units remaining) - [ None @unpacked ] + [ None ] - location: 283 (remaining gas: 1038416.277 units remaining) [ ] - location: 283 (remaining gas: 1038416.262 units remaining) @@ -830,7 +830,7 @@ trace - location: 289 (remaining gas: 1038416.252 units remaining) [ 0x05 ] - location: 292 (remaining gas: 1038415.972 units remaining) - [ None @unpacked ] + [ None ] - location: 295 (remaining gas: 1038415.962 units remaining) [ ] - location: 295 (remaining gas: 1038415.947 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" index 0446e0d7b9e1..cc3d90a14ba7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" @@ -29,7 +29,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) @parameter ] + { PACK }) ] - location: 29 (remaining gas: 1039468 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -40,7 +40,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) @parameter + { PACK }) (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -50,7 +50,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) @parameter ] + { PACK }) ] - location: 30 (remaining gas: 1039467.990 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @@ -62,7 +62,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) @parameter ] + { PACK }) ] - location: 31 (remaining gas: 1039467.975 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -73,7 +73,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) @parameter ] + { PACK }) ] - location: 33 (remaining gas: 1039467.965 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -98,7 +98,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 34 (remaining gas: 1039466.063 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -121,7 +121,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 37 (remaining gas: 1039464.176 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -132,7 +132,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 38 (remaining gas: 1039143.032 units remaining) - [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") @packed.unpacked + [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -143,7 +143,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 41 (remaining gas: 1039143.022 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -154,7 +154,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 41 (remaining gas: 1039143.007 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -165,7 +165,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 47 (remaining gas: 1039141.135 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -176,8 +176,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 35 (remaining gas: 1039141.105 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -291,7 +291,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 63 (remaining gas: 1039140.728 units remaining) - [ 0x05030b @packed + [ 0x05030b Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -312,7 +312,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 66 (remaining gas: 1039140.486 units remaining) - [ 0x05030b @packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -322,7 +322,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 67 (remaining gas: 1039140.066 units remaining) - [ (Some Unit) @packed.unpacked + [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -332,7 +332,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 70 (remaining gas: 1039140.056 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -342,7 +342,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 70 (remaining gas: 1039140.041 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -352,7 +352,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 76 (remaining gas: 1039139.814 units remaining) - [ 0x05030b @packed.unpacked.some.packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -362,8 +362,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 64 (remaining gas: 1039139.784 units remaining) - [ 0x05030b @packed - 0x05030b @packed.unpacked.some.packed + [ 0x05030b + 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -466,7 +466,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 92 (remaining gas: 1039137.147 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -485,7 +485,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 95 (remaining gas: 1039134.645 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -494,7 +494,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 96 (remaining gas: 1039132.842 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -503,7 +503,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 99 (remaining gas: 1039132.832 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -512,7 +512,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 99 (remaining gas: 1039132.817 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -521,7 +521,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 105 (remaining gas: 1039130.330 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -530,8 +530,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 93 (remaining gas: 1039130.300 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -623,7 +623,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 121 (remaining gas: 1039127.500 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } @@ -640,7 +640,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 124 (remaining gas: 1039124.836 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -648,7 +648,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 125 (remaining gas: 1039122.892 units remaining) - [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) @packed.unpacked + [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) (Pair { Unit } { True } (Pair 19 10) @@ -656,7 +656,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 129 (remaining gas: 1039122.882 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked.some + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } (Pair 19 10) @@ -664,7 +664,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 129 (remaining gas: 1039122.867 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked.some + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } (Pair 19 10) @@ -672,7 +672,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 135 (remaining gas: 1039120.218 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -680,8 +680,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 122 (remaining gas: 1039120.188 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -762,7 +762,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 151 (remaining gas: 1039119.549 units remaining) - [ 0x050200000002030b @packed + [ 0x050200000002030b { Unit } (Pair { True } (Pair 19 10) @@ -777,43 +777,43 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 154 (remaining gas: 1039119.046 units remaining) - [ 0x050200000002030b @packed + [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 155 (remaining gas: 1039118.425 units remaining) - [ (Some { Unit }) @packed.unpacked + [ (Some { Unit }) (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 159 (remaining gas: 1039118.415 units remaining) - [ { Unit } @packed.unpacked.some + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 159 (remaining gas: 1039118.400 units remaining) - [ { Unit } @packed.unpacked.some + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 165 (remaining gas: 1039117.912 units remaining) - [ 0x050200000002030b @packed.unpacked.some.packed + [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 152 (remaining gas: 1039117.882 units remaining) - [ 0x050200000002030b @packed - 0x050200000002030b @packed.unpacked.some.packed + [ 0x050200000002030b + 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @@ -883,7 +883,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 181 (remaining gas: 1039117.244 units remaining) - [ 0x050200000002030a @packed + [ 0x050200000002030a { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @@ -896,38 +896,38 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 184 (remaining gas: 1039116.741 units remaining) - [ 0x050200000002030a @packed + [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 185 (remaining gas: 1039115.920 units remaining) - [ (Some { True }) @packed.unpacked + [ (Some { True }) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 189 (remaining gas: 1039115.910 units remaining) - [ { True } @packed.unpacked.some + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 189 (remaining gas: 1039115.895 units remaining) - [ { True } @packed.unpacked.some + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 195 (remaining gas: 1039115.407 units remaining) - [ 0x050200000002030a @packed.unpacked.some.packed + [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 182 (remaining gas: 1039115.377 units remaining) - [ 0x050200000002030a @packed - 0x050200000002030a @packed.unpacked.some.packed + [ 0x050200000002030a + 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } @@ -986,7 +986,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 211 (remaining gas: 1039114.676 units remaining) - [ 0x0507070013000a @packed + [ 0x0507070013000a (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } @@ -997,33 +997,33 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 214 (remaining gas: 1039114.110 units remaining) - [ 0x0507070013000a @packed + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 215 (remaining gas: 1039113.410 units remaining) - [ (Some (Pair 19 10)) @packed.unpacked + [ (Some (Pair 19 10)) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 220 (remaining gas: 1039113.400 units remaining) - [ (Pair 19 10) @packed.unpacked.some + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 220 (remaining gas: 1039113.385 units remaining) - [ (Pair 19 10) @packed.unpacked.some + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 226 (remaining gas: 1039112.834 units remaining) - [ 0x0507070013000a @packed.unpacked.some.packed + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 212 (remaining gas: 1039112.804 units remaining) - [ 0x0507070013000a @packed - 0x0507070013000a @packed.unpacked.some.packed + [ 0x0507070013000a + 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] @@ -1069,30 +1069,30 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 242 (remaining gas: 1039111.402 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 243 (remaining gas: 1039111.387 units remaining) [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 245 (remaining gas: 1039110.135 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 246 (remaining gas: 1039109.042 units remaining) - [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) @packed.unpacked + [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 251 (remaining gas: 1039109.032 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked.some + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 251 (remaining gas: 1039109.017 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked.some + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 257 (remaining gas: 1039107.765 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 243 (remaining gas: 1039107.735 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed - 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 260 (remaining gas: 1039107.700 units remaining) [ 0 @@ -1120,30 +1120,30 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 273 (remaining gas: 1039105.980 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 274 (remaining gas: 1039105.965 units remaining) [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 276 (remaining gas: 1039104.360 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: 277 (remaining gas: 1039102.504 units remaining) - [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) @packed.unpacked + [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) { PACK } ] - location: 282 (remaining gas: 1039102.494 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } @packed.unpacked.some + [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 282 (remaining gas: 1039102.479 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } @packed.unpacked.some + [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 288 (remaining gas: 1039100.874 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: 274 (remaining gas: 1039100.844 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed - 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 + 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: 291 (remaining gas: 1039100.809 units remaining) [ 0 @@ -1159,23 +1159,23 @@ trace [ { PACK } { PACK } ] - location: 300 (remaining gas: 1039100.086 units remaining) - [ 0x050200000002030c @packed + [ 0x050200000002030c { PACK } ] - location: 301 (remaining gas: 1039100.071 units remaining) [ { PACK } ] - location: 303 (remaining gas: 1039099.398 units remaining) - [ 0x050200000002030c @packed ] + [ 0x050200000002030c ] - location: 304 (remaining gas: 1039098.217 units remaining) - [ (Some { PACK }) @packed.unpacked ] + [ (Some { PACK }) ] - location: 309 (remaining gas: 1039098.207 units remaining) - [ { PACK } @packed.unpacked.some ] + [ { PACK } ] - location: 309 (remaining gas: 1039098.192 units remaining) - [ { PACK } @packed.unpacked.some ] + [ { PACK } ] - location: 315 (remaining gas: 1039097.519 units remaining) - [ 0x050200000002030c @packed.unpacked.some.packed ] + [ 0x050200000002030c ] - location: 301 (remaining gas: 1039097.489 units remaining) - [ 0x050200000002030c @packed - 0x050200000002030c @packed.unpacked.some.packed ] + [ 0x050200000002030c + 0x050200000002030c ] - location: 318 (remaining gas: 1039097.454 units remaining) [ 0 ] - location: 319 (remaining gas: 1039097.439 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" index fd02da8950a6..8370889dd70c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" @@ -29,7 +29,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) @parameter ] + { DUP ; DROP ; PACK }) ] - location: 29 (remaining gas: 1039478.013 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -40,7 +40,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) @parameter + { DUP ; DROP ; PACK }) (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -50,7 +50,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) @parameter ] + { DUP ; DROP ; PACK }) ] - location: 30 (remaining gas: 1039478.003 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @@ -62,7 +62,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) @parameter ] + { DUP ; DROP ; PACK }) ] - location: 31 (remaining gas: 1039477.988 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -73,7 +73,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) @parameter ] + { DUP ; DROP ; PACK }) ] - location: 33 (remaining gas: 1039477.978 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -98,7 +98,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 34 (remaining gas: 1039476.076 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -121,7 +121,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 37 (remaining gas: 1039474.189 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -132,7 +132,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 38 (remaining gas: 1039153.045 units remaining) - [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") @packed.unpacked + [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -143,7 +143,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 41 (remaining gas: 1039153.035 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -154,7 +154,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 41 (remaining gas: 1039153.020 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -165,7 +165,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 47 (remaining gas: 1039151.148 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -176,8 +176,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 35 (remaining gas: 1039151.118 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -291,7 +291,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 63 (remaining gas: 1039150.741 units remaining) - [ 0x05030b @packed + [ 0x05030b Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -312,7 +312,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 66 (remaining gas: 1039150.499 units remaining) - [ 0x05030b @packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -322,7 +322,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 67 (remaining gas: 1039150.079 units remaining) - [ (Some Unit) @packed.unpacked + [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -332,7 +332,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 70 (remaining gas: 1039150.069 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -342,7 +342,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 70 (remaining gas: 1039150.054 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -352,7 +352,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 76 (remaining gas: 1039149.827 units remaining) - [ 0x05030b @packed.unpacked.some.packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -362,8 +362,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 64 (remaining gas: 1039149.797 units remaining) - [ 0x05030b @packed - 0x05030b @packed.unpacked.some.packed + [ 0x05030b + 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -466,7 +466,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 92 (remaining gas: 1039147.160 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} @@ -485,7 +485,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 95 (remaining gas: 1039144.658 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -494,7 +494,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 96 (remaining gas: 1039142.855 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair None {} {} @@ -503,7 +503,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 99 (remaining gas: 1039142.845 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} {} @@ -512,7 +512,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 99 (remaining gas: 1039142.830 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} {} @@ -521,7 +521,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 105 (remaining gas: 1039140.343 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -530,8 +530,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 93 (remaining gas: 1039140.313 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -623,7 +623,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 121 (remaining gas: 1039139.935 units remaining) - [ 0x050306 @packed + [ 0x050306 None (Pair {} {} @@ -640,7 +640,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 124 (remaining gas: 1039139.693 units remaining) - [ 0x050306 @packed + [ 0x050306 (Pair {} {} (Pair 40 -10) @@ -648,7 +648,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 125 (remaining gas: 1039139.273 units remaining) - [ (Some None) @packed.unpacked + [ (Some None) (Pair {} {} (Pair 40 -10) @@ -656,7 +656,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 129 (remaining gas: 1039139.263 units remaining) - [ None @packed.unpacked.some + [ None (Pair {} {} (Pair 40 -10) @@ -664,7 +664,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 129 (remaining gas: 1039139.248 units remaining) - [ None @packed.unpacked.some + [ None (Pair {} {} (Pair 40 -10) @@ -672,7 +672,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 135 (remaining gas: 1039139.021 units remaining) - [ 0x050306 @packed.unpacked.some.packed + [ 0x050306 (Pair {} {} (Pair 40 -10) @@ -680,8 +680,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 122 (remaining gas: 1039138.991 units remaining) - [ 0x050306 @packed - 0x050306 @packed.unpacked.some.packed + [ 0x050306 + 0x050306 (Pair {} {} (Pair 40 -10) @@ -754,30 +754,30 @@ trace {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 151 (remaining gas: 1039138.515 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 152 (remaining gas: 1039138.500 units remaining) [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 154 (remaining gas: 1039138.174 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 155 (remaining gas: 1039137.694 units remaining) - [ (Some {}) @packed.unpacked + [ (Some {}) (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 159 (remaining gas: 1039137.684 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 159 (remaining gas: 1039137.669 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 165 (remaining gas: 1039137.343 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 152 (remaining gas: 1039137.313 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 + 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 168 (remaining gas: 1039137.278 units remaining) [ 0 @@ -805,30 +805,30 @@ trace {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 181 (remaining gas: 1039136.837 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 182 (remaining gas: 1039136.822 units remaining) [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 184 (remaining gas: 1039136.496 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 185 (remaining gas: 1039136.016 units remaining) - [ (Some {}) @packed.unpacked + [ (Some {}) (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 189 (remaining gas: 1039136.006 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 189 (remaining gas: 1039135.991 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 195 (remaining gas: 1039135.665 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 182 (remaining gas: 1039135.635 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 + 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 198 (remaining gas: 1039135.600 units remaining) [ 0 @@ -856,30 +856,30 @@ trace (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 211 (remaining gas: 1039134.934 units remaining) - [ 0x0507070028004a @packed + [ 0x0507070028004a (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 212 (remaining gas: 1039134.919 units remaining) [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 214 (remaining gas: 1039134.368 units remaining) - [ 0x0507070028004a @packed + [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 215 (remaining gas: 1039133.668 units remaining) - [ (Some (Pair 40 -10)) @packed.unpacked + [ (Some (Pair 40 -10)) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 220 (remaining gas: 1039133.658 units remaining) - [ (Pair 40 -10) @packed.unpacked.some + [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 220 (remaining gas: 1039133.643 units remaining) - [ (Pair 40 -10) @packed.unpacked.some + [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 226 (remaining gas: 1039133.092 units remaining) - [ 0x0507070028004a @packed.unpacked.some.packed + [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 212 (remaining gas: 1039133.062 units remaining) - [ 0x0507070028004a @packed - 0x0507070028004a @packed.unpacked.some.packed + [ 0x0507070028004a + 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 229 (remaining gas: 1039133.027 units remaining) [ 0 @@ -907,30 +907,30 @@ trace (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 242 (remaining gas: 1039132.391 units remaining) - [ 0x0505080095bbb0d70b @packed + [ 0x0505080095bbb0d70b (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 243 (remaining gas: 1039132.376 units remaining) [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 245 (remaining gas: 1039131.855 units remaining) - [ 0x0505080095bbb0d70b @packed + [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: 246 (remaining gas: 1039131.214 units remaining) - [ (Some (Right "2019-09-09T08:35:33Z")) @packed.unpacked + [ (Some (Right "2019-09-09T08:35:33Z")) (Pair {} { DUP ; DROP ; PACK }) ] - location: 251 (remaining gas: 1039131.204 units remaining) - [ (Right "2019-09-09T08:35:33Z") @packed.unpacked.some + [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 251 (remaining gas: 1039131.189 units remaining) - [ (Right "2019-09-09T08:35:33Z") @packed.unpacked.some + [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 257 (remaining gas: 1039130.668 units remaining) - [ 0x0505080095bbb0d70b @packed.unpacked.some.packed + [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: 243 (remaining gas: 1039130.638 units remaining) - [ 0x0505080095bbb0d70b @packed - 0x0505080095bbb0d70b @packed.unpacked.some.packed + [ 0x0505080095bbb0d70b + 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: 260 (remaining gas: 1039130.603 units remaining) [ 0 @@ -958,30 +958,30 @@ trace {} { DUP ; DROP ; PACK } ] - location: 273 (remaining gas: 1039130.162 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 {} { DUP ; DROP ; PACK } ] - location: 274 (remaining gas: 1039130.147 units remaining) [ {} { DUP ; DROP ; PACK } ] - location: 276 (remaining gas: 1039129.821 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 { DUP ; DROP ; PACK } ] - location: 277 (remaining gas: 1039129.341 units remaining) - [ (Some {}) @packed.unpacked + [ (Some {}) { DUP ; DROP ; PACK } ] - location: 282 (remaining gas: 1039129.331 units remaining) - [ {} @packed.unpacked.some + [ {} { DUP ; DROP ; PACK } ] - location: 282 (remaining gas: 1039129.316 units remaining) - [ {} @packed.unpacked.some + [ {} { DUP ; DROP ; PACK } ] - location: 288 (remaining gas: 1039128.990 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 { DUP ; DROP ; PACK } ] - location: 274 (remaining gas: 1039128.960 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 + 0x050200000000 { DUP ; DROP ; PACK } ] - location: 291 (remaining gas: 1039128.925 units remaining) [ 0 @@ -997,23 +997,23 @@ trace [ { DUP ; DROP ; PACK } { DUP ; DROP ; PACK } ] - location: 300 (remaining gas: 1039127.738 units remaining) - [ 0x05020000000603210320030c @packed + [ 0x05020000000603210320030c { DUP ; DROP ; PACK } ] - location: 301 (remaining gas: 1039127.723 units remaining) [ { DUP ; DROP ; PACK } ] - location: 303 (remaining gas: 1039126.586 units remaining) - [ 0x05020000000603210320030c @packed ] + [ 0x05020000000603210320030c ] - location: 304 (remaining gas: 1039124.345 units remaining) - [ (Some { DUP ; DROP ; PACK }) @packed.unpacked ] + [ (Some { DUP ; DROP ; PACK }) ] - location: 309 (remaining gas: 1039124.335 units remaining) - [ { DUP ; DROP ; PACK } @packed.unpacked.some ] + [ { DUP ; DROP ; PACK } ] - location: 309 (remaining gas: 1039124.320 units remaining) - [ { DUP ; DROP ; PACK } @packed.unpacked.some ] + [ { DUP ; DROP ; PACK } ] - location: 315 (remaining gas: 1039123.183 units remaining) - [ 0x05020000000603210320030c @packed.unpacked.some.packed ] + [ 0x05020000000603210320030c ] - location: 301 (remaining gas: 1039123.153 units remaining) - [ 0x05020000000603210320030c @packed - 0x05020000000603210320030c @packed.unpacked.some.packed ] + [ 0x05020000000603210320030c + 0x05020000000603210320030c ] - location: 318 (remaining gas: 1039123.118 units remaining) [ 0 ] - location: 319 (remaining gas: 1039123.103 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out index c6213ec84371..e3f3b1fd9c8c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out @@ -10,7 +10,7 @@ trace - location: 12 (remaining gas: 1039993.234 units remaining) [ (Pair (Pair False False) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair False False) @parameter ] + [ (Pair False False) ] - location: 13 (remaining gas: 1039993.209 units remaining) [ (Some (Pair False False)) ] - location: 14 (remaining gas: 1039993.194 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out index 1d2929f83a32..dfdc30f1dbb6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out @@ -10,7 +10,7 @@ trace - location: 12 (remaining gas: 1039993.234 units remaining) [ (Pair (Pair False True) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair False True) @parameter ] + [ (Pair False True) ] - location: 13 (remaining gas: 1039993.209 units remaining) [ (Some (Pair False True)) ] - location: 14 (remaining gas: 1039993.194 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out index 1a48fb35e4cf..643b65d49970 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out @@ -10,7 +10,7 @@ trace - location: 12 (remaining gas: 1039993.234 units remaining) [ (Pair (Pair True False) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair True False) @parameter ] + [ (Pair True False) ] - location: 13 (remaining gas: 1039993.209 units remaining) [ (Some (Pair True False)) ] - location: 14 (remaining gas: 1039993.194 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out index b264ba1e0500..44f9f436f641 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out @@ -10,7 +10,7 @@ trace - location: 12 (remaining gas: 1039993.234 units remaining) [ (Pair (Pair True True) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair True True) @parameter ] + [ (Pair True True) ] - location: 13 (remaining gas: 1039993.209 units remaining) [ (Some (Pair True True)) ] - location: 14 (remaining gas: 1039993.194 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out index e4063d996218..9141ea4d867c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out @@ -16,22 +16,22 @@ trace [ (Pair 38 14) { UNPAIR ; ADD } ] - location: 16 (remaining gas: 1039989.279 units remaining) - [ 38 @parameter - 14 @storage + [ 38 + 14 { UNPAIR ; ADD } ] - location: 17 (remaining gas: 1039989.264 units remaining) - [ 14 @storage + [ 14 { UNPAIR ; ADD } ] - location: 19 (remaining gas: 1039989.039 units remaining) [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 17 (remaining gas: 1039989.009 units remaining) - [ 38 @parameter + [ 38 { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 12 (remaining gas: 1039988.999 units remaining) [ 14 38 ] - location: 12 (remaining gas: 1039988.984 units remaining) - [ (Pair 14 38) @arg ] + [ (Pair 14 38) ] - location: 13 (remaining gas: 1039988.974 units remaining) [ 14 38 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out index 1c397dd83bbe..b497c3c52fdb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out @@ -10,35 +10,35 @@ trace - location: 8 (remaining gas: 1039979.891 units remaining) [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ] - location: 8 (remaining gas: 1039979.881 units remaining) - [ 4 @p - { 0 ; 1 ; 2 ; 3 } @s ] + [ 4 + { 0 ; 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039979.871 units remaining) [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } - 4 @p - { 0 ; 1 ; 2 ; 3 } @s ] + 4 + { 0 ; 1 ; 2 ; 3 } ] - location: 23 (remaining gas: 1039979.861 units remaining) - [ 4 @p + [ 4 { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } - { 0 ; 1 ; 2 ; 3 } @s ] + { 0 ; 1 ; 2 ; 3 } ] - location: 24 (remaining gas: 1039979.636 units remaining) [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } - { 0 ; 1 ; 2 ; 3 } @s ] + { 0 ; 1 ; 2 ; 3 } ] - location: 25 (remaining gas: 1039979.626 units remaining) [ 3 { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } - { 0 ; 1 ; 2 ; 3 } @s ] + { 0 ; 1 ; 2 ; 3 } ] - location: 28 (remaining gas: 1039979.401 units remaining) [ { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } - { 0 ; 1 ; 2 ; 3 } @s ] + { 0 ; 1 ; 2 ; 3 } ] - location: 29 (remaining gas: 1039979.391 units remaining) - [ { 0 ; 1 ; 2 ; 3 } @s + [ { 0 ; 1 ; 2 ; 3 } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039979.391 units remaining) - [ 0 @s.elt + [ 0 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] @@ -54,7 +54,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039979.336 units remaining) - [ 0 @s.elt + [ 0 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -70,7 +70,7 @@ trace [ 4 (Pair 3 0) ] - location: 16 (remaining gas: 1039979.286 units remaining) - [ (Pair 4 3 0) @arg ] + [ (Pair 4 3 0) ] - location: 17 (remaining gas: 1039979.276 units remaining) [ 4 (Pair 3 0) ] @@ -94,7 +94,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039979.020 units remaining) - [ 1 @s.elt + [ 1 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] @@ -110,7 +110,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.965 units remaining) - [ 1 @s.elt + [ 1 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -126,7 +126,7 @@ trace [ 4 (Pair 3 1) ] - location: 16 (remaining gas: 1039978.915 units remaining) - [ (Pair 4 3 1) @arg ] + [ (Pair 4 3 1) ] - location: 17 (remaining gas: 1039978.905 units remaining) [ 4 (Pair 3 1) ] @@ -150,7 +150,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039978.646 units remaining) - [ 2 @s.elt + [ 2 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] @@ -166,7 +166,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.591 units remaining) - [ 2 @s.elt + [ 2 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -182,7 +182,7 @@ trace [ 4 (Pair 3 2) ] - location: 16 (remaining gas: 1039978.541 units remaining) - [ (Pair 4 3 2) @arg ] + [ (Pair 4 3 2) ] - location: 17 (remaining gas: 1039978.531 units remaining) [ 4 (Pair 3 2) ] @@ -206,7 +206,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039978.272 units remaining) - [ 3 @s.elt + [ 3 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] @@ -222,7 +222,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.217 units remaining) - [ 3 @s.elt + [ 3 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -238,7 +238,7 @@ trace [ 4 (Pair 3 3) ] - location: 16 (remaining gas: 1039978.167 units remaining) - [ (Pair 4 3 3) @arg ] + [ (Pair 4 3 3) ] - location: 17 (remaining gas: 1039978.157 units remaining) [ 4 (Pair 3 3) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index a94acd9e8467..9230c50f081e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -10,25 +10,25 @@ trace - location: 9 (remaining gas: 1039990.977 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039990.967 units remaining) - [ { "c" ; "b" ; "a" } @parameter ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039990.952 units remaining) [ {} - { "c" ; "b" ; "a" } @parameter ] + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039990.942 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 13 (remaining gas: 1039990.942 units remaining) - [ "c" @parameter.elt + [ "c" {} ] - location: 15 (remaining gas: 1039990.927 units remaining) [ { "c" } ] - location: 13 (remaining gas: 1039990.912 units remaining) - [ "b" @parameter.elt + [ "b" { "c" } ] - location: 15 (remaining gas: 1039990.897 units remaining) [ { "b" ; "c" } ] - location: 13 (remaining gas: 1039990.882 units remaining) - [ "a" @parameter.elt + [ "a" { "b" ; "c" } ] - location: 15 (remaining gas: 1039990.867 units remaining) [ { "a" ; "b" ; "c" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" index e9a4268f4bbf..30c8cbb40fcf 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" @@ -10,12 +10,12 @@ trace - location: 9 (remaining gas: 1039991.349 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039991.339 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039991.324 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039991.314 units remaining) - [ {} @parameter + [ {} {} ] - location: 13 (remaining gas: 1039991.314 units remaining) [ {} ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index e0eecd77fcc2..ea2ad6533d0b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -10,100 +10,100 @@ trace - location: 9 (remaining gas: 1039982.192 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039982.182 units remaining) - [ { "c" ; "b" ; "a" } @parameter ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039982.167 units remaining) [ {} - { "c" ; "b" ; "a" } @parameter ] + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039982.157 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 13 (remaining gas: 1039982.147 units remaining) [ True - { "c" ; "b" ; "a" } @parameter + { "c" ; "b" ; "a" } {} ] - location: 16 (remaining gas: 1039982.147 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 18 (remaining gas: 1039982.137 units remaining) - [ "c" @parameter.hd - { "b" ; "a" } @parameter.tl + [ "c" + { "b" ; "a" } {} ] - location: 20 (remaining gas: 1039982.127 units remaining) - [ { "b" ; "a" } @parameter.tl - "c" @parameter.hd + [ { "b" ; "a" } + "c" {} ] - location: 21 (remaining gas: 1039982.112 units remaining) - [ "c" @parameter.hd + [ "c" {} ] - location: 23 (remaining gas: 1039982.097 units remaining) [ { "c" } ] - location: 21 (remaining gas: 1039982.067 units remaining) - [ { "b" ; "a" } @parameter.tl + [ { "b" ; "a" } { "c" } ] - location: 24 (remaining gas: 1039982.057 units remaining) [ True - { "b" ; "a" } @parameter + { "b" ; "a" } { "c" } ] - location: 18 (remaining gas: 1039982.042 units remaining) [ True - { "b" ; "a" } @parameter + { "b" ; "a" } { "c" } ] - location: 16 (remaining gas: 1039982.027 units remaining) - [ { "b" ; "a" } @parameter + [ { "b" ; "a" } { "c" } ] - location: 18 (remaining gas: 1039982.017 units remaining) - [ "b" @parameter.hd - { "a" } @parameter.tl + [ "b" + { "a" } { "c" } ] - location: 20 (remaining gas: 1039982.007 units remaining) - [ { "a" } @parameter.tl - "b" @parameter.hd + [ { "a" } + "b" { "c" } ] - location: 21 (remaining gas: 1039981.992 units remaining) - [ "b" @parameter.hd + [ "b" { "c" } ] - location: 23 (remaining gas: 1039981.977 units remaining) [ { "b" ; "c" } ] - location: 21 (remaining gas: 1039981.947 units remaining) - [ { "a" } @parameter.tl + [ { "a" } { "b" ; "c" } ] - location: 24 (remaining gas: 1039981.937 units remaining) [ True - { "a" } @parameter + { "a" } { "b" ; "c" } ] - location: 18 (remaining gas: 1039981.922 units remaining) [ True - { "a" } @parameter + { "a" } { "b" ; "c" } ] - location: 16 (remaining gas: 1039981.907 units remaining) - [ { "a" } @parameter + [ { "a" } { "b" ; "c" } ] - location: 18 (remaining gas: 1039981.897 units remaining) - [ "a" @parameter.hd - {} @parameter.tl + [ "a" + {} { "b" ; "c" } ] - location: 20 (remaining gas: 1039981.887 units remaining) - [ {} @parameter.tl - "a" @parameter.hd + [ {} + "a" { "b" ; "c" } ] - location: 21 (remaining gas: 1039981.872 units remaining) - [ "a" @parameter.hd + [ "a" { "b" ; "c" } ] - location: 23 (remaining gas: 1039981.857 units remaining) [ { "a" ; "b" ; "c" } ] - location: 21 (remaining gas: 1039981.827 units remaining) - [ {} @parameter.tl + [ {} { "a" ; "b" ; "c" } ] - location: 24 (remaining gas: 1039981.817 units remaining) [ True - {} @parameter + {} { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039981.802 units remaining) [ True - {} @parameter + {} { "a" ; "b" ; "c" } ] - location: 16 (remaining gas: 1039981.787 units remaining) - [ {} @parameter + [ {} { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039981.777 units remaining) [ { "a" ; "b" ; "c" } ] @@ -112,14 +112,14 @@ trace { "a" ; "b" ; "c" } ] - location: 30 (remaining gas: 1039981.752 units remaining) [ False - {} @parameter + {} { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039981.737 units remaining) [ False - {} @parameter + {} { "a" ; "b" ; "c" } ] - location: 16 (remaining gas: 1039981.722 units remaining) - [ {} @parameter + [ {} { "a" ; "b" ; "c" } ] - location: 33 (remaining gas: 1039981.712 units remaining) [ { "a" ; "b" ; "c" } ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" index 739a710e2d6b..98377598609b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" @@ -10,19 +10,19 @@ trace - location: 9 (remaining gas: 1039982.564 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039982.554 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039982.539 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039982.529 units remaining) - [ {} @parameter + [ {} {} ] - location: 13 (remaining gas: 1039982.519 units remaining) [ True - {} @parameter + {} {} ] - location: 16 (remaining gas: 1039982.519 units remaining) - [ {} @parameter + [ {} {} ] - location: 18 (remaining gas: 1039982.509 units remaining) [ {} ] @@ -31,14 +31,14 @@ trace {} ] - location: 30 (remaining gas: 1039982.484 units remaining) [ False - {} @parameter + {} {} ] - location: 18 (remaining gas: 1039982.469 units remaining) [ False - {} @parameter + {} {} ] - location: 16 (remaining gas: 1039982.454 units remaining) - [ {} @parameter + [ {} {} ] - location: 33 (remaining gas: 1039982.444 units remaining) [ {} ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out index b01cd3be6973..dbe6de2ddb3a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out @@ -12,10 +12,10 @@ trace - location: 8 (remaining gas: 1039994.847 units remaining) [ ] - location: 9 (remaining gas: 1039994.832 units remaining) - [ {} @sapling ] + [ {} ] - location: 11 (remaining gas: 1039994.817 units remaining) [ {} - {} @sapling ] + {} ] - location: 13 (remaining gas: 1039994.802 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out index 16c4f2ca054a..aace306d543c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out @@ -19,14 +19,14 @@ trace - location: 12 (remaining gas: 1039984.299 units remaining) [ ] - location: 13 (remaining gas: 1039984.284 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 15 (remaining gas: 1039984.254 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 16 (remaining gas: 1039984.239 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 17 (remaining gas: 1039984.229 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self.address + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 20 (remaining gas: 1039984.193 units remaining) [ 0 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out index 415697707f57..8ad3c234e015 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out @@ -12,23 +12,23 @@ trace - location: 13 (remaining gas: 1039983.490 units remaining) [ ] - location: 14 (remaining gas: 1039983.475 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 15 (remaining gas: 1039983.465 units remaining) [ ] - location: 16 (remaining gas: 1039983.450 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 17 (remaining gas: 1039983.440 units remaining) [ ] - location: 18 (remaining gas: 1039983.425 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 19 (remaining gas: 1039972.472 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 20 (remaining gas: 1039972.457 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 21 (remaining gas: 1039961.504 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 24 (remaining gas: 1039961.469 units remaining) [ 0 ] - location: 25 (remaining gas: 1039961.454 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out index 296856b6e869..82d4d0d93804 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out @@ -12,45 +12,45 @@ trace - location: 13 (remaining gas: 1039954.621 units remaining) [ ] - location: 14 (remaining gas: 1039954.606 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 15 (remaining gas: 1039943.620 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 16 (remaining gas: 1039943.605 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 17 (remaining gas: 1039932.652 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 18 (remaining gas: 1039932.642 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 19 (remaining gas: 1039932.627 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 21 (remaining gas: 1039932.617 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 19 (remaining gas: 1039932.587 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 24 (remaining gas: 1039932.552 units remaining) [ -1 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 25 (remaining gas: 1039932.537 units remaining) [ True - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 26 (remaining gas: 1039932.527 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 26 (remaining gas: 1039932.512 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 32 (remaining gas: 1039932.497 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 33 (remaining gas: 1039921.544 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @selfpacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 36 (remaining gas: 1039921.509 units remaining) [ 0 ] - location: 37 (remaining gas: 1039921.494 units remaining) @@ -60,27 +60,27 @@ trace - location: 38 (remaining gas: 1039921.469 units remaining) [ ] - location: 44 (remaining gas: 1039921.454 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 48 (remaining gas: 1039921.444 units remaining) [ ] - location: 49 (remaining gas: 1039921.429 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] - location: 53 (remaining gas: 1039921.419 units remaining) [ ] - location: 54 (remaining gas: 1039921.404 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] - location: 60 (remaining gas: 1039921.394 units remaining) [ ] - location: 61 (remaining gas: 1039921.379 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] - location: 65 (remaining gas: 1039921.369 units remaining) [ ] - location: 66 (remaining gas: 1039921.354 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 76 (remaining gas: 1039921.344 units remaining) [ ] - location: 77 (remaining gas: 1039921.329 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 87 (remaining gas: 1039921.319 units remaining) [ ] - location: 88 (remaining gas: 1039921.309 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 5b5459ccbc04..88751834ec56 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -10,10 +10,10 @@ trace - location: 9 (remaining gas: 1039993.773 units remaining) [ (Pair { "a" ; "b" ; "c" } {}) ] - location: 9 (remaining gas: 1039993.763 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039993.748 units remaining) [ {} - { "a" ; "b" ; "c" } @parameter ] + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039993.733 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" index b361ac4c9b4c..3cdd999dbc72 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" @@ -10,10 +10,10 @@ trace - location: 9 (remaining gas: 1039994.212 units remaining) [ (Pair { "asdf" ; "bcde" } {}) ] - location: 9 (remaining gas: 1039994.202 units remaining) - [ { "asdf" ; "bcde" } @parameter ] + [ { "asdf" ; "bcde" } ] - location: 10 (remaining gas: 1039994.187 units remaining) [ {} - { "asdf" ; "bcde" } @parameter ] + { "asdf" ; "bcde" } ] - location: 12 (remaining gas: 1039994.172 units remaining) [ (Pair {} { "asdf" ; "bcde" }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out index 81c379c5ecbd..5ccce502fc4a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out @@ -10,10 +10,10 @@ trace - location: 9 (remaining gas: 1039995.025 units remaining) [ (Pair {} {}) ] - location: 9 (remaining gas: 1039995.015 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039995 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039994.985 units remaining) [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out index e8f225b80369..4ccecfc9f634 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out @@ -10,30 +10,30 @@ trace - location: 8 (remaining gas: 1039990.518 units remaining) [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039990.508 units remaining) - [ { -100 ; 1 ; 2 ; 3 } @parameter ] + [ { -100 ; 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039990.498 units remaining) [ 0 - { -100 ; 1 ; 2 ; 3 } @parameter ] + { -100 ; 1 ; 2 ; 3 } ] - location: 12 (remaining gas: 1039990.488 units remaining) - [ { -100 ; 1 ; 2 ; 3 } @parameter + [ { -100 ; 1 ; 2 ; 3 } 0 ] - location: 13 (remaining gas: 1039990.488 units remaining) - [ -100 @parameter.elt + [ -100 0 ] - location: 15 (remaining gas: 1039990.433 units remaining) [ -100 ] - location: 13 (remaining gas: 1039990.418 units remaining) - [ 1 @parameter.elt + [ 1 -100 ] - location: 15 (remaining gas: 1039990.363 units remaining) [ -99 ] - location: 13 (remaining gas: 1039990.348 units remaining) - [ 2 @parameter.elt + [ 2 -99 ] - location: 15 (remaining gas: 1039990.293 units remaining) [ -97 ] - location: 13 (remaining gas: 1039990.278 units remaining) - [ 3 @parameter.elt + [ 3 -97 ] - location: 15 (remaining gas: 1039990.223 units remaining) [ -94 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out index 3483abfab852..15ac0c0590cc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out @@ -10,15 +10,15 @@ trace - location: 8 (remaining gas: 1039991.873 units remaining) [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039991.863 units remaining) - [ { 1 } @parameter ] + [ { 1 } ] - location: 9 (remaining gas: 1039991.853 units remaining) [ 0 - { 1 } @parameter ] + { 1 } ] - location: 12 (remaining gas: 1039991.843 units remaining) - [ { 1 } @parameter + [ { 1 } 0 ] - location: 13 (remaining gas: 1039991.843 units remaining) - [ 1 @parameter.elt + [ 1 0 ] - location: 15 (remaining gas: 1039991.788 units remaining) [ 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out index ae6f2075801d..7ed8ceee7b68 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out @@ -10,12 +10,12 @@ trace - location: 8 (remaining gas: 1039992.173 units remaining) [ (Pair {} 111) ] - location: 8 (remaining gas: 1039992.163 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039992.153 units remaining) [ 0 - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039992.143 units remaining) - [ {} @parameter + [ {} 0 ] - location: 13 (remaining gas: 1039992.143 units remaining) [ 0 ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" index 0a4604732e79..6cf013df5c19 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" @@ -17,20 +17,20 @@ trace (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 13 (remaining gas: 1039983.263 units remaining) - [ "" @parameter + [ "" (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 14 (remaining gas: 1039983.248 units remaining) [ (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 17 (remaining gas: 1039983.238 units remaining) - [ (Pair { "Hello" ; "World" } None) @storage + [ (Pair { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 18 (remaining gas: 1039983.228 units remaining) [ { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - location: 14 (remaining gas: 1039983.198 units remaining) - [ "" @parameter + [ "" { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - location: 19 (remaining gas: 1039982.978 units remaining) @@ -42,7 +42,7 @@ trace - location: 21 (remaining gas: 1039982.948 units remaining) [ (Pair "" { "Hello" ; "World" } None) ] - location: 24 (remaining gas: 1039982.938 units remaining) - [ (Pair { "Hello" ; "World" } None) @storage ] + [ (Pair { "Hello" ; "World" } None) ] - location: 25 (remaining gas: 1039982.928 units remaining) [ { "Hello" ; "World" } ] - location: 21 (remaining gas: 1039982.898 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" index ff31ca9f3ec9..b61a373ba988 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" @@ -17,20 +17,20 @@ trace (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 13 (remaining gas: 1039983.742 units remaining) - [ "Hi" @parameter + [ "Hi" (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 14 (remaining gas: 1039983.727 units remaining) [ (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 17 (remaining gas: 1039983.717 units remaining) - [ (Pair { "Hi" } None) @storage + [ (Pair { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 18 (remaining gas: 1039983.707 units remaining) [ { "Hi" } (Pair "Hi" { "Hi" } None) ] - location: 14 (remaining gas: 1039983.677 units remaining) - [ "Hi" @parameter + [ "Hi" { "Hi" } (Pair "Hi" { "Hi" } None) ] - location: 19 (remaining gas: 1039983.492 units remaining) @@ -42,7 +42,7 @@ trace - location: 21 (remaining gas: 1039983.462 units remaining) [ (Pair "Hi" { "Hi" } None) ] - location: 24 (remaining gas: 1039983.452 units remaining) - [ (Pair { "Hi" } None) @storage ] + [ (Pair { "Hi" } None) ] - location: 25 (remaining gas: 1039983.442 units remaining) [ { "Hi" } ] - location: 21 (remaining gas: 1039983.412 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" index 2902c485b14f..d0742d488a98 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" @@ -17,20 +17,20 @@ trace (Pair "Hi" {} None) (Pair "Hi" {} None) ] - location: 13 (remaining gas: 1039984.076 units remaining) - [ "Hi" @parameter + [ "Hi" (Pair "Hi" {} None) (Pair "Hi" {} None) ] - location: 14 (remaining gas: 1039984.061 units remaining) [ (Pair "Hi" {} None) (Pair "Hi" {} None) ] - location: 17 (remaining gas: 1039984.051 units remaining) - [ (Pair {} None) @storage + [ (Pair {} None) (Pair "Hi" {} None) ] - location: 18 (remaining gas: 1039984.041 units remaining) [ {} (Pair "Hi" {} None) ] - location: 14 (remaining gas: 1039984.011 units remaining) - [ "Hi" @parameter + [ "Hi" {} (Pair "Hi" {} None) ] - location: 19 (remaining gas: 1039983.861 units remaining) @@ -42,7 +42,7 @@ trace - location: 21 (remaining gas: 1039983.831 units remaining) [ (Pair "Hi" {} None) ] - location: 24 (remaining gas: 1039983.821 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 25 (remaining gas: 1039983.811 units remaining) [ {} ] - location: 21 (remaining gas: 1039983.781 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out index 207c8456636b..cbcda725463d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.075 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - location: 8 (remaining gas: 1039992.065 units remaining) - [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } @parameter ] + [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - location: 9 (remaining gas: 1039992.050 units remaining) [ 6 ] - location: 10 (remaining gas: 1039992.035 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out index e31ef310629c..a4102e7a4f08 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.640 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039993.630 units remaining) - [ { 1 ; 2 ; 3 } @parameter ] + [ { 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039993.615 units remaining) [ 3 ] - location: 10 (remaining gas: 1039993.600 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out index cf787542f7a5..3966466cf83a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.520 units remaining) [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039994.510 units remaining) - [ { 1 } @parameter ] + [ { 1 } ] - location: 9 (remaining gas: 1039994.495 units remaining) [ 1 ] - location: 10 (remaining gas: 1039994.480 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out index 5b347cf8094c..2bfd8860ad59 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.820 units remaining) [ (Pair {} 111) ] - location: 8 (remaining gas: 1039994.810 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039994.795 units remaining) [ 0 ] - location: 10 (remaining gas: 1039994.780 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out index 46d13add95be..59dc58fbf7c2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039993.957 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 0x48656c6c6f2c20776f726c6421 @parameter ] + [ 0x48656c6c6f2c20776f726c6421 ] - location: 9 (remaining gas: 1039992.490 units remaining) [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ] - location: 10 (remaining gas: 1039992.475 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out index 5a78795dbb63..ac7b2ab5a3e5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Left (Pair 0 0)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 0 0)) @parameter ] + [ (Left (Pair 0 0)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 0) @parameter.left ] + [ (Pair 0 0) ] - location: 17 (remaining gas: 1039989.674 units remaining) [ 0 0 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out index 6a317f925373..3f89a04feeb6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Left (Pair 0 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 0 1)) @parameter ] + [ (Left (Pair 0 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 1) @parameter.left ] + [ (Pair 0 1) ] - location: 17 (remaining gas: 1039989.674 units remaining) [ 0 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out index 271f2ffaeeac..277265f138c3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Left (Pair 1 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 1 2)) @parameter ] + [ (Left (Pair 1 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 1 2) @parameter.left ] + [ (Pair 1 2) ] - location: 17 (remaining gas: 1039989.674 units remaining) [ 1 2 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out index 4999ca7cf2e8..9aa9f0d3ac31 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Left (Pair 15 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 15 2)) @parameter ] + [ (Left (Pair 15 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 15 2) @parameter.left ] + [ (Pair 15 2) ] - location: 17 (remaining gas: 1039989.674 units remaining) [ 15 2 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out index 166d22f11a9f..b380876cac4c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Left (Pair 8 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 8 1)) @parameter ] + [ (Left (Pair 8 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 8 1) @parameter.left ] + [ (Pair 8 1) ] - location: 17 (remaining gas: 1039989.674 units remaining) [ 8 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out index 647668fef382..688dedb22ecd 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 0 0)) @parameter ] + [ (Right (Pair 0 0)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 0) @parameter.right ] + [ (Pair 0 0) ] - location: 20 (remaining gas: 1039989.674 units remaining) [ 0 0 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out index ff9ff5385b1f..28b5aecf0182 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 0 1)) @parameter ] + [ (Right (Pair 0 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 1) @parameter.right ] + [ (Pair 0 1) ] - location: 20 (remaining gas: 1039989.674 units remaining) [ 0 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out index f1119c6347e4..337efc9a9293 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Right (Pair 1 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 1 2)) @parameter ] + [ (Right (Pair 1 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 1 2) @parameter.right ] + [ (Pair 1 2) ] - location: 20 (remaining gas: 1039989.674 units remaining) [ 1 2 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out index 62d47cfdde13..0474a65ff64c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Right (Pair 15 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 15 2)) @parameter ] + [ (Right (Pair 15 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 15 2) @parameter.right ] + [ (Pair 15 2) ] - location: 20 (remaining gas: 1039989.674 units remaining) [ 15 2 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out index fa875222fde7..58178a7a49fa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out @@ -10,9 +10,9 @@ trace - location: 14 (remaining gas: 1039989.704 units remaining) [ (Pair (Right (Pair 8 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 8 1)) @parameter ] + [ (Right (Pair 8 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 8 1) @parameter.right ] + [ (Pair 8 1) ] - location: 20 (remaining gas: 1039989.674 units remaining) [ 8 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out index b8a7fbd579d4..d1ce3c5a2b6b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out @@ -10,13 +10,13 @@ trace - location: 10 (remaining gas: 1039989.042 units remaining) [ (Pair (Pair 0 0) None) ] - location: 10 (remaining gas: 1039989.032 units remaining) - [ (Pair 0 0) @parameter - None @storage ] + [ (Pair 0 0) + None ] - location: 11 (remaining gas: 1039989.022 units remaining) - [ None @storage - (Pair 0 0) @parameter ] + [ None + (Pair 0 0) ] - location: 13 (remaining gas: 1039989.012 units remaining) - [ (Pair 0 0) @parameter ] + [ (Pair 0 0) ] - location: 15 (remaining gas: 1039989.002 units remaining) [ ] - location: 16 (remaining gas: 1039988.987 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" index 7cddff086116..e560b460da7e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.898 units remaining) [ (Pair (Pair 0 0) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 0 0) @parameter - (Some "Foo") @storage ] + [ (Pair 0 0) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") @storage - (Pair 0 0) @parameter ] + [ (Some "Foo") + (Pair 0 0) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" @storage.some - (Pair 0 0) @parameter ] + [ "Foo" + (Pair 0 0) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 0 0) @parameter - "Foo" @storage.some ] + [ (Pair 0 0) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) [ 0 0 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) [ (Some "") ] - location: 13 (remaining gas: 1039988.793 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" index 99e2695b4b14..21b844f60392 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.898 units remaining) [ (Pair (Pair 0 10) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 0 10) @parameter - (Some "Foo") @storage ] + [ (Pair 0 10) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") @storage - (Pair 0 10) @parameter ] + [ (Some "Foo") + (Pair 0 10) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" @storage.some - (Pair 0 10) @parameter ] + [ "Foo" + (Pair 0 10) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 0 10) @parameter - "Foo" @storage.some ] + [ (Pair 0 10) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) [ 0 10 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) [ None ] - location: 13 (remaining gas: 1039988.793 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" index 54696cfa06ac..076c6ab5b7a9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.898 units remaining) [ (Pair (Pair 0 2) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 0 2) @parameter - (Some "Foo") @storage ] + [ (Pair 0 2) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") @storage - (Pair 0 2) @parameter ] + [ (Some "Foo") + (Pair 0 2) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" @storage.some - (Pair 0 2) @parameter ] + [ "Foo" + (Pair 0 2) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 0 2) @parameter - "Foo" @storage.some ] + [ (Pair 0 2) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) [ 0 2 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) [ (Some "Fo") ] - location: 13 (remaining gas: 1039988.793 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" index 8c98a9e47a71..0a7caac8bbc5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.898 units remaining) [ (Pair (Pair 1 1) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 1 1) @parameter - (Some "Foo") @storage ] + [ (Pair 1 1) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") @storage - (Pair 1 1) @parameter ] + [ (Some "Foo") + (Pair 1 1) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" @storage.some - (Pair 1 1) @parameter ] + [ "Foo" + (Pair 1 1) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 1 1) @parameter - "Foo" @storage.some ] + [ (Pair 1 1) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) [ 1 1 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) [ (Some "o") ] - location: 13 (remaining gas: 1039988.793 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" index 23873f114615..c5cd69a0a23e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.898 units remaining) [ (Pair (Pair 1 3) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 1 3) @parameter - (Some "Foo") @storage ] + [ (Pair 1 3) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") @storage - (Pair 1 3) @parameter ] + [ (Some "Foo") + (Pair 1 3) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" @storage.some - (Pair 1 3) @parameter ] + [ "Foo" + (Pair 1 3) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 1 3) @parameter - "Foo" @storage.some ] + [ (Pair 1 3) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) [ 1 3 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) [ None ] - location: 13 (remaining gas: 1039988.793 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" index cc8f05eb538f..8a1ce998ac4f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.898 units remaining) [ (Pair (Pair 10 5) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 10 5) @parameter - (Some "Foo") @storage ] + [ (Pair 10 5) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") @storage - (Pair 10 5) @parameter ] + [ (Some "Foo") + (Pair 10 5) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" @storage.some - (Pair 10 5) @parameter ] + [ "Foo" + (Pair 10 5) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 10 5) @parameter - "Foo" @storage.some ] + [ (Pair 10 5) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) [ 10 5 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) [ None ] - location: 13 (remaining gas: 1039988.793 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" index b1d7bb4fe7b6..2c1100d4113e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" @@ -11,21 +11,21 @@ trace [ (Pair (Pair 1 10000) (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ] - location: 10 (remaining gas: 1039928.918 units remaining) - [ (Pair 1 10000) @parameter - (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") @storage ] + [ (Pair 1 10000) + (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") ] - location: 11 (remaining gas: 1039928.908 units remaining) - [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") @storage - (Pair 1 10000) @parameter ] + [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") + (Pair 1 10000) ] - location: 13 (remaining gas: 1039928.898 units remaining) - [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some - (Pair 1 10000) @parameter ] + [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" + (Pair 1 10000) ] - location: 19 (remaining gas: 1039928.888 units remaining) - [ (Pair 1 10000) @parameter - "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some ] + [ (Pair 1 10000) + "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - location: 20 (remaining gas: 1039928.878 units remaining) [ 1 10000 - "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some ] + "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - location: 21 (remaining gas: 1039928.463 units remaining) [ None ] - location: 13 (remaining gas: 1039928.448 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out index 256f5917a2d9..bcdb1245d465 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out @@ -10,13 +10,13 @@ trace - location: 10 (remaining gas: 1039989.042 units remaining) [ (Pair (Pair 0 1) None) ] - location: 10 (remaining gas: 1039989.032 units remaining) - [ (Pair 0 1) @parameter - None @storage ] + [ (Pair 0 1) + None ] - location: 11 (remaining gas: 1039989.022 units remaining) - [ None @storage - (Pair 0 1) @parameter ] + [ None + (Pair 0 1) ] - location: 13 (remaining gas: 1039989.012 units remaining) - [ (Pair 0 1) @parameter ] + [ (Pair 0 1) ] - location: 15 (remaining gas: 1039989.002 units remaining) [ ] - location: 16 (remaining gas: 1039988.987 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out index 96a78a7ff8cd..d31938e3a103 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 0 0) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 0 0) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 0 0) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 0 0) @parameter ] + [ (Some 0xaabbcc) + (Pair 0 0) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc @storage.some - (Pair 0 0) @parameter ] + [ 0xaabbcc + (Pair 0 0) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 0 0) @parameter - 0xaabbcc @storage.some ] + [ (Pair 0 0) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 0 0 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) [ (Some 0x) ] - location: 13 (remaining gas: 1039988.837 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out index b233c04348ed..a8d0bb71cd58 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 0 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 0 1) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 0 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 0 1) @parameter ] + [ (Some 0xaabbcc) + (Pair 0 1) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc @storage.some - (Pair 0 1) @parameter ] + [ 0xaabbcc + (Pair 0 1) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 0 1) @parameter - 0xaabbcc @storage.some ] + [ (Pair 0 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 0 1 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) [ (Some 0xaa) ] - location: 13 (remaining gas: 1039988.837 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out index 9f69cf01a07a..5e8cef70aab8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 1) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 1) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 1) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc @storage.some - (Pair 1 1) @parameter ] + [ 0xaabbcc + (Pair 1 1) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 1) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 1 1 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) [ (Some 0xbb) ] - location: 13 (remaining gas: 1039988.837 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out index fa991956f7ce..29c349e130c5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 1) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 1) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 1) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc @storage.some - (Pair 1 1) @parameter ] + [ 0xaabbcc + (Pair 1 1) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 1) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 1 1 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) [ (Some 0xbb) ] - location: 13 (remaining gas: 1039988.837 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out index 5a965d90bfc9..19d285d644c0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 1 2) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 2) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 2) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 2) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 2) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc @storage.some - (Pair 1 2) @parameter ] + [ 0xaabbcc + (Pair 1 2) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 2) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 2) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 1 2 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) [ (Some 0xbbcc) ] - location: 13 (remaining gas: 1039988.837 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out index 4de769383eb7..eb73897b75de 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 1 3) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 3) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 3) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 3) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 3) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc @storage.some - (Pair 1 3) @parameter ] + [ 0xaabbcc + (Pair 1 3) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 3) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 3) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 1 3 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) [ None ] - location: 13 (remaining gas: 1039988.837 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out index 610a32f2cdee..c799f7b1fc87 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out @@ -11,21 +11,21 @@ trace [ (Pair (Pair 1 10000) (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 10000) @parameter - (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) @storage ] + [ (Pair 1 10000) + (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) @storage - (Pair 1 10000) @parameter ] + [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) + (Pair 1 10000) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some - (Pair 1 10000) @parameter ] + [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc + (Pair 1 10000) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 10000) @parameter - 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some ] + [ (Pair 1 10000) + 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) [ 1 10000 - 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some ] + 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - location: 21 (remaining gas: 1039988.477 units remaining) [ None ] - location: 13 (remaining gas: 1039988.462 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" index 162c47dc4c1d..1546d7521796 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.491 units remaining) [ (Pair "Hello" None) ] - location: 8 (remaining gas: 1039994.481 units remaining) - [ "Hello" @parameter ] + [ "Hello" ] - location: 9 (remaining gas: 1039994.466 units remaining) [ (Some "Hello") ] - location: 10 (remaining gas: 1039994.451 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" index 87dff6fbde5d..c27191405d89 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039994.501 units remaining) [ (Pair "abcd" None) ] - location: 8 (remaining gas: 1039994.491 units remaining) - [ "abcd" @parameter ] + [ "abcd" ] - location: 9 (remaining gas: 1039994.476 units remaining) [ (Some "abcd") ] - location: 10 (remaining gas: 1039994.461 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" index 939c203a3433..153eeec13325 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.553 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter - (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 11 (remaining gas: 1039991.523 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 14 (remaining gas: 1039991.498 units remaining) [ -100 ] - location: 12 (remaining gas: 1039991.468 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" index b7d7a6e25ad1..9452cd9c65fd 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.553 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter - (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 11 (remaining gas: 1039991.523 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 14 (remaining gas: 1039991.498 units remaining) [ 100 ] - location: 12 (remaining gas: 1039991.468 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out index f1dc51c5b589..e01283a07a19 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out @@ -10,15 +10,15 @@ trace - location: 9 (remaining gas: 1039991.553 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter - (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) + (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 11 (remaining gas: 1039991.523 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 14 (remaining gas: 1039991.498 units remaining) [ 2000000000000000000 ] - location: 12 (remaining gas: 1039991.468 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out index 631857ce90c6..0f816c4c8db8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out @@ -10,41 +10,41 @@ trace - location: 12 (remaining gas: 1039980.750 units remaining) [ (Pair (Pair 2000000 1000000) None) ] - location: 12 (remaining gas: 1039980.740 units remaining) - [ (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) ] - location: 13 (remaining gas: 1039980.730 units remaining) - [ (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 14 (remaining gas: 1039980.720 units remaining) - [ (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 15 (remaining gas: 1039980.710 units remaining) [ 2000000 - (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 16 (remaining gas: 1039980.695 units remaining) - [ (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 18 (remaining gas: 1039980.685 units remaining) [ 1000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 16 (remaining gas: 1039980.655 units remaining) [ 2000000 1000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 19 (remaining gas: 1039980.635 units remaining) [ 3000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 20 (remaining gas: 1039980.620 units remaining) - [ (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) ] - location: 22 (remaining gas: 1039980.610 units remaining) - [ (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 23 (remaining gas: 1039980.600 units remaining) [ 2000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 24 (remaining gas: 1039980.585 units remaining) - [ (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) ] - location: 26 (remaining gas: 1039980.575 units remaining) [ 1000000 ] - location: 24 (remaining gas: 1039980.545 units remaining) @@ -53,12 +53,12 @@ trace - location: 27 (remaining gas: 1039980.525 units remaining) [ (Some 1000000) ] - location: 29 (remaining gas: 1039980.515 units remaining) - [ 1000000 @some ] + [ 1000000 ] - location: 29 (remaining gas: 1039980.500 units remaining) - [ 1000000 @some ] + [ 1000000 ] - location: 20 (remaining gas: 1039980.470 units remaining) [ 3000000 - 1000000 @some ] + 1000000 ] - location: 35 (remaining gas: 1039980.455 units remaining) [ (Pair 3000000 1000000) ] - location: 36 (remaining gas: 1039980.440 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out index 8476b34141b9..8a4550d36299 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out @@ -10,41 +10,41 @@ trace - location: 12 (remaining gas: 1039980.750 units remaining) [ (Pair (Pair 2310000 1010000) None) ] - location: 12 (remaining gas: 1039980.740 units remaining) - [ (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) ] - location: 13 (remaining gas: 1039980.730 units remaining) - [ (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 14 (remaining gas: 1039980.720 units remaining) - [ (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 15 (remaining gas: 1039980.710 units remaining) [ 2310000 - (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 16 (remaining gas: 1039980.695 units remaining) - [ (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 18 (remaining gas: 1039980.685 units remaining) [ 1010000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 16 (remaining gas: 1039980.655 units remaining) [ 2310000 1010000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 19 (remaining gas: 1039980.635 units remaining) [ 3320000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 20 (remaining gas: 1039980.620 units remaining) - [ (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) ] - location: 22 (remaining gas: 1039980.610 units remaining) - [ (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 23 (remaining gas: 1039980.600 units remaining) [ 2310000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 24 (remaining gas: 1039980.585 units remaining) - [ (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) ] - location: 26 (remaining gas: 1039980.575 units remaining) [ 1010000 ] - location: 24 (remaining gas: 1039980.545 units remaining) @@ -53,12 +53,12 @@ trace - location: 27 (remaining gas: 1039980.525 units remaining) [ (Some 1300000) ] - location: 29 (remaining gas: 1039980.515 units remaining) - [ 1300000 @some ] + [ 1300000 ] - location: 29 (remaining gas: 1039980.500 units remaining) - [ 1300000 @some ] + [ 1300000 ] - location: 20 (remaining gas: 1039980.470 units remaining) [ 3320000 - 1300000 @some ] + 1300000 ] - location: 35 (remaining gas: 1039980.455 units remaining) [ (Pair 3320000 1300000) ] - location: 36 (remaining gas: 1039980.440 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out index 2c4d6472da8f..5f5c1ccc7d7c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out @@ -10,7 +10,7 @@ trace - location: 10 (remaining gas: 1039988.846 units remaining) [ (Pair (Pair 1 4 2) 0) ] - location: 10 (remaining gas: 1039988.836 units remaining) - [ (Pair 1 4 2) @parameter ] + [ (Pair 1 4 2) ] - location: 11 (remaining gas: 1039988.799 units remaining) [ 1 4 diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" index 50ad2a1cdfef..24900d3ab54b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" @@ -10,7 +10,7 @@ trace - location: 9 (remaining gas: 1039666.323 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ] - location: 9 (remaining gas: 1039666.313 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter ] + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - location: 10 (remaining gas: 1039665.658 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 11 (remaining gas: 1039445.120 units remaining) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out index fd7eba43bf9f..cfefc05870c2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Left (Pair False False)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair False False)) @parameter ] + [ (Left (Pair False False)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair False False) @parameter.left ] + [ (Pair False False) ] - location: 19 (remaining gas: 1039986.729 units remaining) [ False False ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out index fa58c680f844..5b7a2be2c2a0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Left (Pair False True)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair False True)) @parameter ] + [ (Left (Pair False True)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair False True) @parameter.left ] + [ (Pair False True) ] - location: 19 (remaining gas: 1039986.729 units remaining) [ False True ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out index 82918b6ec24a..3ff40dde899d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Left (Pair True False)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair True False)) @parameter ] + [ (Left (Pair True False)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair True False) @parameter.left ] + [ (Pair True False) ] - location: 19 (remaining gas: 1039986.729 units remaining) [ True False ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out index ecc4b102cb0c..486f94582820 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Left (Pair True True)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair True True)) @parameter ] + [ (Left (Pair True True)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair True True) @parameter.left ] + [ (Pair True True) ] - location: 19 (remaining gas: 1039986.729 units remaining) [ True True ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out index 0936aa9bb70f..8c0ba39db8e1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 0 0)) @parameter ] + [ (Right (Pair 0 0)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 0 0) @parameter.right ] + [ (Pair 0 0) ] - location: 24 (remaining gas: 1039986.729 units remaining) [ 0 0 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out index 20fbdeb82829..d806e493bcdf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 0 1)) @parameter ] + [ (Right (Pair 0 1)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 0 1) @parameter.right ] + [ (Pair 0 1) ] - location: 24 (remaining gas: 1039986.729 units remaining) [ 0 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out index 18e78e5e5061..98a4afea0807 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Right (Pair 1 0)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 1 0)) @parameter ] + [ (Right (Pair 1 0)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 1 0) @parameter.right ] + [ (Pair 1 0) ] - location: 24 (remaining gas: 1039986.729 units remaining) [ 1 0 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out index 33fdbda9e13e..6bd104337516 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Right (Pair 1 1)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 1 1)) @parameter ] + [ (Right (Pair 1 1)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 1 1) @parameter.right ] + [ (Pair 1 1) ] - location: 24 (remaining gas: 1039986.729 units remaining) [ 1 1 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out index 8006c7b5b9d0..4e10d0de47f7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Right (Pair 42 21)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 42 21)) @parameter ] + [ (Right (Pair 42 21)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 42 21) @parameter.right ] + [ (Pair 42 21) ] - location: 24 (remaining gas: 1039986.729 units remaining) [ 42 21 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out index 22c89c416d6f..fd4ae34cd5f9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out @@ -10,9 +10,9 @@ trace - location: 16 (remaining gas: 1039986.759 units remaining) [ (Pair (Right (Pair 42 63)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 42 63)) @parameter ] + [ (Right (Pair 42 63)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 42 63) @parameter.right ] + [ (Pair 42 63) ] - location: 24 (remaining gas: 1039986.729 units remaining) [ 42 63 ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out index 6d1948a5fc60..df46a5c8bc6a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039994.923 units remaining) - [ 10 @level ] + [ 10 ] - location: 9 (remaining gas: 1039994.908 units remaining) [ {} - 10 @level ] + 10 ] - location: 11 (remaining gas: 1039994.893 units remaining) [ (Pair {} 10) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out index 4b51db4baad5..a6549cb09694 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out @@ -12,10 +12,10 @@ trace - location: 7 (remaining gas: 1039994.838 units remaining) [ ] - location: 8 (remaining gas: 1039994.823 units remaining) - [ "2021-10-13T10:16:52Z" @now ] + [ "2021-10-13T10:16:52Z" ] - location: 9 (remaining gas: 1039994.808 units remaining) [ {} - "2021-10-13T10:16:52Z" @now ] + "2021-10-13T10:16:52Z" ] - location: 11 (remaining gas: 1039994.793 units remaining) [ (Pair {} "2021-10-13T10:16:52Z") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out index 4f54f2ba537c..69d30c9a1f3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out @@ -13,7 +13,7 @@ trace Unit) ] - location: 15 (remaining gas: 1039977.521 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) @parameter ] + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ] - location: 16 (remaining gas: 1039977.511 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] @@ -27,7 +27,7 @@ trace 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 20 (remaining gas: 1039975.016 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 @packed + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 23 (remaining gas: 1039974.981 units remaining) @@ -41,11 +41,11 @@ trace - location: 25 (remaining gas: 1039974.941 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 31 (remaining gas: 1039971.783 units remaining) - [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) @unpacked ] + [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ] - location: 40 (remaining gas: 1039971.773 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) @unpacked.some ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] - location: 40 (remaining gas: 1039971.758 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) @unpacked.some ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] - location: 46 (remaining gas: 1039971.748 units remaining) [ ] - location: 47 (remaining gas: 1039971.738 units remaining) @@ -74,7 +74,7 @@ trace Unit) ] - location: 15 (remaining gas: 1039977.521 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) @parameter ] + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ] - location: 16 (remaining gas: 1039977.511 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] @@ -88,7 +88,7 @@ trace 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 20 (remaining gas: 1039975.016 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 @packed + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 23 (remaining gas: 1039974.981 units remaining) -- GitLab From 79d527f45031be2e5c976eda8a3b299de4dbcce0 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 6 Jan 2022 14:55:32 +0100 Subject: [PATCH 22/35] Proto/Michelson: unparse_var_annot None is [] --- src/proto_alpha/lib_plugin/plugin.ml | 7 +------ src/proto_alpha/lib_protocol/script_ir_translator.ml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 9bf9ab9b1a9e..55940be7088b 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -1492,12 +1492,7 @@ module RPC = struct v >>=? fun (data, _ctxt) -> unparse_stack (rest_ty, rest) >|=? fun rest -> - let annot = - match Script_ir_annot.unparse_var_annot None with - | [] -> None - | [a] -> Some a - | _ -> assert false - in + let annot = None in let data = Micheline.strip_locations data in (data, annot) :: rest in diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 69711bb09ba2..89ab1c123cb4 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -402,7 +402,7 @@ let rec unparse_stack_uncarbonated : | Item_t (ty, rest) -> let uty = unparse_ty_uncarbonated ~loc:() ty in let urest = unparse_stack_uncarbonated rest in - (strip_locations uty, unparse_var_annot None) :: urest + (strip_locations uty, []) :: urest let serialize_stack_for_error ctxt stack_ty = match Gas.level ctxt with -- GitLab From 981cee2ce1d858f9827c9898cf0eb84a81a4070a Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 6 Jan 2022 15:08:19 +0100 Subject: [PATCH 23/35] Proto/Michelson: simplify unparsed_stack_ty --- .../lib_protocol/script_ir_translator.ml | 9 +++------ .../lib_protocol/script_ir_translator.mli | 5 +---- src/proto_alpha/lib_protocol/script_tc_errors.ml | 2 +- .../script_tc_errors_registration.ml | 16 ++++++++++++++-- .../script_tc_errors_registration.mli | 5 ++--- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 89ab1c123cb4..ad3e74e7c397 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -99,10 +99,7 @@ type tc_context = Tc_context.t type unparsing_mode = Optimized | Readable | Optimized_legacy type type_logger = - Script.location -> - (Script.expr * Script.annot) list -> - (Script.expr * Script.annot) list -> - unit + Script.location -> Script.expr list -> Script.expr list -> unit (* ---- Error helpers -------------------------------------------------------*) @@ -397,12 +394,12 @@ let[@coq_axiom_with_reason "gadt"] rec comparable_ty_of_ty : error (Comparable_type_expected (loc, t)) let rec unparse_stack_uncarbonated : - type a s. (a, s) stack_ty -> (Script.expr * Script.annot) list = function + type a s. (a, s) stack_ty -> Script.expr list = function | Bot_t -> [] | Item_t (ty, rest) -> let uty = unparse_ty_uncarbonated ~loc:() ty in let urest = unparse_stack_uncarbonated rest in - (strip_locations uty, []) :: urest + strip_locations uty :: urest let serialize_stack_for_error ctxt stack_ty = match Gas.level ctxt with diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index a6f906826ad4..24c1d6ef4daa 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -148,10 +148,7 @@ type unparsing_mode = Optimized | Readable | Optimized_legacy (** {2 High-level Michelson Data Types} *) type type_logger = - Script.location -> - (Script.expr * Script.annot) list -> - (Script.expr * Script.annot) list -> - unit + Script.location -> Script.expr list -> Script.expr list -> unit (** Create an empty big_map *) val empty_big_map : diff --git a/src/proto_alpha/lib_protocol/script_tc_errors.ml b/src/proto_alpha/lib_protocol/script_tc_errors.ml index 7b334cb5bf04..f75694fe8104 100644 --- a/src/proto_alpha/lib_protocol/script_tc_errors.ml +++ b/src/proto_alpha/lib_protocol/script_tc_errors.ml @@ -30,7 +30,7 @@ open Script type kind = Int_kind | String_kind | Bytes_kind | Prim_kind | Seq_kind -type unparsed_stack_ty = (Script.expr * Script.annot) list +type unparsed_stack_ty = Script.expr list type type_map = (Script.location * (unparsed_stack_ty * unparsed_stack_ty)) list diff --git a/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml b/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml index e63e9c5f764a..0d7f79e0fd36 100644 --- a/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml +++ b/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml @@ -30,7 +30,14 @@ open Script_tc_errors (* Helpers for encoding *) let type_map_enc = let open Data_encoding in - let stack_enc = list (tup2 Script.expr_encoding (list string)) in + (* TODO? simplify this encoding *) + let stack_enc = + list + (conv + (fun ty -> (ty, [])) + (fun (ty, _annots) -> ty) + (tup2 Script.expr_encoding (list string))) + in list (conv (fun (loc, (bef, aft)) -> (loc, bef, aft)) @@ -42,7 +49,12 @@ let type_map_enc = let stack_ty_enc = let open Data_encoding in - list (obj2 (req "type" Script.expr_encoding) (dft "annots" (list string) [])) + (* TODO? simplify this encoding *) + list + (conv + (fun ty -> (ty, [])) + (fun (ty, _annots) -> ty) + (obj2 (req "type" Script.expr_encoding) (dft "annots" (list string) []))) (* main registration *) let () = diff --git a/src/proto_alpha/lib_protocol/script_tc_errors_registration.mli b/src/proto_alpha/lib_protocol/script_tc_errors_registration.mli index c8dd34c2e0bd..b8f29ec306a2 100644 --- a/src/proto_alpha/lib_protocol/script_tc_errors_registration.mli +++ b/src/proto_alpha/lib_protocol/script_tc_errors_registration.mli @@ -28,7 +28,6 @@ open Alpha_context open Script val type_map_enc : - (location * ((expr * string list) list * (expr * string list) list)) list - Data_encoding.encoding + (location * (expr list * expr list)) list Data_encoding.encoding -val stack_ty_enc : (expr * string list) list Data_encoding.encoding +val stack_ty_enc : expr list Data_encoding.encoding -- GitLab From 6377c5b72710d21610186d16ba885193ee5b1446 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 6 Jan 2022 15:29:57 +0100 Subject: [PATCH 24/35] Proto/Client: adapt to change of unparsed_stack_ty --- .../lib_client/michelson_v1_emacs.ml | 5 +---- .../lib_client/michelson_v1_error_reporter.ml | 19 ++++--------------- .../lib_client/michelson_v1_printer.ml | 7 +------ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/proto_alpha/lib_client/michelson_v1_emacs.ml b/src/proto_alpha/lib_client/michelson_v1_emacs.ml index 2721fa702d46..c7e7010770a6 100644 --- a/src/proto_alpha/lib_client/michelson_v1_emacs.ml +++ b/src/proto_alpha/lib_client/michelson_v1_emacs.ml @@ -57,10 +57,7 @@ let print_expr ppf expr = let root = root (Michelson_v1_primitives.strings_of_prims expr) in Format.fprintf ppf "@[%a@]" print_expr root -let print_var_annots ppf = List.iter (Format.fprintf ppf "%s ") - -let print_annot_expr ppf (expr, annot) = - Format.fprintf ppf "(%a%a)" print_var_annots annot print_expr expr +let print_annot_expr ppf expr = Format.fprintf ppf "(%a)" print_expr expr open Micheline_parser open Script_tc_errors diff --git a/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml b/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml index 88250bf7bf38..1376f983a96e 100644 --- a/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml +++ b/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml @@ -32,24 +32,13 @@ open Michelson_v1_printer let print_ty ppf ty = Michelson_v1_printer.print_expr_unwrapped ppf ty -let print_var_annot ppf annot = List.iter (Format.fprintf ppf "@ %s") annot - let print_stack_ty ?(depth = max_int) ppf s = let rec loop depth ppf = function | [] -> () | _ when depth <= 0 -> Format.fprintf ppf "..." - | [(last, annot)] -> - Format.fprintf ppf "%a%a" print_ty last print_var_annot annot - | (last, annot) :: rest -> - Format.fprintf - ppf - "%a%a@ :@ %a" - print_ty - last - print_var_annot - annot - (loop (depth - 1)) - rest + | [last] -> print_ty ppf last + | last :: rest -> + Format.fprintf ppf "%a@ :@ %a" print_ty last (loop (depth - 1)) rest in match s with | [] -> Format.fprintf ppf "[]" @@ -538,7 +527,7 @@ let report_errors ~details ~show_source ?parsed ppf errs = print_loc loc (fun ppf -> print_stack_ty ppf) - [(exp, [])] + [exp] (fun ppf -> print_stack_ty ppf) got | Bad_stack (loc, name, depth, sty) -> diff --git a/src/proto_alpha/lib_client/michelson_v1_printer.ml b/src/proto_alpha/lib_client/michelson_v1_printer.ml index 5eeb4e1fd88c..e6ade80dd017 100644 --- a/src/proto_alpha/lib_client/michelson_v1_printer.ml +++ b/src/proto_alpha/lib_client/michelson_v1_printer.ml @@ -41,11 +41,6 @@ let print_expr_unwrapped ppf expr = |> Micheline.inject_locations (fun _ -> anon) |> print_expr_unwrapped ppf -let print_var_annots ppf = List.iter (Format.fprintf ppf "%s ") - -let print_annot_expr_unwrapped ppf (expr, annot) = - Format.fprintf ppf "%a%a" print_var_annots annot print_expr_unwrapped expr - let print_stack ppf = function | [] -> Format.fprintf ppf "[]" | more -> @@ -54,7 +49,7 @@ let print_stack ppf = function "@[[ %a ]@]" (Format.pp_print_list ~pp_sep:(fun ppf () -> Format.fprintf ppf "@ : ") - print_annot_expr_unwrapped) + print_expr_unwrapped) more let print_execution_trace ppf trace = -- GitLab From 1cc01811e8f9141b5e30ec852f7cf85ed8ed629d Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 6 Jan 2022 15:46:45 +0100 Subject: [PATCH 25/35] Proto/Michelson: ignore special annotations instead of failing It happened in cases like `PAIR %@ %@`, where it meant the stack variable annotation should be converted to a field annotation. But since there are no stack variable annotation any more, it was failing all the time. Let's ignore them instead. --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index c028a7d0adcf..85c27c1178f6 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -320,11 +320,10 @@ let parse_var_annot : Script.location -> string list -> unit tzresult = error_unexpected_annot loc fields >>? fun () -> get_one_annot loc vars >|? fun (_a : var_annot option) -> () -let split_if_special ~loc f = +let ignore_special f = match f with - | Some (Field_annot fa) when Non_empty_string.(fa = at) -> - error (Unexpected_annotation loc) - | _ -> ok () + | Some (Field_annot fa) when Non_empty_string.(fa = at) -> ok None + | _ -> ok f let parse_constr_annot : Script.location -> @@ -336,8 +335,8 @@ let parse_constr_annot : get_one_annot loc vars >>? fun (_v : var_annot option) -> get_one_annot loc types >>? fun t -> get_two_annot loc fields >>? fun (f1, f2) -> - split_if_special ~loc f1 >>? fun () -> - split_if_special ~loc f2 >|? fun () -> (t, f1, f2) + ignore_special f1 >>? fun f1 -> + ignore_special f2 >|? fun f2 -> (t, f1, f2) let parse_two_var_annot : Script.location -> string list -> unit tzresult = fun loc annot -> -- GitLab From 6dd7e5b20399a305d962a847f9309711abd246c5 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 6 Jan 2022 16:16:51 +0100 Subject: [PATCH 26/35] Tests/Python: adapt tests accordingly --- .../unpair_field_annotation_mismatch.tz | 0 ..._hash[client_regtest_custom_scrubber0].out | 1 + ...est_typecheck[macros--map_caddaadr.tz].out | 6 +- ...est_typecheck[macros--set_caddaadr.tz].out | 36 +-- ...[mini_scenarios--vote_for_delegate.tz].out | 109 ++++----- ...[mini_scenarios--weather_insurance.tz].out | 62 +++-- ...k::test_typecheck[opcodes--map_car.tz].out | 13 +- ...k::test_typecheck[opcodes--set_car.tz].out | 10 +- ...k::test_typecheck[opcodes--set_cdr.tz].out | 10 +- ...ck::test_typecheck[opcodes--unpair.tz].out | 214 +++++++++--------- ...--unpair_field_annotation_mismatch.tz].out | 28 +++ ...Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" | 34 +-- ..."hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" | 34 +-- ...lo\" 0)-\"world\"-(Pair \"world\" 0)].out" | 34 +-- ...ir \"hello\" 0)-1-(Pair \"hello\" 1)].out" | 30 +-- ... \"hello\" 500)-3-(Pair \"hello\" 3)].out" | 30 +-- ..."hello\" 7)-100-(Pair \"hello\" 100)].out" | 30 +-- ...input_output[unpair.tz-Unit-Unit-Unit].out | 212 ++++++++--------- tests_python/tests_alpha/test_contract.py | 5 - 19 files changed, 434 insertions(+), 464 deletions(-) rename tests_python/contracts_alpha/{ill_typed => opcodes}/unpair_field_annotation_mismatch.tz (100%) create mode 100644 tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out diff --git a/tests_python/contracts_alpha/ill_typed/unpair_field_annotation_mismatch.tz b/tests_python/contracts_alpha/opcodes/unpair_field_annotation_mismatch.tz similarity index 100% rename from tests_python/contracts_alpha/ill_typed/unpair_field_annotation_mismatch.tz rename to tests_python/contracts_alpha/opcodes/unpair_field_annotation_mismatch.tz diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out index 96b6c31728c6..e1fbc7c9c83c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out @@ -282,6 +282,7 @@ expruhV9RSEPAtKAUhBbdTw5gPFdjcKk8zr7cVLSsGtmJuH3o7VXXo [CONTRACT_PATH]/opcodes/t expru3MSjYZRmQi3yiN6gYa4X6rs88XLWH4H8ivzrCvxs8z8cJfu4Z [CONTRACT_PATH]/opcodes/transfer_tokens.tz exprtbACDcFtDfEwsBA5LAG13uMRAjnQsFjzNELMS7jQ87bcqgdE6r [CONTRACT_PATH]/opcodes/uncomb.tz exprufJpS3BWpgv4QBaBEMucbn1jsVpdqEGLLMfXjDuKGPRGCpZUkj [CONTRACT_PATH]/opcodes/unpair.tz +exprtqjpmEs9GUjSEzJYSnN3skiCb8js2bY48R9Lhxk9JW1CKnm6VP [CONTRACT_PATH]/opcodes/unpair_field_annotation_mismatch.tz exprv4ACaZe4aECCfG93NGVVHbQBNQ5Atxtju5vWASZSEp5sLECcjg [CONTRACT_PATH]/opcodes/update_big_map.tz expruWzM36ATA3fAee4WHDS4vvMeewkwhya1fZaa6HFPbjwt9vvGpg [CONTRACT_PATH]/opcodes/utxo_read.tz expru3YgRPQBAnTWgKytSMs3tRj7dMgtWUxo75b1pUFrTLscKy2byF [CONTRACT_PATH]/opcodes/utxor.tz diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out index 8c504cfa9ab5..2cd94487cb3a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out @@ -6,13 +6,13 @@ Gas remaining: 1039964.206 units remaining storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ; code { MAP_CDADDAADR @new_storage %value { PUSH mutez 1000000 - /* [ mutez : @value mutez : pair (nat %p) (mutez %value) ] */ ; + /* [ mutez : mutez : pair (nat %p) (mutez %value) ] */ ; ADD /* [ mutez : pair (nat %p) (mutez %value) ] */ } ; NIL operation /* [ list operation - : @new_storage pair unit (pair nat nat (pair (pair (nat %p @p) (mutez %value)) nat) nat) nat ] */ ; + : pair unit (pair nat nat (pair (pair nat (mutez %value)) nat) nat) nat ] */ ; SWAP - /* [ @new_storage pair unit (pair nat nat (pair (pair (nat %p @p) (mutez %value)) nat) nat) nat + /* [ pair unit (pair nat nat (pair (pair nat (mutez %value)) nat) nat) nat : list operation ] */ ; SET_CAR } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out index 089d2e45eff1..6cb6fd18c00a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out @@ -10,43 +10,19 @@ Gas remaining: 1039968.110 units remaining : pair (mutez @parameter) (pair @storage (pair nat nat (pair (pair (nat %p) (mutez %value)) nat) nat) nat) ] */ ; CAR - /* [ @parameter mutez + /* [ mutez : pair (mutez @parameter) (pair @storage (pair nat nat (pair (pair (nat %p) (mutez %value)) nat) nat) nat) ] */ ; SWAP /* [ pair (mutez @parameter) (pair @storage (pair nat nat (pair (pair (nat %p) (mutez %value)) nat) nat) nat) - : @parameter mutez ] */ ; + : mutez ] */ ; CDR - /* [ @storage pair (pair nat nat (pair (pair (nat %p) (mutez %value)) nat) nat) nat - : @parameter mutez ] */ ; + /* [ pair (pair nat nat (pair (pair (nat %p) (mutez %value)) nat) nat) nat + : mutez ] */ ; SET_CADDAADR @toplevel_pair_name %value ; NIL operation /* [ list operation - : @toplevel_pair_name pair (pair @storage.car - (nat @storage.car.car) - (pair @storage.car.cdr - (nat @storage.car.cdr.car) - (pair @storage.car.cdr.cdr - (pair @storage.car.cdr.cdr.car - (pair @storage.car.cdr.cdr.car.car - (nat %p @storage.car.cdr.cdr.car.car.p) - (mutez %value @parameter)) - (nat @storage.car.cdr.cdr.car.cdr)) - (nat @storage.car.cdr.cdr.cdr)))) - (nat @storage.cdr) ] */ ; + : pair (pair nat nat (pair (pair nat (mutez %value)) nat) nat) nat ] */ ; PAIR - /* [ pair (list operation) - (pair @toplevel_pair_name - (pair @storage.car - (nat @storage.car.car) - (pair @storage.car.cdr - (nat @storage.car.cdr.car) - (pair @storage.car.cdr.cdr - (pair @storage.car.cdr.cdr.car - (pair @storage.car.cdr.cdr.car.car - (nat %p @storage.car.cdr.cdr.car.car.p) - (mutez %value @parameter)) - (nat @storage.car.cdr.cdr.car.cdr)) - (nat @storage.car.cdr.cdr.cdr)))) - (nat @storage.cdr)) ] */ } } + /* [ pair (list operation) (pair nat nat (pair (pair nat (mutez %value)) nat) nat) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out index 3c1a5323b98c..09ddd4a67886 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out @@ -17,32 +17,31 @@ Gas remaining: 1039933.671 units remaining (pair %mgr2 (address %addr) (option %key key_hash))) ] */ ; CDAAR %addr @% ; SENDER - /* [ @sender address : @addr address + /* [ address : address : pair (option @parameter key_hash) (pair @storage (pair %mgr1 (address %addr) (option %key key_hash)) (pair %mgr2 (address %addr) (option %key key_hash))) ] */ ; PAIR %@ %@ - /* [ pair (address %sender @sender) (address %addr @addr) + /* [ pair address address : pair (option @parameter key_hash) (pair @storage (pair %mgr1 (address %addr) (option %key key_hash)) (pair %mgr2 (address %addr) (option %key key_hash))) ] */ ; UNPAIR - /* [ @sender address : @addr address + /* [ address : address : pair (option @parameter key_hash) (pair @storage (pair %mgr1 (address %addr) (option %key key_hash)) (pair %mgr2 (address %addr) (option %key key_hash))) ] */ ; IFCMPEQ { UNPAIR - /* [ @parameter option key_hash - : @storage pair (pair %mgr1 (address %addr) (option %key key_hash)) + /* [ option key_hash + : pair (pair %mgr1 (address %addr) (option %key key_hash)) (pair %mgr2 (address %addr) (option %key key_hash)) ] */ ; SWAP - /* [ @storage pair (pair %mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 (address %addr) (option %key key_hash)) - : @parameter option key_hash ] */ ; + /* [ pair (pair %mgr1 (address %addr) (option %key key_hash)) + (pair %mgr2 (address %addr) (option %key key_hash)) : option key_hash ] */ ; SET_CADR %key @changed_mgr1_key } { DUP /* [ pair (option @parameter key_hash) @@ -55,114 +54,90 @@ Gas remaining: 1039933.671 units remaining (pair %mgr2 (address %addr) (option %key key_hash))) ] */ ; CDDAR ; SENDER - /* [ @sender address : address + /* [ address : address : pair (option @parameter key_hash) (pair @storage (pair %mgr1 (address %addr) (option %key key_hash)) (pair %mgr2 (address %addr) (option %key key_hash))) ] */ ; IFCMPEQ { UNPAIR - /* [ @parameter option key_hash - : @storage pair (pair %mgr1 (address %addr) (option %key key_hash)) + /* [ option key_hash + : pair (pair %mgr1 (address %addr) (option %key key_hash)) (pair %mgr2 (address %addr) (option %key key_hash)) ] */ ; SWAP - /* [ @storage pair (pair %mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 (address %addr) (option %key key_hash)) - : @parameter option key_hash ] */ ; + /* [ pair (pair %mgr1 (address %addr) (option %key key_hash)) + (pair %mgr2 (address %addr) (option %key key_hash)) : option key_hash ] */ ; SET_CDDR %key } { FAIL } } ; DUP - /* [ pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ pair (pair address (option %key key_hash)) address (option %key key_hash) + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; CADR ; DIP { DUP - /* [ pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ pair (pair address (option %key key_hash)) address (option %key key_hash) + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; CDDR } /* [ option key_hash : option key_hash - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; IF_NONE { IF_NONE { NONE key_hash /* [ option key_hash - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; SET_DELEGATE /* [ operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; NIL operation /* [ list operation : operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; SWAP /* [ operation : list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; CONS /* [ list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ } { DROP - /* [ pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; NIL operation /* [ list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } } + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ } } { SWAP - /* [ option key_hash : @some key_hash - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ option key_hash : key_hash + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; IF_SOME { DIP { DUP - /* [ @some key_hash : @some key_hash - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } - /* [ @some key_hash : @some key_hash : @some key_hash - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ key_hash : key_hash + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ } + /* [ key_hash : key_hash : key_hash + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; IFCMPEQ { SOME /* [ option key_hash - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; SET_DELEGATE /* [ operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; NIL operation /* [ list operation : operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; SWAP /* [ operation : list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; CONS /* [ list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ } { DROP - /* [ pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; NIL operation /* [ list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } } + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ } } { DROP - /* [ pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ ; + /* [ pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ ; NIL operation /* [ list operation - : pair (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } } ; + : pair (pair address (option %key key_hash)) address (option %key key_hash) ] */ } } ; PAIR /* [ pair (list operation) - (pair %mgr1 @storage.mgr1 (address %addr) (option %key key_hash)) - (pair %mgr2 @storage.mgr2 (address %addr) (option %key key_hash)) ] */ } } + (pair address (option %key key_hash)) + address + (option %key key_hash) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out index 54f287f9e622..24584db5b745 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out @@ -34,7 +34,7 @@ Gas remaining: 1039960.200 units remaining (nat :rain %rain_level) (key %weather_service_key)) ] */ ; CAR - /* [ @parameter pair (signature %signed_weather_data) (nat :rain %actual_level) + /* [ pair (signature %signed_weather_data) (nat :rain %actual_level) : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) @@ -47,8 +47,7 @@ Gas remaining: 1039960.200 units remaining (key %weather_service_key)) ] */ ; MAP_CDR { PACK - /* [ @packed bytes - : @parameter pair (signature %signed_weather_data) (nat :rain %actual_level) + /* [ bytes : pair (signature %signed_weather_data) (nat :rain %actual_level) : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) @@ -60,8 +59,7 @@ Gas remaining: 1039960.200 units remaining (nat :rain %rain_level) (key %weather_service_key)) ] */ ; BLAKE2B - /* [ bytes - : @parameter pair (signature %signed_weather_data) (nat :rain %actual_level) + /* [ bytes : pair (signature %signed_weather_data) (nat :rain %actual_level) : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) @@ -77,8 +75,7 @@ Gas remaining: 1039960.200 units remaining (pair @storage (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) - (key %weather_service_key)) - : @parameter pair (signature %signed_weather_data @parameter.signed_weather_data) bytes + (key %weather_service_key)) : pair signature bytes : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) @@ -86,20 +83,20 @@ Gas remaining: 1039960.200 units remaining (key %weather_service_key)) ] */ ; CDDDR %weather_service_key ; DIP { UNPAIR - /* [ @parameter.signed_weather_data signature : bytes + /* [ signature : bytes : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key)) ] */ } - /* [ key : @parameter.signed_weather_data signature : bytes + /* [ key : signature : bytes : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key)) ] */ ; CHECK_SIGNATURE @sigok - /* [ @sigok bool + /* [ bool : pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) (pair @storage (pair (address %under_key) (address %over_key)) @@ -156,7 +153,7 @@ Gas remaining: 1039960.200 units remaining (key %weather_service_key)) ] */ ; DIIIP { CDR %storage - /* [ @storage pair (pair (address %under_key) (address %over_key)) + /* [ pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ } /* [ pair (pair @parameter (signature %signed_weather_data) (nat :rain %actual_level)) @@ -174,7 +171,7 @@ Gas remaining: 1039960.200 units remaining (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key)) - : @storage pair (pair (address %under_key) (address %over_key)) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; DIIP { CDAR } @@ -189,7 +186,7 @@ Gas remaining: 1039960.200 units remaining (nat :rain %rain_level) (key %weather_service_key)) : pair (address %under_key) (address %over_key) - : @storage pair (pair (address %under_key) (address %over_key)) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; DIP { CADR %actual_level } @@ -199,61 +196,60 @@ Gas remaining: 1039960.200 units remaining (nat :rain %rain_level) (key %weather_service_key)) : nat :rain : pair (address %under_key) (address %over_key) - : @storage pair (pair (address %under_key) (address %over_key)) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; CDDAR %rain_level ; CMPLT ; IF { CAR %under_key /* [ address - : @storage pair (pair (address %under_key) (address %over_key)) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ } { CDR %over_key /* [ address - : @storage pair (pair (address %under_key) (address %over_key)) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ } ; CONTRACT unit - /* [ @contract option (contract unit) - : @storage pair (pair (address %under_key) (address %over_key)) + /* [ option (contract unit) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; ASSERT_SOME ; BALANCE - /* [ @balance mutez : @contract.some contract unit - : @storage pair (pair (address %under_key) (address %over_key)) + /* [ mutez : contract unit + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; UNIT - /* [ unit : @balance mutez : @contract.some contract unit - : @storage pair (pair (address %under_key) (address %over_key)) + /* [ unit : mutez : contract unit + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; TRANSFER_TOKENS @trans.op - /* [ @trans.op operation - : @storage pair (pair (address %under_key) (address %over_key)) + /* [ operation + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; NIL operation - /* [ list operation : @trans.op operation - : @storage pair (pair (address %under_key) (address %over_key)) + /* [ list operation : operation + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; SWAP - /* [ @trans.op operation : list operation - : @storage pair (pair (address %under_key) (address %over_key)) + /* [ operation : list operation + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; CONS /* [ list operation - : @storage pair (pair (address %under_key) (address %over_key)) + : pair (pair (address %under_key) (address %over_key)) (nat :rain %rain_level) (key %weather_service_key) ] */ ; PAIR /* [ pair (list operation) - (pair @storage - (pair (address %under_key) (address %over_key)) - (nat :rain %rain_level) - (key %weather_service_key)) ] */ } } + (pair (address %under_key) (address %over_key)) + (nat :rain %rain_level) + (key %weather_service_key) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out index 653d28692726..38c2db76e933 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out @@ -8,14 +8,13 @@ Gas remaining: 1039990.103 units remaining /* [ pair (bool @parameter) (pair @storage (bool %b) (nat %n)) : pair (bool @parameter) (pair @storage (bool %b) (nat %n)) ] */ ; CAR - /* [ @parameter bool - : pair (bool @parameter) (pair @storage (bool %b) (nat %n)) ] */ ; - DIP { CDR /* [ @storage pair (bool %b) (nat %n) ] */ } - /* [ @parameter bool : @storage pair (bool %b) (nat %n) ] */ ; + /* [ bool : pair (bool @parameter) (pair @storage (bool %b) (nat %n)) ] */ ; + DIP { CDR /* [ pair (bool %b) (nat %n) ] */ } + /* [ bool : pair (bool %b) (nat %n) ] */ ; SWAP - /* [ @storage pair (bool %b) (nat %n) : @parameter bool ] */ ; + /* [ pair (bool %b) (nat %n) : bool ] */ ; MAP_CAR @new_storage %b { AND /* [ bool ] */ } ; NIL operation - /* [ list operation : @storage pair (bool %b) (nat %n @storage.n) ] */ ; + /* [ list operation : pair (bool %b) nat ] */ ; PAIR - /* [ pair (list operation) (pair @storage (bool %b) (nat %n @storage.n)) ] */ } } + /* [ pair (list operation) (bool %b) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out index 917fc6f413a1..0fdf159b0527 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out @@ -8,12 +8,12 @@ Gas remaining: 1039991.314 units remaining /* [ pair (string @parameter) (pair @storage (string %s) (nat %n)) : pair (string @parameter) (pair @storage (string %s) (nat %n)) ] */ ; CDR - /* [ @storage pair (string %s) (nat %n) + /* [ pair (string %s) (nat %n) : pair (string @parameter) (pair @storage (string %s) (nat %n)) ] */ ; - DIP { CAR /* [ @parameter string ] */ } - /* [ @storage pair (string %s) (nat %n) : @parameter string ] */ ; + DIP { CAR /* [ string ] */ } + /* [ pair (string %s) (nat %n) : string ] */ ; SET_CAR %s ; NIL operation - /* [ list operation : @storage pair (string %s @parameter) (nat %n @storage.n) ] */ ; + /* [ list operation : pair (string %s) nat ] */ ; PAIR - /* [ pair (list operation) (pair @storage (string %s @parameter) (nat %n @storage.n)) ] */ } } + /* [ pair (list operation) (string %s) nat ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out index 6fa6e5940614..04a7076e77ed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out @@ -8,12 +8,12 @@ Gas remaining: 1039991.782 units remaining /* [ pair (nat @parameter) (pair @storage (string %s) (nat %n)) : pair (nat @parameter) (pair @storage (string %s) (nat %n)) ] */ ; CDR - /* [ @storage pair (string %s) (nat %n) + /* [ pair (string %s) (nat %n) : pair (nat @parameter) (pair @storage (string %s) (nat %n)) ] */ ; - DIP { CAR /* [ @parameter nat ] */ } - /* [ @storage pair (string %s) (nat %n) : @parameter nat ] */ ; + DIP { CAR /* [ nat ] */ } + /* [ pair (string %s) (nat %n) : nat ] */ ; SET_CDR %n ; NIL operation - /* [ list operation : @storage pair (string %s @storage.s) (nat %n @parameter) ] */ ; + /* [ list operation : pair string (nat %n) ] */ ; PAIR - /* [ pair (list operation) (pair @storage (string %s @storage.s) (nat %n @parameter)) ] */ } } + /* [ pair (list operation) string (nat %n) ] */ } } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out index f9b6f69e4a27..2cea990326ec 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out @@ -17,173 +17,173 @@ Gas remaining: 1039903.879 units remaining DROP 2 /* [] */ ; UNIT @b - /* [ @b unit ] */ ; + /* [ unit ] */ ; UNIT @a - /* [ @a unit : @b unit ] */ ; + /* [ unit : unit ] */ ; PAIR - /* [ pair (unit @a) (unit @b) ] */ ; + /* [ pair unit unit ] */ ; UNPAIR @c @d - /* [ @c unit : @d unit ] */ ; + /* [ unit : unit ] */ ; DROP 2 /* [] */ ; UNIT @b - /* [ @b unit ] */ ; + /* [ unit ] */ ; UNIT @a - /* [ @a unit : @b unit ] */ ; + /* [ unit : unit ] */ ; PAIR %@ %@ - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR %a %b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR % %b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR %a % - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR % % - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR %a - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR % - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR %a %b @a @b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR @a @b %a %b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR @a @% %a %b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR @% @% %a %b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DUP - /* [ pair (unit %a @a) (unit %b @b) : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit : pair unit unit ] */ ; UNPAIR @% @b %a %b - /* [ @a unit : @b unit : pair (unit %a @a) (unit %b @b) ] */ ; + /* [ unit : unit : pair unit unit ] */ ; DROP 2 - /* [ pair (unit %a @a) (unit %b @b) ] */ ; + /* [ pair unit unit ] */ ; DROP /* [] */ ; UNIT @d - /* [ @d unit ] */ ; + /* [ unit ] */ ; UNIT @c - /* [ @c unit : @d unit ] */ ; + /* [ unit : unit ] */ ; PAIR %a %b - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR %a %b - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR % %b - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR %a % - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR % % - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR %a - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR % - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR - /* [ @c unit : @d unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR %a %b @a @b - /* [ @a unit : @b unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @a @b %a %b - /* [ @a unit : @b unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @a @% %a %b - /* [ @a unit : @b unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @% @% %a %b - /* [ @a unit : @b unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ pair (unit %a @c) (unit %b @d) : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @% @b %a %b - /* [ @a unit : @b unit : pair (unit %a @c) (unit %b @d) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ pair (unit %a @c) (unit %b @d) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DROP /* [] */ ; UNIT @@ -237,31 +237,31 @@ Gas remaining: 1039903.879 units remaining DUP /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR %a %b @a @b - /* [ @a unit : @b unit : pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 /* [ pair (unit %a) (unit %b) ] */ ; DUP /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @a @b %a %b - /* [ @a unit : @b unit : pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 /* [ pair (unit %a) (unit %b) ] */ ; DUP /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @a @% %a %b - /* [ @a unit : @b unit : pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 /* [ pair (unit %a) (unit %b) ] */ ; DUP /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @% @% %a %b - /* [ @a unit : @b unit : pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 /* [ pair (unit %a) (unit %b) ] */ ; DUP /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @% @b %a %b - /* [ @a unit : @b unit : pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 /* [ pair (unit %a) (unit %b) ] */ ; DROP @@ -271,47 +271,47 @@ Gas remaining: 1039903.879 units remaining UNIT /* [ unit : unit ] */ ; PAIR %a %b @p - /* [ @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ @p pair (unit %a) (unit %b) : @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @%% @b - /* [ @p.a unit : @b unit : @p pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ @p pair (unit %a) (unit %b) : @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @a @%% - /* [ @a unit : @p.b unit : @p pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ @p pair (unit %a) (unit %b) : @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @%% @%% - /* [ @p.a unit : @p.b unit : @p pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ @p pair (unit %a) (unit %b) : @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @% @%% - /* [ @a unit : @p.b unit : @p pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DUP - /* [ @p pair (unit %a) (unit %b) : @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) : pair (unit %a) (unit %b) ] */ ; UNPAIR @%% @% - /* [ @p.a unit : @b unit : @p pair (unit %a) (unit %b) ] */ ; + /* [ unit : unit : pair (unit %a) (unit %b) ] */ ; DROP 2 - /* [ @p pair (unit %a) (unit %b) ] */ ; + /* [ pair (unit %a) (unit %b) ] */ ; DROP /* [] */ ; UNIT @b - /* [ @b unit ] */ ; + /* [ unit ] */ ; UNIT @a - /* [ @a unit : @b unit ] */ ; + /* [ unit : unit ] */ ; PAIR @c - /* [ @c pair (unit @a) (unit @b) ] */ ; + /* [ pair unit unit ] */ ; UNPAIR @b @a - /* [ @b unit : @a unit ] */ ; + /* [ unit : unit ] */ ; DROP 2 /* [] */ ; UNIT diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out new file mode 100644 index 000000000000..51456482ac14 --- /dev/null +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out @@ -0,0 +1,28 @@ +tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/unpair_field_annotation_mismatch.tz] + +Well typed +Gas remaining: 1039993.045 units remaining +{ parameter (unit :param_unit) ; + storage (unit :u1) ; + code { DROP + /* [] */ ; + UNIT @b + /* [ unit ] */ ; + UNIT @a + /* [ unit : unit ] */ ; + PAIR %@ %@ + /* [ pair unit unit ] */ ; + DUP + /* [ pair unit unit : pair unit unit ] */ ; + UNPAIR %c %d + /* [ unit : unit : pair unit unit ] */ ; + DROP 2 + /* [ pair unit unit ] */ ; + DROP + /* [] */ ; + UNIT + /* [ unit ] */ ; + NIL operation + /* [ list operation : unit ] */ ; + PAIR + /* [ pair (list operation) unit ] */ } } diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" index 0997339e6b86..05f706bdcd5e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" @@ -13,37 +13,37 @@ trace [ (Pair "" "hello" 0) (Pair "" "hello" 0) ] - location: 10 (remaining gas: 1039987.541 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair "" "hello" 0) ] - location: 11 (remaining gas: 1039987.526 units remaining) [ (Pair "" "hello" 0) ] - location: 13 (remaining gas: 1039987.516 units remaining) - [ "" @parameter ] + [ "" ] - location: 11 (remaining gas: 1039987.486 units remaining) - [ (Pair "hello" 0) @storage - "" @parameter ] + [ (Pair "hello" 0) + "" ] - location: 15 (remaining gas: 1039987.476 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - "" @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "" ] - location: 16 (remaining gas: 1039987.466 units remaining) [ "hello" - (Pair "hello" 0) @storage - "" @parameter ] + (Pair "hello" 0) + "" ] - location: 17 (remaining gas: 1039987.456 units remaining) - [ (Pair "hello" 0) @storage - "" @parameter ] + [ (Pair "hello" 0) + "" ] - location: 18 (remaining gas: 1039987.446 units remaining) - [ 0 @storage.n - "" @parameter ] + [ 0 + "" ] - location: 19 (remaining gas: 1039987.436 units remaining) - [ "" @parameter - 0 @storage.n ] + [ "" + 0 ] - location: 20 (remaining gas: 1039987.421 units remaining) - [ (Pair "" 0) @storage ] + [ (Pair "" 0) ] - location: 21 (remaining gas: 1039987.406 units remaining) [ {} - (Pair "" 0) @storage ] + (Pair "" 0) ] - location: 23 (remaining gas: 1039987.391 units remaining) [ (Pair {} "" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" index f03b3b848ba1..7aa7e30addf8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" @@ -13,37 +13,37 @@ trace [ (Pair "abc" "hello" 0) (Pair "abc" "hello" 0) ] - location: 10 (remaining gas: 1039987.511 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair "abc" "hello" 0) ] - location: 11 (remaining gas: 1039987.496 units remaining) [ (Pair "abc" "hello" 0) ] - location: 13 (remaining gas: 1039987.486 units remaining) - [ "abc" @parameter ] + [ "abc" ] - location: 11 (remaining gas: 1039987.456 units remaining) - [ (Pair "hello" 0) @storage - "abc" @parameter ] + [ (Pair "hello" 0) + "abc" ] - location: 15 (remaining gas: 1039987.446 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - "abc" @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "abc" ] - location: 16 (remaining gas: 1039987.436 units remaining) [ "hello" - (Pair "hello" 0) @storage - "abc" @parameter ] + (Pair "hello" 0) + "abc" ] - location: 17 (remaining gas: 1039987.426 units remaining) - [ (Pair "hello" 0) @storage - "abc" @parameter ] + [ (Pair "hello" 0) + "abc" ] - location: 18 (remaining gas: 1039987.416 units remaining) - [ 0 @storage.n - "abc" @parameter ] + [ 0 + "abc" ] - location: 19 (remaining gas: 1039987.406 units remaining) - [ "abc" @parameter - 0 @storage.n ] + [ "abc" + 0 ] - location: 20 (remaining gas: 1039987.391 units remaining) - [ (Pair "abc" 0) @storage ] + [ (Pair "abc" 0) ] - location: 21 (remaining gas: 1039987.376 units remaining) [ {} - (Pair "abc" 0) @storage ] + (Pair "abc" 0) ] - location: 23 (remaining gas: 1039987.361 units remaining) [ (Pair {} "abc" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" index 1d2d951295f5..209613e5711a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" @@ -13,37 +13,37 @@ trace [ (Pair "world" "hello" 0) (Pair "world" "hello" 0) ] - location: 10 (remaining gas: 1039987.491 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair "world" "hello" 0) ] - location: 11 (remaining gas: 1039987.476 units remaining) [ (Pair "world" "hello" 0) ] - location: 13 (remaining gas: 1039987.466 units remaining) - [ "world" @parameter ] + [ "world" ] - location: 11 (remaining gas: 1039987.436 units remaining) - [ (Pair "hello" 0) @storage - "world" @parameter ] + [ (Pair "hello" 0) + "world" ] - location: 15 (remaining gas: 1039987.426 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - "world" @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "world" ] - location: 16 (remaining gas: 1039987.416 units remaining) [ "hello" - (Pair "hello" 0) @storage - "world" @parameter ] + (Pair "hello" 0) + "world" ] - location: 17 (remaining gas: 1039987.406 units remaining) - [ (Pair "hello" 0) @storage - "world" @parameter ] + [ (Pair "hello" 0) + "world" ] - location: 18 (remaining gas: 1039987.396 units remaining) - [ 0 @storage.n - "world" @parameter ] + [ 0 + "world" ] - location: 19 (remaining gas: 1039987.386 units remaining) - [ "world" @parameter - 0 @storage.n ] + [ "world" + 0 ] - location: 20 (remaining gas: 1039987.371 units remaining) - [ (Pair "world" 0) @storage ] + [ (Pair "world" 0) ] - location: 21 (remaining gas: 1039987.356 units remaining) [ {} - (Pair "world" 0) @storage ] + (Pair "world" 0) ] - location: 23 (remaining gas: 1039987.341 units remaining) [ (Pair {} "world" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" index 9f90fe189541..fb0d3ede36c2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" @@ -13,34 +13,34 @@ trace [ (Pair 1 "hello" 0) (Pair 1 "hello" 0) ] - location: 10 (remaining gas: 1039988.158 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair 1 "hello" 0) ] - location: 11 (remaining gas: 1039988.143 units remaining) [ (Pair 1 "hello" 0) ] - location: 13 (remaining gas: 1039988.133 units remaining) - [ 1 @parameter ] + [ 1 ] - location: 11 (remaining gas: 1039988.103 units remaining) - [ (Pair "hello" 0) @storage - 1 @parameter ] + [ (Pair "hello" 0) + 1 ] - location: 15 (remaining gas: 1039988.093 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - 1 @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + 1 ] - location: 16 (remaining gas: 1039988.083 units remaining) [ 0 - (Pair "hello" 0) @storage - 1 @parameter ] + (Pair "hello" 0) + 1 ] - location: 17 (remaining gas: 1039988.073 units remaining) - [ (Pair "hello" 0) @storage - 1 @parameter ] + [ (Pair "hello" 0) + 1 ] - location: 18 (remaining gas: 1039988.063 units remaining) - [ "hello" @storage.s - 1 @parameter ] + [ "hello" + 1 ] - location: 19 (remaining gas: 1039988.048 units remaining) - [ (Pair "hello" 1) @storage ] + [ (Pair "hello" 1) ] - location: 20 (remaining gas: 1039988.033 units remaining) [ {} - (Pair "hello" 1) @storage ] + (Pair "hello" 1) ] - location: 22 (remaining gas: 1039988.018 units remaining) [ (Pair {} "hello" 1) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" index 79f18b9ba14a..9c87b488d077 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" @@ -13,34 +13,34 @@ trace [ (Pair 3 "hello" 500) (Pair 3 "hello" 500) ] - location: 10 (remaining gas: 1039988.158 units remaining) - [ (Pair "hello" 500) @storage + [ (Pair "hello" 500) (Pair 3 "hello" 500) ] - location: 11 (remaining gas: 1039988.143 units remaining) [ (Pair 3 "hello" 500) ] - location: 13 (remaining gas: 1039988.133 units remaining) - [ 3 @parameter ] + [ 3 ] - location: 11 (remaining gas: 1039988.103 units remaining) - [ (Pair "hello" 500) @storage - 3 @parameter ] + [ (Pair "hello" 500) + 3 ] - location: 15 (remaining gas: 1039988.093 units remaining) - [ (Pair "hello" 500) @storage - (Pair "hello" 500) @storage - 3 @parameter ] + [ (Pair "hello" 500) + (Pair "hello" 500) + 3 ] - location: 16 (remaining gas: 1039988.083 units remaining) [ 500 - (Pair "hello" 500) @storage - 3 @parameter ] + (Pair "hello" 500) + 3 ] - location: 17 (remaining gas: 1039988.073 units remaining) - [ (Pair "hello" 500) @storage - 3 @parameter ] + [ (Pair "hello" 500) + 3 ] - location: 18 (remaining gas: 1039988.063 units remaining) - [ "hello" @storage.s - 3 @parameter ] + [ "hello" + 3 ] - location: 19 (remaining gas: 1039988.048 units remaining) - [ (Pair "hello" 3) @storage ] + [ (Pair "hello" 3) ] - location: 20 (remaining gas: 1039988.033 units remaining) [ {} - (Pair "hello" 3) @storage ] + (Pair "hello" 3) ] - location: 22 (remaining gas: 1039988.018 units remaining) [ (Pair {} "hello" 3) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" index 41b3b1a297bb..73ffe70d7747 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" @@ -13,34 +13,34 @@ trace [ (Pair 100 "hello" 7) (Pair 100 "hello" 7) ] - location: 10 (remaining gas: 1039988.158 units remaining) - [ (Pair "hello" 7) @storage + [ (Pair "hello" 7) (Pair 100 "hello" 7) ] - location: 11 (remaining gas: 1039988.143 units remaining) [ (Pair 100 "hello" 7) ] - location: 13 (remaining gas: 1039988.133 units remaining) - [ 100 @parameter ] + [ 100 ] - location: 11 (remaining gas: 1039988.103 units remaining) - [ (Pair "hello" 7) @storage - 100 @parameter ] + [ (Pair "hello" 7) + 100 ] - location: 15 (remaining gas: 1039988.093 units remaining) - [ (Pair "hello" 7) @storage - (Pair "hello" 7) @storage - 100 @parameter ] + [ (Pair "hello" 7) + (Pair "hello" 7) + 100 ] - location: 16 (remaining gas: 1039988.083 units remaining) [ 7 - (Pair "hello" 7) @storage - 100 @parameter ] + (Pair "hello" 7) + 100 ] - location: 17 (remaining gas: 1039988.073 units remaining) - [ (Pair "hello" 7) @storage - 100 @parameter ] + [ (Pair "hello" 7) + 100 ] - location: 18 (remaining gas: 1039988.063 units remaining) - [ "hello" @storage.s - 100 @parameter ] + [ "hello" + 100 ] - location: 19 (remaining gas: 1039988.048 units remaining) - [ (Pair "hello" 100) @storage ] + [ (Pair "hello" 100) ] - location: 20 (remaining gas: 1039988.033 units remaining) [ {} - (Pair "hello" 100) @storage ] + (Pair "hello" 100) ] - location: 22 (remaining gas: 1039988.018 units remaining) [ (Pair {} "hello" 100) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out index fe53dfdd8646..cb6725b9952f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out @@ -24,30 +24,30 @@ trace - location: 12 (remaining gas: 1039872.969 units remaining) [ ] - location: 14 (remaining gas: 1039872.959 units remaining) - [ Unit @b ] + [ Unit ] - location: 15 (remaining gas: 1039872.949 units remaining) - [ Unit @a - Unit @b ] + [ Unit + Unit ] - location: 16 (remaining gas: 1039872.934 units remaining) [ (Pair Unit Unit) ] - location: 17 (remaining gas: 1039872.924 units remaining) - [ Unit @c - Unit @d ] + [ Unit + Unit ] - location: 18 (remaining gas: 1039872.859 units remaining) [ ] - location: 20 (remaining gas: 1039872.849 units remaining) - [ Unit @b ] + [ Unit ] - location: 21 (remaining gas: 1039872.839 units remaining) - [ Unit @a - Unit @b ] + [ Unit + Unit ] - location: 22 (remaining gas: 1039872.824 units remaining) [ (Pair Unit Unit) ] - location: 23 (remaining gas: 1039872.814 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 24 (remaining gas: 1039872.804 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 25 (remaining gas: 1039872.739 units remaining) [ (Pair Unit Unit) ] @@ -55,8 +55,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 28 (remaining gas: 1039872.719 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 29 (remaining gas: 1039872.654 units remaining) [ (Pair Unit Unit) ] @@ -64,8 +64,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 32 (remaining gas: 1039872.634 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 33 (remaining gas: 1039872.569 units remaining) [ (Pair Unit Unit) ] @@ -73,8 +73,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 36 (remaining gas: 1039872.549 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 37 (remaining gas: 1039872.484 units remaining) [ (Pair Unit Unit) ] @@ -82,8 +82,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 40 (remaining gas: 1039872.464 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 41 (remaining gas: 1039872.399 units remaining) [ (Pair Unit Unit) ] @@ -91,8 +91,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 44 (remaining gas: 1039872.379 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 45 (remaining gas: 1039872.314 units remaining) [ (Pair Unit Unit) ] @@ -100,8 +100,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 48 (remaining gas: 1039872.294 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 49 (remaining gas: 1039872.229 units remaining) [ (Pair Unit Unit) ] @@ -109,8 +109,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 52 (remaining gas: 1039872.209 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 53 (remaining gas: 1039872.144 units remaining) [ (Pair Unit Unit) ] @@ -118,8 +118,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 56 (remaining gas: 1039872.124 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 57 (remaining gas: 1039872.059 units remaining) [ (Pair Unit Unit) ] @@ -127,8 +127,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 60 (remaining gas: 1039872.039 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 61 (remaining gas: 1039871.974 units remaining) [ (Pair Unit Unit) ] @@ -136,8 +136,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 64 (remaining gas: 1039871.954 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 65 (remaining gas: 1039871.889 units remaining) [ (Pair Unit Unit) ] @@ -145,26 +145,26 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 68 (remaining gas: 1039871.869 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 69 (remaining gas: 1039871.804 units remaining) [ (Pair Unit Unit) ] - location: 71 (remaining gas: 1039871.794 units remaining) [ ] - location: 72 (remaining gas: 1039871.784 units remaining) - [ Unit @d ] + [ Unit ] - location: 73 (remaining gas: 1039871.774 units remaining) - [ Unit @c - Unit @d ] + [ Unit + Unit ] - location: 74 (remaining gas: 1039871.759 units remaining) [ (Pair Unit Unit) ] - location: 75 (remaining gas: 1039871.749 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 76 (remaining gas: 1039871.739 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 77 (remaining gas: 1039871.674 units remaining) [ (Pair Unit Unit) ] @@ -172,8 +172,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 80 (remaining gas: 1039871.654 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 81 (remaining gas: 1039871.589 units remaining) [ (Pair Unit Unit) ] @@ -181,8 +181,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 84 (remaining gas: 1039871.569 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 85 (remaining gas: 1039871.504 units remaining) [ (Pair Unit Unit) ] @@ -190,8 +190,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 88 (remaining gas: 1039871.484 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 89 (remaining gas: 1039871.419 units remaining) [ (Pair Unit Unit) ] @@ -199,8 +199,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 92 (remaining gas: 1039871.399 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 93 (remaining gas: 1039871.334 units remaining) [ (Pair Unit Unit) ] @@ -208,8 +208,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 96 (remaining gas: 1039871.314 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 97 (remaining gas: 1039871.249 units remaining) [ (Pair Unit Unit) ] @@ -217,8 +217,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 100 (remaining gas: 1039871.229 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 101 (remaining gas: 1039871.164 units remaining) [ (Pair Unit Unit) ] @@ -226,8 +226,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 104 (remaining gas: 1039871.144 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 105 (remaining gas: 1039871.079 units remaining) [ (Pair Unit Unit) ] @@ -235,8 +235,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 108 (remaining gas: 1039871.059 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 109 (remaining gas: 1039870.994 units remaining) [ (Pair Unit Unit) ] @@ -244,8 +244,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 112 (remaining gas: 1039870.974 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 113 (remaining gas: 1039870.909 units remaining) [ (Pair Unit Unit) ] @@ -253,8 +253,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 116 (remaining gas: 1039870.889 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 117 (remaining gas: 1039870.824 units remaining) [ (Pair Unit Unit) ] @@ -262,8 +262,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 120 (remaining gas: 1039870.804 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 121 (remaining gas: 1039870.739 units remaining) [ (Pair Unit Unit) ] @@ -343,8 +343,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 156 (remaining gas: 1039870.079 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 157 (remaining gas: 1039870.014 units remaining) [ (Pair Unit Unit) ] @@ -352,8 +352,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 160 (remaining gas: 1039869.994 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 161 (remaining gas: 1039869.929 units remaining) [ (Pair Unit Unit) ] @@ -361,8 +361,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 164 (remaining gas: 1039869.909 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 165 (remaining gas: 1039869.844 units remaining) [ (Pair Unit Unit) ] @@ -370,8 +370,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 168 (remaining gas: 1039869.824 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 169 (remaining gas: 1039869.759 units remaining) [ (Pair Unit Unit) ] @@ -379,8 +379,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 172 (remaining gas: 1039869.739 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 173 (remaining gas: 1039869.674 units remaining) [ (Pair Unit Unit) ] @@ -392,64 +392,64 @@ trace [ Unit Unit ] - location: 178 (remaining gas: 1039869.629 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 179 (remaining gas: 1039869.619 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 180 (remaining gas: 1039869.609 units remaining) - [ Unit @p.a - Unit @b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 181 (remaining gas: 1039869.544 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 183 (remaining gas: 1039869.534 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 184 (remaining gas: 1039869.524 units remaining) - [ Unit @a - Unit @p.b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 185 (remaining gas: 1039869.459 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 187 (remaining gas: 1039869.449 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 188 (remaining gas: 1039869.439 units remaining) - [ Unit @p.a - Unit @p.b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 189 (remaining gas: 1039869.374 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 191 (remaining gas: 1039869.364 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 192 (remaining gas: 1039869.354 units remaining) - [ Unit @a - Unit @p.b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 193 (remaining gas: 1039869.289 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 195 (remaining gas: 1039869.279 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 196 (remaining gas: 1039869.269 units remaining) - [ Unit @p.a - Unit @b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 197 (remaining gas: 1039869.204 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 199 (remaining gas: 1039869.194 units remaining) [ ] - location: 200 (remaining gas: 1039869.184 units remaining) - [ Unit @b ] + [ Unit ] - location: 201 (remaining gas: 1039869.174 units remaining) - [ Unit @a - Unit @b ] + [ Unit + Unit ] - location: 202 (remaining gas: 1039869.159 units remaining) - [ (Pair Unit Unit) @c ] + [ (Pair Unit Unit) ] - location: 203 (remaining gas: 1039869.149 units remaining) - [ Unit @b - Unit @a ] + [ Unit + Unit ] - location: 204 (remaining gas: 1039869.084 units remaining) [ ] - location: 206 (remaining gas: 1039869.074 units remaining) diff --git a/tests_python/tests_alpha/test_contract.py b/tests_python/tests_alpha/test_contract.py index 06c0e745c423..61dd7a4b9cc8 100644 --- a/tests_python/tests_alpha/test_contract.py +++ b/tests_python/tests_alpha/test_contract.py @@ -557,11 +557,6 @@ class TestContracts: ), # error message for attempting to push a value of type never ("never_literal.tz", r'type never has no inhabitant.'), - # field annotation mismatch with UNPAIR - ( - "unpair_field_annotation_mismatch.tz", - r'The field access annotation does not match', - ), # COMB, UNCOMB, and DUP cannot take 0 as argument ("comb0.tz", r"PAIR expects an argument of at least 2"), ("comb1.tz", r"PAIR expects an argument of at least 2"), -- GitLab From 455879e3a1c1606db5f6748faa16b2b1327af98b Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 7 Jan 2022 11:46:28 +0100 Subject: [PATCH 27/35] Proto/Michelson: simplify execution_trace --- src/proto_alpha/lib_client/michelson_v1_printer.ml | 9 ++------- src/proto_alpha/lib_client/michelson_v1_printer.mli | 4 +--- src/proto_alpha/lib_plugin/plugin.ml | 13 +++++++++---- src/proto_alpha/lib_protocol/script_interpreter.ml | 7 ++++++- src/proto_alpha/lib_protocol/script_typed_ir.ml | 3 +-- src/proto_alpha/lib_protocol/script_typed_ir.mli | 3 +-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/proto_alpha/lib_client/michelson_v1_printer.ml b/src/proto_alpha/lib_client/michelson_v1_printer.ml index e6ade80dd017..0e53de294bc9 100644 --- a/src/proto_alpha/lib_client/michelson_v1_printer.ml +++ b/src/proto_alpha/lib_client/michelson_v1_printer.ml @@ -61,13 +61,8 @@ let print_execution_trace ppf trace = loc Gas.pp gas - (Format.pp_print_list (fun ppf (e, annot) -> - Format.fprintf - ppf - "@[%a \t%s@]" - print_expr - e - (match annot with None -> "" | Some a -> a))) + (Format.pp_print_list (fun ppf e -> + Format.fprintf ppf "@[%a@]" print_expr e)) stack) ppf trace diff --git a/src/proto_alpha/lib_client/michelson_v1_printer.mli b/src/proto_alpha/lib_client/michelson_v1_printer.mli index 07cb29ae8556..8b7ec8dfaa30 100644 --- a/src/proto_alpha/lib_client/michelson_v1_printer.mli +++ b/src/proto_alpha/lib_client/michelson_v1_printer.mli @@ -32,9 +32,7 @@ val print_expr : Format.formatter -> Script_repr.expr -> unit val print_expr_unwrapped : Format.formatter -> Script_repr.expr -> unit val print_execution_trace : - Format.formatter -> - (Script.location * Gas.t * (Script.expr * string option) list) list -> - unit + Format.formatter -> (Script.location * Gas.t * Script.expr list) list -> unit val print_big_map_diff : Format.formatter -> Lazy_storage.diffs -> unit diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 55940be7088b..47f36c344616 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -1245,6 +1245,7 @@ module RPC = struct let trace_code_input_encoding = run_code_input_encoding let trace_encoding = + (* TODO: should this encoding be updated? *) def "scripted.trace" @@ list @@ obj3 (req "location" Script.location_encoding) @@ -1252,7 +1253,12 @@ module RPC = struct (req "stack" (list - (obj2 (req "item" Script.expr_encoding) (opt "annot" string)))) + (conv + (fun e -> (e, None)) + (fun (e, _annot) -> e) + (obj2 + (req "item" Script.expr_encoding) + (opt "annot" string))))) let trace_code_output_encoding = conv @@ -1482,7 +1488,7 @@ module RPC = struct let rec unparse_stack : type a s. (a, s) Script_typed_ir.stack_ty * (a * s) -> - (Script.expr * string option) list tzresult Lwt.t = function + Script.expr list tzresult Lwt.t = function | (Bot_t, (EmptyCell, EmptyCell)) -> return_nil | (Item_t (ty, rest_ty), (v, rest)) -> Script_ir_translator.unparse_data @@ -1492,9 +1498,8 @@ module RPC = struct v >>=? fun (data, _ctxt) -> unparse_stack (rest_ty, rest) >|=? fun rest -> - let annot = None in let data = Micheline.strip_locations data in - (data, annot) :: rest + data :: rest in unparse_stack (stack_ty, stack) diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index dd156b88f547..d2cc95e3d73e 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -119,13 +119,18 @@ type error += Michelson_too_many_recursive_calls let () = let open Data_encoding in let trace_encoding = + (* TODO: should this encoding be updated? *) list @@ obj3 (req "location" Script.location_encoding) (req "gas" Gas.encoding) (req "stack" - (list (obj2 (req "item" Script.expr_encoding) (opt "annot" string)))) + (list + (conv + (fun e -> (e, None)) + (fun (e, _annot) -> e) + (obj2 (req "item" Script.expr_encoding) (opt "annot" string))))) in (* Reject *) register_error_kind diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index debf68612863..1b795de98d01 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -1111,8 +1111,7 @@ and ('a, 's, 'b, 'f, 'c, 'u) logging_function = 'c * 'u -> unit -and execution_trace = - (Script.location * Gas.t * (Script.expr * string option) list) list +and execution_trace = (Script.location * Gas.t * Script.expr list) list and logger = { log_interp : 'a 's 'b 'f 'c 'u. ('a, 's, 'b, 'f, 'c, 'u) logging_function; diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.mli b/src/proto_alpha/lib_protocol/script_typed_ir.mli index 1a29beb60559..7c586021b632 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.mli +++ b/src/proto_alpha/lib_protocol/script_typed_ir.mli @@ -1207,8 +1207,7 @@ and ('a, 's, 'b, 'f, 'c, 'u) logging_function = 'c * 'u -> unit -and execution_trace = - (Script.location * Gas.t * (Script.expr * string option) list) list +and execution_trace = (Script.location * Gas.t * Script.expr list) list and logger = { log_interp : 'a 's 'b 'f 'c 'u. ('a, 's, 'b, 'f, 'c, 'u) logging_function; -- GitLab From 4521e1d907d2f9c6912e96ac3a4c054fa52bd9ed Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 7 Jan 2022 11:49:33 +0100 Subject: [PATCH 28/35] Proto/Michelson: rename parse_var_annot into check_var_annot --- .../lib_protocol/script_ir_annot.ml | 2 +- .../lib_protocol/script_ir_annot.mli | 4 +- .../lib_protocol/script_ir_translator.ml | 252 +++++++++--------- 3 files changed, 129 insertions(+), 129 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 85c27c1178f6..6cdc6892d00f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -313,7 +313,7 @@ let check_correct_field : (Inconsistent_field_annotations ("%" ^ (s1 :> string), "%" ^ (s2 :> string))) -let parse_var_annot : Script.location -> string list -> unit tzresult = +let check_var_annot : Script.location -> string list -> unit tzresult = fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 18dc22605c1e..dcc133449af5 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -131,8 +131,8 @@ val check_correct_field : (** Instruction annotations parsing *) -(** Parse a variable annotation. *) -val parse_var_annot : Script.location -> string list -> unit tzresult +(** Check a variable annotation. *) +val check_var_annot : Script.location -> string list -> unit tzresult val is_allowed_char : char -> bool diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index ad3e74e7c397..090abeebcc32 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -3040,7 +3040,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : However, DROP is equivalent to DROP 1 so hinting at an arity of 1 makes sense. *) fail (Invalid_arity (loc, I_DROP, 1, List.length l)) | (Prim (loc, I_DUP, [], annot), Item_t (v, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> record_trace_eval (fun () -> let t = serialize_ty_for_error v in @@ -3050,7 +3050,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let dup = {apply = (fun kinfo k -> IDup (kinfo, k))} in typed ctxt loc dup (Item_t (v, Item_t (v, rest))) | (Prim (loc, I_DUP, [n], v_annot), stack_ty) -> - parse_var_annot loc v_annot >>?= fun () -> + check_var_annot loc v_annot >>?= fun () -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a * s) dup_n_proof_argument tzresult = @@ -3143,7 +3143,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack_ty = Item_t (w, Item_t (v, rest)) in typed ctxt loc swap stack_ty | (Prim (loc, I_PUSH, [t; d], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> parse_packable_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy t >>?= fun (Ex_ty t, ctxt) -> parse_data @@ -3244,7 +3244,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let cons_pair = {apply = (fun kinfo k -> ICons_pair (kinfo, k))} in typed ctxt loc cons_pair stack_ty | (Prim (loc, I_PAIR, [n], annot), stack_ty) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let rec make_proof_argument : type a s. int -> (a, s) stack_ty -> (a * s) comb_proof_argument tzresult = @@ -3298,7 +3298,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let uncomb = {apply = (fun kinfo k -> IUncomb (kinfo, n, witness, k))} in typed ctxt loc uncomb after_ty | (Prim (loc, I_GET, [n], annot), Item_t (comb_ty, rest_ty)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let rec make_proof_argument : type b. int -> b ty -> b comb_get_proof_argument tzresult = fun n ty -> @@ -3327,7 +3327,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc comb_get after_stack_ty | ( Prim (loc, I_UPDATE, [n], annot), Item_t (value_ty, Item_t (comb_ty, rest_ty)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let rec make_proof_argument : type value before. int -> @@ -3448,7 +3448,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_CONS, [], annot), Item_t (tv, Item_t (List_t (t, ty_name), rest)) ) -> check_item_ty ctxt tv t loc I_CONS 1 2 >>?= fun (Eq, t, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let cons_list = {apply = (fun kinfo k -> ICons_list (kinfo, k))} in (typed ctxt loc cons_list (Item_t (List_t (t, ty_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3617,12 +3617,12 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (v, Item_t (Bool_t _, Item_t (Set_t (elt, tname), rest))) ) -> check_item_ty ctxt (ty_of_comparable_ty elt) v loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_update (kinfo, k))} in (typed ctxt loc instr (Item_t (Set_t (elt, tname), rest)) : ((a, s) judgement * context) tzresult Lwt.t) | (Prim (loc, I_SIZE, [], annot), Item_t (Set_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_size (kinfo, k))} in typed ctxt loc instr (Item_t (nat_t ~annot:None, rest)) (* maps *) @@ -3729,7 +3729,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_mem (kinfo, k))} in (typed ctxt loc instr (Item_t (bool_t ~annot:None, rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3737,7 +3737,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (vk, Item_t (Map_t (ck, elt, _), rest)) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_get (kinfo, k))} in option_t loc elt ~annot:None >>?= fun ty : ((a, s) judgement * context) tzresult Lwt.t -> @@ -3749,7 +3749,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_update (kinfo, k))} in (typed ctxt loc instr (Item_t (Map_t (ck, v, map_name), rest)) : ((a, s) judgement * context) tzresult Lwt.t) @@ -3761,14 +3761,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_get_and_update (kinfo, k))} in let stack = Item_t (Option_t (vv, vname), Item_t (Map_t (ck, v, map_name), rest)) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | (Prim (loc, I_SIZE, [], annot), Item_t (Map_t (_, _, _), rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMap_size (kinfo, k))} in typed ctxt loc instr (Item_t (nat_t ~annot:None, rest)) (* big_map *) @@ -3788,7 +3788,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (set_key, Item_t (Big_map_t (map_key, _, _), rest)) ) -> let k = ty_of_comparable_ty map_key in check_item_ty ctxt set_key k loc I_MEM 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_mem (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -3796,7 +3796,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (vk, Item_t (Big_map_t (ck, elt, _), rest)) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_get (kinfo, k))} in option_t loc elt ~annot:None >>?= fun ty -> let stack = Item_t (ty, rest) in @@ -3811,7 +3811,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_item_ty ctxt set_key k loc I_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt set_value map_value loc I_UPDATE 2 3 >>?= fun (Eq, map_value, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_update (kinfo, k))} in let stack = Item_t (Big_map_t (map_key, map_value, map_name), rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -3824,7 +3824,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_GET_AND_UPDATE 1 3 >>?= fun (Eq, _, ctxt) -> check_item_ty ctxt vv v loc I_GET_AND_UPDATE 2 3 >>?= fun (Eq, v, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBig_map_get_and_update (kinfo, k))} in @@ -3835,7 +3835,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* Sapling *) | (Prim (loc, I_SAPLING_EMPTY_STATE, [memo_size], annot), rest) -> parse_memo_size memo_size >>?= fun memo_size -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISapling_empty_state (kinfo, memo_size, k))} in @@ -3959,7 +3959,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_LOOP_LEFT, [body], annot), (Item_t (Union_t ((tl, _l_field), (tr, _), _), rest) as stack) ) -> ( check_kind [Seq_kind] body >>?= fun () -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> non_terminal_recursion ?type_logger tc_context @@ -4013,7 +4013,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy ret >>?= fun (Ex_ty ret, ctxt) -> check_kind [Seq_kind] code >>?= fun () -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> parse_returning (Tc_context.add_lambda tc_context) ?type_logger @@ -4031,7 +4031,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_EXEC, [], annot), Item_t (arg, Item_t (Lambda_t (param, ret, _), rest)) ) -> check_item_ty ctxt arg param loc I_EXEC 1 2 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IExec (kinfo, k))} in let stack = Item_t (ret, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) @@ -4048,7 +4048,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : check_packable ~legacy:false loc capture_ty >>?= fun () -> check_item_ty ctxt capture capture_ty loc I_APPLY 1 2 >>?= fun (Eq, capture_ty, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IApply (kinfo, capture_ty, k))} in lambda_t loc arg_ty ret ~annot:lam_annot (* This cannot fail because the type [lambda 'arg 'ret] is always smaller than @@ -4146,21 +4146,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* timestamp operations *) | ( Prim (loc, I_ADD, [], annot), Item_t (Timestamp_t tname, Item_t (Int_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_timestamp_to_seconds (kinfo, k))} in typed ctxt loc instr (Item_t (Timestamp_t tname, rest)) | ( Prim (loc, I_ADD, [], annot), Item_t (Int_t _, Item_t (Timestamp_t tname, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_seconds_to_timestamp (kinfo, k))} in typed ctxt loc instr (Item_t (Timestamp_t tname, rest)) | ( Prim (loc, I_SUB, [], annot), Item_t (Timestamp_t tname, Item_t (Int_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISub_timestamp_seconds (kinfo, k))} in @@ -4170,7 +4170,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t ( Timestamp_t {annot = tn1; size = _}, Item_t (Timestamp_t {annot = tn2; size = _}, rest) ) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_annot ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IDiff_timestamps (kinfo, k))} in @@ -4179,31 +4179,31 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* string operations *) | ( Prim (loc, I_CONCAT, [], annot), Item_t (String_t tn1, Item_t (String_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IConcat_string_pair (kinfo, k))} in typed ctxt loc instr (Item_t (String_t tname, rest)) | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (String_t tname, _), rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IConcat_string (kinfo, k))} in typed ctxt loc instr (Item_t (String_t tname, rest)) | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (String_t tname, rest))) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISlice_string (kinfo, k))} in let stack = Item_t (option_string'_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SIZE, [], annot), Item_t (String_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IString_size (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack (* bytes operations *) | ( Prim (loc, I_CONCAT, [], annot), Item_t (Bytes_t tn1, Item_t (Bytes_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IConcat_bytes_pair (kinfo, k))} in @@ -4211,25 +4211,25 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_CONCAT, [], annot), Item_t (List_t (Bytes_t tname, _), rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IConcat_bytes (kinfo, k))} in let stack = Item_t (Bytes_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_SLICE, [], annot), Item_t (Nat_t _, Item_t (Nat_t _, Item_t (Bytes_t tname, rest))) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISlice_bytes (kinfo, k))} in let stack = Item_t (option_bytes'_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SIZE, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBytes_size (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack (* currency operations *) | ( Prim (loc, I_ADD, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_tez (kinfo, k))} in @@ -4238,7 +4238,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_SUB, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> if legacy then - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_tez_legacy (kinfo, k))} in @@ -4247,7 +4247,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : else fail (Deprecated_instruction I_SUB) | ( Prim (loc, I_SUB_MUTEZ, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_tez (kinfo, k))} in @@ -4256,21 +4256,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : | ( Prim (loc, I_MUL, [], annot), Item_t (Mutez_t tname, Item_t (Nat_t _, rest)) ) -> (* no type name check *) - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_teznat (kinfo, k))} in let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Mutez_t tname, rest)) ) -> (* no type name check *) - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_nattez (kinfo, k))} in let stack = Item_t (Mutez_t tname, rest) in typed ctxt loc instr stack (* boolean operations *) | (Prim (loc, I_OR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IOr (kinfo, k))} in @@ -4278,7 +4278,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_AND, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAnd (kinfo, k))} in @@ -4286,46 +4286,46 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_XOR, [], annot), Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IXor (kinfo, k))} in let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NOT, [], annot), Item_t (Bool_t tname, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INot (kinfo, k))} in let stack = Item_t (Bool_t tname, rest) in typed ctxt loc instr stack (* integer operations *) | (Prim (loc, I_ABS, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAbs_int (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IIs_nat (kinfo, k))} in let stack = Item_t (option_nat_t, rest) in typed ctxt loc instr stack | (Prim (loc, I_INT, [], annot), Item_t (Nat_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IInt_nat (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Int_t tname, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Nat_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in @@ -4333,19 +4333,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAdd_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_ADD, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_nat (kinfo, k))} in @@ -4353,7 +4353,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in @@ -4361,19 +4361,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_SUB, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun _tname -> let instr = {apply = (fun kinfo k -> ISub_int (kinfo, k))} in @@ -4381,7 +4381,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IMul_int (kinfo, k))} in @@ -4389,19 +4389,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Nat_t _, Item_t (Int_t tname, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_nat (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_MUL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IMul_nat (kinfo, k))} in @@ -4409,13 +4409,13 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_EDIV, [], annot), Item_t (Mutez_t tname, Item_t (Nat_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEdiv_teznat (kinfo, k))} in let stack = Item_t (option_pair_mutez'_mutez'_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_EDIV, [], annot), Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_tez (kinfo, k))} in @@ -4423,7 +4423,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Int_t tn1, Item_t (Int_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_int (kinfo, k))} in @@ -4431,19 +4431,19 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Int_t tname, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEdiv_int (kinfo, k))} in let stack = Item_t (option_pair_int'_nat_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Nat_t tname, Item_t (Int_t _, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEdiv_nat (kinfo, k))} in let stack = Item_t (option_pair_int_nat'_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_EDIV, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IEdiv_nat (kinfo, k))} in @@ -4451,7 +4451,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_LSL, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ILsl_nat (kinfo, k))} in @@ -4459,7 +4459,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_LSR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> ILsr_nat (kinfo, k))} in @@ -4467,7 +4467,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_OR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IOr_nat (kinfo, k))} in @@ -4475,7 +4475,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_AND, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAnd_nat (kinfo, k))} in @@ -4483,31 +4483,31 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | (Prim (loc, I_AND, [], annot), Item_t (Int_t _, Item_t (Nat_t tname, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAnd_int_nat (kinfo, k))} in let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_XOR, [], annot), Item_t (Nat_t tn1, Item_t (Nat_t tn2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IXor_nat (kinfo, k))} in let stack = Item_t (Nat_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NOT, [], annot), Item_t (Int_t tname, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INot_int (kinfo, k))} in let stack = Item_t (Int_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NOT, [], annot), Item_t (Nat_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INot_int (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack (* comparison *) | (Prim (loc, I_COMPARE, [], annot), Item_t (t1, Item_t (t2, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> check_item_ty ctxt t1 t2 loc I_COMPARE 1 2 >>?= fun (Eq, t, ctxt) -> comparable_ty_of_ty ctxt loc t >>?= fun (key, ctxt) -> let instr = {apply = (fun kinfo k -> ICompare (kinfo, key, k))} in @@ -4515,38 +4515,38 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) (* comparators *) | (Prim (loc, I_EQ, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IEq (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEQ, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeq (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_LT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILt (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_GT, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IGt (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_LE, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILe (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_GE, [], annot), Item_t (Int_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IGe (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack (* annotations *) | (Prim (loc, I_CAST, [cast_t], annot), Item_t (t, stack)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> parse_any_ty ctxt ~stack_depth:(stack_depth + 1) ~legacy cast_t >>?= fun (Ex_ty cast_t, ctxt) -> ty_eq ~legacy ctxt loc cast_t t >>?= fun (Eq, ctxt) -> @@ -4554,7 +4554,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (cast_t, stack) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | (Prim (loc, I_RENAME, [], annot), Item_t (t, stack)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> (* can erase annot *) let instr = {apply = (fun _ k -> k)} in let stack = Item_t (t, stack) in @@ -4566,7 +4566,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (* allow to pack contracts for hash/signature checks *) loc t >>?= fun () -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IPack (kinfo, t, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack @@ -4580,7 +4580,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* protocol *) | (Prim (loc, I_ADDRESS, [], annot), Item_t (Contract_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAddress (kinfo, k))} in let stack = Item_t (address_t ~annot:None, rest) in typed ctxt loc instr stack @@ -4604,7 +4604,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : parse_view_output_ty ctxt ~stack_depth:0 ~legacy output_ty >>?= fun (Ex_ty output_ty, ctxt) -> option_t output_ty_loc output_ty ~annot:None >>?= fun res_ty -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = { apply = @@ -4618,21 +4618,21 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t (p, Item_t (Mutez_t _, Item_t (Contract_t (cp, _), rest))) ) -> Tc_context.check_not_in_view loc ~legacy tc_context prim >>?= fun () -> check_item_ty ctxt p cp loc prim 1 4 >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ITransfer_tokens (kinfo, k))} in let stack = Item_t (operation_t ~annot:None, rest) in (typed ctxt loc instr stack : ((a, s) judgement * context) tzresult Lwt.t) | ( Prim (loc, (I_SET_DELEGATE as prim), [], annot), Item_t (Option_t (Key_hash_t _, _), rest) ) -> Tc_context.check_not_in_view loc ~legacy tc_context prim >>?= fun () -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISet_delegate (kinfo, k))} in let stack = Item_t (operation_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (_, I_CREATE_ACCOUNT, _, _), _) -> fail (Deprecated_instruction I_CREATE_ACCOUNT) | (Prim (loc, I_IMPLICIT_ACCOUNT, [], annot), Item_t (Key_hash_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IImplicit_account (kinfo, k))} in let stack = Item_t (contract_unit_t, rest) in typed ctxt loc instr stack @@ -4722,49 +4722,49 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : in typed ctxt loc instr stack | (Prim (loc, I_NOW, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INow (kinfo, k))} in let stack = Item_t (timestamp_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_AMOUNT, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IAmount (kinfo, k))} in let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_CHAIN_ID, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IChainId (kinfo, k))} in let stack = Item_t (chain_id_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_BALANCE, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBalance (kinfo, k))} in let stack = Item_t (mutez_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_LEVEL, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ILevel (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_VOTING_POWER, [], annot), Item_t (Key_hash_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IVoting_power (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_TOTAL_VOTING_POWER, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ITotal_voting_power (kinfo, k))} in let stack = Item_t (nat_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (_, I_STEPS_TO_QUOTA, _, _), _) -> fail (Deprecated_instruction I_STEPS_TO_QUOTA) | (Prim (loc, I_SOURCE, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISource (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack | (Prim (loc, I_SENDER, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISender (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack @@ -4804,50 +4804,50 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : let stack = Item_t (res_ty, stack) in typed_no_lwt ctxt loc instr stack ) | (Prim (loc, I_SELF_ADDRESS, [], annot), stack) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISelf_address (kinfo, k))} in let stack = Item_t (address_t ~annot:None, stack) in typed ctxt loc instr stack (* cryptography *) | (Prim (loc, I_HASH_KEY, [], annot), Item_t (Key_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IHash_key (kinfo, k))} in let stack = Item_t (key_hash_t ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_CHECK_SIGNATURE, [], annot), Item_t (Key_t _, Item_t (Signature_t _, Item_t (Bytes_t _, rest))) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ICheck_signature (kinfo, k))} in let stack = Item_t (bool_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_BLAKE2B, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IBlake2b (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_SHA256, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISha256 (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_SHA512, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISha512 (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_KECCAK, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IKeccak (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_SHA3, [], annot), Item_t (Bytes_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> ISha3 (kinfo, k))} in let stack = Item_t (bytes_t ~annot:None, rest) in typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_g1_t tn1, Item_t (Bls12_381_g1_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_g1 (kinfo, k))} in @@ -4855,7 +4855,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_g2_t tn1, Item_t (Bls12_381_g2_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_g2 (kinfo, k))} in @@ -4863,7 +4863,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_ADD, [], annot), Item_t (Bls12_381_fr_t tn1, Item_t (Bls12_381_fr_t tn2, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> merge_type_metadata ~legacy ~error_details:Informative tn1 tn2 >>?= fun tname -> let instr = {apply = (fun kinfo k -> IAdd_bls12_381_fr (kinfo, k))} in @@ -4871,63 +4871,63 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_g1_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_g1 (kinfo, k))} in let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_g2_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_g2 (kinfo, k))} in let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Nat_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} in let stack = Item_t (bls12_381_fr_t ~annot:tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Int_t {annot = tname; _}, Item_t (Bls12_381_fr_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_fr_z (kinfo, k))} in let stack = Item_t (bls12_381_fr_t ~annot:tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Int_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | ( Prim (loc, I_MUL, [], annot), Item_t (Bls12_381_fr_t tname, Item_t (Nat_t _, rest)) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IMul_bls12_381_z_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_INT, [], annot), Item_t (Bls12_381_fr_t _, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IInt_bls12_381_fr (kinfo, k))} in let stack = Item_t (int_t ~annot:None, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g1_t tname, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_g1 (kinfo, k))} in let stack = Item_t (Bls12_381_g1_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g2_t tname, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_g2 (kinfo, k))} in let stack = Item_t (Bls12_381_g2_t tname, rest) in typed ctxt loc instr stack | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_fr_t tname, rest)) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> INeg_bls12_381_fr (kinfo, k))} in let stack = Item_t (Bls12_381_fr_t tname, rest) in typed ctxt loc instr stack @@ -4936,7 +4936,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( List_t (Pair_t ((Bls12_381_g1_t _, _, _), (Bls12_381_g2_t _, _, _), _), _), rest ) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let instr = {apply = (fun kinfo k -> IPairing_check_bls12_381 (kinfo, k))} in @@ -4944,7 +4944,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack (* Tickets *) | (Prim (loc, I_TICKET, [], annot), Item_t (t, Item_t (Nat_t _, rest))) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> comparable_ty_of_ty ctxt loc t >>?= fun (ty, ctxt) -> ticket_t loc ty ~annot:None >>?= fun res_ty -> let instr = {apply = (fun kinfo k -> ITicket (kinfo, k))} in @@ -4952,7 +4952,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : typed ctxt loc instr stack | ( Prim (loc, I_READ_TICKET, [], annot), (Item_t (Ticket_t (t, _), _) as full_stack) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let () = check_dupable_comparable_ty t in opened_ticket_type loc t >>?= fun opened_ticket_ty -> let result = ty_of_comparable_ty opened_ticket_ty in @@ -4964,7 +4964,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : ( (Ticket_t (t, _) as ticket_t), Item_t (Pair_t ((Nat_t _, fa_a, a_a), (Nat_t _, fa_b, a_b), _), rest) ) ) -> - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> let () = check_dupable_comparable_ty t in pair_t loc (ticket_t, fa_a, a_a) (ticket_t, fa_b, a_b) ~annot:None >>?= fun pair_tickets_ty -> @@ -4976,7 +4976,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : Item_t ( Pair_t (((Ticket_t _ as ty_a), _, _), ((Ticket_t _ as ty_b), _, _), _), rest ) ) -> ( - parse_var_annot loc annot >>?= fun () -> + check_var_annot loc annot >>?= fun () -> Gas_monad.run ctxt @@ merge_types ~legacy ~error_details:Informative loc ty_a ty_b >>?= fun (eq_ty, ctxt) -> -- GitLab From 89d945ba59562b4c0173bf4126a8b5df61a304e8 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 7 Jan 2022 11:50:09 +0100 Subject: [PATCH 29/35] Proto/Michelson: rename parse_two_var_annot into check_two_var_annot --- src/proto_alpha/lib_protocol/script_ir_annot.ml | 2 +- src/proto_alpha/lib_protocol/script_ir_annot.mli | 2 +- src/proto_alpha/lib_protocol/script_ir_translator.ml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 6cdc6892d00f..bd7801125ec0 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -338,7 +338,7 @@ let parse_constr_annot : ignore_special f1 >>? fun f1 -> ignore_special f2 >|? fun f2 -> (t, f1, f2) -let parse_two_var_annot : Script.location -> string list -> unit tzresult = +let check_two_var_annot : Script.location -> string list -> unit tzresult = fun loc annot -> parse_annots loc annot >>? classify_annot loc >>? fun (vars, types, fields) -> error_unexpected_annot loc types >>? fun () -> diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index dcc133449af5..b606426da09f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -141,7 +141,7 @@ val parse_constr_annot : string list -> (type_annot option * field_annot option * field_annot option) tzresult -val parse_two_var_annot : Script.location -> string list -> unit tzresult +val check_two_var_annot : Script.location -> string list -> unit tzresult val parse_destr_annot : Script.location -> string list -> field_annot option tzresult diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 090abeebcc32..655d8db2d99f 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -4641,7 +4641,7 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : (Option_t (Key_hash_t _, _), Item_t (Mutez_t _, Item_t (ginit, rest))) ) -> Tc_context.check_not_in_view ~legacy loc tc_context prim >>?= fun () -> - parse_two_var_annot loc annot >>?= fun () -> + check_two_var_annot loc annot >>?= fun () -> let canonical_code = Micheline.strip_locations code in parse_toplevel ctxt ~legacy canonical_code >>?= fun ({arg_type; storage_type; code_field; views; root_name}, ctxt) -> -- GitLab From be0cccb528b2e1ceea0ba9abde21595f64e89295 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 7 Jan 2022 13:46:06 +0100 Subject: [PATCH 30/35] Tests/Python: regenerate regtest outputs A previous commit removed a tab in the format of stack types --- ...(Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" | 30 +- ...(Some 5) { Elt \"hello\" 4.0427752f13.out" | 30 +- ...(Some 5) { Elt \"hello\" 4.0793dc66d5.out" | 30 +- ...None { Elt \"1\" 1 ; .df114499b8.out" | 30 +- ...None { Elt \"1\" 1 ; .f9bea98de9.out" | 30 +- ...None { Elt \"hello\" 4 })-.1db12cd837.out" | 30 +- ...None {})-\"hello\"-(Pair N.6fc7d0acf2.out" | 30 +- ..." \"one\" ; Elt \"2\" \"tw.524c5459f8.out" | 42 +- ...ello\" \"hi\" } None)-\"\".33eba403e7.out" | 42 +- ...hello\" \"hi\" } None)-\"h.a5cd1005c9.out" | 42 +- ...one\" ; Elt \"2\" \"two\" .6f3d35b151.out" | 30 +- ...one\" ; Elt \"2\" \"two\" .76aeaa0706.out" | 48 +- ...one\" ; Elt \"2\" \"two\" .7e7197f248.out" | 48 +- ...one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" | 48 +- ...one\" ; Elt \"2\" \"two\" .b688cc94a7.out" | 48 +- ...one\" ; Elt \"2\" \"two\" .c68db221ed.out" | 48 +- ...TestContractOpcodes::test_balance[0.5].out | 10 +- ...s.TestContractOpcodes::test_balance[0].out | 10 +- ...estContractOpcodes::test_balance[1000].out | 10 +- ...s.TestContractOpcodes::test_balance[1].out | 10 +- ...stContractOpcodes::test_balance[1e-06].out | 10 +- ...s.TestContractOpcodes::test_balance[5].out | 10 +- ...Opcodes::test_balance[8000000000000.0].out | 10 +- ... \"two\" }) )-(Right (Righ.7492e8cdea.out" | 98 +- ... \"two\" }))-(Left Unit)-(.21b30dd90f.out" | 36 +- ... \"two\" }))-(Right (Left .2873ef610c.out" | 30 +- ... \"two\" }))-(Right (Left .8a6f480005.out" | 30 +- ... \"two\" }))-(Right (Right.d336ca1903.out" | 88 +- ...Pair \"foo\" \"bar\" } { P.7f2ee47600.out" | 162 +- ...tContractOpcodes::test_check_signature.out | 158 +- ...tract_input_output[abs.tz-Unit-0-Unit].out | 28 +- ....tz-Unit-12039123919239192312931-Unit].out | 28 +- ...act_input_output[abs.tz-Unit-948-Unit].out | 28 +- ...ct_input_output[add.tz-Unit-Unit-Unit].out | 266 +- ...r 0x00 0x00-(Some 0x0000000.3c2de60480.out | 18 +- ...r 0x01 0x00-(Some 0x0100000.12b2c1172b.out | 18 +- ...r 0x010000 0x00-(Some 0x010.0e44fc6f40.out | 18 +- ...r 0x010000 0x010000-(Some 0.7e0ed229a3.out | 18 +- ...air -100 100)-(Some \"1970.7c1b1e4e5b.out" | 30 +- ...air 0 \"1970-01-01T00:00:0.528ed42c01.out" | 30 +- ...air 100 100)-(Some \"1970-.6566111ad2.out" | 30 +- ...air \"1970-01-01T00:00:00Z.72c424f3da.out" | 30 +- ...air 100 -100)-(Some \"1970.7c4b12e9aa.out" | 30 +- ...air 100 100)-(Some \"1970-.af32743640.out" | 30 +- ...dhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" | 14 +- ...-None-(Pair False False)-(Some False)].out | 24 +- ...z-None-(Pair False True)-(Some False)].out | 24 +- ...z-None-(Pair True False)-(Some False)].out | 24 +- ....tz-None-(Pair True True)-(Some True)].out | 24 +- ...t_output[and_binary.tz-Unit-Unit-Unit].out | 74 +- ...l_1.tz-False-(Pair False False)-False].out | 16 +- ...al_1.tz-False-(Pair False True)-False].out | 16 +- ...al_1.tz-False-(Pair True False)-False].out | 16 +- ...ical_1.tz-False-(Pair True True)-True].out | 16 +- ...put[balance.tz-111-Unit-4000000000000].out | 10 +- ...lt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out | 40 +- ...lt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out | 40 +- ...lt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out | 40 +- ...lt 1 0 } None)-1-(Pair 4 (S.73700321f8.out | 40 +- ...lt 1 4 ; Elt 2 11 } None)-1.1182eca937.out | 40 +- ...lt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out | 40 +- ...lt 1 4 ; Elt 2 11 } None)-2.1eead33885.out | 40 +- ...lt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out | 40 +- ...lt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out | 40 +- ...lt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out | 40 +- ...air {} None)-1-(Pair 4 (Some False))0].out | 40 +- ...air {} None)-1-(Pair 4 (Some False))1].out | 40 +- ... \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" | 40 +- ... \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" | 40 +- ... \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" | 40 +- ... \"foo\" 0 } None)-\"foo\".968709d39d.out" | 40 +- ... \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" | 40 +- ... None)-\"bar\"-(Pair 4 (Some False))].out" | 40 +- ...padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out | 12 +- ...e-Unit-(Some 0x100000000000.d1219ca789.out | 12 +- ...utput[bls12_381_fr_to_int.tz-0-0x00-0].out | 12 +- ...utput[bls12_381_fr_to_int.tz-0-0x01-1].out | 12 +- ...8db8e57af88d9576acd181b89f2.7a85c336ff.out | 12 +- ...9e8abf8dc324a010007addde986.b821eb26b3.out | 12 +- ...ut[bls12_381_fr_to_mutez.tz-0-0x10-16].out | 24 +- ...000000000000000000000000000.0accef5bef.out | 14 +- ...000000000000000000000000000.0ecc537252.out | 14 +- ...000000000000000000000000000.2229b767cd.out | 14 +- ...000000000000000000000000000.2ff549b46b.out | 14 +- ...000000000000000000000000000.bf8a711be6.out | 14 +- ...000000000000000000000000000.d41cbb044b.out | 14 +- ...a5ad0a633e4880d2296f08ec5c1.a50412e458.out | 14 +- ...cd0fa853810e356f1eb79721e80.f3a349c4a7.out | 14 +- ...be1766f92cd82c5e5135c374a03.1b9676e4c2.out | 14 +- ...be1766f92cd82c5e5135c374a03.e966dc6de5.out | 14 +- ...000000000000000000000000000.964835cc43.out | 14 +- ...000000000000000000000000000.b25ea709fb.out | 14 +- ...000000000000000000000000000.eae36753ea.out | 14 +- ...000000000000000000000000000.ee57dac8f7.out | 14 +- ...a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out | 14 +- ...cd0fa853810e356f1eb79721e80.bd5800f6b8.out | 14 +- ...be1766f92cd82c5e5135c374a03.00e897789a.out | 14 +- ...be1766f92cd82c5e5135c374a03.a4697eaa13.out | 14 +- ...000000000000000000000000000.0177355bbf.out | 18 +- ...000000000000000000000000000.744166c609.out | 18 +- ...000000000000000000000000000.9f3c5cdc6a.out | 18 +- ...000000000000000000000000000.a54cb341ba.out | 18 +- ...000000000000000000000000000.b0dc584c94.out | 18 +- ...000000000000000000000000000.bddcad090c.out | 18 +- ...a5ad0a633e4880d2296f08ec5c1.92c153eb47.out | 18 +- ...cd0fa853810e356f1eb79721e80.290ab49d11.out | 18 +- ...be1766f92cd82c5e5135c374a03.69f3589a06.out | 18 +- ...be1766f92cd82c5e5135c374a03.fee3c5cf43.out | 18 +- ...000000000000000000000000000.1bccc033e8.out | 18 +- ...000000000000000000000000000.40958700fe.out | 18 +- ...000000000000000000000000000.6c62b03d78.out | 18 +- ...000000000000000000000000000.d23f269341.out | 18 +- ...a5ad0a633e4880d2296f08ec5c1.927f808504.out | 18 +- ...cd0fa853810e356f1eb79721e80.0c114c956a.out | 18 +- ...be1766f92cd82c5e5135c374a03.03c4f38e68.out | 18 +- ...be1766f92cd82c5e5135c374a03.8ed19cfdd9.out | 18 +- ...input_output[car.tz-0-(Pair 34 17)-34].out | 12 +- ...input_output[cdr.tz-0-(Pair 34 17)-17].out | 12 +- ...prcVkpaWU\")-Unit-(Some \".8420090f97.out" | 12 +- ...770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" | 12 +- ...None-Unit-(Some \"NetXdQprcVkpaWU\")].out" | 12 +- ...mb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out | 142 +- ... Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" | 30 +- ...r 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out | 34 +- ...omb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out | 24 +- ...nput_output[compare.tz-Unit-Unit-Unit].out | 300 +- ...; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out | 378 +- ...-{ \"World!\" }-{ \"Hello World!\" }].out" | 20 +- ..."test2\" }-{ \"Hello test1.c27e8c3ee6.out" | 28 +- ...input_output[concat_hello.tz-{}-{}-{}].out | 12 +- ...}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out | 28 +- ...hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out | 20 +- ...output[concat_hello_bytes.tz-{}-{}-{}].out | 12 +- ...; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" | 132 +- ...\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" | 104 +- ...t_output[concat_list.tz-\"\"-{}-\"\"].out" | 20 +- ...ns.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out | 14 +- ..._output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out | 14 +- ...act_input_output[cons.tz-{}-10-{ 10 }].out | 14 +- ...ir { \"A\" } { \"B\" })-(Some False)].out" | 212 +- ...\"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" | 556 +- ...\"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" | 588 +- ...air { \"B\" } { \"B\" })-(Some True)].out" | 212 +- ...ir { \"c\" } { \"B\" })-(Some False)].out" | 212 +- ..._all.tz-None-(Pair {} {})-(Some True)].out | 68 +- ...wnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" | 18 +- ...Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" | 38 +- ...970-01-01T00:03:20Z\" \"19.90e9215d17.out" | 28 +- ...t[diff_timestamps.tz-111-(Pair 0 0)-0].out | 28 +- ...[diff_timestamps.tz-111-(Pair 0 1)--1].out | 28 +- ...t[diff_timestamps.tz-111-(Pair 1 0)-1].out | 28 +- ...r 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out | 6090 ++++++++--------- ... 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out | 6090 ++++++++--------- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out | 70 +- ...p.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out | 32 +- ...z-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out | 32 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out | 122 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out | 40 +- ...air (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out | 68 +- ..._input_output[dup-n.tz-Unit-Unit-Unit].out | 390 +- ... None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out | 194 +- ... None)-(Pair 10 -3)-(Pair (.3caea50555.out | 194 +- ... None)-(Pair 10 0)-(Pair No.f9448c04fb.out | 194 +- ... None)-(Pair 10 (Left 0))-(Left None)].out | 32 +- ...air 10 (Left 10))-(Left (So.f782cc1dec.out | 32 +- ...air 10 (Left 3))-(Left (Som.016b4db96c.out | 32 +- ...one)-(Pair 10 (Right 0))-(Right None)].out | 32 +- ...air 10 (Right 10))-(Right (.e705a30e07.out | 32 +- ...air 10 (Right 3))-(Right (S.44485eda6a.out | 32 +- ...air 5 (Right 10))-(Right (S.8ab987af15.out | 32 +- ...-{}-Unit-{ Elt \"hello\" \"world\" }].out" | 26 +- ...t[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" | 48 +- ...oncat.tz-\"?\"-\"test\"-\"test_abc\"].out" | 48 +- ...tput[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out | 20 +- ...act_input_output[first.tz-111-{ 4 }-4].out | 20 +- ...me 4) {})-\"hello\"-(Pair .161d86cef6.out" | 30 +- ...me 5) { Elt \"hello\" 4 }).684ab7e326.out" | 30 +- ...me 5) { Elt \"hello\" 4 }).d49817fb83.out" | 30 +- ...e { Elt \"1\" 1 ; .6900b1da14.out" | 30 +- ...e { Elt \"1\" 1 ; .bca0ede8be.out" | 30 +- ... { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" | 30 +- ...ir None {})-\"hello\"-(Pair None {})].out" | 30 +- ... \"1\" \"one\" ; .bc4127094e.out" | 38 +- ..."hello\" \"hi\" })-\"\"-(P.0c03056487.out" | 38 +- ...\"hello\" \"hi\" })-\"hell.cc45544c66.out" | 38 +- ...nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" | 14 +- ...2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" | 14 +- ...xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" | 14 +- ...-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" | 14 +- ..._output[if.tz-None-False-(Some False)].out | 16 +- ...ut_output[if.tz-None-True-(Some True)].out | 16 +- ....tz-\"?\"-(Some \"hello\")-\"hello\"].out" | 14 +- ...ut_output[if_some.tz-\"?\"-None-\"\"].out" | 14 +- ...t_input_output[int.tz-None-0-(Some 0)].out | 14 +- ...t_input_output[int.tz-None-1-(Some 1)].out | 14 +- ...t_output[int.tz-None-9999-(Some 9999)].out | 14 +- ...c20776f726c6421-(Some 0xb6e.34c02678c9.out | 14 +- ...Left \"X\")-(Left True)-(Right True)].out" | 16 +- ...ft \"X\")-(Right \"a\")-(Left \"a\")].out" | 16 +- ...ract_input_output[level.tz-111-Unit-1].out | 10 +- ...{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" | 20 +- ...ut[list_concat.tz-\"abc\"-{}-\"abc\"].out" | 20 +- ...tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out | 20 +- ..._output[list_concat_bytes.tz-0x-{}-0x].out | 20 +- ...b-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out | 20 +- ...list_concat_bytes.tz-0xabcd-{}-0xabcd].out | 20 +- ... ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" | 10 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 10 +- ...input_output[list_id.tz-{\"\"}-{}-{}].out" | 10 +- ... ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" | 18 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 18 +- ...t_output[list_id_map.tz-{\"\"}-{}-{}].out" | 12 +- ...tput[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out | 38 +- ...tput[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out | 38 +- ...}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out | 158 +- ...}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out | 158 +- ...ut_output[list_map_block.tz-{0}-{}-{}].out | 30 +- ...ze.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out | 12 +- ...tput[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out | 12 +- ...input_output[list_size.tz-111-{ 1 }-1].out | 12 +- ...ct_input_output[list_size.tz-111-{}-0].out | 12 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 186 +- ...put_output[loop_left.tz-{\"\"}-{}-{}].out" | 48 +- ...0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out | 10 +- ...[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out | 10 +- ...[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out | 10 +- ... Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out | 190 +- ...-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out | 190 +- ...foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" | 72 +- ...lt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" | 48 +- ...ract_input_output[map_map.tz-{}-10-{}].out | 24 +- ... 1 } None)-1-(Pair { Elt 0 .7396e5f090.out | 40 +- ... 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out | 40 +- ... 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out | 40 +- ... 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out | 40 +- ... 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out | 40 +- ...air {} None)-1-(Pair {} (Some False))].out | 40 +- ...ar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" | 40 +- ...ar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" | 40 +- ...ar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" | 40 +- ...oo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" | 40 +- ...oo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" | 40 +- ...None)-\"bar\"-(Pair {} (Some False))].out" | 40 +- ... \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" | 12 +- ...\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" | 12 +- ...ut[map_size.tz-111-{ Elt \"a\" 1 }-1].out" | 12 +- ...act_input_output[map_size.tz-111-{}-0].out | 12 +- ...ct_input_output[mul.tz-Unit-Unit-Unit].out | 108 +- ...0-257-0x0101000000000000000.be11332c7f.out | 32 +- ...2-16-0x10000000000000000000.8230fb4fac.out | 32 +- ...act_input_output[neg.tz-0-(Left -2)-2].out | 16 +- ...ract_input_output[neg.tz-0-(Left 0)-0].out | 16 +- ...act_input_output[neg.tz-0-(Left 2)--2].out | 16 +- ...act_input_output[neg.tz-0-(Right 0)-0].out | 16 +- ...ct_input_output[neg.tz-0-(Right 2)--2].out | 16 +- ...nput_output[none.tz-Some 10-Unit-None].out | 10 +- ..._output[not.tz-None-False-(Some True)].out | 14 +- ..._output[not.tz-None-True-(Some False)].out | 14 +- ...not_binary.tz-None-(Left -8)-(Some 7)].out | 18 +- ...not_binary.tz-None-(Left -9)-(Some 8)].out | 18 +- ...not_binary.tz-None-(Left 0)-(Some -1)].out | 18 +- ...not_binary.tz-None-(Left 7)-(Some -8)].out | 18 +- ...not_binary.tz-None-(Left 8)-(Some -9)].out | 18 +- ...ot_binary.tz-None-(Right 0)-(Some -1)].out | 18 +- ...ot_binary.tz-None-(Right 7)-(Some -8)].out | 18 +- ...ot_binary.tz-None-(Right 8)-(Some -9)].out | 18 +- ...-None-(Pair False False)-(Some False)].out | 30 +- ...tz-None-(Pair False True)-(Some True)].out | 30 +- ...tz-None-(Pair True False)-(Some True)].out | 30 +- ....tz-None-(Pair True True)-(Some True)].out | 30 +- ...or_binary.tz-None-(Pair 0 8)-(Some 8)].out | 18 +- ..._binary.tz-None-(Pair 14 1)-(Some 15)].out | 18 +- ..._binary.tz-None-(Pair 15 4)-(Some 15)].out | 18 +- ...r_binary.tz-None-(Pair 4 8)-(Some 12)].out | 18 +- ...or_binary.tz-None-(Pair 7 7)-(Some 7)].out | 18 +- ...or_binary.tz-None-(Pair 8 0)-(Some 8)].out | 18 +- ... (Pair 1 (Pair \"foobar\".368bdfd73a.out" | 512 +- ... (Pair 1 (Pair \"foobar\".735d9ae802.out" | 512 +- ...ir \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" | 652 +- ...ir \"edpkuBknW28nW72KG6RoH.4e20b52378.out" | 652 +- ...alse False)-(Some (Pair False False))].out | 12 +- ... False True)-(Some (Pair False True))].out | 12 +- ... True False)-(Some (Pair True False))].out | 12 +- ...ir True True)-(Some (Pair True True))].out | 12 +- ...ntract_input_output[pexec.tz-14-38-52].out | 46 +- ... 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out | 266 +- ...utput[ret_int.tz-None-Unit-(Some 300)].out | 12 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 38 +- ...input_output[reverse.tz-{\"\"}-{}-{}].out" | 20 +- ... ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 166 +- ..._output[reverse_loop.tz-{\"\"}-{}-{}].out" | 52 +- ...tput[sapling_empty_state.tz-{}-Unit-0].out | 10 +- ...output[self_address.tz-Unit-Unit-Unit].out | 32 +- ..._default_entrypoint.tz-Unit-Unit-Unit].out | 30 +- ...entrypoint.tz-Unit-Left (Left 0)-Unit].out | 78 +- ...Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" | 50 +- ..."hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" | 50 +- ...lo\" 0)-\"world\"-(Pair \"world\" 0)].out" | 50 +- ...ir \"hello\" 0)-1-(Pair \"hello\" 1)].out" | 46 +- ... \"hello\" 500)-3-(Pair \"hello\" 3)].out" | 46 +- ..."hello\" 7)-100-(Pair \"hello\" 100)].out" | 46 +- ... ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" | 10 +- ...; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" | 10 +- ...tract_input_output[set_id.tz-{}-{}-{}].out | 10 +- ..._iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out | 44 +- ..._input_output[set_iter.tz-111-{ 1 }-1].out | 26 +- ...act_input_output[set_iter.tz-111-{}-0].out | 20 +- ..."World\" } None)-\"\"-(Pai.3d2044726e.out" | 66 +- ...)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" | 66 +- ... None)-\"Hi\"-(Pair {} (Some False))].out" | 66 +- ...ze.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out | 12 +- ...utput[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out | 12 +- ..._input_output[set_size.tz-111-{ 1 }-1].out | 12 +- ...act_input_output[set_size.tz-111-{}-0].out | 12 +- ...0776f726c6421-(Some 0xf345a.a07ae9dddf.out | 14 +- ...ts.tz-None-(Left (Pair 0 0))-(Some 0)].out | 22 +- ...ts.tz-None-(Left (Pair 0 1))-(Some 0)].out | 22 +- ...ts.tz-None-(Left (Pair 1 2))-(Some 4)].out | 22 +- ....tz-None-(Left (Pair 15 2))-(Some 60)].out | 22 +- ...s.tz-None-(Left (Pair 8 1))-(Some 16)].out | 22 +- ...s.tz-None-(Right (Pair 0 0))-(Some 0)].out | 22 +- ...s.tz-None-(Right (Pair 0 1))-(Some 0)].out | 22 +- ...s.tz-None-(Right (Pair 1 2))-(Some 0)].out | 22 +- ....tz-None-(Right (Pair 15 2))-(Some 3)].out | 22 +- ...s.tz-None-(Right (Pair 8 1))-(Some 4)].out | 22 +- ...ut_output[slice.tz-None-Pair 0 0-None].out | 22 +- ...tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" | 34 +- ...slice.tz-Some \"Foo\"-Pair 0 10-None].out" | 34 +- ...-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" | 34 +- ...z-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" | 34 +- ...[slice.tz-Some \"Foo\"-Pair 1 3-None].out" | 34 +- ...slice.tz-Some \"Foo\"-Pair 10 5-None].out" | 34 +- ...FooFooFooFooFooFooFooFooFo.c508d67bb0.out" | 34 +- ...put[slice_bytes.tz-None-Pair 0 1-None].out | 22 +- ...s.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out | 34 +- ...tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out | 34 +- ...z-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out | 34 +- ...z-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out | 34 +- ...-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out | 34 +- ..._bytes.tz-Some 0xaabbcc-Pair 1 3-None].out | 34 +- ...aabbccaabbccaabbccaabbccaab.df5895de85.out | 34 +- ...d.tz-None-\"Hello\"-(Some \"Hello\")].out" | 12 +- ..._id.tz-None-\"abcd\"-(Some \"abcd\")].out" | 12 +- ...r 100 -100)-\"1970-01-01T00:03:20Z\"].out" | 28 +- ...ir 100 100)-\"1970-01-01T00:00:00Z\"].out" | 28 +- ...Pair 100 200000000000000000.3db82d2c25.out | 28 +- ...00000 1000000)-(Some (Pair .b461aa042b.out | 76 +- ...10000 1010000)-(Some (Pair .1e8cf7679c.out | 76 +- ...t_output[uncomb.tz-0-(Pair 1 4 2)-142].out | 56 +- ...input_output[unpair.tz-Unit-Unit-Unit].out | 570 +- ...dpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" | 22 +- ...Pair False False)-(Some (Left False))].out | 24 +- ... (Pair False True)-(Some (Left True))].out | 24 +- ... (Pair True False)-(Some (Left True))].out | 24 +- ... (Pair True True)-(Some (Left False))].out | 24 +- ...one-Right (Pair 0 0)-(Some (Right 0))].out | 24 +- ...one-Right (Pair 0 1)-(Some (Right 1))].out | 24 +- ...one-Right (Pair 1 0)-(Some (Right 1))].out | 24 +- ...one-Right (Pair 1 1)-(Some (Right 0))].out | 24 +- ...-Right (Pair 42 21)-(Some (Right 63))].out | 24 +- ...-Right (Pair 42 63)-(Some (Right 21))].out | 24 +- ...pcodes.TestContractOpcodes::test_level.out | 10 +- ..._opcodes.TestContractOpcodes::test_now.out | 10 +- ...s.TestContractOpcodes::test_packunpack.out | 92 +- 364 files changed, 14906 insertions(+), 14906 deletions(-) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" index d7d62b06ef58..8e53e14d2911 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" @@ -9,27 +9,27 @@ big_map diff Set map(4)["hello"] to 4 trace - location: 13 (remaining gas: 1039989.246 units remaining) - [ (Pair "hello" (Some 4) {}) ] + [ (Pair "hello" (Some 4) {}) ] - location: 13 (remaining gas: 1039989.236 units remaining) - [ "hello" - (Pair (Some 4) {}) ] + [ "hello" + (Pair (Some 4) {}) ] - location: 14 (remaining gas: 1039989.221 units remaining) - [ (Pair (Some 4) {}) ] + [ (Pair (Some 4) {}) ] - location: 16 (remaining gas: 1039989.211 units remaining) - [ (Some 4) - {} ] + [ (Some 4) + {} ] - location: 14 (remaining gas: 1039989.181 units remaining) - [ "hello" - (Some 4) - {} ] + [ "hello" + (Some 4) + {} ] - location: 17 (remaining gas: 1039988.109 units remaining) - [ None - { Elt "hello" 4 } ] + [ None + { Elt "hello" 4 } ] - location: 18 (remaining gas: 1039988.094 units remaining) - [ (Pair None { Elt "hello" 4 }) ] + [ (Pair None { Elt "hello" 4 }) ] - location: 19 (remaining gas: 1039988.079 units remaining) - [ {} - (Pair None { Elt "hello" 4 }) ] + [ {} + (Pair None { Elt "hello" 4 }) ] - location: 21 (remaining gas: 1039988.064 units remaining) - [ (Pair {} None { Elt "hello" 4 }) ] + [ (Pair {} None { Elt "hello" 4 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" index 72939f4a082f..c25cd2b11aad 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" @@ -9,27 +9,27 @@ big_map diff Set map(4)["hello"] to 5 trace - location: 13 (remaining gas: 1039987.916 units remaining) - [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] + [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039987.906 units remaining) - [ "hello" - (Pair (Some 5) { Elt "hello" 4 }) ] + [ "hello" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039987.891 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.881 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] + [ (Some 5) + { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.851 units remaining) - [ "hello" - (Some 5) - { Elt "hello" 4 } ] + [ "hello" + (Some 5) + { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039986.774 units remaining) - [ (Some 4) - { Elt "hello" 5 } ] + [ (Some 4) + { Elt "hello" 5 } ] - location: 18 (remaining gas: 1039986.759 units remaining) - [ (Pair (Some 4) { Elt "hello" 5 }) ] + [ (Pair (Some 4) { Elt "hello" 5 }) ] - location: 19 (remaining gas: 1039986.744 units remaining) - [ {} - (Pair (Some 4) { Elt "hello" 5 }) ] + [ {} + (Pair (Some 4) { Elt "hello" 5 }) ] - location: 21 (remaining gas: 1039986.729 units remaining) - [ (Pair {} (Some 4) { Elt "hello" 5 }) ] + [ (Pair {} (Some 4) { Elt "hello" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" index 4e5bcf4372b4..05d15f7ae6c6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" @@ -10,27 +10,27 @@ big_map diff Set map(4)["hi"] to 5 trace - location: 13 (remaining gas: 1039987.946 units remaining) - [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] + [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039987.936 units remaining) - [ "hi" - (Pair (Some 5) { Elt "hello" 4 }) ] + [ "hi" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039987.921 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.911 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] + [ (Some 5) + { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.881 units remaining) - [ "hi" - (Some 5) - { Elt "hello" 4 } ] + [ "hi" + (Some 5) + { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039986.906 units remaining) - [ None - { Elt "hello" 4 ; Elt "hi" 5 } ] + [ None + { Elt "hello" 4 ; Elt "hi" 5 } ] - location: 18 (remaining gas: 1039986.891 units remaining) - [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] + [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - location: 19 (remaining gas: 1039986.876 units remaining) - [ {} - (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] + [ {} + (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - location: 21 (remaining gas: 1039986.861 units remaining) - [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] + [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" index e2c009ca36ff..6279c52fd8d7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .df114499b8.out" @@ -10,27 +10,27 @@ big_map diff Unset map(4)["1"] trace - location: 13 (remaining gas: 1039987.042 units remaining) - [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039987.032 units remaining) - [ "1" - (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039987.017 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039987.007 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] + [ None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039986.977 units remaining) - [ "1" - None - { Elt "1" 1 ; Elt "2" 2 } ] + [ "1" + None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039986.033 units remaining) - [ (Some 1) - { Elt "2" 2 } ] + [ (Some 1) + { Elt "2" 2 } ] - location: 18 (remaining gas: 1039986.018 units remaining) - [ (Pair (Some 1) { Elt "2" 2 }) ] + [ (Pair (Some 1) { Elt "2" 2 }) ] - location: 19 (remaining gas: 1039986.003 units remaining) - [ {} - (Pair (Some 1) { Elt "2" 2 }) ] + [ {} + (Pair (Some 1) { Elt "2" 2 }) ] - location: 21 (remaining gas: 1039985.988 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] + [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" index 74d56b8f1ebd..17bb59cb626c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ; .f9bea98de9.out" @@ -10,27 +10,27 @@ big_map diff Unset map(4)["1"] trace - location: 13 (remaining gas: 1039987.042 units remaining) - [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039987.032 units remaining) - [ "1" - (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039987.017 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039987.007 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] + [ None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039986.977 units remaining) - [ "1" - None - { Elt "1" 1 ; Elt "2" 2 } ] + [ "1" + None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039986.033 units remaining) - [ (Some 1) - { Elt "2" 2 } ] + [ (Some 1) + { Elt "2" 2 } ] - location: 18 (remaining gas: 1039986.018 units remaining) - [ (Pair (Some 1) { Elt "2" 2 }) ] + [ (Pair (Some 1) { Elt "2" 2 }) ] - location: 19 (remaining gas: 1039986.003 units remaining) - [ {} - (Pair (Some 1) { Elt "2" 2 }) ] + [ {} + (Pair (Some 1) { Elt "2" 2 }) ] - location: 21 (remaining gas: 1039985.988 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] + [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" index c0ab6d621483..33d5479c3ae6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" @@ -9,27 +9,27 @@ big_map diff Unset map(4)["hello"] trace - location: 13 (remaining gas: 1039988.016 units remaining) - [ (Pair "hello" None { Elt "hello" 4 }) ] + [ (Pair "hello" None { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039988.006 units remaining) - [ "hello" - (Pair None { Elt "hello" 4 }) ] + [ "hello" + (Pair None { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039987.991 units remaining) - [ (Pair None { Elt "hello" 4 }) ] + [ (Pair None { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.981 units remaining) - [ None - { Elt "hello" 4 } ] + [ None + { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.951 units remaining) - [ "hello" - None - { Elt "hello" 4 } ] + [ "hello" + None + { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039986.874 units remaining) - [ (Some 4) - {} ] + [ (Some 4) + {} ] - location: 18 (remaining gas: 1039986.859 units remaining) - [ (Pair (Some 4) {}) ] + [ (Pair (Some 4) {}) ] - location: 19 (remaining gas: 1039986.844 units remaining) - [ {} - (Pair (Some 4) {}) ] + [ {} + (Pair (Some 4) {}) ] - location: 21 (remaining gas: 1039986.829 units remaining) - [ (Pair {} (Some 4) {}) ] + [ (Pair {} (Some 4) {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" index 5259001789e2..9cd26e035a08 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" @@ -9,27 +9,27 @@ big_map diff Unset map(4)["hello"] trace - location: 13 (remaining gas: 1039989.346 units remaining) - [ (Pair "hello" None {}) ] + [ (Pair "hello" None {}) ] - location: 13 (remaining gas: 1039989.336 units remaining) - [ "hello" - (Pair None {}) ] + [ "hello" + (Pair None {}) ] - location: 14 (remaining gas: 1039989.321 units remaining) - [ (Pair None {}) ] + [ (Pair None {}) ] - location: 16 (remaining gas: 1039989.311 units remaining) - [ None - {} ] + [ None + {} ] - location: 14 (remaining gas: 1039989.281 units remaining) - [ "hello" - None - {} ] + [ "hello" + None + {} ] - location: 17 (remaining gas: 1039988.209 units remaining) - [ None - {} ] + [ None + {} ] - location: 18 (remaining gas: 1039988.194 units remaining) - [ (Pair None {}) ] + [ (Pair None {}) ] - location: 19 (remaining gas: 1039988.179 units remaining) - [ {} - (Pair None {}) ] + [ {} + (Pair None {}) ] - location: 21 (remaining gas: 1039988.164 units remaining) - [ (Pair {} None {}) ] + [ (Pair {} None {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" index 4550d805fc7f..337147c0dc53 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" @@ -10,37 +10,37 @@ big_map diff Set map(4)["1"] to "one" trace - location: 12 (remaining gas: 1039983.953 units remaining) - [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] + [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 12 (remaining gas: 1039983.943 units remaining) - [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) - (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] + [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) + (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 13 (remaining gas: 1039983.933 units remaining) - [ "1" - (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] + [ "1" + (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 14 (remaining gas: 1039983.918 units remaining) - [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] + [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 17 (remaining gas: 1039983.908 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 18 (remaining gas: 1039983.898 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } ] + [ { Elt "1" "one" ; Elt "2" "two" } ] - location: 19 (remaining gas: 1039983.888 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] + [ { Elt "1" "one" ; Elt "2" "two" } + { Elt "1" "one" ; Elt "2" "two" } ] - location: 14 (remaining gas: 1039983.858 units remaining) - [ "1" - { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] + [ "1" + { Elt "1" "one" ; Elt "2" "two" } + { Elt "1" "one" ; Elt "2" "two" } ] - location: 20 (remaining gas: 1039982.948 units remaining) - [ (Some "one") - { Elt "1" "one" ; Elt "2" "two" } ] + [ (Some "one") + { Elt "1" "one" ; Elt "2" "two" } ] - location: 21 (remaining gas: 1039982.938 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - (Some "one") ] + [ { Elt "1" "one" ; Elt "2" "two" } + (Some "one") ] - location: 22 (remaining gas: 1039982.923 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - location: 23 (remaining gas: 1039982.908 units remaining) - [ {} - (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] - location: 25 (remaining gas: 1039982.893 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] + [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" index 50c6e12614f8..ffff5e29c90f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" @@ -9,37 +9,37 @@ big_map diff Set map(4)["hello"] to "hi" trace - location: 12 (remaining gas: 1039985.031 units remaining) - [ (Pair "" { Elt "hello" "hi" } None) ] + [ (Pair "" { Elt "hello" "hi" } None) ] - location: 12 (remaining gas: 1039985.021 units remaining) - [ (Pair "" { Elt "hello" "hi" } None) - (Pair "" { Elt "hello" "hi" } None) ] + [ (Pair "" { Elt "hello" "hi" } None) + (Pair "" { Elt "hello" "hi" } None) ] - location: 13 (remaining gas: 1039985.011 units remaining) - [ "" - (Pair "" { Elt "hello" "hi" } None) ] + [ "" + (Pair "" { Elt "hello" "hi" } None) ] - location: 14 (remaining gas: 1039984.996 units remaining) - [ (Pair "" { Elt "hello" "hi" } None) ] + [ (Pair "" { Elt "hello" "hi" } None) ] - location: 17 (remaining gas: 1039984.986 units remaining) - [ (Pair { Elt "hello" "hi" } None) ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 18 (remaining gas: 1039984.976 units remaining) - [ { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039984.966 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039984.936 units remaining) - [ "" - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ "" + { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039984.061 units remaining) - [ None - { Elt "hello" "hi" } ] + [ None + { Elt "hello" "hi" } ] - location: 21 (remaining gas: 1039984.051 units remaining) - [ { Elt "hello" "hi" } - None ] + [ { Elt "hello" "hi" } + None ] - location: 22 (remaining gas: 1039984.036 units remaining) - [ (Pair { Elt "hello" "hi" } None) ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 23 (remaining gas: 1039984.021 units remaining) - [ {} - (Pair { Elt "hello" "hi" } None) ] + [ {} + (Pair { Elt "hello" "hi" } None) ] - location: 25 (remaining gas: 1039984.006 units remaining) - [ (Pair {} { Elt "hello" "hi" } None) ] + [ (Pair {} { Elt "hello" "hi" } None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" index f59faa698da5..072de163ff15 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" @@ -9,37 +9,37 @@ big_map diff Set map(4)["hello"] to "hi" trace - location: 12 (remaining gas: 1039984.981 units remaining) - [ (Pair "hello" { Elt "hello" "hi" } None) ] + [ (Pair "hello" { Elt "hello" "hi" } None) ] - location: 12 (remaining gas: 1039984.971 units remaining) - [ (Pair "hello" { Elt "hello" "hi" } None) - (Pair "hello" { Elt "hello" "hi" } None) ] + [ (Pair "hello" { Elt "hello" "hi" } None) + (Pair "hello" { Elt "hello" "hi" } None) ] - location: 13 (remaining gas: 1039984.961 units remaining) - [ "hello" - (Pair "hello" { Elt "hello" "hi" } None) ] + [ "hello" + (Pair "hello" { Elt "hello" "hi" } None) ] - location: 14 (remaining gas: 1039984.946 units remaining) - [ (Pair "hello" { Elt "hello" "hi" } None) ] + [ (Pair "hello" { Elt "hello" "hi" } None) ] - location: 17 (remaining gas: 1039984.936 units remaining) - [ (Pair { Elt "hello" "hi" } None) ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 18 (remaining gas: 1039984.926 units remaining) - [ { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039984.916 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039984.886 units remaining) - [ "hello" - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ "hello" + { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039983.840 units remaining) - [ (Some "hi") - { Elt "hello" "hi" } ] + [ (Some "hi") + { Elt "hello" "hi" } ] - location: 21 (remaining gas: 1039983.830 units remaining) - [ { Elt "hello" "hi" } - (Some "hi") ] + [ { Elt "hello" "hi" } + (Some "hi") ] - location: 22 (remaining gas: 1039983.815 units remaining) - [ (Pair { Elt "hello" "hi" } (Some "hi")) ] + [ (Pair { Elt "hello" "hi" } (Some "hi")) ] - location: 23 (remaining gas: 1039983.800 units remaining) - [ {} - (Pair { Elt "hello" "hi" } (Some "hi")) ] + [ {} + (Pair { Elt "hello" "hi" } (Some "hi")) ] - location: 25 (remaining gas: 1039983.785 units remaining) - [ (Pair {} { Elt "hello" "hi" } (Some "hi")) ] + [ (Pair {} { Elt "hello" "hi" } (Some "hi")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" index 7d4e9dd6f516..15079a7ea75f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" @@ -10,27 +10,27 @@ big_map diff Set map(4)["1"] to "one" trace - location: 15 (remaining gas: 1039984.639 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.629 units remaining) - [ {} - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.614 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.604 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 16 (remaining gas: 1039984.574 units remaining) - [ {} - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ {} + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039984.574 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 23 (remaining gas: 1039984.559 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 24 (remaining gas: 1039984.544 units remaining) - [ {} - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 26 (remaining gas: 1039984.529 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" index edf538c68577..831cd03c4a33 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" @@ -10,39 +10,39 @@ big_map diff Set map(4)["1"] to "two" trace - location: 15 (remaining gas: 1039984.121 units remaining) - [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.111 units remaining) - [ { Elt "1" (Some "two") } - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ { Elt "1" (Some "two") } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.096 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.086 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 16 (remaining gas: 1039984.056 units remaining) - [ { Elt "1" (Some "two") } - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" (Some "two") } + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039984.056 units remaining) - [ (Pair "1" (Some "two")) - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ (Pair "1" (Some "two")) + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 21 (remaining gas: 1039984.046 units remaining) - [ "1" - (Some "two") - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ "1" + (Some "two") + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 22 (remaining gas: 1039983.111 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "two" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039983.096 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "two" ; Elt "2" "two" } + Unit ] - location: 23 (remaining gas: 1039983.081 units remaining) - [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - location: 24 (remaining gas: 1039983.066 units remaining) - [ {} - (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] + [ {} + (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - location: 26 (remaining gas: 1039983.051 units remaining) - [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] + [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" index 5a01c495a269..3dc184666ad2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" @@ -10,39 +10,39 @@ big_map diff Set map(4)["1"] to "two" trace - location: 15 (remaining gas: 1039984.121 units remaining) - [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.111 units remaining) - [ { Elt "1" (Some "two") } - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ { Elt "1" (Some "two") } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.096 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.086 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 16 (remaining gas: 1039984.056 units remaining) - [ { Elt "1" (Some "two") } - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" (Some "two") } + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039984.056 units remaining) - [ (Pair "1" (Some "two")) - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ (Pair "1" (Some "two")) + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 21 (remaining gas: 1039984.046 units remaining) - [ "1" - (Some "two") - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ "1" + (Some "two") + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 22 (remaining gas: 1039983.111 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "two" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039983.096 units remaining) - [ { Elt "1" "two" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "two" ; Elt "2" "two" } + Unit ] - location: 23 (remaining gas: 1039983.081 units remaining) - [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - location: 24 (remaining gas: 1039983.066 units remaining) - [ {} - (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] + [ {} + (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ] - location: 26 (remaining gas: 1039983.051 units remaining) - [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] + [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" index 07ca29e9bf8f..809729f5eae0 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" @@ -11,39 +11,39 @@ big_map diff Set map(4)["1"] to "one" trace - location: 15 (remaining gas: 1039984.101 units remaining) - [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.091 units remaining) - [ { Elt "3" (Some "three") } - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ { Elt "3" (Some "three") } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.076 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.066 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 16 (remaining gas: 1039984.036 units remaining) - [ { Elt "3" (Some "three") } - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "3" (Some "three") } + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039984.036 units remaining) - [ (Pair "3" (Some "three")) - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ (Pair "3" (Some "three")) + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 21 (remaining gas: 1039984.026 units remaining) - [ "3" - (Some "three") - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ "3" + (Some "three") + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 22 (remaining gas: 1039983.091 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } + Unit ] - location: 19 (remaining gas: 1039983.076 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } + Unit ] - location: 23 (remaining gas: 1039983.061 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - location: 24 (remaining gas: 1039983.046 units remaining) - [ {} - (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] - location: 26 (remaining gas: 1039983.031 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] + [ (Pair {} { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" index 5d841a4f18ac..840edbe77d7a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" @@ -11,39 +11,39 @@ big_map diff Set map(4)["1"] to "one" trace - location: 15 (remaining gas: 1039984.265 units remaining) - [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.255 units remaining) - [ { Elt "3" None } - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ { Elt "3" None } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.240 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.230 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 16 (remaining gas: 1039984.200 units remaining) - [ { Elt "3" None } - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "3" None } + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039984.200 units remaining) - [ (Pair "3" None) - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ (Pair "3" None) + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 21 (remaining gas: 1039984.190 units remaining) - [ "3" - None - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ "3" + None + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 22 (remaining gas: 1039983.255 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039983.240 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 23 (remaining gas: 1039983.225 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 24 (remaining gas: 1039983.210 units remaining) - [ {} - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 26 (remaining gas: 1039983.195 units remaining) - [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" index 960d8f38b50e..7ef65e62a328 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" @@ -10,39 +10,39 @@ big_map diff Set map(4)["1"] to "one" trace - location: 15 (remaining gas: 1039984.265 units remaining) - [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.255 units remaining) - [ { Elt "2" None } - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ { Elt "2" None } + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 16 (remaining gas: 1039984.240 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.230 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 16 (remaining gas: 1039984.200 units remaining) - [ { Elt "2" None } - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ { Elt "2" None } + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 19 (remaining gas: 1039984.200 units remaining) - [ (Pair "2" None) - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ (Pair "2" None) + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 21 (remaining gas: 1039984.190 units remaining) - [ "2" - None - { Elt "1" "one" ; Elt "2" "two" } - Unit ] + [ "2" + None + { Elt "1" "one" ; Elt "2" "two" } + Unit ] - location: 22 (remaining gas: 1039983.255 units remaining) - [ { Elt "1" "one" } - Unit ] + [ { Elt "1" "one" } + Unit ] - location: 19 (remaining gas: 1039983.240 units remaining) - [ { Elt "1" "one" } - Unit ] + [ { Elt "1" "one" } + Unit ] - location: 23 (remaining gas: 1039983.225 units remaining) - [ (Pair { Elt "1" "one" } Unit) ] + [ (Pair { Elt "1" "one" } Unit) ] - location: 24 (remaining gas: 1039983.210 units remaining) - [ {} - (Pair { Elt "1" "one" } Unit) ] + [ {} + (Pair { Elt "1" "one" } Unit) ] - location: 26 (remaining gas: 1039983.195 units remaining) - [ (Pair {} { Elt "1" "one" } Unit) ] + [ (Pair {} { Elt "1" "one" } Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out index 1086ac40e938..49508b6ba64a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 500000 ] + [ 500000 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 500000 ] + [ {} + 500000 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 500000) ] + [ (Pair {} 500000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out index 37b7098d60d3..5e66595481d6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 0 ] + [ 0 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out index 026c5b66fed4..a579be096adc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 1000000000 ] + [ 1000000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 1000000000 ] + [ {} + 1000000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 1000000000) ] + [ (Pair {} 1000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out index 181e955e1274..bf19a152b9eb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 1000000 ] + [ 1000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 1000000 ] + [ {} + 1000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 1000000) ] + [ (Pair {} 1000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out index af71c77770ba..9ac426c714a7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 1 ] + [ 1 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out index 1da47dccfa92..ce8cb0601025 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 5000000 ] + [ 5000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 5000000 ] + [ {} + 5000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 5000000) ] + [ (Pair {} 5000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out index e668b6c00341..47b7efaaaf6e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 0) ] + [ (Pair Unit 0) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 8000000000000000000 ] + [ 8000000000000000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 8000000000000000000 ] + [ {} + 8000000000000000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 8000000000000000000) ] + [ (Pair {} 8000000000000000000) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" index d1176a9ba960..a5fd94e28f30 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" @@ -13,78 +13,78 @@ big_map diff trace - location: 43 (remaining gas: 1039916.593 units remaining) [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] + (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039916.583 units remaining) - [ (Right (Right (Right (Left { Pair "3" "three" })))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Right (Right (Left { Pair "3" "three" })))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039916.573 units remaining) - [ (Right (Right (Left { Pair "3" "three" }))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Right (Left { Pair "3" "three" }))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039916.563 units remaining) - [ (Right (Left { Pair "3" "three" })) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Left { Pair "3" "three" })) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 65 (remaining gas: 1039916.553 units remaining) - [ (Left { Pair "3" "three" }) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left { Pair "3" "three" }) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 108 (remaining gas: 1039916.543 units remaining) - [ { Pair "3" "three" } - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ { Pair "3" "three" } + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 110 (remaining gas: 1039916.528 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 113 (remaining gas: 1039916.518 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 113 (remaining gas: 1039916.503 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 119 (remaining gas: 1039916.493 units remaining) - [ { Elt "1" "one" } - { Elt "2" "two" } ] + [ { Elt "1" "one" } + { Elt "2" "two" } ] - location: 110 (remaining gas: 1039916.463 units remaining) - [ { Pair "3" "three" } - { Elt "1" "one" } - { Elt "2" "two" } ] + [ { Pair "3" "three" } + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 120 (remaining gas: 1039916.463 units remaining) - [ (Pair "3" "three") - { Elt "1" "one" } - { Elt "2" "two" } ] + [ (Pair "3" "three") + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 122 (remaining gas: 1039916.453 units remaining) - [ "3" - "three" - { Elt "1" "one" } - { Elt "2" "two" } ] + [ "3" + "three" + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 123 (remaining gas: 1039916.438 units remaining) - [ "three" - { Elt "1" "one" } - { Elt "2" "two" } ] + [ "three" + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 125 (remaining gas: 1039916.423 units remaining) - [ (Some "three") - { Elt "1" "one" } - { Elt "2" "two" } ] + [ (Some "three") + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 123 (remaining gas: 1039916.393 units remaining) - [ "3" - (Some "three") - { Elt "1" "one" } - { Elt "2" "two" } ] + [ "3" + (Some "three") + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 126 (remaining gas: 1039915.461 units remaining) - [ { Elt "1" "one" ; Elt "3" "three" } - { Elt "2" "two" } ] + [ { Elt "1" "one" ; Elt "3" "three" } + { Elt "2" "two" } ] - location: 120 (remaining gas: 1039915.446 units remaining) - [ { Elt "1" "one" ; Elt "3" "three" } - { Elt "2" "two" } ] + [ { Elt "1" "one" ; Elt "3" "three" } + { Elt "2" "two" } ] - location: 127 (remaining gas: 1039915.431 units remaining) - [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ] - location: 128 (remaining gas: 1039915.416 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - location: 108 (remaining gas: 1039915.401 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - location: 65 (remaining gas: 1039915.386 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039915.371 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039915.356 units remaining) - [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - location: 151 (remaining gas: 1039915.341 units remaining) - [ {} - (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] + [ {} + (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - location: 153 (remaining gas: 1039915.326 units remaining) - [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ] + [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" index d545e5435b2e..c21de0497c03 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" @@ -11,34 +11,34 @@ big_map diff Set map(4)["2"] to "two" trace - location: 43 (remaining gas: 1039917.501 units remaining) - [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] + [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039917.491 units remaining) - [ (Left Unit) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left Unit) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039917.481 units remaining) - [ Unit - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ Unit + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 46 (remaining gas: 1039917.471 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 48 (remaining gas: 1039917.461 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 48 (remaining gas: 1039917.446 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 54 (remaining gas: 1039917.436 units remaining) - [ { Elt "1" "one" } - { Elt "2" "two" } ] + [ { Elt "1" "one" } + { Elt "2" "two" } ] - location: 55 (remaining gas: 1039917.426 units remaining) - [ { Elt "2" "two" } - { Elt "1" "one" } ] + [ { Elt "2" "two" } + { Elt "1" "one" } ] - location: 56 (remaining gas: 1039917.411 units remaining) - [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ] + [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ] - location: 57 (remaining gas: 1039917.396 units remaining) - [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] + [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - location: 44 (remaining gas: 1039917.381 units remaining) - [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] + [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - location: 151 (remaining gas: 1039917.366 units remaining) - [ {} - (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] + [ {} + (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - location: 153 (remaining gas: 1039917.351 units remaining) - [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ] + [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" index 6506a10c744d..b632f89aff9d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" @@ -12,28 +12,28 @@ big_map diff trace - location: 43 (remaining gas: 1039913.797 units remaining) [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] + (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039913.787 units remaining) - [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039913.777 units remaining) - [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039913.767 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 62 (remaining gas: 1039913.757 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) - (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) + (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 63 (remaining gas: 1039913.747 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 60 (remaining gas: 1039913.732 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 44 (remaining gas: 1039913.717 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 151 (remaining gas: 1039913.702 units remaining) - [ {} - (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] + [ {} + (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 153 (remaining gas: 1039913.687 units remaining) - [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ] + [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" index 4918b5e8fe40..a3d2c6c6e05e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" @@ -8,28 +8,28 @@ big_map diff trace - location: 43 (remaining gas: 1039916.861 units remaining) - [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] + [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039916.851 units remaining) - [ (Right (Left (Right Unit))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Left (Right Unit))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039916.841 units remaining) - [ (Left (Right Unit)) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left (Right Unit)) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039916.831 units remaining) - [ (Right Unit) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right Unit) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 62 (remaining gas: 1039916.821 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) - (Right Unit) ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) + (Right Unit) ] - location: 63 (remaining gas: 1039916.811 units remaining) - [ (Right Unit) ] + [ (Right Unit) ] - location: 60 (remaining gas: 1039916.796 units remaining) - [ (Right Unit) ] + [ (Right Unit) ] - location: 44 (remaining gas: 1039916.781 units remaining) - [ (Right Unit) ] + [ (Right Unit) ] - location: 151 (remaining gas: 1039916.766 units remaining) - [ {} - (Right Unit) ] + [ {} + (Right Unit) ] - location: 153 (remaining gas: 1039916.751 units remaining) - [ (Pair {} (Right Unit)) ] + [ (Pair {} (Right Unit)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" index 8489cdc827b8..2bc1e13b5b78 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" @@ -12,72 +12,72 @@ big_map diff trace - location: 43 (remaining gas: 1039916.857 units remaining) [ (Pair (Right (Right (Right (Right { "1" })))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] + (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039916.847 units remaining) - [ (Right (Right (Right (Right { "1" })))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Right (Right (Right { "1" })))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039916.837 units remaining) - [ (Right (Right (Right { "1" }))) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Right (Right { "1" }))) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039916.827 units remaining) - [ (Right (Right { "1" })) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right (Right { "1" })) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 65 (remaining gas: 1039916.817 units remaining) - [ (Right { "1" }) - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Right { "1" }) + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 108 (remaining gas: 1039916.807 units remaining) - [ { "1" } - (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ { "1" } + (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 131 (remaining gas: 1039916.792 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 134 (remaining gas: 1039916.782 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 134 (remaining gas: 1039916.767 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 140 (remaining gas: 1039916.757 units remaining) - [ { Elt "1" "one" } - { Elt "2" "two" } ] + [ { Elt "1" "one" } + { Elt "2" "two" } ] - location: 131 (remaining gas: 1039916.727 units remaining) - [ { "1" } - { Elt "1" "one" } - { Elt "2" "two" } ] + [ { "1" } + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 141 (remaining gas: 1039916.727 units remaining) - [ "1" - { Elt "1" "one" } - { Elt "2" "two" } ] + [ "1" + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 143 (remaining gas: 1039916.712 units remaining) - [ { Elt "1" "one" } - { Elt "2" "two" } ] + [ { Elt "1" "one" } + { Elt "2" "two" } ] - location: 145 (remaining gas: 1039916.697 units remaining) - [ None - { Elt "1" "one" } - { Elt "2" "two" } ] + [ None + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 143 (remaining gas: 1039916.667 units remaining) - [ "1" - None - { Elt "1" "one" } - { Elt "2" "two" } ] + [ "1" + None + { Elt "1" "one" } + { Elt "2" "two" } ] - location: 147 (remaining gas: 1039915.735 units remaining) - [ {} - { Elt "2" "two" } ] + [ {} + { Elt "2" "two" } ] - location: 141 (remaining gas: 1039915.720 units remaining) - [ {} - { Elt "2" "two" } ] + [ {} + { Elt "2" "two" } ] - location: 148 (remaining gas: 1039915.705 units remaining) - [ (Pair {} { Elt "2" "two" }) ] + [ (Pair {} { Elt "2" "two" }) ] - location: 149 (remaining gas: 1039915.690 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] + [ (Left (Pair {} { Elt "2" "two" })) ] - location: 108 (remaining gas: 1039915.675 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] + [ (Left (Pair {} { Elt "2" "two" })) ] - location: 65 (remaining gas: 1039915.660 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] + [ (Left (Pair {} { Elt "2" "two" })) ] - location: 60 (remaining gas: 1039915.645 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] + [ (Left (Pair {} { Elt "2" "two" })) ] - location: 44 (remaining gas: 1039915.630 units remaining) - [ (Left (Pair {} { Elt "2" "two" })) ] + [ (Left (Pair {} { Elt "2" "two" })) ] - location: 151 (remaining gas: 1039915.615 units remaining) - [ {} - (Left (Pair {} { Elt "2" "two" })) ] + [ {} + (Left (Pair {} { Elt "2" "two" })) ] - location: 153 (remaining gas: 1039915.600 units remaining) - [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ] + [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" index 5bd8c2bf4332..f342fec9091d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" @@ -11,125 +11,125 @@ big_map diff Set map(4)["foo"] to "bar" trace - location: 43 (remaining gas: 1039919.139 units remaining) - [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] + [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - location: 43 (remaining gas: 1039919.129 units remaining) - [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) - (Right Unit) ] + [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) + (Right Unit) ] - location: 44 (remaining gas: 1039919.119 units remaining) - [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) - (Right Unit) ] + [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) + (Right Unit) ] - location: 60 (remaining gas: 1039919.109 units remaining) - [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) - (Right Unit) ] + [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) + (Right Unit) ] - location: 65 (remaining gas: 1039919.099 units remaining) - [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) - (Right Unit) ] + [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) + (Right Unit) ] - location: 67 (remaining gas: 1039919.084 units remaining) - [ (Right Unit) ] + [ (Right Unit) ] - location: 70 (remaining gas: 1039919.074 units remaining) - [ Unit ] + [ Unit ] - location: 70 (remaining gas: 1039919.059 units remaining) - [ Unit ] + [ Unit ] - location: 76 (remaining gas: 1039919.049 units remaining) [ ] - location: 67 (remaining gas: 1039919.019 units remaining) - [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ] + [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ] - location: 77 (remaining gas: 1039919.009 units remaining) - [ { Pair "foo" "bar" } - { Pair "gaz" "baz" } ] + [ { Pair "foo" "bar" } + { Pair "gaz" "baz" } ] - location: 78 (remaining gas: 1039918.994 units remaining) - [ { Pair "gaz" "baz" } ] + [ { Pair "gaz" "baz" } ] - location: 80 (remaining gas: 1039918.979 units remaining) - [ {} - { Pair "gaz" "baz" } ] + [ {} + { Pair "gaz" "baz" } ] - location: 78 (remaining gas: 1039918.949 units remaining) - [ { Pair "foo" "bar" } - {} - { Pair "gaz" "baz" } ] + [ { Pair "foo" "bar" } + {} + { Pair "gaz" "baz" } ] - location: 83 (remaining gas: 1039918.949 units remaining) - [ (Pair "foo" "bar") - {} - { Pair "gaz" "baz" } ] + [ (Pair "foo" "bar") + {} + { Pair "gaz" "baz" } ] - location: 85 (remaining gas: 1039918.939 units remaining) - [ "foo" - "bar" - {} - { Pair "gaz" "baz" } ] + [ "foo" + "bar" + {} + { Pair "gaz" "baz" } ] - location: 86 (remaining gas: 1039918.924 units remaining) - [ "bar" - {} - { Pair "gaz" "baz" } ] + [ "bar" + {} + { Pair "gaz" "baz" } ] - location: 88 (remaining gas: 1039918.909 units remaining) - [ (Some "bar") - {} - { Pair "gaz" "baz" } ] + [ (Some "bar") + {} + { Pair "gaz" "baz" } ] - location: 86 (remaining gas: 1039918.879 units remaining) - [ "foo" - (Some "bar") - {} - { Pair "gaz" "baz" } ] + [ "foo" + (Some "bar") + {} + { Pair "gaz" "baz" } ] - location: 89 (remaining gas: 1039917.881 units remaining) - [ { Elt "foo" "bar" } - { Pair "gaz" "baz" } ] + [ { Elt "foo" "bar" } + { Pair "gaz" "baz" } ] - location: 83 (remaining gas: 1039917.866 units remaining) - [ { Elt "foo" "bar" } - { Pair "gaz" "baz" } ] + [ { Elt "foo" "bar" } + { Pair "gaz" "baz" } ] - location: 90 (remaining gas: 1039917.856 units remaining) - [ { Pair "gaz" "baz" } - { Elt "foo" "bar" } ] + [ { Pair "gaz" "baz" } + { Elt "foo" "bar" } ] - location: 91 (remaining gas: 1039917.841 units remaining) - [ { Elt "foo" "bar" } ] + [ { Elt "foo" "bar" } ] - location: 93 (remaining gas: 1039917.826 units remaining) - [ {} - { Elt "foo" "bar" } ] + [ {} + { Elt "foo" "bar" } ] - location: 91 (remaining gas: 1039917.796 units remaining) - [ { Pair "gaz" "baz" } - {} - { Elt "foo" "bar" } ] + [ { Pair "gaz" "baz" } + {} + { Elt "foo" "bar" } ] - location: 96 (remaining gas: 1039917.796 units remaining) - [ (Pair "gaz" "baz") - {} - { Elt "foo" "bar" } ] + [ (Pair "gaz" "baz") + {} + { Elt "foo" "bar" } ] - location: 98 (remaining gas: 1039917.786 units remaining) - [ "gaz" - "baz" - {} - { Elt "foo" "bar" } ] + [ "gaz" + "baz" + {} + { Elt "foo" "bar" } ] - location: 99 (remaining gas: 1039917.771 units remaining) - [ "baz" - {} - { Elt "foo" "bar" } ] + [ "baz" + {} + { Elt "foo" "bar" } ] - location: 101 (remaining gas: 1039917.756 units remaining) - [ (Some "baz") - {} - { Elt "foo" "bar" } ] + [ (Some "baz") + {} + { Elt "foo" "bar" } ] - location: 99 (remaining gas: 1039917.726 units remaining) - [ "gaz" - (Some "baz") - {} - { Elt "foo" "bar" } ] + [ "gaz" + (Some "baz") + {} + { Elt "foo" "bar" } ] - location: 102 (remaining gas: 1039916.728 units remaining) - [ { Elt "gaz" "baz" } - { Elt "foo" "bar" } ] + [ { Elt "gaz" "baz" } + { Elt "foo" "bar" } ] - location: 96 (remaining gas: 1039916.713 units remaining) - [ { Elt "gaz" "baz" } - { Elt "foo" "bar" } ] + [ { Elt "gaz" "baz" } + { Elt "foo" "bar" } ] - location: 103 (remaining gas: 1039916.703 units remaining) - [ { Elt "foo" "bar" } - { Elt "gaz" "baz" } ] + [ { Elt "foo" "bar" } + { Elt "gaz" "baz" } ] - location: 104 (remaining gas: 1039916.688 units remaining) - [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ] + [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ] - location: 105 (remaining gas: 1039916.673 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] + [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - location: 65 (remaining gas: 1039916.658 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] + [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - location: 60 (remaining gas: 1039916.643 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] + [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - location: 44 (remaining gas: 1039916.628 units remaining) - [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] + [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - location: 151 (remaining gas: 1039916.613 units remaining) - [ {} - (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] + [ {} + (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - location: 153 (remaining gas: 1039916.598 units remaining) - [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ] + [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out index f6a3132a50eb..59df2ccab853 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out @@ -11,114 +11,114 @@ trace - location: 9 (remaining gas: 1039651.625 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 9 (remaining gas: 1039651.615 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 10 (remaining gas: 1039651.605 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 11 (remaining gas: 1039651.590 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 13 (remaining gas: 1039651.580 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 14 (remaining gas: 1039651.570 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 15 (remaining gas: 1039651.560 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 16 (remaining gas: 1039651.545 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 18 (remaining gas: 1039651.535 units remaining) - [ "hello" + [ "hello" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 19 (remaining gas: 1039651.044 units remaining) - [ 0x05010000000568656c6c6f + [ 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 16 (remaining gas: 1039651.014 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f + [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 11 (remaining gas: 1039650.984 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f + "hello") + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 20 (remaining gas: 1039650.974 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 21 (remaining gas: 1039585.162 units remaining) - [ True + [ True (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 22 (remaining gas: 1039585.152 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 22 (remaining gas: 1039585.137 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 28 (remaining gas: 1039585.127 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 29 (remaining gas: 1039585.112 units remaining) - [ {} + [ {} (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] - location: 31 (remaining gas: 1039585.097 units remaining) [ (Pair {} "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") ] + "hello") ] Runtime error in contract [CONTRACT_HASH]: 01: parameter key; @@ -139,103 +139,103 @@ trace - location: 9 (remaining gas: 1039651.635 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 9 (remaining gas: 1039651.625 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 10 (remaining gas: 1039651.615 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 11 (remaining gas: 1039651.600 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 13 (remaining gas: 1039651.590 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 14 (remaining gas: 1039651.580 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 15 (remaining gas: 1039651.570 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 16 (remaining gas: 1039651.555 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 18 (remaining gas: 1039651.545 units remaining) - [ "abcd" + [ "abcd" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 19 (remaining gas: 1039651.087 units remaining) - [ 0x05010000000461626364 + [ 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 16 (remaining gas: 1039651.057 units remaining) - [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 + [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 11 (remaining gas: 1039651.027 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 + "abcd") + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 20 (remaining gas: 1039651.017 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 21 (remaining gas: 1039585.206 units remaining) - [ False + [ False (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 22 (remaining gas: 1039585.196 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] - location: 26 (remaining gas: 1039585.186 units remaining) - [ Unit + [ Unit (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") ] + "abcd") ] Fatal error: error running script diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out index e2bb06cdf526..a558e24ed724 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out @@ -8,31 +8,31 @@ big_map diff trace - location: 7 (remaining gas: 1039988.319 units remaining) - [ (Pair 0 Unit) ] + [ (Pair 0 Unit) ] - location: 7 (remaining gas: 1039988.309 units remaining) - [ 0 ] + [ 0 ] - location: 8 (remaining gas: 1039988.299 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 9 (remaining gas: 1039988.259 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 10 (remaining gas: 1039988.234 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 11 (remaining gas: 1039988.199 units remaining) - [ 0 ] + [ 0 ] - location: 13 (remaining gas: 1039988.184 units remaining) - [ True ] + [ True ] - location: 14 (remaining gas: 1039988.174 units remaining) [ ] - location: 14 (remaining gas: 1039988.159 units remaining) [ ] - location: 20 (remaining gas: 1039988.149 units remaining) - [ Unit ] + [ Unit ] - location: 21 (remaining gas: 1039988.134 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 23 (remaining gas: 1039988.119 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out index e0c421e74861..84d2968d9bc7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out @@ -8,31 +8,31 @@ big_map diff trace - location: 7 (remaining gas: 1039988.319 units remaining) - [ (Pair 12039123919239192312931 Unit) ] + [ (Pair 12039123919239192312931 Unit) ] - location: 7 (remaining gas: 1039988.309 units remaining) - [ 12039123919239192312931 ] + [ 12039123919239192312931 ] - location: 8 (remaining gas: 1039988.299 units remaining) - [ 12039123919239192312931 - 12039123919239192312931 ] + [ 12039123919239192312931 + 12039123919239192312931 ] - location: 9 (remaining gas: 1039988.259 units remaining) - [ -12039123919239192312931 - 12039123919239192312931 ] + [ -12039123919239192312931 + 12039123919239192312931 ] - location: 10 (remaining gas: 1039988.234 units remaining) - [ 12039123919239192312931 - 12039123919239192312931 ] + [ 12039123919239192312931 + 12039123919239192312931 ] - location: 11 (remaining gas: 1039988.199 units remaining) - [ 0 ] + [ 0 ] - location: 13 (remaining gas: 1039988.184 units remaining) - [ True ] + [ True ] - location: 14 (remaining gas: 1039988.174 units remaining) [ ] - location: 14 (remaining gas: 1039988.159 units remaining) [ ] - location: 20 (remaining gas: 1039988.149 units remaining) - [ Unit ] + [ Unit ] - location: 21 (remaining gas: 1039988.134 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 23 (remaining gas: 1039988.119 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out index fff9d94664ef..0919fe3067b4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out @@ -8,31 +8,31 @@ big_map diff trace - location: 7 (remaining gas: 1039988.319 units remaining) - [ (Pair 948 Unit) ] + [ (Pair 948 Unit) ] - location: 7 (remaining gas: 1039988.309 units remaining) - [ 948 ] + [ 948 ] - location: 8 (remaining gas: 1039988.299 units remaining) - [ 948 - 948 ] + [ 948 + 948 ] - location: 9 (remaining gas: 1039988.259 units remaining) - [ -948 - 948 ] + [ -948 + 948 ] - location: 10 (remaining gas: 1039988.234 units remaining) - [ 948 - 948 ] + [ 948 + 948 ] - location: 11 (remaining gas: 1039988.199 units remaining) - [ 0 ] + [ 0 ] - location: 13 (remaining gas: 1039988.184 units remaining) - [ True ] + [ True ] - location: 14 (remaining gas: 1039988.174 units remaining) [ ] - location: 14 (remaining gas: 1039988.159 units remaining) [ ] - location: 20 (remaining gas: 1039988.149 units remaining) - [ Unit ] + [ Unit ] - location: 21 (remaining gas: 1039988.134 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 23 (remaining gas: 1039988.119 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out index 81c0677e14e9..a1ff07053236 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out @@ -8,204 +8,204 @@ big_map diff trace - location: 7 (remaining gas: 1039925.003 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039924.993 units remaining) - [ Unit ] + [ Unit ] - location: 8 (remaining gas: 1039924.983 units remaining) - [ 2 - Unit ] + [ 2 + Unit ] - location: 11 (remaining gas: 1039924.973 units remaining) - [ 2 - 2 - Unit ] + [ 2 + 2 + Unit ] - location: 14 (remaining gas: 1039924.918 units remaining) - [ 4 - Unit ] + [ 4 + Unit ] - location: 15 (remaining gas: 1039924.908 units remaining) - [ 4 - 4 - Unit ] + [ 4 + 4 + Unit ] - location: 20 (remaining gas: 1039924.873 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 21 (remaining gas: 1039924.858 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 22 (remaining gas: 1039924.848 units remaining) - [ Unit ] + [ Unit ] - location: 22 (remaining gas: 1039924.833 units remaining) - [ Unit ] + [ Unit ] - location: 28 (remaining gas: 1039924.823 units remaining) - [ 2 - Unit ] + [ 2 + Unit ] - location: 31 (remaining gas: 1039924.813 units remaining) - [ 2 - 2 - Unit ] + [ 2 + 2 + Unit ] - location: 34 (remaining gas: 1039924.758 units remaining) - [ 4 - Unit ] + [ 4 + Unit ] - location: 35 (remaining gas: 1039924.748 units remaining) - [ 4 - 4 - Unit ] + [ 4 + 4 + Unit ] - location: 40 (remaining gas: 1039924.713 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 41 (remaining gas: 1039924.698 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 42 (remaining gas: 1039924.688 units remaining) - [ Unit ] + [ Unit ] - location: 42 (remaining gas: 1039924.673 units remaining) - [ Unit ] + [ Unit ] - location: 48 (remaining gas: 1039924.663 units remaining) - [ 2 - Unit ] + [ 2 + Unit ] - location: 51 (remaining gas: 1039924.653 units remaining) - [ 2 - 2 - Unit ] + [ 2 + 2 + Unit ] - location: 54 (remaining gas: 1039924.598 units remaining) - [ 4 - Unit ] + [ 4 + Unit ] - location: 55 (remaining gas: 1039924.588 units remaining) - [ 4 - 4 - Unit ] + [ 4 + 4 + Unit ] - location: 60 (remaining gas: 1039924.553 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 61 (remaining gas: 1039924.538 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 62 (remaining gas: 1039924.528 units remaining) - [ Unit ] + [ Unit ] - location: 62 (remaining gas: 1039924.513 units remaining) - [ Unit ] + [ Unit ] - location: 68 (remaining gas: 1039924.503 units remaining) - [ 2 - Unit ] + [ 2 + Unit ] - location: 71 (remaining gas: 1039924.493 units remaining) - [ 2 - 2 - Unit ] + [ 2 + 2 + Unit ] - location: 74 (remaining gas: 1039924.438 units remaining) - [ 4 - Unit ] + [ 4 + Unit ] - location: 75 (remaining gas: 1039924.428 units remaining) - [ 4 - 4 - Unit ] + [ 4 + 4 + Unit ] - location: 80 (remaining gas: 1039924.393 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 81 (remaining gas: 1039924.378 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 82 (remaining gas: 1039924.368 units remaining) - [ Unit ] + [ Unit ] - location: 82 (remaining gas: 1039924.353 units remaining) - [ Unit ] + [ Unit ] - location: 88 (remaining gas: 1039924.343 units remaining) - [ 2 - Unit ] + [ 2 + Unit ] - location: 91 (remaining gas: 1039924.333 units remaining) - [ 2 - 2 - Unit ] + [ 2 + 2 + Unit ] - location: 94 (remaining gas: 1039924.278 units remaining) - [ 4 - Unit ] + [ 4 + Unit ] - location: 95 (remaining gas: 1039924.268 units remaining) - [ 4 - 4 - Unit ] + [ 4 + 4 + Unit ] - location: 100 (remaining gas: 1039924.233 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 101 (remaining gas: 1039924.218 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 102 (remaining gas: 1039924.208 units remaining) - [ Unit ] + [ Unit ] - location: 102 (remaining gas: 1039924.193 units remaining) - [ Unit ] + [ Unit ] - location: 108 (remaining gas: 1039924.183 units remaining) - [ 60 - Unit ] + [ 60 + Unit ] - location: 111 (remaining gas: 1039924.173 units remaining) - [ "2019-09-09T12:08:37Z" - 60 - Unit ] + [ "2019-09-09T12:08:37Z" + 60 + Unit ] - location: 114 (remaining gas: 1039924.118 units remaining) - [ "2019-09-09T12:09:37Z" - Unit ] + [ "2019-09-09T12:09:37Z" + Unit ] - location: 115 (remaining gas: 1039924.108 units remaining) - [ "2019-09-09T12:09:37Z" - "2019-09-09T12:09:37Z" - Unit ] + [ "2019-09-09T12:09:37Z" + "2019-09-09T12:09:37Z" + Unit ] - location: 120 (remaining gas: 1039924.073 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 121 (remaining gas: 1039924.058 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 122 (remaining gas: 1039924.048 units remaining) - [ Unit ] + [ Unit ] - location: 122 (remaining gas: 1039924.033 units remaining) - [ Unit ] + [ Unit ] - location: 128 (remaining gas: 1039924.023 units remaining) - [ "2019-09-09T12:08:37Z" - Unit ] + [ "2019-09-09T12:08:37Z" + Unit ] - location: 131 (remaining gas: 1039924.013 units remaining) - [ 60 - "2019-09-09T12:08:37Z" - Unit ] + [ 60 + "2019-09-09T12:08:37Z" + Unit ] - location: 134 (remaining gas: 1039923.958 units remaining) - [ "2019-09-09T12:09:37Z" - Unit ] + [ "2019-09-09T12:09:37Z" + Unit ] - location: 135 (remaining gas: 1039923.948 units remaining) - [ "2019-09-09T12:09:37Z" - "2019-09-09T12:09:37Z" - Unit ] + [ "2019-09-09T12:09:37Z" + "2019-09-09T12:09:37Z" + Unit ] - location: 140 (remaining gas: 1039923.913 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 141 (remaining gas: 1039923.898 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 142 (remaining gas: 1039923.888 units remaining) - [ Unit ] + [ Unit ] - location: 142 (remaining gas: 1039923.873 units remaining) - [ Unit ] + [ Unit ] - location: 148 (remaining gas: 1039923.863 units remaining) - [ 1000 - Unit ] + [ 1000 + Unit ] - location: 151 (remaining gas: 1039923.853 units remaining) - [ 1000 - 1000 - Unit ] + [ 1000 + 1000 + Unit ] - location: 154 (remaining gas: 1039923.833 units remaining) - [ 2000 - Unit ] + [ 2000 + Unit ] - location: 155 (remaining gas: 1039923.823 units remaining) - [ 2000 - 2000 - Unit ] + [ 2000 + 2000 + Unit ] - location: 160 (remaining gas: 1039923.788 units remaining) - [ 0 - Unit ] + [ 0 + Unit ] - location: 161 (remaining gas: 1039923.773 units remaining) - [ True - Unit ] + [ True + Unit ] - location: 162 (remaining gas: 1039923.763 units remaining) - [ Unit ] + [ Unit ] - location: 162 (remaining gas: 1039923.748 units remaining) - [ Unit ] + [ Unit ] - location: 168 (remaining gas: 1039923.733 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 170 (remaining gas: 1039923.718 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out index e8078892e396..24e6cbcdf706 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039992.524 units remaining) [ (Pair (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) - None) ] + None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039992.459 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 13 (remaining gas: 1039992.444 units remaining) - [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 14 (remaining gas: 1039992.429 units remaining) - [ {} - (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ {} + (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 16 (remaining gas: 1039992.414 units remaining) [ (Pair {} - (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] + (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out index 23fbcb9c5aa2..8da54a4da9bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039992.524 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) - None) ] + None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039992.459 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 13 (remaining gas: 1039992.444 units remaining) - [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 14 (remaining gas: 1039992.429 units remaining) - [ {} - (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ {} + (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 16 (remaining gas: 1039992.414 units remaining) [ (Pair {} - (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] + (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out index b637f3a2ef10..b8ff832fcd71 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039992.524 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000000000000000000000000000) - None) ] + None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039992.459 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 13 (remaining gas: 1039992.444 units remaining) - [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 14 (remaining gas: 1039992.429 units remaining) - [ {} - (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ {} + (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 16 (remaining gas: 1039992.414 units remaining) [ (Pair {} - (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] + (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out index 790d95b9c385..6a320b0b7d7c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out @@ -10,21 +10,21 @@ trace - location: 10 (remaining gas: 1039992.524 units remaining) [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0x0100000000000000000000000000000000000000000000000000000000000000) - None) ] + None) ] - location: 10 (remaining gas: 1039992.514 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0100000000000000000000000000000000000000000000000000000000000000) ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039992.504 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039992.459 units remaining) - [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 13 (remaining gas: 1039992.444 units remaining) - [ (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] - location: 14 (remaining gas: 1039992.429 units remaining) - [ {} - (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ {} + (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ] - location: 16 (remaining gas: 1039992.414 units remaining) [ (Pair {} - (Some 0x0200000000000000000000000000000000000000000000000000000000000000)) ] + (Some 0x0200000000000000000000000000000000000000000000000000000000000000)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" index 7ad05509fa04..ff6f287ef478 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 10 (remaining gas: 1039990.553 units remaining) - [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ] + [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") ] + [ (Pair -100 "1970-01-01T00:01:40Z") ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") - (Pair -100 "1970-01-01T00:01:40Z") ] + [ (Pair -100 "1970-01-01T00:01:40Z") + (Pair -100 "1970-01-01T00:01:40Z") ] - location: 12 (remaining gas: 1039990.523 units remaining) - [ -100 - (Pair -100 "1970-01-01T00:01:40Z") ] + [ -100 + (Pair -100 "1970-01-01T00:01:40Z") ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") ] + [ (Pair -100 "1970-01-01T00:01:40Z") ] - location: 15 (remaining gas: 1039990.498 units remaining) - [ "1970-01-01T00:01:40Z" ] + [ "1970-01-01T00:01:40Z" ] - location: 13 (remaining gas: 1039990.468 units remaining) - [ -100 - "1970-01-01T00:01:40Z" ] + [ -100 + "1970-01-01T00:01:40Z" ] - location: 16 (remaining gas: 1039990.413 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 17 (remaining gas: 1039990.398 units remaining) - [ (Some "1970-01-01T00:00:00Z") ] + [ (Some "1970-01-01T00:00:00Z") ] - location: 18 (remaining gas: 1039990.383 units remaining) - [ {} - (Some "1970-01-01T00:00:00Z") ] + [ {} + (Some "1970-01-01T00:00:00Z") ] - location: 20 (remaining gas: 1039990.368 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] + [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" index 2f84092b1d09..a5ff0af6cea3 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 10 (remaining gas: 1039990.453 units remaining) - [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ] + [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ] - location: 10 (remaining gas: 1039990.443 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") ] + [ (Pair 0 "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039990.433 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") - (Pair 0 "1970-01-01T00:00:00Z") ] + [ (Pair 0 "1970-01-01T00:00:00Z") + (Pair 0 "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039990.423 units remaining) - [ 0 - (Pair 0 "1970-01-01T00:00:00Z") ] + [ 0 + (Pair 0 "1970-01-01T00:00:00Z") ] - location: 13 (remaining gas: 1039990.408 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") ] + [ (Pair 0 "1970-01-01T00:00:00Z") ] - location: 15 (remaining gas: 1039990.398 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 13 (remaining gas: 1039990.368 units remaining) - [ 0 - "1970-01-01T00:00:00Z" ] + [ 0 + "1970-01-01T00:00:00Z" ] - location: 16 (remaining gas: 1039990.313 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 17 (remaining gas: 1039990.298 units remaining) - [ (Some "1970-01-01T00:00:00Z") ] + [ (Some "1970-01-01T00:00:00Z") ] - location: 18 (remaining gas: 1039990.283 units remaining) - [ {} - (Some "1970-01-01T00:00:00Z") ] + [ {} + (Some "1970-01-01T00:00:00Z") ] - location: 20 (remaining gas: 1039990.268 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] + [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" index cd54c3c5422d..afdaa65ea177 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 10 (remaining gas: 1039990.553 units remaining) - [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ] + [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") ] + [ (Pair 100 "1970-01-01T00:01:40Z") ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") - (Pair 100 "1970-01-01T00:01:40Z") ] + [ (Pair 100 "1970-01-01T00:01:40Z") + (Pair 100 "1970-01-01T00:01:40Z") ] - location: 12 (remaining gas: 1039990.523 units remaining) - [ 100 - (Pair 100 "1970-01-01T00:01:40Z") ] + [ 100 + (Pair 100 "1970-01-01T00:01:40Z") ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") ] + [ (Pair 100 "1970-01-01T00:01:40Z") ] - location: 15 (remaining gas: 1039990.498 units remaining) - [ "1970-01-01T00:01:40Z" ] + [ "1970-01-01T00:01:40Z" ] - location: 13 (remaining gas: 1039990.468 units remaining) - [ 100 - "1970-01-01T00:01:40Z" ] + [ 100 + "1970-01-01T00:01:40Z" ] - location: 16 (remaining gas: 1039990.413 units remaining) - [ "1970-01-01T00:03:20Z" ] + [ "1970-01-01T00:03:20Z" ] - location: 17 (remaining gas: 1039990.398 units remaining) - [ (Some "1970-01-01T00:03:20Z") ] + [ (Some "1970-01-01T00:03:20Z") ] - location: 18 (remaining gas: 1039990.383 units remaining) - [ {} - (Some "1970-01-01T00:03:20Z") ] + [ {} + (Some "1970-01-01T00:03:20Z") ] - location: 20 (remaining gas: 1039990.368 units remaining) - [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] + [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" index 2ecbae14a5fa..9471de84852e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 10 (remaining gas: 1039990.453 units remaining) - [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ] + [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ] - location: 10 (remaining gas: 1039990.443 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) ] + [ (Pair "1970-01-01T00:00:00Z" 0) ] - location: 11 (remaining gas: 1039990.433 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) - (Pair "1970-01-01T00:00:00Z" 0) ] + [ (Pair "1970-01-01T00:00:00Z" 0) + (Pair "1970-01-01T00:00:00Z" 0) ] - location: 12 (remaining gas: 1039990.423 units remaining) - [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" 0) ] + [ "1970-01-01T00:00:00Z" + (Pair "1970-01-01T00:00:00Z" 0) ] - location: 13 (remaining gas: 1039990.408 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) ] + [ (Pair "1970-01-01T00:00:00Z" 0) ] - location: 15 (remaining gas: 1039990.398 units remaining) - [ 0 ] + [ 0 ] - location: 13 (remaining gas: 1039990.368 units remaining) - [ "1970-01-01T00:00:00Z" - 0 ] + [ "1970-01-01T00:00:00Z" + 0 ] - location: 16 (remaining gas: 1039990.313 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 17 (remaining gas: 1039990.298 units remaining) - [ (Some "1970-01-01T00:00:00Z") ] + [ (Some "1970-01-01T00:00:00Z") ] - location: 18 (remaining gas: 1039990.283 units remaining) - [ {} - (Some "1970-01-01T00:00:00Z") ] + [ {} + (Some "1970-01-01T00:00:00Z") ] - location: 20 (remaining gas: 1039990.268 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] + [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" index 951cae1f288c..fd3b1fe3bc4c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 10 (remaining gas: 1039990.553 units remaining) - [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ] + [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) - (Pair "1970-01-01T00:01:40Z" -100) ] + [ (Pair "1970-01-01T00:01:40Z" -100) + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 12 (remaining gas: 1039990.523 units remaining) - [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" -100) ] + [ "1970-01-01T00:01:40Z" + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 15 (remaining gas: 1039990.498 units remaining) - [ -100 ] + [ -100 ] - location: 13 (remaining gas: 1039990.468 units remaining) - [ "1970-01-01T00:01:40Z" - -100 ] + [ "1970-01-01T00:01:40Z" + -100 ] - location: 16 (remaining gas: 1039990.413 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 17 (remaining gas: 1039990.398 units remaining) - [ (Some "1970-01-01T00:00:00Z") ] + [ (Some "1970-01-01T00:00:00Z") ] - location: 18 (remaining gas: 1039990.383 units remaining) - [ {} - (Some "1970-01-01T00:00:00Z") ] + [ {} + (Some "1970-01-01T00:00:00Z") ] - location: 20 (remaining gas: 1039990.368 units remaining) - [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] + [ (Pair {} (Some "1970-01-01T00:00:00Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" index ccd1b962d0e8..6024b7ff6ceb 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 10 (remaining gas: 1039990.553 units remaining) - [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ] + [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ] - location: 10 (remaining gas: 1039990.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 11 (remaining gas: 1039990.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) - (Pair "1970-01-01T00:01:40Z" 100) ] + [ (Pair "1970-01-01T00:01:40Z" 100) + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 12 (remaining gas: 1039990.523 units remaining) - [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 100) ] + [ "1970-01-01T00:01:40Z" + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 13 (remaining gas: 1039990.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 15 (remaining gas: 1039990.498 units remaining) - [ 100 ] + [ 100 ] - location: 13 (remaining gas: 1039990.468 units remaining) - [ "1970-01-01T00:01:40Z" - 100 ] + [ "1970-01-01T00:01:40Z" + 100 ] - location: 16 (remaining gas: 1039990.413 units remaining) - [ "1970-01-01T00:03:20Z" ] + [ "1970-01-01T00:03:20Z" ] - location: 17 (remaining gas: 1039990.398 units remaining) - [ (Some "1970-01-01T00:03:20Z") ] + [ (Some "1970-01-01T00:03:20Z") ] - location: 18 (remaining gas: 1039990.383 units remaining) - [ {} - (Some "1970-01-01T00:03:20Z") ] + [ {} + (Some "1970-01-01T00:03:20Z") ] - location: 20 (remaining gas: 1039990.368 units remaining) - [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] + [ (Pair {} (Some "1970-01-01T00:03:20Z")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" index e280de38f1f0..48d573875fe3 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" @@ -8,16 +8,16 @@ big_map diff trace - location: 9 (remaining gas: 1039343.609 units remaining) - [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ] + [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ] - location: 9 (remaining gas: 1039343.599 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 10 (remaining gas: 1039343.589 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 11 (remaining gas: 1039343.574 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 12 (remaining gas: 1039343.559 units remaining) - [ {} - (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ {} + (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 14 (remaining gas: 1039343.544 units remaining) - [ (Pair {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) ] + [ (Pair {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out index bee19dea562b..a4fc8fe3f11c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out @@ -8,24 +8,24 @@ big_map diff trace - location: 10 (remaining gas: 1039991.303 units remaining) - [ (Pair (Pair False False) None) ] + [ (Pair (Pair False False) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair False False) ] + [ (Pair False False) ] - location: 11 (remaining gas: 1039991.283 units remaining) - [ False - False ] + [ False + False ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ False ] + [ False ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039991.218 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039991.193 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out index 0cca8c86d49a..1aebaad3bcf0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out @@ -8,24 +8,24 @@ big_map diff trace - location: 10 (remaining gas: 1039991.303 units remaining) - [ (Pair (Pair False True) None) ] + [ (Pair (Pair False True) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair False True) ] + [ (Pair False True) ] - location: 11 (remaining gas: 1039991.283 units remaining) - [ False - True ] + [ False + True ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ False ] + [ False ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039991.218 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039991.193 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out index 274ee1e111b9..bb922eddadd2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out @@ -8,24 +8,24 @@ big_map diff trace - location: 10 (remaining gas: 1039991.303 units remaining) - [ (Pair (Pair True False) None) ] + [ (Pair (Pair True False) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair True False) ] + [ (Pair True False) ] - location: 11 (remaining gas: 1039991.283 units remaining) - [ True - False ] + [ True + False ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ False ] + [ False ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039991.218 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039991.193 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out index 9aacb64a523e..2d1032293849 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out @@ -8,24 +8,24 @@ big_map diff trace - location: 10 (remaining gas: 1039991.303 units remaining) - [ (Pair (Pair True True) None) ] + [ (Pair (Pair True True) None) ] - location: 10 (remaining gas: 1039991.293 units remaining) - [ (Pair True True) ] + [ (Pair True True) ] - location: 11 (remaining gas: 1039991.283 units remaining) - [ True - True ] + [ True + True ] - location: 12 (remaining gas: 1039991.263 units remaining) - [ True ] + [ True ] - location: 13 (remaining gas: 1039991.248 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 14 (remaining gas: 1039991.233 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 16 (remaining gas: 1039991.218 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] - location: 17 (remaining gas: 1039991.208 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 18 (remaining gas: 1039991.193 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out index cfe6aa0f79aa..0337fc64578a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out @@ -8,86 +8,86 @@ big_map diff trace - location: 7 (remaining gas: 1039960.451 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039960.441 units remaining) [ ] - location: 8 (remaining gas: 1039960.431 units remaining) - [ 5 ] + [ 5 ] - location: 11 (remaining gas: 1039960.421 units remaining) - [ 6 - 5 ] + [ 6 + 5 ] - location: 14 (remaining gas: 1039960.371 units remaining) - [ 4 ] + [ 4 ] - location: 15 (remaining gas: 1039960.361 units remaining) - [ 4 - 4 ] + [ 4 + 4 ] - location: 20 (remaining gas: 1039960.326 units remaining) - [ 0 ] + [ 0 ] - location: 21 (remaining gas: 1039960.311 units remaining) - [ True ] + [ True ] - location: 22 (remaining gas: 1039960.301 units remaining) [ ] - location: 22 (remaining gas: 1039960.286 units remaining) [ ] - location: 28 (remaining gas: 1039960.276 units remaining) - [ 6 ] + [ 6 ] - location: 31 (remaining gas: 1039960.266 units remaining) - [ 5 - 6 ] + [ 5 + 6 ] - location: 34 (remaining gas: 1039960.216 units remaining) - [ 4 ] + [ 4 ] - location: 35 (remaining gas: 1039960.206 units remaining) - [ 4 - 4 ] + [ 4 + 4 ] - location: 40 (remaining gas: 1039960.171 units remaining) - [ 0 ] + [ 0 ] - location: 41 (remaining gas: 1039960.156 units remaining) - [ True ] + [ True ] - location: 42 (remaining gas: 1039960.146 units remaining) [ ] - location: 42 (remaining gas: 1039960.131 units remaining) [ ] - location: 48 (remaining gas: 1039960.121 units remaining) - [ 12 ] + [ 12 ] - location: 51 (remaining gas: 1039960.111 units remaining) - [ -1 - 12 ] + [ -1 + 12 ] - location: 54 (remaining gas: 1039960.061 units remaining) - [ 12 ] + [ 12 ] - location: 55 (remaining gas: 1039960.051 units remaining) - [ 12 - 12 ] + [ 12 + 12 ] - location: 60 (remaining gas: 1039960.016 units remaining) - [ 0 ] + [ 0 ] - location: 61 (remaining gas: 1039960.001 units remaining) - [ True ] + [ True ] - location: 62 (remaining gas: 1039959.991 units remaining) [ ] - location: 62 (remaining gas: 1039959.976 units remaining) [ ] - location: 68 (remaining gas: 1039959.966 units remaining) - [ 12 ] + [ 12 ] - location: 71 (remaining gas: 1039959.956 units remaining) - [ -5 - 12 ] + [ -5 + 12 ] - location: 74 (remaining gas: 1039959.906 units remaining) - [ 8 ] + [ 8 ] - location: 75 (remaining gas: 1039959.896 units remaining) - [ 8 - 8 ] + [ 8 + 8 ] - location: 80 (remaining gas: 1039959.861 units remaining) - [ 0 ] + [ 0 ] - location: 81 (remaining gas: 1039959.846 units remaining) - [ True ] + [ True ] - location: 82 (remaining gas: 1039959.836 units remaining) [ ] - location: 82 (remaining gas: 1039959.821 units remaining) [ ] - location: 88 (remaining gas: 1039959.811 units remaining) - [ Unit ] + [ Unit ] - location: 89 (remaining gas: 1039959.796 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 91 (remaining gas: 1039959.781 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out index 4c5abc838739..33b2a0f8b919 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out @@ -8,17 +8,17 @@ big_map diff trace - location: 9 (remaining gas: 1039993.804 units remaining) - [ (Pair (Pair False False) False) ] + [ (Pair (Pair False False) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair False False) ] + [ (Pair False False) ] - location: 10 (remaining gas: 1039993.784 units remaining) - [ False - False ] + [ False + False ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ False ] + [ False ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} - False ] + [ {} + False ] - location: 14 (remaining gas: 1039993.734 units remaining) - [ (Pair {} False) ] + [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out index ef555e8253b6..b774e9f07140 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out @@ -8,17 +8,17 @@ big_map diff trace - location: 9 (remaining gas: 1039993.804 units remaining) - [ (Pair (Pair False True) False) ] + [ (Pair (Pair False True) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair False True) ] + [ (Pair False True) ] - location: 10 (remaining gas: 1039993.784 units remaining) - [ False - True ] + [ False + True ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ False ] + [ False ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} - False ] + [ {} + False ] - location: 14 (remaining gas: 1039993.734 units remaining) - [ (Pair {} False) ] + [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out index b654eef473b3..c60ecc28d9e4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out @@ -8,17 +8,17 @@ big_map diff trace - location: 9 (remaining gas: 1039993.804 units remaining) - [ (Pair (Pair True False) False) ] + [ (Pair (Pair True False) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair True False) ] + [ (Pair True False) ] - location: 10 (remaining gas: 1039993.784 units remaining) - [ True - False ] + [ True + False ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ False ] + [ False ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} - False ] + [ {} + False ] - location: 14 (remaining gas: 1039993.734 units remaining) - [ (Pair {} False) ] + [ (Pair {} False) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out index 63ef601a1971..1b17ddce0005 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out @@ -8,17 +8,17 @@ big_map diff trace - location: 9 (remaining gas: 1039993.804 units remaining) - [ (Pair (Pair True True) False) ] + [ (Pair (Pair True True) False) ] - location: 9 (remaining gas: 1039993.794 units remaining) - [ (Pair True True) ] + [ (Pair True True) ] - location: 10 (remaining gas: 1039993.784 units remaining) - [ True - True ] + [ True + True ] - location: 11 (remaining gas: 1039993.764 units remaining) - [ True ] + [ True ] - location: 12 (remaining gas: 1039993.749 units remaining) - [ {} - True ] + [ {} + True ] - location: 14 (remaining gas: 1039993.734 units remaining) - [ (Pair {} True) ] + [ (Pair {} True) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out index 1a20af3830ed..78cc5b82534c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 111) ] + [ (Pair Unit 111) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039774.922 units remaining) - [ 4000000000000 ] + [ 4000000000000 ] - location: 9 (remaining gas: 1039774.907 units remaining) - [ {} - 4000000000000 ] + [ {} + 4000000000000 ] - location: 11 (remaining gas: 1039774.892 units remaining) - [ (Pair {} 4000000000000) ] + [ (Pair {} 4000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out index 8dd7f60a8a02..bd0dba8d0d9e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out @@ -9,35 +9,35 @@ big_map diff Set map(4)[0] to 1 trace - location: 12 (remaining gas: 1039987.011 units remaining) - [ (Pair 1 { Elt 0 1 } None) ] + [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 - (Pair { Elt 0 1 } None) ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 0 1 } None) ] + [ (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) - [ { Elt 0 1 } ] + [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039986.966 units remaining) - [ { Elt 0 1 } - { Elt 0 1 } ] + [ { Elt 0 1 } + { Elt 0 1 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 - { Elt 0 1 } - { Elt 0 1 } ] + [ 1 + { Elt 0 1 } + { Elt 0 1 } ] - location: 17 (remaining gas: 1039986.163 units remaining) - [ False - { Elt 0 1 } ] + [ False + { Elt 0 1 } ] - location: 18 (remaining gas: 1039986.148 units remaining) - [ (Some False) - { Elt 0 1 } ] + [ (Some False) + { Elt 0 1 } ] - location: 19 (remaining gas: 1039986.138 units remaining) - [ { Elt 0 1 } - (Some False) ] + [ { Elt 0 1 } + (Some False) ] - location: 20 (remaining gas: 1039986.123 units remaining) - [ (Pair { Elt 0 1 } (Some False)) ] + [ (Pair { Elt 0 1 } (Some False)) ] - location: 21 (remaining gas: 1039986.108 units remaining) - [ {} - (Pair { Elt 0 1 } (Some False)) ] + [ {} + (Pair { Elt 0 1 } (Some False)) ] - location: 23 (remaining gas: 1039986.093 units remaining) - [ (Pair {} { Elt 0 1 } (Some False)) ] + [ (Pair {} { Elt 0 1 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out index 2ace6b8de4fd..26dd95fdafd8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out @@ -9,35 +9,35 @@ big_map diff Set map(4)[0] to 1 trace - location: 12 (remaining gas: 1039987.011 units remaining) - [ (Pair 1 { Elt 0 1 } None) ] + [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 - (Pair { Elt 0 1 } None) ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 0 1 } None) ] + [ (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) - [ { Elt 0 1 } ] + [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039986.966 units remaining) - [ { Elt 0 1 } - { Elt 0 1 } ] + [ { Elt 0 1 } + { Elt 0 1 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 - { Elt 0 1 } - { Elt 0 1 } ] + [ 1 + { Elt 0 1 } + { Elt 0 1 } ] - location: 17 (remaining gas: 1039986.163 units remaining) - [ False - { Elt 0 1 } ] + [ False + { Elt 0 1 } ] - location: 18 (remaining gas: 1039986.148 units remaining) - [ (Some False) - { Elt 0 1 } ] + [ (Some False) + { Elt 0 1 } ] - location: 19 (remaining gas: 1039986.138 units remaining) - [ { Elt 0 1 } - (Some False) ] + [ { Elt 0 1 } + (Some False) ] - location: 20 (remaining gas: 1039986.123 units remaining) - [ (Pair { Elt 0 1 } (Some False)) ] + [ (Pair { Elt 0 1 } (Some False)) ] - location: 21 (remaining gas: 1039986.108 units remaining) - [ {} - (Pair { Elt 0 1 } (Some False)) ] + [ {} + (Pair { Elt 0 1 } (Some False)) ] - location: 23 (remaining gas: 1039986.093 units remaining) - [ (Pair {} { Elt 0 1 } (Some False)) ] + [ (Pair {} { Elt 0 1 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out index e9cc9b980648..d8bf969f3ea4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out @@ -9,35 +9,35 @@ big_map diff Set map(4)[1] to 0 trace - location: 12 (remaining gas: 1039987.011 units remaining) - [ (Pair 1 { Elt 1 0 } None) ] + [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 - (Pair { Elt 1 0 } None) ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 1 0 } None) ] + [ (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) - [ { Elt 1 0 } ] + [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039986.966 units remaining) - [ { Elt 1 0 } - { Elt 1 0 } ] + [ { Elt 1 0 } + { Elt 1 0 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 - { Elt 1 0 } - { Elt 1 0 } ] + [ 1 + { Elt 1 0 } + { Elt 1 0 } ] - location: 17 (remaining gas: 1039986.163 units remaining) - [ True - { Elt 1 0 } ] + [ True + { Elt 1 0 } ] - location: 18 (remaining gas: 1039986.148 units remaining) - [ (Some True) - { Elt 1 0 } ] + [ (Some True) + { Elt 1 0 } ] - location: 19 (remaining gas: 1039986.138 units remaining) - [ { Elt 1 0 } - (Some True) ] + [ { Elt 1 0 } + (Some True) ] - location: 20 (remaining gas: 1039986.123 units remaining) - [ (Pair { Elt 1 0 } (Some True)) ] + [ (Pair { Elt 1 0 } (Some True)) ] - location: 21 (remaining gas: 1039986.108 units remaining) - [ {} - (Pair { Elt 1 0 } (Some True)) ] + [ {} + (Pair { Elt 1 0 } (Some True)) ] - location: 23 (remaining gas: 1039986.093 units remaining) - [ (Pair {} { Elt 1 0 } (Some True)) ] + [ (Pair {} { Elt 1 0 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out index 21fdc5a44722..23d66d24d54b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out @@ -9,35 +9,35 @@ big_map diff Set map(4)[1] to 0 trace - location: 12 (remaining gas: 1039987.011 units remaining) - [ (Pair 1 { Elt 1 0 } None) ] + [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039987.001 units remaining) - [ 1 - (Pair { Elt 1 0 } None) ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 13 (remaining gas: 1039986.986 units remaining) - [ (Pair { Elt 1 0 } None) ] + [ (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039986.976 units remaining) - [ { Elt 1 0 } ] + [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039986.966 units remaining) - [ { Elt 1 0 } - { Elt 1 0 } ] + [ { Elt 1 0 } + { Elt 1 0 } ] - location: 13 (remaining gas: 1039986.936 units remaining) - [ 1 - { Elt 1 0 } - { Elt 1 0 } ] + [ 1 + { Elt 1 0 } + { Elt 1 0 } ] - location: 17 (remaining gas: 1039986.163 units remaining) - [ True - { Elt 1 0 } ] + [ True + { Elt 1 0 } ] - location: 18 (remaining gas: 1039986.148 units remaining) - [ (Some True) - { Elt 1 0 } ] + [ (Some True) + { Elt 1 0 } ] - location: 19 (remaining gas: 1039986.138 units remaining) - [ { Elt 1 0 } - (Some True) ] + [ { Elt 1 0 } + (Some True) ] - location: 20 (remaining gas: 1039986.123 units remaining) - [ (Pair { Elt 1 0 } (Some True)) ] + [ (Pair { Elt 1 0 } (Some True)) ] - location: 21 (remaining gas: 1039986.108 units remaining) - [ {} - (Pair { Elt 1 0 } (Some True)) ] + [ {} + (Pair { Elt 1 0 } (Some True)) ] - location: 23 (remaining gas: 1039986.093 units remaining) - [ (Pair {} { Elt 1 0 } (Some True)) ] + [ (Pair {} { Elt 1 0 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out index a2facc759a15..cc4ce7a2cb45 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out @@ -10,35 +10,35 @@ big_map diff Set map(4)[2] to 11 trace - location: 12 (remaining gas: 1039985.980 units remaining) - [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 1 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 1 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 1 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) - [ True - { Elt 1 4 ; Elt 2 11 } ] + [ True + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039985.116 units remaining) - [ (Some True) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some True) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039985.106 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some True) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some True) ] - location: 20 (remaining gas: 1039985.091 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 21 (remaining gas: 1039985.076 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 23 (remaining gas: 1039985.061 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out index 772b053b45cb..c89a3f0e4027 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out @@ -10,35 +10,35 @@ big_map diff Set map(4)[2] to 11 trace - location: 12 (remaining gas: 1039985.980 units remaining) - [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 1 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 1 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 1 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) - [ True - { Elt 1 4 ; Elt 2 11 } ] + [ True + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039985.116 units remaining) - [ (Some True) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some True) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039985.106 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some True) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some True) ] - location: 20 (remaining gas: 1039985.091 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 21 (remaining gas: 1039985.076 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 23 (remaining gas: 1039985.061 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out index 4e0e0c3669d5..e7337b20442e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out @@ -10,35 +10,35 @@ big_map diff Set map(4)[2] to 11 trace - location: 12 (remaining gas: 1039985.980 units remaining) - [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 2 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 2 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 2 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) - [ True - { Elt 1 4 ; Elt 2 11 } ] + [ True + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039985.116 units remaining) - [ (Some True) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some True) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039985.106 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some True) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some True) ] - location: 20 (remaining gas: 1039985.091 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 21 (remaining gas: 1039985.076 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 23 (remaining gas: 1039985.061 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out index 3eb04b7638c7..2e95aa6a1e15 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out @@ -10,35 +10,35 @@ big_map diff Set map(4)[2] to 11 trace - location: 12 (remaining gas: 1039985.980 units remaining) - [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 2 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 2 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 2 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) - [ True - { Elt 1 4 ; Elt 2 11 } ] + [ True + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039985.116 units remaining) - [ (Some True) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some True) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039985.106 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some True) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some True) ] - location: 20 (remaining gas: 1039985.091 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 21 (remaining gas: 1039985.076 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 23 (remaining gas: 1039985.061 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out index 70dfe5d4de5a..5ffb855ef92e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out @@ -10,35 +10,35 @@ big_map diff Set map(4)[2] to 11 trace - location: 12 (remaining gas: 1039985.980 units remaining) - [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 3 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 3 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 3 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) - [ False - { Elt 1 4 ; Elt 2 11 } ] + [ False + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039985.116 units remaining) - [ (Some False) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some False) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039985.106 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some False) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some False) ] - location: 20 (remaining gas: 1039985.091 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - location: 21 (remaining gas: 1039985.076 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - location: 23 (remaining gas: 1039985.061 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out index 953b10d7c0bf..4f4172fc54be 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out @@ -10,35 +10,35 @@ big_map diff Set map(4)[2] to 11 trace - location: 12 (remaining gas: 1039985.980 units remaining) - [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.970 units remaining) - [ 3 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039985.955 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.945 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.935 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.905 units remaining) - [ 3 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 3 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.131 units remaining) - [ False - { Elt 1 4 ; Elt 2 11 } ] + [ False + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039985.116 units remaining) - [ (Some False) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some False) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039985.106 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some False) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some False) ] - location: 20 (remaining gas: 1039985.091 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - location: 21 (remaining gas: 1039985.076 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - location: 23 (remaining gas: 1039985.061 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out index e6139cb929d8..966472a96e33 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out @@ -8,35 +8,35 @@ big_map diff New map(4) of type (big_map nat nat) trace - location: 12 (remaining gas: 1039988.004 units remaining) - [ (Pair 1 {} None) ] + [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039987.994 units remaining) - [ 1 - (Pair {} None) ] + [ 1 + (Pair {} None) ] - location: 13 (remaining gas: 1039987.979 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039987.969 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039987.959 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039987.929 units remaining) - [ 1 - {} - {} ] + [ 1 + {} + {} ] - location: 17 (remaining gas: 1039987.158 units remaining) - [ False - {} ] + [ False + {} ] - location: 18 (remaining gas: 1039987.143 units remaining) - [ (Some False) - {} ] + [ (Some False) + {} ] - location: 19 (remaining gas: 1039987.133 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 20 (remaining gas: 1039987.118 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 21 (remaining gas: 1039987.103 units remaining) - [ {} - (Pair {} (Some False)) ] + [ {} + (Pair {} (Some False)) ] - location: 23 (remaining gas: 1039987.088 units remaining) - [ (Pair {} {} (Some False)) ] + [ (Pair {} {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out index d0348a66efdb..fe8b9fb96421 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out @@ -8,35 +8,35 @@ big_map diff New map(4) of type (big_map nat nat) trace - location: 12 (remaining gas: 1039988.004 units remaining) - [ (Pair 1 {} None) ] + [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039987.994 units remaining) - [ 1 - (Pair {} None) ] + [ 1 + (Pair {} None) ] - location: 13 (remaining gas: 1039987.979 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039987.969 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039987.959 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039987.929 units remaining) - [ 1 - {} - {} ] + [ 1 + {} + {} ] - location: 17 (remaining gas: 1039987.158 units remaining) - [ False - {} ] + [ False + {} ] - location: 18 (remaining gas: 1039987.143 units remaining) - [ (Some False) - {} ] + [ (Some False) + {} ] - location: 19 (remaining gas: 1039987.133 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 20 (remaining gas: 1039987.118 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 21 (remaining gas: 1039987.103 units remaining) - [ {} - (Pair {} (Some False)) ] + [ {} + (Pair {} (Some False)) ] - location: 23 (remaining gas: 1039987.088 units remaining) - [ (Pair {} {} (Some False)) ] + [ (Pair {} {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" index 65b757d5b6f3..7ca3059033be 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" @@ -10,35 +10,35 @@ big_map diff Set map(4)["foo"] to 11 trace - location: 12 (remaining gas: 1039985.438 units remaining) - [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.428 units remaining) - [ "baz" - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ "baz" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039985.413 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.403 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.393 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.363 units remaining) - [ "baz" - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ "baz" + { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.384 units remaining) - [ False - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ False + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 18 (remaining gas: 1039984.369 units remaining) - [ (Some False) - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ (Some False) + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 19 (remaining gas: 1039984.359 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - (Some False) ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + (Some False) ] - location: 20 (remaining gas: 1039984.344 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - location: 21 (remaining gas: 1039984.329 units remaining) - [ {} - (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] + [ {} + (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - location: 23 (remaining gas: 1039984.314 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] + [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" index a1cfb1a0356e..3a8da639832b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" @@ -10,35 +10,35 @@ big_map diff Set map(4)["foo"] to 11 trace - location: 12 (remaining gas: 1039985.438 units remaining) - [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.428 units remaining) - [ "foo" - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ "foo" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039985.413 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.403 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.393 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.363 units remaining) - [ "foo" - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ "foo" + { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.384 units remaining) - [ True - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ True + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 18 (remaining gas: 1039984.369 units remaining) - [ (Some True) - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ (Some True) + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 19 (remaining gas: 1039984.359 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - (Some True) ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + (Some True) ] - location: 20 (remaining gas: 1039984.344 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 21 (remaining gas: 1039984.329 units remaining) - [ {} - (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ {} + (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 23 (remaining gas: 1039984.314 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" index 47519a488914..43f9d8e9dda8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" @@ -10,35 +10,35 @@ big_map diff Set map(4)["foo"] to 11 trace - location: 12 (remaining gas: 1039985.438 units remaining) - [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.428 units remaining) - [ "bar" - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ "bar" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039985.413 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.403 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.393 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.363 units remaining) - [ "bar" - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ "bar" + { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.384 units remaining) - [ True - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ True + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 18 (remaining gas: 1039984.369 units remaining) - [ (Some True) - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ (Some True) + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 19 (remaining gas: 1039984.359 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - (Some True) ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + (Some True) ] - location: 20 (remaining gas: 1039984.344 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 21 (remaining gas: 1039984.329 units remaining) - [ {} - (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ {} + (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 23 (remaining gas: 1039984.314 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" index 86a1d85a153f..53bc0976d17d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" @@ -9,35 +9,35 @@ big_map diff Set map(4)["foo"] to 0 trace - location: 12 (remaining gas: 1039986.718 units remaining) - [ (Pair "foo" { Elt "foo" 0 } None) ] + [ (Pair "foo" { Elt "foo" 0 } None) ] - location: 12 (remaining gas: 1039986.708 units remaining) - [ "foo" - (Pair { Elt "foo" 0 } None) ] + [ "foo" + (Pair { Elt "foo" 0 } None) ] - location: 13 (remaining gas: 1039986.693 units remaining) - [ (Pair { Elt "foo" 0 } None) ] + [ (Pair { Elt "foo" 0 } None) ] - location: 15 (remaining gas: 1039986.683 units remaining) - [ { Elt "foo" 0 } ] + [ { Elt "foo" 0 } ] - location: 16 (remaining gas: 1039986.673 units remaining) - [ { Elt "foo" 0 } - { Elt "foo" 0 } ] + [ { Elt "foo" 0 } + { Elt "foo" 0 } ] - location: 13 (remaining gas: 1039986.643 units remaining) - [ "foo" - { Elt "foo" 0 } - { Elt "foo" 0 } ] + [ "foo" + { Elt "foo" 0 } + { Elt "foo" 0 } ] - location: 17 (remaining gas: 1039985.665 units remaining) - [ True - { Elt "foo" 0 } ] + [ True + { Elt "foo" 0 } ] - location: 18 (remaining gas: 1039985.650 units remaining) - [ (Some True) - { Elt "foo" 0 } ] + [ (Some True) + { Elt "foo" 0 } ] - location: 19 (remaining gas: 1039985.640 units remaining) - [ { Elt "foo" 0 } - (Some True) ] + [ { Elt "foo" 0 } + (Some True) ] - location: 20 (remaining gas: 1039985.625 units remaining) - [ (Pair { Elt "foo" 0 } (Some True)) ] + [ (Pair { Elt "foo" 0 } (Some True)) ] - location: 21 (remaining gas: 1039985.610 units remaining) - [ {} - (Pair { Elt "foo" 0 } (Some True)) ] + [ {} + (Pair { Elt "foo" 0 } (Some True)) ] - location: 23 (remaining gas: 1039985.595 units remaining) - [ (Pair {} { Elt "foo" 0 } (Some True)) ] + [ (Pair {} { Elt "foo" 0 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" index 189205480a8f..138002e1ef11 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" @@ -9,35 +9,35 @@ big_map diff Set map(4)["foo"] to 1 trace - location: 12 (remaining gas: 1039986.718 units remaining) - [ (Pair "bar" { Elt "foo" 1 } None) ] + [ (Pair "bar" { Elt "foo" 1 } None) ] - location: 12 (remaining gas: 1039986.708 units remaining) - [ "bar" - (Pair { Elt "foo" 1 } None) ] + [ "bar" + (Pair { Elt "foo" 1 } None) ] - location: 13 (remaining gas: 1039986.693 units remaining) - [ (Pair { Elt "foo" 1 } None) ] + [ (Pair { Elt "foo" 1 } None) ] - location: 15 (remaining gas: 1039986.683 units remaining) - [ { Elt "foo" 1 } ] + [ { Elt "foo" 1 } ] - location: 16 (remaining gas: 1039986.673 units remaining) - [ { Elt "foo" 1 } - { Elt "foo" 1 } ] + [ { Elt "foo" 1 } + { Elt "foo" 1 } ] - location: 13 (remaining gas: 1039986.643 units remaining) - [ "bar" - { Elt "foo" 1 } - { Elt "foo" 1 } ] + [ "bar" + { Elt "foo" 1 } + { Elt "foo" 1 } ] - location: 17 (remaining gas: 1039985.665 units remaining) - [ False - { Elt "foo" 1 } ] + [ False + { Elt "foo" 1 } ] - location: 18 (remaining gas: 1039985.650 units remaining) - [ (Some False) - { Elt "foo" 1 } ] + [ (Some False) + { Elt "foo" 1 } ] - location: 19 (remaining gas: 1039985.640 units remaining) - [ { Elt "foo" 1 } - (Some False) ] + [ { Elt "foo" 1 } + (Some False) ] - location: 20 (remaining gas: 1039985.625 units remaining) - [ (Pair { Elt "foo" 1 } (Some False)) ] + [ (Pair { Elt "foo" 1 } (Some False)) ] - location: 21 (remaining gas: 1039985.610 units remaining) - [ {} - (Pair { Elt "foo" 1 } (Some False)) ] + [ {} + (Pair { Elt "foo" 1 } (Some False)) ] - location: 23 (remaining gas: 1039985.595 units remaining) - [ (Pair {} { Elt "foo" 1 } (Some False)) ] + [ (Pair {} { Elt "foo" 1 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" index 5e3d574dfcc2..f8b48e05251c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" @@ -8,35 +8,35 @@ big_map diff New map(4) of type (big_map string nat) trace - location: 12 (remaining gas: 1039987.960 units remaining) - [ (Pair "bar" {} None) ] + [ (Pair "bar" {} None) ] - location: 12 (remaining gas: 1039987.950 units remaining) - [ "bar" - (Pair {} None) ] + [ "bar" + (Pair {} None) ] - location: 13 (remaining gas: 1039987.935 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039987.925 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039987.915 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039987.885 units remaining) - [ "bar" - {} - {} ] + [ "bar" + {} + {} ] - location: 17 (remaining gas: 1039986.909 units remaining) - [ False - {} ] + [ False + {} ] - location: 18 (remaining gas: 1039986.894 units remaining) - [ (Some False) - {} ] + [ (Some False) + {} ] - location: 19 (remaining gas: 1039986.884 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 20 (remaining gas: 1039986.869 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 21 (remaining gas: 1039986.854 units remaining) - [ {} - (Pair {} (Some False)) ] + [ {} + (Pair {} (Some False)) ] - location: 23 (remaining gas: 1039986.839 units remaining) - [ (Pair {} {} (Some False)) ] + [ (Pair {} {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out index b98b1e13d1a4..c23a873b9bc2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out @@ -8,17 +8,17 @@ big_map diff trace - location: 8 (remaining gas: 1039993.391 units remaining) - [ (Pair Unit None) ] + [ (Pair Unit None) ] - location: 8 (remaining gas: 1039993.381 units remaining) [ ] - location: 9 (remaining gas: 1039993.371 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.356 units remaining) - [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 13 (remaining gas: 1039993.341 units remaining) - [ {} - (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ {} + (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 15 (remaining gas: 1039993.326 units remaining) [ (Pair {} - (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] + (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out index 6d98c13cab1b..57750ecd1f73 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out @@ -8,17 +8,17 @@ big_map diff trace - location: 8 (remaining gas: 1039993.391 units remaining) - [ (Pair Unit None) ] + [ (Pair Unit None) ] - location: 8 (remaining gas: 1039993.381 units remaining) [ ] - location: 9 (remaining gas: 1039993.371 units remaining) - [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.356 units remaining) - [ (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] + [ (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] - location: 13 (remaining gas: 1039993.341 units remaining) - [ {} - (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] + [ {} + (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ] - location: 15 (remaining gas: 1039993.326 units remaining) [ (Pair {} - (Some 0x1000000000000000000000000000000000000000000000000000000000000000)) ] + (Some 0x1000000000000000000000000000000000000000000000000000000000000000)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out index f3e30eb4557e..b538dd115fcc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ] + [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.663 units remaining) - [ 0 ] + [ 0 ] - location: 9 (remaining gas: 1039994.648 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 11 (remaining gas: 1039994.633 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out index c63e99c05e8a..2ee44971f749 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ] + [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.663 units remaining) - [ 1 ] + [ 1 ] - location: 9 (remaining gas: 1039994.648 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 11 (remaining gas: 1039994.633 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out index bb0afa1cf60e..d99a8360631f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ] + [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 ] + [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 ] - location: 8 (remaining gas: 1039994.663 units remaining) - [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] + [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - location: 9 (remaining gas: 1039994.648 units remaining) - [ {} - 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] + [ {} + 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - location: 11 (remaining gas: 1039994.633 units remaining) [ (Pair {} - 17832688077013577776524784494464728518213913213412866604053735695200962927400) ] + 17832688077013577776524784494464728518213913213412866604053735695200962927400) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out index 915b57fa5d8d..072eddd6dee5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ] + [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 ] + [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 ] - location: 8 (remaining gas: 1039994.663 units remaining) - [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] + [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - location: 9 (remaining gas: 1039994.648 units remaining) - [ {} - 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] + [ {} + 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - location: 11 (remaining gas: 1039994.633 units remaining) [ (Pair {} - 11320265829256585830781521966149529460476767408210445238902869222031333517497) ] + 11320265829256585830781521966149529460476767408210445238902869222031333517497) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out index 5be3e74fdf74..2c09c6747faa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out @@ -8,25 +8,25 @@ big_map diff trace - location: 7 (remaining gas: 1039989.509 units remaining) - [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] + [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039989.499 units remaining) - [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039989.374 units remaining) - [ 16 ] + [ 16 ] - location: 9 (remaining gas: 1039989.359 units remaining) - [ (Some 16) ] + [ (Some 16) ] - location: 11 (remaining gas: 1039989.349 units remaining) - [ 16 ] + [ 16 ] - location: 11 (remaining gas: 1039989.334 units remaining) - [ 16 ] + [ 16 ] - location: 17 (remaining gas: 1039989.324 units remaining) - [ 1 - 16 ] + [ 1 + 16 ] - location: 20 (remaining gas: 1039989.324 units remaining) - [ 16 ] + [ 16 ] - location: 21 (remaining gas: 1039989.309 units remaining) - [ {} - 16 ] + [ {} + 16 ] - location: 23 (remaining gas: 1039989.294 units remaining) - [ (Pair {} 16) ] + [ (Pair {} 16) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out index 387a4f7064f5..ae11b1b77922 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ -42 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ -42 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) - [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 9 (remaining gas: 1039994.442 units remaining) - [ {} - 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ {} + 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 11 (remaining gas: 1039994.427 units remaining) - [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] + [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out index 738d40e31bba..e45e96c05feb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 2 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) - [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) - [ {} - 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.427 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out index 24d8968a891d..6f951075d84c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ -1 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ -1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) - [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 9 (remaining gas: 1039994.442 units remaining) - [ {} - 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ {} + 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 11 (remaining gas: 1039994.427 units remaining) - [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] + [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out index 65f8e7bc477c..a1ad16ec1f37 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.458 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.443 units remaining) - [ {} - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.428 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out index 15438080a4fd..84906a164a12 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000) ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out index adb62b5a4249..68102fa494aa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 1 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.427 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out index df94be6244a2..894554b52749 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ {} + 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] + [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out index aa1e80460d4c..db34b4115d19 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ {} + 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] + [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out index f15cd6ebd6bc..3106a2674739 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out index 769c1e5856ed..c116e842a71b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out index 6c429511be2f..a4195cc3be89 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 1 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.427 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out index db9d2d80514f..9f942855e22f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 0 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.458 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.443 units remaining) - [ {} - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.428 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out index b2f90efdfd3d..85b20c111e71 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000) ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out index 9c166a387d3d..803db298cd4f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out @@ -8,15 +8,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) - [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 2 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.457 units remaining) - [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039994.442 units remaining) - [ {} - 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 11 (remaining gas: 1039994.427 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out index ef105dd0e4f8..930b37a402b5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ {} + 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] + [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out index 4903c56a5aac..f9dd4e0b5840 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ {} + 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] + [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out index 68ccd215ece9..0667104a8ab0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out index 592484dd8c1d..805487c5c0aa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out @@ -9,15 +9,15 @@ big_map diff trace - location: 7 (remaining gas: 1039994.798 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.788 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.424 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039994.409 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 11 (remaining gas: 1039994.394 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out index 212e1a80fa10..b59d98bd9821 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 2 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 2 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 2 ] - location: 9 (remaining gas: 1039993.849 units remaining) - [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) - [ {} - 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.819 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out index cb44a73d5978..47699c6b954e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ -1 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ -1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - -1 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + -1 ] - location: 9 (remaining gas: 1039993.849 units remaining) - [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 10 (remaining gas: 1039993.834 units remaining) - [ {} - 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ {} + 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 12 (remaining gas: 1039993.819 units remaining) - [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] + [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out index 0bda3c16a07f..fa6edceede58 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 0 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 0 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0 ] - location: 9 (remaining gas: 1039993.850 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.835 units remaining) - [ {} - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out index d539b95b0f33..565d87212883 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ -42 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ -42 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - -42 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + -42 ] - location: 9 (remaining gas: 1039993.849 units remaining) - [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 10 (remaining gas: 1039993.834 units remaining) - [ {} - 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] + [ {} + 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 12 (remaining gas: 1039993.819 units remaining) - [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] + [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out index 6c42a7331d39..5c627e828ba3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 1 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 1 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 1 ] - location: 9 (remaining gas: 1039993.849 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.819 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out index 2c173ef748f7..29ecaf0f8bd6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000) ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out index 7afaf42c9ad5..e142c2f449f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f - 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] + [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f + 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ {} + 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] + [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out index 603b3ec223ee..4653f893394d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f - 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] + [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f + 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ {} + 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] + [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out index 9888f5e5fd6b..0f9a7dcaa2ad 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d - 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out index 3756e52b0e36..911876413e2c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d - 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out index 08d0622e6cf3..a49ced7be2b3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000) ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out index 017a16d6a608..9073ccb95a0a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 0 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 0 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0 ] - location: 9 (remaining gas: 1039993.850 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.835 units remaining) - [ {} - 0x0000000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.820 units remaining) - [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out index 609b05c2a8e8..790176f39a55 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 1 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 1 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 1 ] - location: 9 (remaining gas: 1039993.849 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) - [ {} - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.819 units remaining) - [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out index d537cd5a0499..2d8931cb7681 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out @@ -8,18 +8,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) - [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 2 - 0x0100000000000000000000000000000000000000000000000000000000000000 ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 2 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 2 ] - location: 9 (remaining gas: 1039993.849 units remaining) - [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.834 units remaining) - [ {} - 0x0200000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 12 (remaining gas: 1039993.819 units remaining) - [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out index 0b364f13980f..42386c0957d8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f - 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] + [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f + 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] + [ {} + 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] + [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out index df944c3ab6a3..05eed80df7fe 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f - 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] + [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f + 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] + [ {} + 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] + [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out index 8fd31556a2c6..154de78b52fa 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d - 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out index ba2c2fce328b..0e82c89bff8a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out @@ -9,18 +9,18 @@ big_map diff trace - location: 7 (remaining gas: 1039994.200 units remaining) [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ] - location: 7 (remaining gas: 1039994.190 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.180 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d - 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - location: 9 (remaining gas: 1039993.816 units remaining) - [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.801 units remaining) - [ {} - 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] + [ {} + 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 12 (remaining gas: 1039993.786 units remaining) - [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] + [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out index 58ffce67093a..b45e3a3f76f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039994.492 units remaining) - [ (Pair (Pair 34 17) 0) ] + [ (Pair (Pair 34 17) 0) ] - location: 9 (remaining gas: 1039994.482 units remaining) - [ (Pair 34 17) ] + [ (Pair 34 17) ] - location: 10 (remaining gas: 1039994.472 units remaining) - [ 34 ] + [ 34 ] - location: 11 (remaining gas: 1039994.457 units remaining) - [ {} - 34 ] + [ {} + 34 ] - location: 13 (remaining gas: 1039994.442 units remaining) - [ (Pair {} 34) ] + [ (Pair {} 34) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out index 14ffec712826..3754a4b45720 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039994.492 units remaining) - [ (Pair (Pair 34 17) 0) ] + [ (Pair (Pair 34 17) 0) ] - location: 9 (remaining gas: 1039994.482 units remaining) - [ (Pair 34 17) ] + [ (Pair 34 17) ] - location: 10 (remaining gas: 1039994.472 units remaining) - [ 17 ] + [ 17 ] - location: 11 (remaining gas: 1039994.457 units remaining) - [ {} - 17 ] + [ {} + 17 ] - location: 13 (remaining gas: 1039994.442 units remaining) - [ (Pair {} 17) ] + [ (Pair {} 17) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" index bb224412a5bc..530ae4ba6d6b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039992.257 units remaining) - [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] + [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] - location: 8 (remaining gas: 1039992.247 units remaining) [ ] - location: 9 (remaining gas: 1039992.232 units remaining) - [ "NetXdQprcVkpaWU" ] + [ "NetXdQprcVkpaWU" ] - location: 10 (remaining gas: 1039992.217 units remaining) - [ (Some "NetXdQprcVkpaWU") ] + [ (Some "NetXdQprcVkpaWU") ] - location: 11 (remaining gas: 1039992.202 units remaining) - [ {} - (Some "NetXdQprcVkpaWU") ] + [ {} + (Some "NetXdQprcVkpaWU") ] - location: 13 (remaining gas: 1039992.187 units remaining) - [ (Pair {} (Some "NetXdQprcVkpaWU")) ] + [ (Pair {} (Some "NetXdQprcVkpaWU")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" index 370f25246c2a..b297aafdc731 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.807 units remaining) - [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] + [ (Pair Unit (Some "NetXdQprcVkpaWU")) ] - location: 8 (remaining gas: 1039993.797 units remaining) [ ] - location: 9 (remaining gas: 1039993.782 units remaining) - [ "NetXdQprcVkpaWU" ] + [ "NetXdQprcVkpaWU" ] - location: 10 (remaining gas: 1039993.767 units remaining) - [ (Some "NetXdQprcVkpaWU") ] + [ (Some "NetXdQprcVkpaWU") ] - location: 11 (remaining gas: 1039993.752 units remaining) - [ {} - (Some "NetXdQprcVkpaWU") ] + [ {} + (Some "NetXdQprcVkpaWU") ] - location: 13 (remaining gas: 1039993.737 units remaining) - [ (Pair {} (Some "NetXdQprcVkpaWU")) ] + [ (Pair {} (Some "NetXdQprcVkpaWU")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" index 6450bebfa25e..e9a1e54f7ba9 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair Unit None) ] + [ (Pair Unit None) ] - location: 8 (remaining gas: 1039993.947 units remaining) [ ] - location: 9 (remaining gas: 1039993.932 units remaining) - [ "NetXdQprcVkpaWU" ] + [ "NetXdQprcVkpaWU" ] - location: 10 (remaining gas: 1039993.917 units remaining) - [ (Some "NetXdQprcVkpaWU") ] + [ (Some "NetXdQprcVkpaWU") ] - location: 11 (remaining gas: 1039993.902 units remaining) - [ {} - (Some "NetXdQprcVkpaWU") ] + [ {} + (Some "NetXdQprcVkpaWU") ] - location: 13 (remaining gas: 1039993.887 units remaining) - [ (Pair {} (Some "NetXdQprcVkpaWU")) ] + [ (Pair {} (Some "NetXdQprcVkpaWU")) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out index 58fa69c425c7..84381ccb6e39 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out @@ -8,116 +8,116 @@ big_map diff trace - location: 11 (remaining gas: 1039950.642 units remaining) - [ (Pair (Pair 1 4 2 Unit) Unit) ] + [ (Pair (Pair 1 4 2 Unit) Unit) ] - location: 11 (remaining gas: 1039950.632 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 12 (remaining gas: 1039950.622 units remaining) - [ (Pair 1 4 2 Unit) - (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 13 (remaining gas: 1039950.612 units remaining) - [ 1 - (Pair 1 4 2 Unit) ] + [ 1 + (Pair 1 4 2 Unit) ] - location: 14 (remaining gas: 1039950.602 units remaining) - [ 1 - 1 - (Pair 1 4 2 Unit) ] + [ 1 + 1 + (Pair 1 4 2 Unit) ] - location: 19 (remaining gas: 1039950.567 units remaining) - [ 0 - (Pair 1 4 2 Unit) ] + [ 0 + (Pair 1 4 2 Unit) ] - location: 20 (remaining gas: 1039950.552 units remaining) - [ True - (Pair 1 4 2 Unit) ] + [ True + (Pair 1 4 2 Unit) ] - location: 21 (remaining gas: 1039950.542 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 21 (remaining gas: 1039950.527 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 27 (remaining gas: 1039950.517 units remaining) - [ (Pair 1 4 2 Unit) - (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 28 (remaining gas: 1039950.487 units remaining) - [ 1 - (Pair 1 4 2 Unit) ] + [ 1 + (Pair 1 4 2 Unit) ] - location: 30 (remaining gas: 1039950.477 units remaining) - [ 1 - 1 - (Pair 1 4 2 Unit) ] + [ 1 + 1 + (Pair 1 4 2 Unit) ] - location: 35 (remaining gas: 1039950.442 units remaining) - [ 0 - (Pair 1 4 2 Unit) ] + [ 0 + (Pair 1 4 2 Unit) ] - location: 36 (remaining gas: 1039950.427 units remaining) - [ True - (Pair 1 4 2 Unit) ] + [ True + (Pair 1 4 2 Unit) ] - location: 37 (remaining gas: 1039950.417 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 37 (remaining gas: 1039950.402 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 43 (remaining gas: 1039950.392 units remaining) - [ (Pair 1 4 2 Unit) - (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 44 (remaining gas: 1039950.361 units remaining) - [ 4 - (Pair 1 4 2 Unit) ] + [ 4 + (Pair 1 4 2 Unit) ] - location: 46 (remaining gas: 1039950.351 units remaining) - [ 4 - 4 - (Pair 1 4 2 Unit) ] + [ 4 + 4 + (Pair 1 4 2 Unit) ] - location: 51 (remaining gas: 1039950.316 units remaining) - [ 0 - (Pair 1 4 2 Unit) ] + [ 0 + (Pair 1 4 2 Unit) ] - location: 52 (remaining gas: 1039950.301 units remaining) - [ True - (Pair 1 4 2 Unit) ] + [ True + (Pair 1 4 2 Unit) ] - location: 53 (remaining gas: 1039950.291 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 53 (remaining gas: 1039950.276 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 59 (remaining gas: 1039950.266 units remaining) - [ (Pair 1 4 2 Unit) - (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 60 (remaining gas: 1039950.234 units remaining) - [ 2 - (Pair 1 4 2 Unit) ] + [ 2 + (Pair 1 4 2 Unit) ] - location: 62 (remaining gas: 1039950.224 units remaining) - [ 2 - 2 - (Pair 1 4 2 Unit) ] + [ 2 + 2 + (Pair 1 4 2 Unit) ] - location: 67 (remaining gas: 1039950.189 units remaining) - [ 0 - (Pair 1 4 2 Unit) ] + [ 0 + (Pair 1 4 2 Unit) ] - location: 68 (remaining gas: 1039950.174 units remaining) - [ True - (Pair 1 4 2 Unit) ] + [ True + (Pair 1 4 2 Unit) ] - location: 69 (remaining gas: 1039950.164 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 69 (remaining gas: 1039950.149 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 75 (remaining gas: 1039950.139 units remaining) - [ (Pair 1 4 2 Unit) - (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) + (Pair 1 4 2 Unit) ] - location: 76 (remaining gas: 1039950.106 units remaining) - [ Unit - (Pair 1 4 2 Unit) ] + [ Unit + (Pair 1 4 2 Unit) ] - location: 78 (remaining gas: 1039950.096 units remaining) - [ Unit - Unit - (Pair 1 4 2 Unit) ] + [ Unit + Unit + (Pair 1 4 2 Unit) ] - location: 81 (remaining gas: 1039950.086 units remaining) - [ 0 - (Pair 1 4 2 Unit) ] + [ 0 + (Pair 1 4 2 Unit) ] - location: 82 (remaining gas: 1039950.071 units remaining) - [ True - (Pair 1 4 2 Unit) ] + [ True + (Pair 1 4 2 Unit) ] - location: 83 (remaining gas: 1039950.061 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 83 (remaining gas: 1039950.046 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 89 (remaining gas: 1039950.036 units remaining) [ ] - location: 90 (remaining gas: 1039950.026 units remaining) - [ Unit ] + [ Unit ] - location: 91 (remaining gas: 1039950.011 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 93 (remaining gas: 1039949.996 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" index 76af827bac8d..3a51b3621552 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" @@ -8,29 +8,29 @@ big_map diff trace - location: 16 (remaining gas: 1039985.116 units remaining) - [ (Pair (Pair 1 4 2 Unit) None) ] + [ (Pair (Pair 1 4 2 Unit) None) ] - location: 16 (remaining gas: 1039985.106 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 17 (remaining gas: 1039985.096 units remaining) - [ 2 - (Pair 1 4 2 Unit) ] + [ 2 + (Pair 1 4 2 Unit) ] - location: 20 (remaining gas: 1039985.055 units remaining) - [ (Pair 2 4 2 Unit) ] + [ (Pair 2 4 2 Unit) ] - location: 22 (remaining gas: 1039985.045 units remaining) - [ "toto" - (Pair 2 4 2 Unit) ] + [ "toto" + (Pair 2 4 2 Unit) ] - location: 25 (remaining gas: 1039984.999 units remaining) - [ (Pair 2 4 "toto" Unit) ] + [ (Pair 2 4 "toto" Unit) ] - location: 27 (remaining gas: 1039984.989 units remaining) - [ 0x01 - (Pair 2 4 "toto" Unit) ] + [ 0x01 + (Pair 2 4 "toto" Unit) ] - location: 30 (remaining gas: 1039984.942 units remaining) - [ (Pair 2 4 "toto" 0x01) ] + [ (Pair 2 4 "toto" 0x01) ] - location: 32 (remaining gas: 1039984.927 units remaining) - [ (Some (Pair 2 4 "toto" 0x01)) ] + [ (Some (Pair 2 4 "toto" 0x01)) ] - location: 33 (remaining gas: 1039984.912 units remaining) - [ {} - (Some (Pair 2 4 "toto" 0x01)) ] + [ {} + (Some (Pair 2 4 "toto" 0x01)) ] - location: 35 (remaining gas: 1039984.897 units remaining) - [ (Pair {} (Some (Pair 2 4 "toto" 0x01))) ] + [ (Pair {} (Some (Pair 2 4 "toto" 0x01))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out index 4d57d85ea67d..ab1120011e12 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out @@ -8,32 +8,32 @@ big_map diff trace - location: 11 (remaining gas: 1039985.453 units remaining) - [ (Pair Unit 1 4 2 Unit) ] + [ (Pair Unit 1 4 2 Unit) ] - location: 11 (remaining gas: 1039985.443 units remaining) - [ (Pair 1 4 2 Unit) ] + [ (Pair 1 4 2 Unit) ] - location: 12 (remaining gas: 1039985.433 units remaining) - [ 2 - (Pair 1 4 2 Unit) ] + [ 2 + (Pair 1 4 2 Unit) ] - location: 15 (remaining gas: 1039985.392 units remaining) - [ (Pair 2 4 2 Unit) ] + [ (Pair 2 4 2 Unit) ] - location: 17 (remaining gas: 1039985.382 units remaining) - [ 12 - (Pair 2 4 2 Unit) ] + [ 12 + (Pair 2 4 2 Unit) ] - location: 20 (remaining gas: 1039985.339 units remaining) - [ (Pair 2 12 2 Unit) ] + [ (Pair 2 12 2 Unit) ] - location: 22 (remaining gas: 1039985.329 units remaining) - [ 8 - (Pair 2 12 2 Unit) ] + [ 8 + (Pair 2 12 2 Unit) ] - location: 25 (remaining gas: 1039985.283 units remaining) - [ (Pair 2 12 8 Unit) ] + [ (Pair 2 12 8 Unit) ] - location: 27 (remaining gas: 1039985.273 units remaining) - [ Unit - (Pair 2 12 8 Unit) ] + [ Unit + (Pair 2 12 8 Unit) ] - location: 28 (remaining gas: 1039985.226 units remaining) - [ (Pair 2 12 8 Unit) ] + [ (Pair 2 12 8 Unit) ] - location: 30 (remaining gas: 1039985.211 units remaining) - [ {} - (Pair 2 12 8 Unit) ] + [ {} + (Pair 2 12 8 Unit) ] - location: 32 (remaining gas: 1039985.196 units remaining) - [ (Pair {} 2 12 8 Unit) ] + [ (Pair {} 2 12 8 Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out index bbb63940bc0a..b23d86105f2e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 10 (remaining gas: 1039990.399 units remaining) - [ (Pair Unit 0 0 0) ] + [ (Pair Unit 0 0 0) ] - location: 10 (remaining gas: 1039990.389 units remaining) [ ] - location: 11 (remaining gas: 1039990.379 units remaining) - [ 3 ] + [ 3 ] - location: 14 (remaining gas: 1039990.369 units remaining) - [ 2 - 3 ] + [ 2 + 3 ] - location: 17 (remaining gas: 1039990.359 units remaining) - [ 1 - 2 - 3 ] + [ 1 + 2 + 3 ] - location: 20 (remaining gas: 1039990.344 units remaining) - [ {} - 1 - 2 - 3 ] + [ {} + 1 + 2 + 3 ] - location: 22 (remaining gas: 1039990.330 units remaining) - [ (Pair {} 1 2 3) ] + [ (Pair {} 1 2 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out index c4d0618c6b0a..72e683be9eb4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out @@ -8,391 +8,391 @@ big_map diff trace - location: 7 (remaining gas: 1039782.668 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039782.658 units remaining) [ ] - location: 8 (remaining gas: 1039782.648 units remaining) - [ True ] + [ True ] - location: 11 (remaining gas: 1039782.638 units remaining) - [ True - True ] + [ True + True ] - location: 12 (remaining gas: 1039782.603 units remaining) - [ 0 ] + [ 0 ] - location: 14 (remaining gas: 1039782.588 units remaining) - [ True ] + [ True ] - location: 15 (remaining gas: 1039782.578 units remaining) [ ] - location: 15 (remaining gas: 1039782.563 units remaining) [ ] - location: 21 (remaining gas: 1039782.553 units remaining) - [ False ] + [ False ] - location: 24 (remaining gas: 1039782.543 units remaining) - [ False - False ] + [ False + False ] - location: 25 (remaining gas: 1039782.508 units remaining) - [ 0 ] + [ 0 ] - location: 27 (remaining gas: 1039782.493 units remaining) - [ True ] + [ True ] - location: 28 (remaining gas: 1039782.483 units remaining) [ ] - location: 28 (remaining gas: 1039782.468 units remaining) [ ] - location: 34 (remaining gas: 1039782.458 units remaining) - [ False ] + [ False ] - location: 37 (remaining gas: 1039782.448 units remaining) - [ True - False ] + [ True + False ] - location: 40 (remaining gas: 1039782.413 units remaining) - [ 1 ] + [ 1 ] - location: 42 (remaining gas: 1039782.398 units remaining) - [ True ] + [ True ] - location: 43 (remaining gas: 1039782.388 units remaining) [ ] - location: 43 (remaining gas: 1039782.373 units remaining) [ ] - location: 49 (remaining gas: 1039782.363 units remaining) - [ True ] + [ True ] - location: 52 (remaining gas: 1039782.353 units remaining) - [ False - True ] + [ False + True ] - location: 55 (remaining gas: 1039782.318 units remaining) - [ -1 ] + [ -1 ] - location: 57 (remaining gas: 1039782.303 units remaining) - [ True ] + [ True ] - location: 58 (remaining gas: 1039782.293 units remaining) [ ] - location: 58 (remaining gas: 1039782.278 units remaining) [ ] - location: 64 (remaining gas: 1039782.268 units remaining) - [ 0xaabbcc ] + [ 0xaabbcc ] - location: 67 (remaining gas: 1039782.258 units remaining) - [ 0xaabbcc - 0xaabbcc ] + [ 0xaabbcc + 0xaabbcc ] - location: 68 (remaining gas: 1039782.223 units remaining) - [ 0 ] + [ 0 ] - location: 70 (remaining gas: 1039782.208 units remaining) - [ True ] + [ True ] - location: 71 (remaining gas: 1039782.198 units remaining) [ ] - location: 71 (remaining gas: 1039782.183 units remaining) [ ] - location: 77 (remaining gas: 1039782.173 units remaining) - [ 0x ] + [ 0x ] - location: 80 (remaining gas: 1039782.163 units remaining) - [ 0x - 0x ] + [ 0x + 0x ] - location: 83 (remaining gas: 1039782.128 units remaining) - [ 0 ] + [ 0 ] - location: 85 (remaining gas: 1039782.113 units remaining) - [ True ] + [ True ] - location: 86 (remaining gas: 1039782.103 units remaining) [ ] - location: 86 (remaining gas: 1039782.088 units remaining) [ ] - location: 92 (remaining gas: 1039782.078 units remaining) - [ 0x ] + [ 0x ] - location: 95 (remaining gas: 1039782.068 units remaining) - [ 0x01 - 0x ] + [ 0x01 + 0x ] - location: 98 (remaining gas: 1039782.033 units remaining) - [ 1 ] + [ 1 ] - location: 100 (remaining gas: 1039782.018 units remaining) - [ True ] + [ True ] - location: 101 (remaining gas: 1039782.008 units remaining) [ ] - location: 101 (remaining gas: 1039781.993 units remaining) [ ] - location: 107 (remaining gas: 1039781.983 units remaining) - [ 0x01 ] + [ 0x01 ] - location: 110 (remaining gas: 1039781.973 units remaining) - [ 0x02 - 0x01 ] + [ 0x02 + 0x01 ] - location: 113 (remaining gas: 1039781.938 units remaining) - [ 1 ] + [ 1 ] - location: 115 (remaining gas: 1039781.923 units remaining) - [ True ] + [ True ] - location: 116 (remaining gas: 1039781.913 units remaining) [ ] - location: 116 (remaining gas: 1039781.898 units remaining) [ ] - location: 122 (remaining gas: 1039781.888 units remaining) - [ 0x02 ] + [ 0x02 ] - location: 125 (remaining gas: 1039781.878 units remaining) - [ 0x01 - 0x02 ] + [ 0x01 + 0x02 ] - location: 128 (remaining gas: 1039781.843 units remaining) - [ -1 ] + [ -1 ] - location: 130 (remaining gas: 1039781.828 units remaining) - [ True ] + [ True ] - location: 131 (remaining gas: 1039781.818 units remaining) [ ] - location: 131 (remaining gas: 1039781.803 units remaining) [ ] - location: 137 (remaining gas: 1039781.793 units remaining) - [ 1 ] + [ 1 ] - location: 140 (remaining gas: 1039781.783 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 141 (remaining gas: 1039781.748 units remaining) - [ 0 ] + [ 0 ] - location: 143 (remaining gas: 1039781.733 units remaining) - [ True ] + [ True ] - location: 144 (remaining gas: 1039781.723 units remaining) [ ] - location: 144 (remaining gas: 1039781.708 units remaining) [ ] - location: 150 (remaining gas: 1039781.698 units remaining) - [ 10 ] + [ 10 ] - location: 153 (remaining gas: 1039781.688 units remaining) - [ 5 - 10 ] + [ 5 + 10 ] - location: 156 (remaining gas: 1039781.653 units remaining) - [ -1 ] + [ -1 ] - location: 158 (remaining gas: 1039781.638 units remaining) - [ True ] + [ True ] - location: 159 (remaining gas: 1039781.628 units remaining) [ ] - location: 159 (remaining gas: 1039781.613 units remaining) [ ] - location: 165 (remaining gas: 1039781.603 units remaining) - [ -4 ] + [ -4 ] - location: 168 (remaining gas: 1039781.593 units remaining) - [ 1923 - -4 ] + [ 1923 + -4 ] - location: 171 (remaining gas: 1039781.558 units remaining) - [ 1 ] + [ 1 ] - location: 173 (remaining gas: 1039781.543 units remaining) - [ True ] + [ True ] - location: 174 (remaining gas: 1039781.533 units remaining) [ ] - location: 174 (remaining gas: 1039781.518 units remaining) [ ] - location: 180 (remaining gas: 1039781.508 units remaining) - [ 1 ] + [ 1 ] - location: 183 (remaining gas: 1039781.498 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 184 (remaining gas: 1039781.463 units remaining) - [ 0 ] + [ 0 ] - location: 186 (remaining gas: 1039781.448 units remaining) - [ True ] + [ True ] - location: 187 (remaining gas: 1039781.438 units remaining) [ ] - location: 187 (remaining gas: 1039781.423 units remaining) [ ] - location: 193 (remaining gas: 1039781.413 units remaining) - [ 10 ] + [ 10 ] - location: 196 (remaining gas: 1039781.403 units remaining) - [ 5 - 10 ] + [ 5 + 10 ] - location: 199 (remaining gas: 1039781.368 units remaining) - [ -1 ] + [ -1 ] - location: 201 (remaining gas: 1039781.353 units remaining) - [ True ] + [ True ] - location: 202 (remaining gas: 1039781.343 units remaining) [ ] - location: 202 (remaining gas: 1039781.328 units remaining) [ ] - location: 208 (remaining gas: 1039781.318 units remaining) - [ 4 ] + [ 4 ] - location: 211 (remaining gas: 1039781.308 units remaining) - [ 1923 - 4 ] + [ 1923 + 4 ] - location: 214 (remaining gas: 1039781.273 units remaining) - [ 1 ] + [ 1 ] - location: 216 (remaining gas: 1039781.258 units remaining) - [ True ] + [ True ] - location: 217 (remaining gas: 1039781.248 units remaining) [ ] - location: 217 (remaining gas: 1039781.233 units remaining) [ ] - location: 223 (remaining gas: 1039781.223 units remaining) - [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] + [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 226 (remaining gas: 1039781.213 units remaining) - [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" - "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] + [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" + "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 227 (remaining gas: 1039781.177 units remaining) - [ 0 ] + [ 0 ] - location: 229 (remaining gas: 1039781.162 units remaining) - [ True ] + [ True ] - location: 230 (remaining gas: 1039781.152 units remaining) [ ] - location: 230 (remaining gas: 1039781.137 units remaining) [ ] - location: 236 (remaining gas: 1039781.127 units remaining) - [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] + [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] - location: 239 (remaining gas: 1039781.117 units remaining) - [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" - "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] + [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" + "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ] - location: 242 (remaining gas: 1039781.081 units remaining) - [ -1 ] + [ -1 ] - location: 244 (remaining gas: 1039781.066 units remaining) - [ True ] + [ True ] - location: 245 (remaining gas: 1039781.056 units remaining) [ ] - location: 245 (remaining gas: 1039781.041 units remaining) [ ] - location: 251 (remaining gas: 1039781.031 units remaining) - [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] + [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 254 (remaining gas: 1039781.021 units remaining) - [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" - "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] + [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" + "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 257 (remaining gas: 1039780.985 units remaining) - [ 1 ] + [ 1 ] - location: 259 (remaining gas: 1039780.970 units remaining) - [ True ] + [ True ] - location: 260 (remaining gas: 1039780.960 units remaining) [ ] - location: 260 (remaining gas: 1039780.945 units remaining) [ ] - location: 266 (remaining gas: 1039780.935 units remaining) - [ 1 ] + [ 1 ] - location: 269 (remaining gas: 1039780.925 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 270 (remaining gas: 1039780.890 units remaining) - [ 0 ] + [ 0 ] - location: 272 (remaining gas: 1039780.875 units remaining) - [ True ] + [ True ] - location: 273 (remaining gas: 1039780.865 units remaining) [ ] - location: 273 (remaining gas: 1039780.850 units remaining) [ ] - location: 279 (remaining gas: 1039780.840 units remaining) - [ 10 ] + [ 10 ] - location: 282 (remaining gas: 1039780.830 units remaining) - [ 5 - 10 ] + [ 5 + 10 ] - location: 285 (remaining gas: 1039780.795 units remaining) - [ -1 ] + [ -1 ] - location: 287 (remaining gas: 1039780.780 units remaining) - [ True ] + [ True ] - location: 288 (remaining gas: 1039780.770 units remaining) [ ] - location: 288 (remaining gas: 1039780.755 units remaining) [ ] - location: 294 (remaining gas: 1039780.745 units remaining) - [ 4 ] + [ 4 ] - location: 297 (remaining gas: 1039780.735 units remaining) - [ 1923 - 4 ] + [ 1923 + 4 ] - location: 300 (remaining gas: 1039780.700 units remaining) - [ 1 ] + [ 1 ] - location: 302 (remaining gas: 1039780.685 units remaining) - [ True ] + [ True ] - location: 303 (remaining gas: 1039780.675 units remaining) [ ] - location: 303 (remaining gas: 1039780.660 units remaining) [ ] - location: 309 (remaining gas: 1039780.650 units remaining) - [ "AABBCC" ] + [ "AABBCC" ] - location: 312 (remaining gas: 1039780.640 units remaining) - [ "AABBCC" - "AABBCC" ] + [ "AABBCC" + "AABBCC" ] - location: 313 (remaining gas: 1039780.605 units remaining) - [ 0 ] + [ 0 ] - location: 315 (remaining gas: 1039780.590 units remaining) - [ True ] + [ True ] - location: 316 (remaining gas: 1039780.580 units remaining) [ ] - location: 316 (remaining gas: 1039780.565 units remaining) [ ] - location: 322 (remaining gas: 1039780.555 units remaining) - [ "" ] + [ "" ] - location: 325 (remaining gas: 1039780.545 units remaining) - [ "" - "" ] + [ "" + "" ] - location: 328 (remaining gas: 1039780.510 units remaining) - [ 0 ] + [ 0 ] - location: 330 (remaining gas: 1039780.495 units remaining) - [ True ] + [ True ] - location: 331 (remaining gas: 1039780.485 units remaining) [ ] - location: 331 (remaining gas: 1039780.470 units remaining) [ ] - location: 337 (remaining gas: 1039780.460 units remaining) - [ "" ] + [ "" ] - location: 340 (remaining gas: 1039780.450 units remaining) - [ "a" - "" ] + [ "a" + "" ] - location: 343 (remaining gas: 1039780.415 units remaining) - [ 1 ] + [ 1 ] - location: 345 (remaining gas: 1039780.400 units remaining) - [ True ] + [ True ] - location: 346 (remaining gas: 1039780.390 units remaining) [ ] - location: 346 (remaining gas: 1039780.375 units remaining) [ ] - location: 352 (remaining gas: 1039780.365 units remaining) - [ "a" ] + [ "a" ] - location: 355 (remaining gas: 1039780.355 units remaining) - [ "b" - "a" ] + [ "b" + "a" ] - location: 358 (remaining gas: 1039780.320 units remaining) - [ 1 ] + [ 1 ] - location: 360 (remaining gas: 1039780.305 units remaining) - [ True ] + [ True ] - location: 361 (remaining gas: 1039780.295 units remaining) [ ] - location: 361 (remaining gas: 1039780.280 units remaining) [ ] - location: 367 (remaining gas: 1039780.270 units remaining) - [ "b" ] + [ "b" ] - location: 370 (remaining gas: 1039780.260 units remaining) - [ "a" - "b" ] + [ "a" + "b" ] - location: 373 (remaining gas: 1039780.225 units remaining) - [ -1 ] + [ -1 ] - location: 375 (remaining gas: 1039780.210 units remaining) - [ True ] + [ True ] - location: 376 (remaining gas: 1039780.200 units remaining) [ ] - location: 376 (remaining gas: 1039780.185 units remaining) [ ] - location: 382 (remaining gas: 1039780.175 units remaining) - [ "2019-09-16T08:38:05Z" ] + [ "2019-09-16T08:38:05Z" ] - location: 385 (remaining gas: 1039780.165 units remaining) - [ "2019-09-16T08:38:05Z" - "2019-09-16T08:38:05Z" ] + [ "2019-09-16T08:38:05Z" + "2019-09-16T08:38:05Z" ] - location: 386 (remaining gas: 1039780.130 units remaining) - [ 0 ] + [ 0 ] - location: 388 (remaining gas: 1039780.115 units remaining) - [ True ] + [ True ] - location: 389 (remaining gas: 1039780.105 units remaining) [ ] - location: 389 (remaining gas: 1039780.090 units remaining) [ ] - location: 395 (remaining gas: 1039780.080 units remaining) - [ "2017-09-16T08:38:04Z" ] + [ "2017-09-16T08:38:04Z" ] - location: 398 (remaining gas: 1039780.070 units remaining) - [ "2019-09-16T08:38:05Z" - "2017-09-16T08:38:04Z" ] + [ "2019-09-16T08:38:05Z" + "2017-09-16T08:38:04Z" ] - location: 401 (remaining gas: 1039780.035 units remaining) - [ 1 ] + [ 1 ] - location: 403 (remaining gas: 1039780.020 units remaining) - [ True ] + [ True ] - location: 404 (remaining gas: 1039780.010 units remaining) [ ] - location: 404 (remaining gas: 1039779.995 units remaining) [ ] - location: 410 (remaining gas: 1039779.985 units remaining) - [ "2019-09-16T08:38:05Z" ] + [ "2019-09-16T08:38:05Z" ] - location: 413 (remaining gas: 1039779.975 units remaining) - [ "2019-09-16T08:38:04Z" - "2019-09-16T08:38:05Z" ] + [ "2019-09-16T08:38:04Z" + "2019-09-16T08:38:05Z" ] - location: 416 (remaining gas: 1039779.940 units remaining) - [ -1 ] + [ -1 ] - location: 418 (remaining gas: 1039779.925 units remaining) - [ True ] + [ True ] - location: 419 (remaining gas: 1039779.915 units remaining) [ ] - location: 419 (remaining gas: 1039779.900 units remaining) [ ] - location: 425 (remaining gas: 1039779.890 units remaining) - [ Unit ] + [ Unit ] - location: 426 (remaining gas: 1039779.875 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 428 (remaining gas: 1039779.860 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out index ec75cfebb8cb..8c32b1b907c2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out @@ -13,332 +13,332 @@ big_map diff trace - location: 10 (remaining gas: 1039962.637 units remaining) - [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ] + [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ] - location: 10 (remaining gas: 1039962.627 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 11 (remaining gas: 1039962.612 units remaining) - [ {} - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ {} + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 14 (remaining gas: 1039962.597 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 16 (remaining gas: 1039962.587 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.587 units remaining) - [ -9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.572 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.557 units remaining) - [ -1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.542 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.527 units remaining) - [ 0 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.512 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.497 units remaining) - [ 1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.482 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.467 units remaining) - [ 9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039962.452 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039962.437 units remaining) - [ { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { False ; False ; True ; False ; False } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 14 (remaining gas: 1039962.407 units remaining) - [ {} - { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ {} + { False ; False ; True ; False ; False } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 20 (remaining gas: 1039962.397 units remaining) - [ { False ; False ; True ; False ; False } - {} - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { False ; False ; True ; False ; False } + {} + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 21 (remaining gas: 1039962.382 units remaining) - [ { { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 22 (remaining gas: 1039962.367 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 24 (remaining gas: 1039962.357 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.357 units remaining) - [ -9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.342 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.327 units remaining) - [ -1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.312 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.297 units remaining) - [ 0 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.282 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.267 units remaining) - [ 1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.252 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.237 units remaining) - [ 9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039962.222 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039962.207 units remaining) - [ { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { True ; True ; False ; True ; True } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 22 (remaining gas: 1039962.177 units remaining) - [ { { False ; False ; True ; False ; False } } - { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { { False ; False ; True ; False ; False } } + { True ; True ; False ; True ; True } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 28 (remaining gas: 1039962.167 units remaining) - [ { True ; True ; False ; True ; True } - { { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { True ; True ; False ; True ; True } + { { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 29 (remaining gas: 1039962.152 units remaining) [ { { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 30 (remaining gas: 1039962.137 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 32 (remaining gas: 1039962.127 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.127 units remaining) - [ -9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.112 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.097 units remaining) - [ -1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.082 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.067 units remaining) - [ 0 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.052 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.037 units remaining) - [ 1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039962.022 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039962.007 units remaining) - [ 9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039961.992 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039961.977 units remaining) - [ { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { True ; True ; True ; False ; False } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 30 (remaining gas: 1039961.947 units remaining) [ { { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { True ; True ; True ; False ; False } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 36 (remaining gas: 1039961.937 units remaining) - [ { True ; True ; True ; False ; False } + [ { True ; True ; True ; False ; False } { { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 37 (remaining gas: 1039961.922 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 38 (remaining gas: 1039961.907 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 40 (remaining gas: 1039961.897 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.897 units remaining) - [ -9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.882 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.867 units remaining) - [ -1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.852 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.837 units remaining) - [ 0 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.822 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.807 units remaining) - [ 1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.792 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.777 units remaining) - [ 9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039961.762 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039961.747 units remaining) - [ { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { True ; True ; False ; False ; False } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 38 (remaining gas: 1039961.717 units remaining) [ { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { True ; True ; False ; False ; False } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 44 (remaining gas: 1039961.707 units remaining) - [ { True ; True ; False ; False ; False } + [ { True ; True ; False ; False ; False } { { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 45 (remaining gas: 1039961.692 units remaining) [ { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 46 (remaining gas: 1039961.677 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 48 (remaining gas: 1039961.667 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.667 units remaining) - [ -9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.652 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.637 units remaining) - [ -1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ -1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.622 units remaining) - [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ False + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.607 units remaining) - [ 0 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 0 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.592 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.577 units remaining) - [ 1 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 1 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.562 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.547 units remaining) - [ 9999999 - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ 9999999 + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039961.532 units remaining) - [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ True + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039961.517 units remaining) - [ { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { False ; False ; True ; True ; True } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 46 (remaining gas: 1039961.487 units remaining) [ { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { False ; False ; True ; True ; True } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 52 (remaining gas: 1039961.477 units remaining) - [ { False ; False ; True ; True ; True } + [ { False ; False ; True ; True ; True } { { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 53 (remaining gas: 1039961.462 units remaining) [ { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + { False ; False ; True ; False ; False } } + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 54 (remaining gas: 1039961.447 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 56 (remaining gas: 1039961.447 units remaining) - [ -9999999 ] + [ -9999999 ] - location: 58 (remaining gas: 1039961.432 units remaining) - [ False ] + [ False ] - location: 56 (remaining gas: 1039961.417 units remaining) - [ -1 ] + [ -1 ] - location: 58 (remaining gas: 1039961.402 units remaining) - [ False ] + [ False ] - location: 56 (remaining gas: 1039961.387 units remaining) - [ 0 ] + [ 0 ] - location: 58 (remaining gas: 1039961.372 units remaining) - [ False ] + [ False ] - location: 56 (remaining gas: 1039961.357 units remaining) - [ 1 ] + [ 1 ] - location: 58 (remaining gas: 1039961.342 units remaining) - [ True ] + [ True ] - location: 56 (remaining gas: 1039961.327 units remaining) - [ 9999999 ] + [ 9999999 ] - location: 58 (remaining gas: 1039961.312 units remaining) - [ True ] + [ True ] - location: 56 (remaining gas: 1039961.297 units remaining) - [ { False ; False ; False ; True ; True } ] + [ { False ; False ; False ; True ; True } ] - location: 54 (remaining gas: 1039961.267 units remaining) [ { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } - { False ; False ; False ; True ; True } ] + { False ; False ; True ; False ; False } } + { False ; False ; False ; True ; True } ] - location: 59 (remaining gas: 1039961.257 units remaining) - [ { False ; False ; False ; True ; True } + [ { False ; False ; False ; True ; True } { { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } ] + { False ; False ; True ; False ; False } } ] - location: 60 (remaining gas: 1039961.242 units remaining) [ { { False ; False ; False ; True ; True } ; { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } ] + { False ; False ; True ; False ; False } } ] - location: 61 (remaining gas: 1039961.227 units remaining) - [ {} + [ {} { { False ; False ; False ; True ; True } ; { False ; False ; True ; True ; True } ; { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } } ] + { False ; False ; True ; False ; False } } ] - location: 63 (remaining gas: 1039961.212 units remaining) [ (Pair {} { { False ; False ; False ; True ; True } ; @@ -346,5 +346,5 @@ trace { True ; True ; False ; False ; False } ; { True ; True ; True ; False ; False } ; { True ; True ; False ; True ; True } ; - { False ; False ; True ; False ; False } }) ] + { False ; False ; True ; False ; False } }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" index 28986a4e8a4e..85cbfe2d5742 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" @@ -8,21 +8,21 @@ big_map diff trace - location: 9 (remaining gas: 1039992.305 units remaining) - [ (Pair { "World!" } {}) ] + [ (Pair { "World!" } {}) ] - location: 9 (remaining gas: 1039992.295 units remaining) - [ { "World!" } ] + [ { "World!" } ] - location: 10 (remaining gas: 1039992.295 units remaining) - [ "World!" ] + [ "World!" ] - location: 12 (remaining gas: 1039992.285 units remaining) - [ "Hello " - "World!" ] + [ "Hello " + "World!" ] - location: 15 (remaining gas: 1039992.220 units remaining) - [ "Hello World!" ] + [ "Hello World!" ] - location: 10 (remaining gas: 1039992.205 units remaining) - [ { "Hello World!" } ] + [ { "Hello World!" } ] - location: 16 (remaining gas: 1039992.190 units remaining) - [ {} - { "Hello World!" } ] + [ {} + { "Hello World!" } ] - location: 18 (remaining gas: 1039992.175 units remaining) - [ (Pair {} { "Hello World!" }) ] + [ (Pair {} { "Hello World!" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" index 92d059004c15..cce3f270bfb2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" @@ -8,28 +8,28 @@ big_map diff trace - location: 9 (remaining gas: 1039992.151 units remaining) - [ (Pair { "test1" ; "test2" } {}) ] + [ (Pair { "test1" ; "test2" } {}) ] - location: 9 (remaining gas: 1039992.141 units remaining) - [ { "test1" ; "test2" } ] + [ { "test1" ; "test2" } ] - location: 10 (remaining gas: 1039992.141 units remaining) - [ "test1" ] + [ "test1" ] - location: 12 (remaining gas: 1039992.131 units remaining) - [ "Hello " - "test1" ] + [ "Hello " + "test1" ] - location: 15 (remaining gas: 1039992.066 units remaining) - [ "Hello test1" ] + [ "Hello test1" ] - location: 10 (remaining gas: 1039992.051 units remaining) - [ "test2" ] + [ "test2" ] - location: 12 (remaining gas: 1039992.041 units remaining) - [ "Hello " - "test2" ] + [ "Hello " + "test2" ] - location: 15 (remaining gas: 1039991.976 units remaining) - [ "Hello test2" ] + [ "Hello test2" ] - location: 10 (remaining gas: 1039991.961 units remaining) - [ { "Hello test1" ; "Hello test2" } ] + [ { "Hello test1" ; "Hello test2" } ] - location: 16 (remaining gas: 1039991.946 units remaining) - [ {} - { "Hello test1" ; "Hello test2" } ] + [ {} + { "Hello test1" ; "Hello test2" } ] - location: 18 (remaining gas: 1039991.931 units remaining) - [ (Pair {} { "Hello test1" ; "Hello test2" }) ] + [ (Pair {} { "Hello test1" ; "Hello test2" }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out index f43586da20f2..dfa030773d27 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039992.479 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 9 (remaining gas: 1039992.469 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039992.469 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039992.454 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 18 (remaining gas: 1039992.439 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out index d24d76a16eb5..1cf956e38ec1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out @@ -8,28 +8,28 @@ big_map diff trace - location: 9 (remaining gas: 1039992.398 units remaining) - [ (Pair { 0xab ; 0xcd } {}) ] + [ (Pair { 0xab ; 0xcd } {}) ] - location: 9 (remaining gas: 1039992.388 units remaining) - [ { 0xab ; 0xcd } ] + [ { 0xab ; 0xcd } ] - location: 10 (remaining gas: 1039992.388 units remaining) - [ 0xab ] + [ 0xab ] - location: 12 (remaining gas: 1039992.378 units remaining) - [ 0xff - 0xab ] + [ 0xff + 0xab ] - location: 15 (remaining gas: 1039992.313 units remaining) - [ 0xffab ] + [ 0xffab ] - location: 10 (remaining gas: 1039992.298 units remaining) - [ 0xcd ] + [ 0xcd ] - location: 12 (remaining gas: 1039992.288 units remaining) - [ 0xff - 0xcd ] + [ 0xff + 0xcd ] - location: 15 (remaining gas: 1039992.223 units remaining) - [ 0xffcd ] + [ 0xffcd ] - location: 10 (remaining gas: 1039992.208 units remaining) - [ { 0xffab ; 0xffcd } ] + [ { 0xffab ; 0xffcd } ] - location: 16 (remaining gas: 1039992.193 units remaining) - [ {} - { 0xffab ; 0xffcd } ] + [ {} + { 0xffab ; 0xffcd } ] - location: 18 (remaining gas: 1039992.178 units remaining) - [ (Pair {} { 0xffab ; 0xffcd }) ] + [ (Pair {} { 0xffab ; 0xffcd }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out index df03ec93fae6..72093649ef51 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out @@ -8,21 +8,21 @@ big_map diff trace - location: 9 (remaining gas: 1039992.498 units remaining) - [ (Pair { 0xcd } {}) ] + [ (Pair { 0xcd } {}) ] - location: 9 (remaining gas: 1039992.488 units remaining) - [ { 0xcd } ] + [ { 0xcd } ] - location: 10 (remaining gas: 1039992.488 units remaining) - [ 0xcd ] + [ 0xcd ] - location: 12 (remaining gas: 1039992.478 units remaining) - [ 0xff - 0xcd ] + [ 0xff + 0xcd ] - location: 15 (remaining gas: 1039992.413 units remaining) - [ 0xffcd ] + [ 0xffcd ] - location: 10 (remaining gas: 1039992.398 units remaining) - [ { 0xffcd } ] + [ { 0xffcd } ] - location: 16 (remaining gas: 1039992.383 units remaining) - [ {} - { 0xffcd } ] + [ {} + { 0xffcd } ] - location: 18 (remaining gas: 1039992.368 units remaining) - [ (Pair {} { 0xffcd }) ] + [ (Pair {} { 0xffcd }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out index 0612eb4df578..16a9b699f71a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039992.598 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 9 (remaining gas: 1039992.588 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039992.588 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039992.573 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 18 (remaining gas: 1039992.558 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" index bd2733d92a20..4d8c7075d1c2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" @@ -8,112 +8,112 @@ big_map diff trace - location: 8 (remaining gas: 1039987.037 units remaining) - [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ] + [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ] - location: 8 (remaining gas: 1039987.027 units remaining) - [ { "Hello" ; " " ; "World" ; "!" } ] + [ { "Hello" ; " " ; "World" ; "!" } ] - location: 9 (remaining gas: 1039987.017 units remaining) - [ "" - { "Hello" ; " " ; "World" ; "!" } ] + [ "" + { "Hello" ; " " ; "World" ; "!" } ] - location: 12 (remaining gas: 1039987.007 units remaining) - [ { "Hello" ; " " ; "World" ; "!" } - "" ] + [ { "Hello" ; " " ; "World" ; "!" } + "" ] - location: 13 (remaining gas: 1039987.007 units remaining) - [ "Hello" - "" ] + [ "Hello" + "" ] - location: 15 (remaining gas: 1039986.997 units remaining) - [ "" - "Hello" ] + [ "" + "Hello" ] - location: 16 (remaining gas: 1039986.982 units remaining) - [ "Hello" ] + [ "Hello" ] - location: 18 (remaining gas: 1039986.967 units remaining) - [ {} - "Hello" ] + [ {} + "Hello" ] - location: 20 (remaining gas: 1039986.957 units remaining) - [ "Hello" - {} ] + [ "Hello" + {} ] - location: 21 (remaining gas: 1039986.942 units remaining) - [ { "Hello" } ] + [ { "Hello" } ] - location: 16 (remaining gas: 1039986.912 units remaining) - [ "" - { "Hello" } ] + [ "" + { "Hello" } ] - location: 22 (remaining gas: 1039986.897 units remaining) - [ { "" ; "Hello" } ] + [ { "" ; "Hello" } ] - location: 23 (remaining gas: 1039986.777 units remaining) - [ "Hello" ] + [ "Hello" ] - location: 13 (remaining gas: 1039986.762 units remaining) - [ " " - "Hello" ] + [ " " + "Hello" ] - location: 15 (remaining gas: 1039986.752 units remaining) - [ "Hello" - " " ] + [ "Hello" + " " ] - location: 16 (remaining gas: 1039986.737 units remaining) - [ " " ] + [ " " ] - location: 18 (remaining gas: 1039986.722 units remaining) - [ {} - " " ] + [ {} + " " ] - location: 20 (remaining gas: 1039986.712 units remaining) - [ " " - {} ] + [ " " + {} ] - location: 21 (remaining gas: 1039986.697 units remaining) - [ { " " } ] + [ { " " } ] - location: 16 (remaining gas: 1039986.667 units remaining) - [ "Hello" - { " " } ] + [ "Hello" + { " " } ] - location: 22 (remaining gas: 1039986.652 units remaining) - [ { "Hello" ; " " } ] + [ { "Hello" ; " " } ] - location: 23 (remaining gas: 1039986.532 units remaining) - [ "Hello " ] + [ "Hello " ] - location: 13 (remaining gas: 1039986.517 units remaining) - [ "World" - "Hello " ] + [ "World" + "Hello " ] - location: 15 (remaining gas: 1039986.507 units remaining) - [ "Hello " - "World" ] + [ "Hello " + "World" ] - location: 16 (remaining gas: 1039986.492 units remaining) - [ "World" ] + [ "World" ] - location: 18 (remaining gas: 1039986.477 units remaining) - [ {} - "World" ] + [ {} + "World" ] - location: 20 (remaining gas: 1039986.467 units remaining) - [ "World" - {} ] + [ "World" + {} ] - location: 21 (remaining gas: 1039986.452 units remaining) - [ { "World" } ] + [ { "World" } ] - location: 16 (remaining gas: 1039986.422 units remaining) - [ "Hello " - { "World" } ] + [ "Hello " + { "World" } ] - location: 22 (remaining gas: 1039986.407 units remaining) - [ { "Hello " ; "World" } ] + [ { "Hello " ; "World" } ] - location: 23 (remaining gas: 1039986.286 units remaining) - [ "Hello World" ] + [ "Hello World" ] - location: 13 (remaining gas: 1039986.271 units remaining) - [ "!" - "Hello World" ] + [ "!" + "Hello World" ] - location: 15 (remaining gas: 1039986.261 units remaining) - [ "Hello World" - "!" ] + [ "Hello World" + "!" ] - location: 16 (remaining gas: 1039986.246 units remaining) - [ "!" ] + [ "!" ] - location: 18 (remaining gas: 1039986.231 units remaining) - [ {} - "!" ] + [ {} + "!" ] - location: 20 (remaining gas: 1039986.221 units remaining) - [ "!" - {} ] + [ "!" + {} ] - location: 21 (remaining gas: 1039986.206 units remaining) - [ { "!" } ] + [ { "!" } ] - location: 16 (remaining gas: 1039986.176 units remaining) - [ "Hello World" - { "!" } ] + [ "Hello World" + { "!" } ] - location: 22 (remaining gas: 1039986.161 units remaining) - [ { "Hello World" ; "!" } ] + [ { "Hello World" ; "!" } ] - location: 23 (remaining gas: 1039986.040 units remaining) - [ "Hello World!" ] + [ "Hello World!" ] - location: 13 (remaining gas: 1039986.025 units remaining) - [ "Hello World!" ] + [ "Hello World!" ] - location: 24 (remaining gas: 1039986.010 units remaining) - [ {} - "Hello World!" ] + [ {} + "Hello World!" ] - location: 26 (remaining gas: 1039985.995 units remaining) - [ (Pair {} "Hello World!") ] + [ (Pair {} "Hello World!") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" index ac946b1f451b..85657f6e29ea 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" @@ -8,89 +8,89 @@ big_map diff trace - location: 8 (remaining gas: 1039987.241 units remaining) - [ (Pair { "a" ; "b" ; "c" } "") ] + [ (Pair { "a" ; "b" ; "c" } "") ] - location: 8 (remaining gas: 1039987.231 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 9 (remaining gas: 1039987.221 units remaining) - [ "" - { "a" ; "b" ; "c" } ] + [ "" + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039987.211 units remaining) - [ { "a" ; "b" ; "c" } - "" ] + [ { "a" ; "b" ; "c" } + "" ] - location: 13 (remaining gas: 1039987.211 units remaining) - [ "a" - "" ] + [ "a" + "" ] - location: 15 (remaining gas: 1039987.201 units remaining) - [ "" - "a" ] + [ "" + "a" ] - location: 16 (remaining gas: 1039987.186 units remaining) - [ "a" ] + [ "a" ] - location: 18 (remaining gas: 1039987.171 units remaining) - [ {} - "a" ] + [ {} + "a" ] - location: 20 (remaining gas: 1039987.161 units remaining) - [ "a" - {} ] + [ "a" + {} ] - location: 21 (remaining gas: 1039987.146 units remaining) - [ { "a" } ] + [ { "a" } ] - location: 16 (remaining gas: 1039987.116 units remaining) - [ "" - { "a" } ] + [ "" + { "a" } ] - location: 22 (remaining gas: 1039987.101 units remaining) - [ { "" ; "a" } ] + [ { "" ; "a" } ] - location: 23 (remaining gas: 1039986.981 units remaining) - [ "a" ] + [ "a" ] - location: 13 (remaining gas: 1039986.966 units remaining) - [ "b" - "a" ] + [ "b" + "a" ] - location: 15 (remaining gas: 1039986.956 units remaining) - [ "a" - "b" ] + [ "a" + "b" ] - location: 16 (remaining gas: 1039986.941 units remaining) - [ "b" ] + [ "b" ] - location: 18 (remaining gas: 1039986.926 units remaining) - [ {} - "b" ] + [ {} + "b" ] - location: 20 (remaining gas: 1039986.916 units remaining) - [ "b" - {} ] + [ "b" + {} ] - location: 21 (remaining gas: 1039986.901 units remaining) - [ { "b" } ] + [ { "b" } ] - location: 16 (remaining gas: 1039986.871 units remaining) - [ "a" - { "b" } ] + [ "a" + { "b" } ] - location: 22 (remaining gas: 1039986.856 units remaining) - [ { "a" ; "b" } ] + [ { "a" ; "b" } ] - location: 23 (remaining gas: 1039986.736 units remaining) - [ "ab" ] + [ "ab" ] - location: 13 (remaining gas: 1039986.721 units remaining) - [ "c" - "ab" ] + [ "c" + "ab" ] - location: 15 (remaining gas: 1039986.711 units remaining) - [ "ab" - "c" ] + [ "ab" + "c" ] - location: 16 (remaining gas: 1039986.696 units remaining) - [ "c" ] + [ "c" ] - location: 18 (remaining gas: 1039986.681 units remaining) - [ {} - "c" ] + [ {} + "c" ] - location: 20 (remaining gas: 1039986.671 units remaining) - [ "c" - {} ] + [ "c" + {} ] - location: 21 (remaining gas: 1039986.656 units remaining) - [ { "c" } ] + [ { "c" } ] - location: 16 (remaining gas: 1039986.626 units remaining) - [ "ab" - { "c" } ] + [ "ab" + { "c" } ] - location: 22 (remaining gas: 1039986.611 units remaining) - [ { "ab" ; "c" } ] + [ { "ab" ; "c" } ] - location: 23 (remaining gas: 1039986.491 units remaining) - [ "abc" ] + [ "abc" ] - location: 13 (remaining gas: 1039986.476 units remaining) - [ "abc" ] + [ "abc" ] - location: 24 (remaining gas: 1039986.461 units remaining) - [ {} - "abc" ] + [ {} + "abc" ] - location: 26 (remaining gas: 1039986.446 units remaining) - [ (Pair {} "abc") ] + [ (Pair {} "abc") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" index 486f5213dd67..b499b54b28f5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039987.613 units remaining) - [ (Pair {} "") ] + [ (Pair {} "") ] - location: 8 (remaining gas: 1039987.603 units remaining) - [ {} ] + [ {} ] - location: 9 (remaining gas: 1039987.593 units remaining) - [ "" - {} ] + [ "" + {} ] - location: 12 (remaining gas: 1039987.583 units remaining) - [ {} - "" ] + [ {} + "" ] - location: 13 (remaining gas: 1039987.583 units remaining) - [ "" ] + [ "" ] - location: 24 (remaining gas: 1039987.568 units remaining) - [ {} - "" ] + [ {} + "" ] - location: 26 (remaining gas: 1039987.553 units remaining) - [ (Pair {} "") ] + [ (Pair {} "") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out index 94dc28981e20..96c73455d483 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out @@ -8,15 +8,15 @@ big_map diff trace - location: 8 (remaining gas: 1039994.045 units remaining) - [ (Pair 99 { -5 ; 10 }) ] + [ (Pair 99 { -5 ; 10 }) ] - location: 8 (remaining gas: 1039994.035 units remaining) - [ 99 - { -5 ; 10 } ] + [ 99 + { -5 ; 10 } ] - location: 9 (remaining gas: 1039994.020 units remaining) - [ { 99 ; -5 ; 10 } ] + [ { 99 ; -5 ; 10 } ] - location: 10 (remaining gas: 1039994.005 units remaining) - [ {} - { 99 ; -5 ; 10 } ] + [ {} + { 99 ; -5 ; 10 } ] - location: 12 (remaining gas: 1039993.990 units remaining) - [ (Pair {} { 99 ; -5 ; 10 }) ] + [ (Pair {} { 99 ; -5 ; 10 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out index b7d44136d77b..d3babd6fcb7d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out @@ -8,15 +8,15 @@ big_map diff trace - location: 8 (remaining gas: 1039994.145 units remaining) - [ (Pair -5 { 10 }) ] + [ (Pair -5 { 10 }) ] - location: 8 (remaining gas: 1039994.135 units remaining) - [ -5 - { 10 } ] + [ -5 + { 10 } ] - location: 9 (remaining gas: 1039994.120 units remaining) - [ { -5 ; 10 } ] + [ { -5 ; 10 } ] - location: 10 (remaining gas: 1039994.105 units remaining) - [ {} - { -5 ; 10 } ] + [ {} + { -5 ; 10 } ] - location: 12 (remaining gas: 1039994.090 units remaining) - [ (Pair {} { -5 ; 10 }) ] + [ (Pair {} { -5 ; 10 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out index 2a7e61e51875..479e6eb03d20 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out @@ -8,15 +8,15 @@ big_map diff trace - location: 8 (remaining gas: 1039994.245 units remaining) - [ (Pair 10 {}) ] + [ (Pair 10 {}) ] - location: 8 (remaining gas: 1039994.235 units remaining) - [ 10 - {} ] + [ 10 + {} ] - location: 9 (remaining gas: 1039994.220 units remaining) - [ { 10 } ] + [ { 10 } ] - location: 10 (remaining gas: 1039994.205 units remaining) - [ {} - { 10 } ] + [ {} + { 10 } ] - location: 12 (remaining gas: 1039994.190 units remaining) - [ (Pair {} { 10 }) ] + [ (Pair {} { 10 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" index 8b9eba75d3b5..a4d658b49653 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" @@ -8,159 +8,159 @@ big_map diff trace - location: 12 (remaining gas: 1039963.179 units remaining) - [ (Pair (Pair { "A" } { "B" }) None) ] + [ (Pair (Pair { "A" } { "B" }) None) ] - location: 12 (remaining gas: 1039963.169 units remaining) - [ (Pair { "A" } { "B" }) ] + [ (Pair { "A" } { "B" }) ] - location: 13 (remaining gas: 1039963.159 units remaining) - [ (Pair { "A" } { "B" }) - (Pair { "A" } { "B" }) ] + [ (Pair { "A" } { "B" }) + (Pair { "A" } { "B" }) ] - location: 14 (remaining gas: 1039963.149 units remaining) - [ { "A" } - (Pair { "A" } { "B" }) ] + [ { "A" } + (Pair { "A" } { "B" }) ] - location: 15 (remaining gas: 1039963.134 units remaining) - [ (Pair { "A" } { "B" }) ] + [ (Pair { "A" } { "B" }) ] - location: 17 (remaining gas: 1039963.124 units remaining) - [ { "B" } ] + [ { "B" } ] - location: 15 (remaining gas: 1039963.094 units remaining) - [ { "A" } - { "B" } ] + [ { "A" } + { "B" } ] - location: 18 (remaining gas: 1039962.874 units remaining) - [ {} - { "A" } - { "B" } ] + [ {} + { "A" } + { "B" } ] - location: 20 (remaining gas: 1039962.864 units remaining) - [ { "A" } - {} - { "B" } ] + [ { "A" } + {} + { "B" } ] - location: 21 (remaining gas: 1039962.864 units remaining) - [ "A" - {} - { "B" } ] + [ "A" + {} + { "B" } ] - location: 23 (remaining gas: 1039962.849 units remaining) - [ (Pair "A" {}) - { "B" } ] + [ (Pair "A" {}) + { "B" } ] - location: 24 (remaining gas: 1039962.839 units remaining) - [ (Pair "A" {}) - (Pair "A" {}) - { "B" } ] + [ (Pair "A" {}) + (Pair "A" {}) + { "B" } ] - location: 25 (remaining gas: 1039962.829 units remaining) - [ "A" - (Pair "A" {}) - { "B" } ] + [ "A" + (Pair "A" {}) + { "B" } ] - location: 26 (remaining gas: 1039962.814 units remaining) - [ (Pair "A" {}) - { "B" } ] + [ (Pair "A" {}) + { "B" } ] - location: 28 (remaining gas: 1039962.804 units remaining) - [ {} - { "B" } ] + [ {} + { "B" } ] - location: 26 (remaining gas: 1039962.774 units remaining) - [ "A" - {} - { "B" } ] + [ "A" + {} + { "B" } ] - location: 29 (remaining gas: 1039962.764 units remaining) - [ True - "A" - {} - { "B" } ] + [ True + "A" + {} + { "B" } ] - location: 32 (remaining gas: 1039962.754 units remaining) - [ "A" - True - {} - { "B" } ] + [ "A" + True + {} + { "B" } ] - location: 33 (remaining gas: 1039962.554 units remaining) - [ { "A" } - { "B" } ] + [ { "A" } + { "B" } ] - location: 21 (remaining gas: 1039962.539 units remaining) - [ { "A" } - { "B" } ] + [ { "A" } + { "B" } ] - location: 34 (remaining gas: 1039962.529 units remaining) - [ True - { "A" } - { "B" } ] + [ True + { "A" } + { "B" } ] - location: 37 (remaining gas: 1039962.519 units remaining) - [ { "A" } - True - { "B" } ] + [ { "A" } + True + { "B" } ] - location: 38 (remaining gas: 1039962.504 units remaining) - [ (Pair { "A" } True) - { "B" } ] + [ (Pair { "A" } True) + { "B" } ] - location: 39 (remaining gas: 1039962.494 units remaining) - [ { "B" } - (Pair { "A" } True) ] + [ { "B" } + (Pair { "A" } True) ] - location: 40 (remaining gas: 1039962.494 units remaining) - [ "B" - (Pair { "A" } True) ] + [ "B" + (Pair { "A" } True) ] - location: 42 (remaining gas: 1039962.479 units remaining) - [ (Pair "B" { "A" } True) ] + [ (Pair "B" { "A" } True) ] - location: 43 (remaining gas: 1039962.469 units remaining) - [ (Pair "B" { "A" } True) - (Pair "B" { "A" } True) ] + [ (Pair "B" { "A" } True) + (Pair "B" { "A" } True) ] - location: 44 (remaining gas: 1039962.459 units remaining) - [ (Pair "B" { "A" } True) - (Pair "B" { "A" } True) - (Pair "B" { "A" } True) ] + [ (Pair "B" { "A" } True) + (Pair "B" { "A" } True) + (Pair "B" { "A" } True) ] - location: 45 (remaining gas: 1039962.449 units remaining) - [ "B" - (Pair "B" { "A" } True) - (Pair "B" { "A" } True) ] + [ "B" + (Pair "B" { "A" } True) + (Pair "B" { "A" } True) ] - location: 46 (remaining gas: 1039962.434 units remaining) - [ (Pair "B" { "A" } True) - (Pair "B" { "A" } True) ] + [ (Pair "B" { "A" } True) + (Pair "B" { "A" } True) ] - location: 49 (remaining gas: 1039962.424 units remaining) - [ (Pair { "A" } True) - (Pair "B" { "A" } True) ] + [ (Pair { "A" } True) + (Pair "B" { "A" } True) ] - location: 50 (remaining gas: 1039962.414 units remaining) - [ { "A" } - (Pair "B" { "A" } True) ] + [ { "A" } + (Pair "B" { "A" } True) ] - location: 51 (remaining gas: 1039962.399 units remaining) - [ (Pair "B" { "A" } True) ] + [ (Pair "B" { "A" } True) ] - location: 54 (remaining gas: 1039962.389 units remaining) - [ (Pair { "A" } True) ] + [ (Pair { "A" } True) ] - location: 55 (remaining gas: 1039962.379 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039962.349 units remaining) - [ { "A" } - True ] + [ { "A" } + True ] - location: 56 (remaining gas: 1039962.339 units remaining) - [ { "A" } - { "A" } - True ] + [ { "A" } + { "A" } + True ] - location: 46 (remaining gas: 1039962.309 units remaining) - [ "B" - { "A" } - { "A" } - True ] + [ "B" + { "A" } + { "A" } + True ] - location: 57 (remaining gas: 1039962.124 units remaining) - [ False - { "A" } - True ] + [ False + { "A" } + True ] - location: 58 (remaining gas: 1039962.109 units remaining) - [ { "A" } - True ] + [ { "A" } + True ] - location: 60 (remaining gas: 1039962.099 units remaining) - [ True - { "A" } ] + [ True + { "A" } ] - location: 58 (remaining gas: 1039962.069 units remaining) - [ False - True - { "A" } ] + [ False + True + { "A" } ] - location: 61 (remaining gas: 1039962.049 units remaining) - [ False - { "A" } ] + [ False + { "A" } ] - location: 62 (remaining gas: 1039962.039 units remaining) - [ { "A" } - False ] + [ { "A" } + False ] - location: 63 (remaining gas: 1039962.024 units remaining) - [ (Pair { "A" } False) ] + [ (Pair { "A" } False) ] - location: 40 (remaining gas: 1039962.009 units remaining) - [ (Pair { "A" } False) ] + [ (Pair { "A" } False) ] - location: 64 (remaining gas: 1039961.999 units remaining) - [ False ] + [ False ] - location: 65 (remaining gas: 1039961.984 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 66 (remaining gas: 1039961.969 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 68 (remaining gas: 1039961.954 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" index 371c9aa80bf5..fde6623fdb1e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" @@ -8,403 +8,403 @@ big_map diff trace - location: 12 (remaining gas: 1039962.499 units remaining) - [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ] + [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ] - location: 12 (remaining gas: 1039962.489 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 13 (remaining gas: 1039962.479 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) - (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) + (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 14 (remaining gas: 1039962.469 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } - (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] + [ { "B" ; "B" ; "asdf" ; "C" } + (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 15 (remaining gas: 1039962.454 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 17 (remaining gas: 1039962.444 units remaining) - [ { "B" ; "C" ; "asdf" } ] + [ { "B" ; "C" ; "asdf" } ] - location: 15 (remaining gas: 1039962.414 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "B" ; "asdf" ; "C" } + { "B" ; "C" ; "asdf" } ] - location: 18 (remaining gas: 1039962.194 units remaining) - [ {} - { "B" ; "B" ; "asdf" ; "C" } - { "B" ; "C" ; "asdf" } ] + [ {} + { "B" ; "B" ; "asdf" ; "C" } + { "B" ; "C" ; "asdf" } ] - location: 20 (remaining gas: 1039962.184 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } - {} - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "B" ; "asdf" ; "C" } + {} + { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039962.184 units remaining) - [ "B" - {} - { "B" ; "C" ; "asdf" } ] + [ "B" + {} + { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039962.169 units remaining) - [ (Pair "B" {}) - { "B" ; "C" ; "asdf" } ] + [ (Pair "B" {}) + { "B" ; "C" ; "asdf" } ] - location: 24 (remaining gas: 1039962.159 units remaining) - [ (Pair "B" {}) - (Pair "B" {}) - { "B" ; "C" ; "asdf" } ] + [ (Pair "B" {}) + (Pair "B" {}) + { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039962.149 units remaining) - [ "B" - (Pair "B" {}) - { "B" ; "C" ; "asdf" } ] + [ "B" + (Pair "B" {}) + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039962.134 units remaining) - [ (Pair "B" {}) - { "B" ; "C" ; "asdf" } ] + [ (Pair "B" {}) + { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039962.124 units remaining) - [ {} - { "B" ; "C" ; "asdf" } ] + [ {} + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039962.094 units remaining) - [ "B" - {} - { "B" ; "C" ; "asdf" } ] + [ "B" + {} + { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039962.084 units remaining) - [ True - "B" - {} - { "B" ; "C" ; "asdf" } ] + [ True + "B" + {} + { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039962.074 units remaining) - [ "B" - True - {} - { "B" ; "C" ; "asdf" } ] + [ "B" + True + {} + { "B" ; "C" ; "asdf" } ] - location: 33 (remaining gas: 1039961.874 units remaining) - [ { "B" } - { "B" ; "C" ; "asdf" } ] + [ { "B" } + { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039961.859 units remaining) - [ "B" - { "B" } - { "B" ; "C" ; "asdf" } ] + [ "B" + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039961.844 units remaining) - [ (Pair "B" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "B" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 24 (remaining gas: 1039961.834 units remaining) - [ (Pair "B" { "B" }) - (Pair "B" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "B" { "B" }) + (Pair "B" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039961.824 units remaining) - [ "B" - (Pair "B" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ "B" + (Pair "B" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.809 units remaining) - [ (Pair "B" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "B" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039961.799 units remaining) - [ { "B" } - { "B" ; "C" ; "asdf" } ] + [ { "B" } + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.769 units remaining) - [ "B" - { "B" } - { "B" ; "C" ; "asdf" } ] + [ "B" + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039961.759 units remaining) - [ True - "B" - { "B" } - { "B" ; "C" ; "asdf" } ] + [ True + "B" + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039961.749 units remaining) - [ "B" - True - { "B" } - { "B" ; "C" ; "asdf" } ] + [ "B" + True + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 33 (remaining gas: 1039961.479 units remaining) - [ { "B" } - { "B" ; "C" ; "asdf" } ] + [ { "B" } + { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039961.464 units remaining) - [ "asdf" - { "B" } - { "B" ; "C" ; "asdf" } ] + [ "asdf" + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039961.449 units remaining) - [ (Pair "asdf" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "asdf" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 24 (remaining gas: 1039961.439 units remaining) - [ (Pair "asdf" { "B" }) - (Pair "asdf" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "asdf" { "B" }) + (Pair "asdf" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039961.429 units remaining) - [ "asdf" - (Pair "asdf" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ "asdf" + (Pair "asdf" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.414 units remaining) - [ (Pair "asdf" { "B" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "asdf" { "B" }) + { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039961.404 units remaining) - [ { "B" } - { "B" ; "C" ; "asdf" } ] + [ { "B" } + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.374 units remaining) - [ "asdf" - { "B" } - { "B" ; "C" ; "asdf" } ] + [ "asdf" + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039961.364 units remaining) - [ True - "asdf" - { "B" } - { "B" ; "C" ; "asdf" } ] + [ True + "asdf" + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039961.354 units remaining) - [ "asdf" - True - { "B" } - { "B" ; "C" ; "asdf" } ] + [ "asdf" + True + { "B" } + { "B" ; "C" ; "asdf" } ] - location: 33 (remaining gas: 1039961.084 units remaining) - [ { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039961.069 units remaining) - [ "C" - { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ "C" + { "B" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 23 (remaining gas: 1039961.054 units remaining) - [ (Pair "C" { "B" ; "asdf" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "C" { "B" ; "asdf" }) + { "B" ; "C" ; "asdf" } ] - location: 24 (remaining gas: 1039961.044 units remaining) - [ (Pair "C" { "B" ; "asdf" }) - (Pair "C" { "B" ; "asdf" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "C" { "B" ; "asdf" }) + (Pair "C" { "B" ; "asdf" }) + { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039961.034 units remaining) - [ "C" - (Pair "C" { "B" ; "asdf" }) - { "B" ; "C" ; "asdf" } ] + [ "C" + (Pair "C" { "B" ; "asdf" }) + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039961.019 units remaining) - [ (Pair "C" { "B" ; "asdf" }) - { "B" ; "C" ; "asdf" } ] + [ (Pair "C" { "B" ; "asdf" }) + { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039961.009 units remaining) - [ { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039960.979 units remaining) - [ "C" - { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ "C" + { "B" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039960.969 units remaining) - [ True - "C" - { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ True + "C" + { "B" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039960.959 units remaining) - [ "C" - True - { "B" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ "C" + True + { "B" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 33 (remaining gas: 1039960.619 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 21 (remaining gas: 1039960.604 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 34 (remaining gas: 1039960.594 units remaining) - [ True - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } ] - location: 37 (remaining gas: 1039960.584 units remaining) - [ { "B" ; "C" ; "asdf" } - True - { "B" ; "C" ; "asdf" } ] + [ { "B" ; "C" ; "asdf" } + True + { "B" ; "C" ; "asdf" } ] - location: 38 (remaining gas: 1039960.569 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - { "B" ; "C" ; "asdf" } ] + [ (Pair { "B" ; "C" ; "asdf" } True) + { "B" ; "C" ; "asdf" } ] - location: 39 (remaining gas: 1039960.559 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.559 units remaining) - [ "B" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "B" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.544 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039960.534 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039960.524 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039960.514 units remaining) - [ "B" - (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ "B" + (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039960.499 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039960.489 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039960.479 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039960.464 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039960.454 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039960.444 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039960.414 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039960.404 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039960.374 units remaining) - [ "B" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "B" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039960.154 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039960.139 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039960.129 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039960.099 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039960.079 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039960.069 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039960.054 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.039 units remaining) - [ "C" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "C" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.024 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039960.014 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039960.004 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.994 units remaining) - [ "C" - (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ "C" + (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.979 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039959.969 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039959.959 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039959.944 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039959.934 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039959.924 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039959.894 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039959.884 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039959.854 units remaining) - [ "C" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "C" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039959.634 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039959.619 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039959.609 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039959.579 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039959.559 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039959.549 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039959.534 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039959.519 units remaining) - [ "asdf" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "asdf" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039959.504 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039959.494 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039959.484 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.474 units remaining) - [ "asdf" - (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ "asdf" + (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.459 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039959.449 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039959.439 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039959.424 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039959.414 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039959.404 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039959.374 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039959.364 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039959.334 units remaining) - [ "asdf" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "asdf" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039959.114 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039959.099 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039959.089 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039959.059 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039959.039 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039959.029 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039959.014 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039958.999 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 64 (remaining gas: 1039958.989 units remaining) - [ True ] + [ True ] - location: 65 (remaining gas: 1039958.974 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 66 (remaining gas: 1039958.959 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 68 (remaining gas: 1039958.944 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" index 0e797d9d170e..c7a2fff6e3a6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" @@ -8,430 +8,430 @@ big_map diff trace - location: 12 (remaining gas: 1039962.499 units remaining) - [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ] + [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ] - location: 12 (remaining gas: 1039962.489 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 13 (remaining gas: 1039962.479 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) - (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) + (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 14 (remaining gas: 1039962.469 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] + [ { "B" ; "C" ; "asdf" } + (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 15 (remaining gas: 1039962.454 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 17 (remaining gas: 1039962.444 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "B" ; "asdf" ; "C" } ] - location: 15 (remaining gas: 1039962.414 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 18 (remaining gas: 1039962.194 units remaining) - [ {} - { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ {} + { "B" ; "C" ; "asdf" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 20 (remaining gas: 1039962.184 units remaining) - [ { "B" ; "C" ; "asdf" } - {} - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" ; "asdf" } + {} + { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039962.184 units remaining) - [ "B" - {} - { "B" ; "B" ; "asdf" ; "C" } ] + [ "B" + {} + { "B" ; "B" ; "asdf" ; "C" } ] - location: 23 (remaining gas: 1039962.169 units remaining) - [ (Pair "B" {}) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "B" {}) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 24 (remaining gas: 1039962.159 units remaining) - [ (Pair "B" {}) - (Pair "B" {}) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "B" {}) + (Pair "B" {}) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039962.149 units remaining) - [ "B" - (Pair "B" {}) - { "B" ; "B" ; "asdf" ; "C" } ] + [ "B" + (Pair "B" {}) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039962.134 units remaining) - [ (Pair "B" {}) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "B" {}) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 28 (remaining gas: 1039962.124 units remaining) - [ {} - { "B" ; "B" ; "asdf" ; "C" } ] + [ {} + { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039962.094 units remaining) - [ "B" - {} - { "B" ; "B" ; "asdf" ; "C" } ] + [ "B" + {} + { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039962.084 units remaining) - [ True - "B" - {} - { "B" ; "B" ; "asdf" ; "C" } ] + [ True + "B" + {} + { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039962.074 units remaining) - [ "B" - True - {} - { "B" ; "B" ; "asdf" ; "C" } ] + [ "B" + True + {} + { "B" ; "B" ; "asdf" ; "C" } ] - location: 33 (remaining gas: 1039961.874 units remaining) - [ { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039961.859 units remaining) - [ "C" - { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ "C" + { "B" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 23 (remaining gas: 1039961.844 units remaining) - [ (Pair "C" { "B" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "C" { "B" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 24 (remaining gas: 1039961.834 units remaining) - [ (Pair "C" { "B" }) - (Pair "C" { "B" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "C" { "B" }) + (Pair "C" { "B" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039961.824 units remaining) - [ "C" - (Pair "C" { "B" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ "C" + (Pair "C" { "B" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.809 units remaining) - [ (Pair "C" { "B" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "C" { "B" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 28 (remaining gas: 1039961.799 units remaining) - [ { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.769 units remaining) - [ "C" - { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ "C" + { "B" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039961.759 units remaining) - [ True - "C" - { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ True + "C" + { "B" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039961.749 units remaining) - [ "C" - True - { "B" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ "C" + True + { "B" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 33 (remaining gas: 1039961.479 units remaining) - [ { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039961.464 units remaining) - [ "asdf" - { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ "asdf" + { "B" ; "C" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 23 (remaining gas: 1039961.449 units remaining) - [ (Pair "asdf" { "B" ; "C" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "asdf" { "B" ; "C" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 24 (remaining gas: 1039961.439 units remaining) - [ (Pair "asdf" { "B" ; "C" }) - (Pair "asdf" { "B" ; "C" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "asdf" { "B" ; "C" }) + (Pair "asdf" { "B" ; "C" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039961.429 units remaining) - [ "asdf" - (Pair "asdf" { "B" ; "C" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ "asdf" + (Pair "asdf" { "B" ; "C" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.414 units remaining) - [ (Pair "asdf" { "B" ; "C" }) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair "asdf" { "B" ; "C" }) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 28 (remaining gas: 1039961.404 units remaining) - [ { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039961.374 units remaining) - [ "asdf" - { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ "asdf" + { "B" ; "C" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039961.364 units remaining) - [ True - "asdf" - { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ True + "asdf" + { "B" ; "C" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039961.354 units remaining) - [ "asdf" - True - { "B" ; "C" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ "asdf" + True + { "B" ; "C" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 33 (remaining gas: 1039961.014 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 21 (remaining gas: 1039960.999 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 34 (remaining gas: 1039960.989 units remaining) - [ True - { "B" ; "C" ; "asdf" } - { "B" ; "B" ; "asdf" ; "C" } ] + [ True + { "B" ; "C" ; "asdf" } + { "B" ; "B" ; "asdf" ; "C" } ] - location: 37 (remaining gas: 1039960.979 units remaining) - [ { "B" ; "C" ; "asdf" } - True - { "B" ; "B" ; "asdf" ; "C" } ] + [ { "B" ; "C" ; "asdf" } + True + { "B" ; "B" ; "asdf" ; "C" } ] - location: 38 (remaining gas: 1039960.964 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - { "B" ; "B" ; "asdf" ; "C" } ] + [ (Pair { "B" ; "C" ; "asdf" } True) + { "B" ; "B" ; "asdf" ; "C" } ] - location: 39 (remaining gas: 1039960.954 units remaining) - [ { "B" ; "B" ; "asdf" ; "C" } - (Pair { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "B" ; "asdf" ; "C" } + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.954 units remaining) - [ "B" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "B" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.939 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039960.929 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039960.919 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039960.909 units remaining) - [ "B" - (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ "B" + (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039960.894 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039960.884 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039960.874 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039960.859 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039960.849 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039960.839 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039960.809 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039960.799 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039960.769 units remaining) - [ "B" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "B" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039960.549 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039960.534 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039960.524 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039960.494 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039960.474 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039960.464 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039960.449 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039960.434 units remaining) - [ "B" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "B" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039960.419 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039960.409 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039960.399 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039960.389 units remaining) - [ "B" - (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ "B" + (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039960.374 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039960.364 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039960.354 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039960.339 units remaining) - [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039960.329 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039960.319 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039960.289 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039960.279 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039960.249 units remaining) - [ "B" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "B" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039960.029 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039960.014 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039960.004 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039959.974 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039959.954 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039959.944 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039959.929 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039959.914 units remaining) - [ "asdf" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "asdf" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039959.899 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039959.889 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039959.879 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.869 units remaining) - [ "asdf" - (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ "asdf" + (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.854 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039959.844 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039959.834 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039959.819 units remaining) - [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039959.809 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039959.799 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039959.769 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039959.759 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039959.729 units remaining) - [ "asdf" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "asdf" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039959.509 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039959.494 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039959.484 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039959.454 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039959.434 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039959.424 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039959.409 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039959.394 units remaining) - [ "C" - (Pair { "B" ; "C" ; "asdf" } True) ] + [ "C" + (Pair { "B" ; "C" ; "asdf" } True) ] - location: 42 (remaining gas: 1039959.379 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 43 (remaining gas: 1039959.369 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 44 (remaining gas: 1039959.359 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039959.349 units remaining) - [ "C" - (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ "C" + (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 46 (remaining gas: 1039959.334 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039959.324 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 50 (remaining gas: 1039959.314 units remaining) - [ { "B" ; "C" ; "asdf" } - (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ { "B" ; "C" ; "asdf" } + (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 51 (remaining gas: 1039959.299 units remaining) - [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] + [ (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 54 (remaining gas: 1039959.289 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 55 (remaining gas: 1039959.279 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039959.249 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 56 (remaining gas: 1039959.239 units remaining) - [ { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 46 (remaining gas: 1039959.209 units remaining) - [ "C" - { "B" ; "C" ; "asdf" } - { "B" ; "C" ; "asdf" } - True ] + [ "C" + { "B" ; "C" ; "asdf" } + { "B" ; "C" ; "asdf" } + True ] - location: 57 (remaining gas: 1039958.989 units remaining) - [ True - { "B" ; "C" ; "asdf" } - True ] + [ True + { "B" ; "C" ; "asdf" } + True ] - location: 58 (remaining gas: 1039958.974 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 60 (remaining gas: 1039958.964 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 58 (remaining gas: 1039958.934 units remaining) - [ True - True - { "B" ; "C" ; "asdf" } ] + [ True + True + { "B" ; "C" ; "asdf" } ] - location: 61 (remaining gas: 1039958.914 units remaining) - [ True - { "B" ; "C" ; "asdf" } ] + [ True + { "B" ; "C" ; "asdf" } ] - location: 62 (remaining gas: 1039958.904 units remaining) - [ { "B" ; "C" ; "asdf" } - True ] + [ { "B" ; "C" ; "asdf" } + True ] - location: 63 (remaining gas: 1039958.889 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 40 (remaining gas: 1039958.874 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } True) ] + [ (Pair { "B" ; "C" ; "asdf" } True) ] - location: 64 (remaining gas: 1039958.864 units remaining) - [ True ] + [ True ] - location: 65 (remaining gas: 1039958.849 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 66 (remaining gas: 1039958.834 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 68 (remaining gas: 1039958.819 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" index 4dc4eb6a6835..17f1e07c7f23 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" @@ -8,159 +8,159 @@ big_map diff trace - location: 12 (remaining gas: 1039963.179 units remaining) - [ (Pair (Pair { "B" } { "B" }) None) ] + [ (Pair (Pair { "B" } { "B" }) None) ] - location: 12 (remaining gas: 1039963.169 units remaining) - [ (Pair { "B" } { "B" }) ] + [ (Pair { "B" } { "B" }) ] - location: 13 (remaining gas: 1039963.159 units remaining) - [ (Pair { "B" } { "B" }) - (Pair { "B" } { "B" }) ] + [ (Pair { "B" } { "B" }) + (Pair { "B" } { "B" }) ] - location: 14 (remaining gas: 1039963.149 units remaining) - [ { "B" } - (Pair { "B" } { "B" }) ] + [ { "B" } + (Pair { "B" } { "B" }) ] - location: 15 (remaining gas: 1039963.134 units remaining) - [ (Pair { "B" } { "B" }) ] + [ (Pair { "B" } { "B" }) ] - location: 17 (remaining gas: 1039963.124 units remaining) - [ { "B" } ] + [ { "B" } ] - location: 15 (remaining gas: 1039963.094 units remaining) - [ { "B" } - { "B" } ] + [ { "B" } + { "B" } ] - location: 18 (remaining gas: 1039962.874 units remaining) - [ {} - { "B" } - { "B" } ] + [ {} + { "B" } + { "B" } ] - location: 20 (remaining gas: 1039962.864 units remaining) - [ { "B" } - {} - { "B" } ] + [ { "B" } + {} + { "B" } ] - location: 21 (remaining gas: 1039962.864 units remaining) - [ "B" - {} - { "B" } ] + [ "B" + {} + { "B" } ] - location: 23 (remaining gas: 1039962.849 units remaining) - [ (Pair "B" {}) - { "B" } ] + [ (Pair "B" {}) + { "B" } ] - location: 24 (remaining gas: 1039962.839 units remaining) - [ (Pair "B" {}) - (Pair "B" {}) - { "B" } ] + [ (Pair "B" {}) + (Pair "B" {}) + { "B" } ] - location: 25 (remaining gas: 1039962.829 units remaining) - [ "B" - (Pair "B" {}) - { "B" } ] + [ "B" + (Pair "B" {}) + { "B" } ] - location: 26 (remaining gas: 1039962.814 units remaining) - [ (Pair "B" {}) - { "B" } ] + [ (Pair "B" {}) + { "B" } ] - location: 28 (remaining gas: 1039962.804 units remaining) - [ {} - { "B" } ] + [ {} + { "B" } ] - location: 26 (remaining gas: 1039962.774 units remaining) - [ "B" - {} - { "B" } ] + [ "B" + {} + { "B" } ] - location: 29 (remaining gas: 1039962.764 units remaining) - [ True - "B" - {} - { "B" } ] + [ True + "B" + {} + { "B" } ] - location: 32 (remaining gas: 1039962.754 units remaining) - [ "B" - True - {} - { "B" } ] + [ "B" + True + {} + { "B" } ] - location: 33 (remaining gas: 1039962.554 units remaining) - [ { "B" } - { "B" } ] + [ { "B" } + { "B" } ] - location: 21 (remaining gas: 1039962.539 units remaining) - [ { "B" } - { "B" } ] + [ { "B" } + { "B" } ] - location: 34 (remaining gas: 1039962.529 units remaining) - [ True - { "B" } - { "B" } ] + [ True + { "B" } + { "B" } ] - location: 37 (remaining gas: 1039962.519 units remaining) - [ { "B" } - True - { "B" } ] + [ { "B" } + True + { "B" } ] - location: 38 (remaining gas: 1039962.504 units remaining) - [ (Pair { "B" } True) - { "B" } ] + [ (Pair { "B" } True) + { "B" } ] - location: 39 (remaining gas: 1039962.494 units remaining) - [ { "B" } - (Pair { "B" } True) ] + [ { "B" } + (Pair { "B" } True) ] - location: 40 (remaining gas: 1039962.494 units remaining) - [ "B" - (Pair { "B" } True) ] + [ "B" + (Pair { "B" } True) ] - location: 42 (remaining gas: 1039962.479 units remaining) - [ (Pair "B" { "B" } True) ] + [ (Pair "B" { "B" } True) ] - location: 43 (remaining gas: 1039962.469 units remaining) - [ (Pair "B" { "B" } True) - (Pair "B" { "B" } True) ] + [ (Pair "B" { "B" } True) + (Pair "B" { "B" } True) ] - location: 44 (remaining gas: 1039962.459 units remaining) - [ (Pair "B" { "B" } True) - (Pair "B" { "B" } True) - (Pair "B" { "B" } True) ] + [ (Pair "B" { "B" } True) + (Pair "B" { "B" } True) + (Pair "B" { "B" } True) ] - location: 45 (remaining gas: 1039962.449 units remaining) - [ "B" - (Pair "B" { "B" } True) - (Pair "B" { "B" } True) ] + [ "B" + (Pair "B" { "B" } True) + (Pair "B" { "B" } True) ] - location: 46 (remaining gas: 1039962.434 units remaining) - [ (Pair "B" { "B" } True) - (Pair "B" { "B" } True) ] + [ (Pair "B" { "B" } True) + (Pair "B" { "B" } True) ] - location: 49 (remaining gas: 1039962.424 units remaining) - [ (Pair { "B" } True) - (Pair "B" { "B" } True) ] + [ (Pair { "B" } True) + (Pair "B" { "B" } True) ] - location: 50 (remaining gas: 1039962.414 units remaining) - [ { "B" } - (Pair "B" { "B" } True) ] + [ { "B" } + (Pair "B" { "B" } True) ] - location: 51 (remaining gas: 1039962.399 units remaining) - [ (Pair "B" { "B" } True) ] + [ (Pair "B" { "B" } True) ] - location: 54 (remaining gas: 1039962.389 units remaining) - [ (Pair { "B" } True) ] + [ (Pair { "B" } True) ] - location: 55 (remaining gas: 1039962.379 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039962.349 units remaining) - [ { "B" } - True ] + [ { "B" } + True ] - location: 56 (remaining gas: 1039962.339 units remaining) - [ { "B" } - { "B" } - True ] + [ { "B" } + { "B" } + True ] - location: 46 (remaining gas: 1039962.309 units remaining) - [ "B" - { "B" } - { "B" } - True ] + [ "B" + { "B" } + { "B" } + True ] - location: 57 (remaining gas: 1039962.124 units remaining) - [ True - { "B" } - True ] + [ True + { "B" } + True ] - location: 58 (remaining gas: 1039962.109 units remaining) - [ { "B" } - True ] + [ { "B" } + True ] - location: 60 (remaining gas: 1039962.099 units remaining) - [ True - { "B" } ] + [ True + { "B" } ] - location: 58 (remaining gas: 1039962.069 units remaining) - [ True - True - { "B" } ] + [ True + True + { "B" } ] - location: 61 (remaining gas: 1039962.049 units remaining) - [ True - { "B" } ] + [ True + { "B" } ] - location: 62 (remaining gas: 1039962.039 units remaining) - [ { "B" } - True ] + [ { "B" } + True ] - location: 63 (remaining gas: 1039962.024 units remaining) - [ (Pair { "B" } True) ] + [ (Pair { "B" } True) ] - location: 40 (remaining gas: 1039962.009 units remaining) - [ (Pair { "B" } True) ] + [ (Pair { "B" } True) ] - location: 64 (remaining gas: 1039961.999 units remaining) - [ True ] + [ True ] - location: 65 (remaining gas: 1039961.984 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 66 (remaining gas: 1039961.969 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 68 (remaining gas: 1039961.954 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" index e02f80d28ca9..ad1d85e8b7e2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" @@ -8,159 +8,159 @@ big_map diff trace - location: 12 (remaining gas: 1039963.179 units remaining) - [ (Pair (Pair { "c" } { "B" }) None) ] + [ (Pair (Pair { "c" } { "B" }) None) ] - location: 12 (remaining gas: 1039963.169 units remaining) - [ (Pair { "c" } { "B" }) ] + [ (Pair { "c" } { "B" }) ] - location: 13 (remaining gas: 1039963.159 units remaining) - [ (Pair { "c" } { "B" }) - (Pair { "c" } { "B" }) ] + [ (Pair { "c" } { "B" }) + (Pair { "c" } { "B" }) ] - location: 14 (remaining gas: 1039963.149 units remaining) - [ { "c" } - (Pair { "c" } { "B" }) ] + [ { "c" } + (Pair { "c" } { "B" }) ] - location: 15 (remaining gas: 1039963.134 units remaining) - [ (Pair { "c" } { "B" }) ] + [ (Pair { "c" } { "B" }) ] - location: 17 (remaining gas: 1039963.124 units remaining) - [ { "B" } ] + [ { "B" } ] - location: 15 (remaining gas: 1039963.094 units remaining) - [ { "c" } - { "B" } ] + [ { "c" } + { "B" } ] - location: 18 (remaining gas: 1039962.874 units remaining) - [ {} - { "c" } - { "B" } ] + [ {} + { "c" } + { "B" } ] - location: 20 (remaining gas: 1039962.864 units remaining) - [ { "c" } - {} - { "B" } ] + [ { "c" } + {} + { "B" } ] - location: 21 (remaining gas: 1039962.864 units remaining) - [ "c" - {} - { "B" } ] + [ "c" + {} + { "B" } ] - location: 23 (remaining gas: 1039962.849 units remaining) - [ (Pair "c" {}) - { "B" } ] + [ (Pair "c" {}) + { "B" } ] - location: 24 (remaining gas: 1039962.839 units remaining) - [ (Pair "c" {}) - (Pair "c" {}) - { "B" } ] + [ (Pair "c" {}) + (Pair "c" {}) + { "B" } ] - location: 25 (remaining gas: 1039962.829 units remaining) - [ "c" - (Pair "c" {}) - { "B" } ] + [ "c" + (Pair "c" {}) + { "B" } ] - location: 26 (remaining gas: 1039962.814 units remaining) - [ (Pair "c" {}) - { "B" } ] + [ (Pair "c" {}) + { "B" } ] - location: 28 (remaining gas: 1039962.804 units remaining) - [ {} - { "B" } ] + [ {} + { "B" } ] - location: 26 (remaining gas: 1039962.774 units remaining) - [ "c" - {} - { "B" } ] + [ "c" + {} + { "B" } ] - location: 29 (remaining gas: 1039962.764 units remaining) - [ True - "c" - {} - { "B" } ] + [ True + "c" + {} + { "B" } ] - location: 32 (remaining gas: 1039962.754 units remaining) - [ "c" - True - {} - { "B" } ] + [ "c" + True + {} + { "B" } ] - location: 33 (remaining gas: 1039962.554 units remaining) - [ { "c" } - { "B" } ] + [ { "c" } + { "B" } ] - location: 21 (remaining gas: 1039962.539 units remaining) - [ { "c" } - { "B" } ] + [ { "c" } + { "B" } ] - location: 34 (remaining gas: 1039962.529 units remaining) - [ True - { "c" } - { "B" } ] + [ True + { "c" } + { "B" } ] - location: 37 (remaining gas: 1039962.519 units remaining) - [ { "c" } - True - { "B" } ] + [ { "c" } + True + { "B" } ] - location: 38 (remaining gas: 1039962.504 units remaining) - [ (Pair { "c" } True) - { "B" } ] + [ (Pair { "c" } True) + { "B" } ] - location: 39 (remaining gas: 1039962.494 units remaining) - [ { "B" } - (Pair { "c" } True) ] + [ { "B" } + (Pair { "c" } True) ] - location: 40 (remaining gas: 1039962.494 units remaining) - [ "B" - (Pair { "c" } True) ] + [ "B" + (Pair { "c" } True) ] - location: 42 (remaining gas: 1039962.479 units remaining) - [ (Pair "B" { "c" } True) ] + [ (Pair "B" { "c" } True) ] - location: 43 (remaining gas: 1039962.469 units remaining) - [ (Pair "B" { "c" } True) - (Pair "B" { "c" } True) ] + [ (Pair "B" { "c" } True) + (Pair "B" { "c" } True) ] - location: 44 (remaining gas: 1039962.459 units remaining) - [ (Pair "B" { "c" } True) - (Pair "B" { "c" } True) - (Pair "B" { "c" } True) ] + [ (Pair "B" { "c" } True) + (Pair "B" { "c" } True) + (Pair "B" { "c" } True) ] - location: 45 (remaining gas: 1039962.449 units remaining) - [ "B" - (Pair "B" { "c" } True) - (Pair "B" { "c" } True) ] + [ "B" + (Pair "B" { "c" } True) + (Pair "B" { "c" } True) ] - location: 46 (remaining gas: 1039962.434 units remaining) - [ (Pair "B" { "c" } True) - (Pair "B" { "c" } True) ] + [ (Pair "B" { "c" } True) + (Pair "B" { "c" } True) ] - location: 49 (remaining gas: 1039962.424 units remaining) - [ (Pair { "c" } True) - (Pair "B" { "c" } True) ] + [ (Pair { "c" } True) + (Pair "B" { "c" } True) ] - location: 50 (remaining gas: 1039962.414 units remaining) - [ { "c" } - (Pair "B" { "c" } True) ] + [ { "c" } + (Pair "B" { "c" } True) ] - location: 51 (remaining gas: 1039962.399 units remaining) - [ (Pair "B" { "c" } True) ] + [ (Pair "B" { "c" } True) ] - location: 54 (remaining gas: 1039962.389 units remaining) - [ (Pair { "c" } True) ] + [ (Pair { "c" } True) ] - location: 55 (remaining gas: 1039962.379 units remaining) - [ True ] + [ True ] - location: 51 (remaining gas: 1039962.349 units remaining) - [ { "c" } - True ] + [ { "c" } + True ] - location: 56 (remaining gas: 1039962.339 units remaining) - [ { "c" } - { "c" } - True ] + [ { "c" } + { "c" } + True ] - location: 46 (remaining gas: 1039962.309 units remaining) - [ "B" - { "c" } - { "c" } - True ] + [ "B" + { "c" } + { "c" } + True ] - location: 57 (remaining gas: 1039962.124 units remaining) - [ False - { "c" } - True ] + [ False + { "c" } + True ] - location: 58 (remaining gas: 1039962.109 units remaining) - [ { "c" } - True ] + [ { "c" } + True ] - location: 60 (remaining gas: 1039962.099 units remaining) - [ True - { "c" } ] + [ True + { "c" } ] - location: 58 (remaining gas: 1039962.069 units remaining) - [ False - True - { "c" } ] + [ False + True + { "c" } ] - location: 61 (remaining gas: 1039962.049 units remaining) - [ False - { "c" } ] + [ False + { "c" } ] - location: 62 (remaining gas: 1039962.039 units remaining) - [ { "c" } - False ] + [ { "c" } + False ] - location: 63 (remaining gas: 1039962.024 units remaining) - [ (Pair { "c" } False) ] + [ (Pair { "c" } False) ] - location: 40 (remaining gas: 1039962.009 units remaining) - [ (Pair { "c" } False) ] + [ (Pair { "c" } False) ] - location: 64 (remaining gas: 1039961.999 units remaining) - [ False ] + [ False ] - location: 65 (remaining gas: 1039961.984 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 66 (remaining gas: 1039961.969 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 68 (remaining gas: 1039961.954 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out index aaaa1e914204..41875cbdb75f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out @@ -8,56 +8,56 @@ big_map diff trace - location: 12 (remaining gas: 1039963.427 units remaining) - [ (Pair (Pair {} {}) None) ] + [ (Pair (Pair {} {}) None) ] - location: 12 (remaining gas: 1039963.417 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 13 (remaining gas: 1039963.407 units remaining) - [ (Pair {} {}) - (Pair {} {}) ] + [ (Pair {} {}) + (Pair {} {}) ] - location: 14 (remaining gas: 1039963.397 units remaining) - [ {} - (Pair {} {}) ] + [ {} + (Pair {} {}) ] - location: 15 (remaining gas: 1039963.382 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 17 (remaining gas: 1039963.372 units remaining) - [ {} ] + [ {} ] - location: 15 (remaining gas: 1039963.342 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 18 (remaining gas: 1039963.122 units remaining) - [ {} - {} - {} ] + [ {} + {} + {} ] - location: 20 (remaining gas: 1039963.112 units remaining) - [ {} - {} - {} ] + [ {} + {} + {} ] - location: 21 (remaining gas: 1039963.112 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 34 (remaining gas: 1039963.102 units remaining) - [ True - {} - {} ] + [ True + {} + {} ] - location: 37 (remaining gas: 1039963.092 units remaining) - [ {} - True - {} ] + [ {} + True + {} ] - location: 38 (remaining gas: 1039963.077 units remaining) - [ (Pair {} True) - {} ] + [ (Pair {} True) + {} ] - location: 39 (remaining gas: 1039963.067 units remaining) - [ {} - (Pair {} True) ] + [ {} + (Pair {} True) ] - location: 40 (remaining gas: 1039963.067 units remaining) - [ (Pair {} True) ] + [ (Pair {} True) ] - location: 64 (remaining gas: 1039963.057 units remaining) - [ True ] + [ True ] - location: 65 (remaining gas: 1039963.042 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 66 (remaining gas: 1039963.027 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 68 (remaining gas: 1039963.012 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" index fa78a318c1e0..320057609853 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" @@ -8,22 +8,22 @@ big_map diff trace - location: 7 (remaining gas: 1039340.345 units remaining) - [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] + [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] - location: 7 (remaining gas: 1039340.335 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 8 (remaining gas: 1039340.085 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 11 (remaining gas: 1039340.075 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 11 (remaining gas: 1039340.060 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 17 (remaining gas: 1039340.050 units remaining) [ ] - location: 18 (remaining gas: 1039340.040 units remaining) - [ Unit ] + [ Unit ] - location: 19 (remaining gas: 1039340.025 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 21 (remaining gas: 1039340.010 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" index d19c0feb319b..2ed1226ac74d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" @@ -14,36 +14,36 @@ emitted operations trace - location: 8 (remaining gas: 1039984.194 units remaining) - [ (Pair Unit None) ] + [ (Pair Unit None) ] - location: 8 (remaining gas: 1039984.184 units remaining) [ ] - location: 9 (remaining gas: 1039984.174 units remaining) - [ Unit ] + [ Unit ] - location: 10 (remaining gas: 1039984.159 units remaining) - [ 50000 - Unit ] + [ 50000 + Unit ] - location: 11 (remaining gas: 1039984.144 units remaining) - [ None - 50000 - Unit ] + [ None + 50000 + Unit ] - location: 13 (remaining gas: 1039983.538 units remaining) - [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b - "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] + [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b + "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - location: 25 (remaining gas: 1039983.523 units remaining) - [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] + [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ] - location: 27 (remaining gas: 1039983.508 units remaining) - [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] + [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - location: 28 (remaining gas: 1039983.493 units remaining) - [ {} - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] + [ {} + (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - location: 25 (remaining gas: 1039983.463 units remaining) - [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b - {} - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] + [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b + {} + (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - location: 30 (remaining gas: 1039983.448 units remaining) - [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] + [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } + (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ] - location: 31 (remaining gas: 1039983.433 units remaining) [ (Pair { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b } - (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ] + (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" index 66ca6f53cf99..483caa2addef 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.353 units remaining) - [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ] + [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039991.343 units remaining) - [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 10 (remaining gas: 1039991.333 units remaining) - [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") - (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") + (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039991.323 units remaining) - [ "1970-01-01T00:03:20Z" - (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] + [ "1970-01-01T00:03:20Z" + (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039991.308 units remaining) - [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ] - location: 14 (remaining gas: 1039991.298 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 12 (remaining gas: 1039991.268 units remaining) - [ "1970-01-01T00:03:20Z" - "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:03:20Z" + "1970-01-01T00:00:00Z" ] - location: 15 (remaining gas: 1039991.213 units remaining) - [ 200 ] + [ 200 ] - location: 16 (remaining gas: 1039991.198 units remaining) - [ {} - 200 ] + [ {} + 200 ] - location: 18 (remaining gas: 1039991.183 units remaining) - [ (Pair {} 200) ] + [ (Pair {} 200) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out index a433c1e26dd1..5c58c2ea7e51 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.553 units remaining) - [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ] + [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039991.523 units remaining) - [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] + [ "1970-01-01T00:00:00Z" + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ] - location: 14 (remaining gas: 1039991.498 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 12 (remaining gas: 1039991.468 units remaining) - [ "1970-01-01T00:00:00Z" - "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" + "1970-01-01T00:00:00Z" ] - location: 15 (remaining gas: 1039991.413 units remaining) - [ 0 ] + [ 0 ] - location: 16 (remaining gas: 1039991.398 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 18 (remaining gas: 1039991.383 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out index 0c2965f5dd3c..00df34dd87a2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.553 units remaining) - [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ] + [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 11 (remaining gas: 1039991.523 units remaining) - [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] + [ "1970-01-01T00:00:00Z" + (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] + [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ] - location: 14 (remaining gas: 1039991.498 units remaining) - [ "1970-01-01T00:00:01Z" ] + [ "1970-01-01T00:00:01Z" ] - location: 12 (remaining gas: 1039991.468 units remaining) - [ "1970-01-01T00:00:00Z" - "1970-01-01T00:00:01Z" ] + [ "1970-01-01T00:00:00Z" + "1970-01-01T00:00:01Z" ] - location: 15 (remaining gas: 1039991.413 units remaining) - [ -1 ] + [ -1 ] - location: 16 (remaining gas: 1039991.398 units remaining) - [ {} - -1 ] + [ {} + -1 ] - location: 18 (remaining gas: 1039991.383 units remaining) - [ (Pair {} -1) ] + [ (Pair {} -1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out index 0c31e3da2c51..2573c9d64ded 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.553 units remaining) - [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ] + [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") - (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") + (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039991.523 units remaining) - [ "1970-01-01T00:00:01Z" - (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] + [ "1970-01-01T00:00:01Z" + (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] + [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ] - location: 14 (remaining gas: 1039991.498 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 12 (remaining gas: 1039991.468 units remaining) - [ "1970-01-01T00:00:01Z" - "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:01Z" + "1970-01-01T00:00:00Z" ] - location: 15 (remaining gas: 1039991.413 units remaining) - [ 1 ] + [ 1 ] - location: 16 (remaining gas: 1039991.398 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 18 (remaining gas: 1039991.383 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out index bc3fd2b0914a..7b06f8f50ec3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out @@ -8,3424 +8,3424 @@ big_map diff trace - location: 24 (remaining gas: 1039868.707 units remaining) - [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ] + [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ] - location: 24 (remaining gas: 1039868.697 units remaining) - [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 25 (remaining gas: 1039868.687 units remaining) - [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 27 (remaining gas: 1039868.677 units remaining) - [ 17 - (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 28 (remaining gas: 1039868.662 units remaining) - [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 30 (remaining gas: 1039868.652 units remaining) - [ 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 28 (remaining gas: 1039868.622 units remaining) - [ 17 - 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.574 units remaining) - [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 34 (remaining gas: 1039868.564 units remaining) - [ 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.539 units remaining) - [ 16 - 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) - [ 17 - 16 - 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) - [ 17 - 16 - 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.480 units remaining) - [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 38 (remaining gas: 1039868.470 units remaining) - [ 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.445 units remaining) - [ 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.435 units remaining) - [ 16 - 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) - [ 17 - 16 - 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) - [ 17 - 16 - 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.374 units remaining) - [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 42 (remaining gas: 1039868.364 units remaining) - [ 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.339 units remaining) - [ 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.329 units remaining) - [ 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.319 units remaining) - [ 16 - 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) - [ 17 - 16 - 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) - [ 17 - 16 - 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.257 units remaining) - [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 46 (remaining gas: 1039868.247 units remaining) - [ 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.222 units remaining) - [ 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.212 units remaining) - [ 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.202 units remaining) - [ 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.192 units remaining) - [ 16 - 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.128 units remaining) - [ (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 50 (remaining gas: 1039868.118 units remaining) - [ 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.093 units remaining) - [ 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.083 units remaining) - [ 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.073 units remaining) - [ 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.063 units remaining) - [ 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.053 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.988 units remaining) - [ (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 54 (remaining gas: 1039867.978 units remaining) - [ 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.953 units remaining) - [ 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.943 units remaining) - [ 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.933 units remaining) - [ 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.923 units remaining) - [ 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.913 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.903 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.835 units remaining) - [ (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 58 (remaining gas: 1039867.825 units remaining) - [ 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.800 units remaining) - [ 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.790 units remaining) - [ 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.780 units remaining) - [ 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.770 units remaining) - [ 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.760 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.750 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.740 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.671 units remaining) - [ (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 62 (remaining gas: 1039867.661 units remaining) - [ 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.636 units remaining) - [ 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.626 units remaining) - [ 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.616 units remaining) - [ 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.606 units remaining) - [ 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.596 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.586 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.576 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.566 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.495 units remaining) - [ (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 66 (remaining gas: 1039867.485 units remaining) - [ 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.460 units remaining) - [ 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.450 units remaining) - [ 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.440 units remaining) - [ 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.430 units remaining) - [ 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.420 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.410 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.400 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.390 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.380 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.308 units remaining) - [ (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 70 (remaining gas: 1039867.298 units remaining) - [ 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.273 units remaining) - [ 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.263 units remaining) - [ 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.253 units remaining) - [ 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.243 units remaining) - [ 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.233 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.223 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.213 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.203 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.193 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.183 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.109 units remaining) - [ (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 74 (remaining gas: 1039867.099 units remaining) - [ 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.074 units remaining) - [ 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.064 units remaining) - [ 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.054 units remaining) - [ 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.044 units remaining) - [ 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.034 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.024 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.014 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039867.004 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.994 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.984 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.974 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.899 units remaining) - [ (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 78 (remaining gas: 1039866.889 units remaining) - [ 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.864 units remaining) - [ 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.854 units remaining) - [ 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.844 units remaining) - [ 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.834 units remaining) - [ 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.824 units remaining) - [ 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.814 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.804 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.794 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.784 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.774 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.764 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.754 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.677 units remaining) - [ (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 82 (remaining gas: 1039866.667 units remaining) - [ 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.642 units remaining) - [ 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.632 units remaining) - [ 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.622 units remaining) - [ 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.612 units remaining) - [ 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.602 units remaining) - [ 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.592 units remaining) - [ 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.582 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.572 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.562 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.552 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.542 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.532 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.522 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.444 units remaining) - [ (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 86 (remaining gas: 1039866.434 units remaining) - [ 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.409 units remaining) - [ 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.399 units remaining) - [ 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.389 units remaining) - [ 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.379 units remaining) - [ 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.369 units remaining) - [ 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.359 units remaining) - [ 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.349 units remaining) - [ 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.339 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.329 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.319 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.309 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.299 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.289 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.279 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 87 (remaining gas: 1039866.209 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 89 (remaining gas: 1039866.143 units remaining) - [ 16 - 17 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 17 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 91 (remaining gas: 1039866.070 units remaining) - [ 15 - 16 - 17 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 16 + 17 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 93 (remaining gas: 1039865.991 units remaining) - [ 14 - 15 - 16 - 17 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 15 + 16 + 17 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 95 (remaining gas: 1039865.904 units remaining) - [ 13 - 14 - 15 - 16 - 17 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 14 + 15 + 16 + 17 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 97 (remaining gas: 1039865.811 units remaining) - [ 12 - 13 - 14 - 15 - 16 - 17 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 13 + 14 + 15 + 16 + 17 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 99 (remaining gas: 1039865.711 units remaining) - [ 11 - 12 - 13 - 14 - 15 - 16 - 17 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 12 + 13 + 14 + 15 + 16 + 17 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 101 (remaining gas: 1039865.605 units remaining) - [ 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 103 (remaining gas: 1039865.491 units remaining) - [ 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 105 (remaining gas: 1039865.371 units remaining) - [ 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 107 (remaining gas: 1039865.244 units remaining) - [ 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 109 (remaining gas: 1039865.111 units remaining) - [ 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 111 (remaining gas: 1039864.970 units remaining) - [ 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 113 (remaining gas: 1039864.823 units remaining) - [ 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 115 (remaining gas: 1039864.669 units remaining) - [ 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 117 (remaining gas: 1039864.509 units remaining) - [ 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 119 (remaining gas: 1039864.341 units remaining) - [ 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 121 (remaining gas: 1039864.281 units remaining) - [ 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 123 (remaining gas: 1039864.215 units remaining) - [ 2 - 1 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 2 + 1 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 125 (remaining gas: 1039864.142 units remaining) - [ 3 - 2 - 1 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 3 + 2 + 1 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 127 (remaining gas: 1039864.063 units remaining) - [ 4 - 3 - 2 - 1 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + 3 + 2 + 1 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 129 (remaining gas: 1039863.976 units remaining) - [ 5 - 4 - 3 - 2 - 1 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 4 + 3 + 2 + 1 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 131 (remaining gas: 1039863.883 units remaining) - [ 6 - 5 - 4 - 3 - 2 - 1 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + 4 + 3 + 2 + 1 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 133 (remaining gas: 1039863.783 units remaining) - [ 7 - 6 - 5 - 4 - 3 - 2 - 1 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + 4 + 3 + 2 + 1 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 135 (remaining gas: 1039863.677 units remaining) - [ 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 137 (remaining gas: 1039863.563 units remaining) - [ 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 139 (remaining gas: 1039863.443 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 141 (remaining gas: 1039863.316 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 12 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 12 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 143 (remaining gas: 1039863.183 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 13 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 13 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 145 (remaining gas: 1039863.042 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 14 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 14 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 147 (remaining gas: 1039862.895 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 15 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 15 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 149 (remaining gas: 1039862.741 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 16 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 16 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 151 (remaining gas: 1039862.581 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 17 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 17 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 153 (remaining gas: 1039862.413 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.345 units remaining) - [ 2 - 1 - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 2 + 1 + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 159 (remaining gas: 1039862.330 units remaining) - [ (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.305 units remaining) - [ 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.295 units remaining) - [ 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.285 units remaining) - [ 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.275 units remaining) - [ 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.265 units remaining) - [ 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.255 units remaining) - [ 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.245 units remaining) - [ 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.235 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.225 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.215 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.205 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.195 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.185 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.175 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.098 units remaining) - [ 3 - (Pair 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 3 + (Pair 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 163 (remaining gas: 1039862.083 units remaining) - [ (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.058 units remaining) - [ 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.048 units remaining) - [ 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.038 units remaining) - [ 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.028 units remaining) - [ 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.018 units remaining) - [ 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039862.008 units remaining) - [ 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.998 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.988 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.978 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.968 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.958 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.948 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.938 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.863 units remaining) - [ 4 - (Pair 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 4 + (Pair 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 167 (remaining gas: 1039861.848 units remaining) - [ (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.823 units remaining) - [ 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.813 units remaining) - [ 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.803 units remaining) - [ 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.793 units remaining) - [ 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.783 units remaining) - [ 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.773 units remaining) - [ 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.763 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.753 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.743 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.733 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.723 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.713 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.639 units remaining) - [ 5 - (Pair 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 5 + (Pair 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 171 (remaining gas: 1039861.624 units remaining) - [ (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.599 units remaining) - [ 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.589 units remaining) - [ 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.579 units remaining) - [ 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.569 units remaining) - [ 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.559 units remaining) - [ 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.549 units remaining) - [ 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.539 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.529 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.519 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.509 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.499 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.427 units remaining) - [ 6 - (Pair 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 6 + (Pair 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 175 (remaining gas: 1039861.412 units remaining) - [ (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.387 units remaining) - [ 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.377 units remaining) - [ 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.367 units remaining) - [ 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.357 units remaining) - [ 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.347 units remaining) - [ 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.337 units remaining) - [ 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.327 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.317 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.307 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.297 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.226 units remaining) - [ 7 - (Pair 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 7 + (Pair 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 179 (remaining gas: 1039861.211 units remaining) - [ (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.186 units remaining) - [ 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.176 units remaining) - [ 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.166 units remaining) - [ 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.156 units remaining) - [ 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.146 units remaining) - [ 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.136 units remaining) - [ 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.126 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.116 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.106 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039861.037 units remaining) - [ 8 - (Pair 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 8 + (Pair 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 183 (remaining gas: 1039861.022 units remaining) - [ (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.997 units remaining) - [ 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.987 units remaining) - [ 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.977 units remaining) - [ 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.967 units remaining) - [ 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.957 units remaining) - [ 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.947 units remaining) - [ 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.937 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.927 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.859 units remaining) - [ 9 - (Pair 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 9 + (Pair 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 187 (remaining gas: 1039860.844 units remaining) - [ (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.819 units remaining) - [ 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.809 units remaining) - [ 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.799 units remaining) - [ 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.789 units remaining) - [ 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.779 units remaining) - [ 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.769 units remaining) - [ 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.759 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.694 units remaining) - [ 10 - (Pair 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 10 + (Pair 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 191 (remaining gas: 1039860.679 units remaining) - [ (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.654 units remaining) - [ 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.644 units remaining) - [ 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.634 units remaining) - [ 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.624 units remaining) - [ 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.614 units remaining) - [ 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.604 units remaining) - [ 16 - 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.540 units remaining) - [ 11 - (Pair 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 11 + (Pair 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 195 (remaining gas: 1039860.525 units remaining) - [ (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.500 units remaining) - [ 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.490 units remaining) - [ 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.480 units remaining) - [ 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.470 units remaining) - [ 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.460 units remaining) - [ 16 - 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) - [ 17 - 16 - 15 - 14 - 13 - 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.398 units remaining) - [ 12 - (Pair 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 12 + (Pair 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 199 (remaining gas: 1039860.383 units remaining) - [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.358 units remaining) - [ 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.348 units remaining) - [ 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.338 units remaining) - [ 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.328 units remaining) - [ 16 - 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) - [ 17 - 16 - 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) - [ 17 - 16 - 15 - 14 - 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.267 units remaining) - [ 13 - (Pair 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 13 + (Pair 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 203 (remaining gas: 1039860.252 units remaining) - [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.227 units remaining) - [ 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.217 units remaining) - [ 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.207 units remaining) - [ 16 - 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) - [ 17 - 16 - 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) - [ 17 - 16 - 15 - 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.148 units remaining) - [ 14 - (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 14 + (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 207 (remaining gas: 1039860.133 units remaining) - [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.108 units remaining) - [ 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.098 units remaining) - [ 16 - 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) - [ 17 - 16 - 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) - [ 17 - 16 - 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039860.040 units remaining) - [ 15 - (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 15 + (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 211 (remaining gas: 1039860.025 units remaining) - [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039860 units remaining) - [ 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) - [ 17 - 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) - [ 17 - 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + 16 + (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 212 (remaining gas: 1039859.975 units remaining) - [ 16 - (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 16 + (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 214 (remaining gas: 1039859.960 units remaining) - [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 212 (remaining gas: 1039859.930 units remaining) - [ 17 - (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ 17 + (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 215 (remaining gas: 1039859.915 units remaining) - [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) - (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] + [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) + (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ] - location: 218 (remaining gas: 1039859.160 units remaining) - [ 0 ] + [ 0 ] - location: 219 (remaining gas: 1039859.145 units remaining) - [ True ] + [ True ] - location: 220 (remaining gas: 1039859.135 units remaining) [ ] - location: 220 (remaining gas: 1039859.120 units remaining) [ ] - location: 226 (remaining gas: 1039859.110 units remaining) - [ Unit ] + [ Unit ] - location: 227 (remaining gas: 1039859.095 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 229 (remaining gas: 1039859.080 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out index 67c801c0862b..5abea80af373 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out @@ -8,3424 +8,3424 @@ big_map diff trace - location: 24 (remaining gas: 1039868.707 units remaining) - [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ] + [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ] - location: 24 (remaining gas: 1039868.697 units remaining) - [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 25 (remaining gas: 1039868.687 units remaining) - [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 27 (remaining gas: 1039868.677 units remaining) - [ 2 - (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 28 (remaining gas: 1039868.662 units remaining) - [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 30 (remaining gas: 1039868.652 units remaining) - [ 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 28 (remaining gas: 1039868.622 units remaining) - [ 2 - 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.574 units remaining) - [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 34 (remaining gas: 1039868.564 units remaining) - [ 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.539 units remaining) - [ 3 - 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) - [ 2 - 3 - 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 31 (remaining gas: 1039868.529 units remaining) - [ 2 - 3 - 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.480 units remaining) - [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 38 (remaining gas: 1039868.470 units remaining) - [ 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.445 units remaining) - [ 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.435 units remaining) - [ 3 - 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) - [ 2 - 3 - 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 35 (remaining gas: 1039868.425 units remaining) - [ 2 - 3 - 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.374 units remaining) - [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 42 (remaining gas: 1039868.364 units remaining) - [ 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.339 units remaining) - [ 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.329 units remaining) - [ 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.319 units remaining) - [ 3 - 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) - [ 2 - 3 - 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 39 (remaining gas: 1039868.309 units remaining) - [ 2 - 3 - 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.257 units remaining) - [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 46 (remaining gas: 1039868.247 units remaining) - [ 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.222 units remaining) - [ 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.212 units remaining) - [ 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.202 units remaining) - [ 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.192 units remaining) - [ 3 - 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 43 (remaining gas: 1039868.182 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.128 units remaining) - [ (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 50 (remaining gas: 1039868.118 units remaining) - [ 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.093 units remaining) - [ 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.083 units remaining) - [ 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.073 units remaining) - [ 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.063 units remaining) - [ 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.053 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 47 (remaining gas: 1039868.043 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.988 units remaining) - [ (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 54 (remaining gas: 1039867.978 units remaining) - [ 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.953 units remaining) - [ 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.943 units remaining) - [ 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.933 units remaining) - [ 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.923 units remaining) - [ 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.913 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.903 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 51 (remaining gas: 1039867.893 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.835 units remaining) - [ (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 58 (remaining gas: 1039867.825 units remaining) - [ 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.800 units remaining) - [ 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.790 units remaining) - [ 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.780 units remaining) - [ 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.770 units remaining) - [ 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.760 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.750 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.740 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 55 (remaining gas: 1039867.730 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.671 units remaining) - [ (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 62 (remaining gas: 1039867.661 units remaining) - [ 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.636 units remaining) - [ 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.626 units remaining) - [ 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.616 units remaining) - [ 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.606 units remaining) - [ 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.596 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.586 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.576 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.566 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 59 (remaining gas: 1039867.556 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.495 units remaining) - [ (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 66 (remaining gas: 1039867.485 units remaining) - [ 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.460 units remaining) - [ 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.450 units remaining) - [ 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.440 units remaining) - [ 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.430 units remaining) - [ 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.420 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.410 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.400 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.390 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.380 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 63 (remaining gas: 1039867.370 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.308 units remaining) - [ (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 70 (remaining gas: 1039867.298 units remaining) - [ 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.273 units remaining) - [ 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.263 units remaining) - [ 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.253 units remaining) - [ 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.243 units remaining) - [ 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.233 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.223 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.213 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.203 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.193 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.183 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 67 (remaining gas: 1039867.173 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.109 units remaining) - [ (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 74 (remaining gas: 1039867.099 units remaining) - [ 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.074 units remaining) - [ 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.064 units remaining) - [ 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.054 units remaining) - [ 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.044 units remaining) - [ 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.034 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.024 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.014 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039867.004 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.994 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.984 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.974 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 71 (remaining gas: 1039866.964 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.899 units remaining) - [ (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 78 (remaining gas: 1039866.889 units remaining) - [ 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.864 units remaining) - [ 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.854 units remaining) - [ 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.844 units remaining) - [ 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.834 units remaining) - [ 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.824 units remaining) - [ 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.814 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.804 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.794 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.784 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.774 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.764 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.754 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 75 (remaining gas: 1039866.744 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.677 units remaining) - [ (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 82 (remaining gas: 1039866.667 units remaining) - [ 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.642 units remaining) - [ 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.632 units remaining) - [ 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.622 units remaining) - [ 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.612 units remaining) - [ 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.602 units remaining) - [ 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.592 units remaining) - [ 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.582 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.572 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.562 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.552 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.542 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.532 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.522 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 79 (remaining gas: 1039866.512 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.444 units remaining) - [ (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 86 (remaining gas: 1039866.434 units remaining) - [ 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.409 units remaining) - [ 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.399 units remaining) - [ 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.389 units remaining) - [ 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.379 units remaining) - [ 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.369 units remaining) - [ 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.359 units remaining) - [ 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.349 units remaining) - [ 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.339 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.329 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.319 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.309 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.299 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.289 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.279 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 83 (remaining gas: 1039866.269 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 87 (remaining gas: 1039866.209 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 89 (remaining gas: 1039866.143 units remaining) - [ 3 - 2 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 2 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 91 (remaining gas: 1039866.070 units remaining) - [ 12 - 3 - 2 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 3 + 2 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 93 (remaining gas: 1039865.991 units remaining) - [ 16 - 12 - 3 - 2 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 12 + 3 + 2 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 95 (remaining gas: 1039865.904 units remaining) - [ 10 - 16 - 12 - 3 - 2 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 16 + 12 + 3 + 2 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 97 (remaining gas: 1039865.811 units remaining) - [ 14 - 10 - 16 - 12 - 3 - 2 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 10 + 16 + 12 + 3 + 2 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 99 (remaining gas: 1039865.711 units remaining) - [ 19 - 14 - 10 - 16 - 12 - 3 - 2 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 14 + 10 + 16 + 12 + 3 + 2 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 101 (remaining gas: 1039865.605 units remaining) - [ 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 103 (remaining gas: 1039865.491 units remaining) - [ 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 105 (remaining gas: 1039865.371 units remaining) - [ 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 107 (remaining gas: 1039865.244 units remaining) - [ 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 109 (remaining gas: 1039865.111 units remaining) - [ 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 111 (remaining gas: 1039864.970 units remaining) - [ 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 113 (remaining gas: 1039864.823 units remaining) - [ 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 115 (remaining gas: 1039864.669 units remaining) - [ 15 - 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 15 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 117 (remaining gas: 1039864.509 units remaining) - [ 5 - 15 - 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 5 + 15 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 119 (remaining gas: 1039864.341 units remaining) - [ 1 - 5 - 15 - 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 1 + 5 + 15 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 121 (remaining gas: 1039864.281 units remaining) - [ 1 - 5 - 15 - 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 1 + 5 + 15 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 123 (remaining gas: 1039864.215 units remaining) - [ 5 - 1 - 15 - 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 5 + 1 + 15 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 125 (remaining gas: 1039864.142 units remaining) - [ 15 - 5 - 1 - 13 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 15 + 5 + 1 + 13 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 127 (remaining gas: 1039864.063 units remaining) - [ 13 - 15 - 5 - 1 - 4 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + 15 + 5 + 1 + 4 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 129 (remaining gas: 1039863.976 units remaining) - [ 4 - 13 - 15 - 5 - 1 - 11 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 13 + 15 + 5 + 1 + 11 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 131 (remaining gas: 1039863.883 units remaining) - [ 11 - 4 - 13 - 15 - 5 - 1 - 8 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + 13 + 15 + 5 + 1 + 8 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 133 (remaining gas: 1039863.783 units remaining) - [ 8 - 11 - 4 - 13 - 15 - 5 - 1 - 6 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + 13 + 15 + 5 + 1 + 6 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 135 (remaining gas: 1039863.677 units remaining) - [ 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 18 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 18 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 137 (remaining gas: 1039863.563 units remaining) - [ 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 9 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 9 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 139 (remaining gas: 1039863.443 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 19 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 19 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 141 (remaining gas: 1039863.316 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 14 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 14 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 143 (remaining gas: 1039863.183 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 10 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 10 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 145 (remaining gas: 1039863.042 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 16 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 16 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 147 (remaining gas: 1039862.895 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 12 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 12 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 149 (remaining gas: 1039862.741 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 3 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 3 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 151 (remaining gas: 1039862.581 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - 2 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + 2 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 153 (remaining gas: 1039862.413 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.345 units remaining) - [ 5 - 1 - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 5 + 1 + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 159 (remaining gas: 1039862.330 units remaining) - [ (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.305 units remaining) - [ 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.295 units remaining) - [ 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.285 units remaining) - [ 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.275 units remaining) - [ 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.265 units remaining) - [ 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.255 units remaining) - [ 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.245 units remaining) - [ 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.235 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.225 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.215 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.205 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.195 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.185 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.175 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 156 (remaining gas: 1039862.165 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.098 units remaining) - [ 15 - (Pair 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 15 + (Pair 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 163 (remaining gas: 1039862.083 units remaining) - [ (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.058 units remaining) - [ 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.048 units remaining) - [ 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.038 units remaining) - [ 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.028 units remaining) - [ 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.018 units remaining) - [ 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039862.008 units remaining) - [ 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.998 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.988 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.978 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.968 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.958 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.948 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.938 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 160 (remaining gas: 1039861.928 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.863 units remaining) - [ 13 - (Pair 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 13 + (Pair 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 167 (remaining gas: 1039861.848 units remaining) - [ (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.823 units remaining) - [ 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.813 units remaining) - [ 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.803 units remaining) - [ 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.793 units remaining) - [ 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.783 units remaining) - [ 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.773 units remaining) - [ 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.763 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.753 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.743 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.733 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.723 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.713 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 164 (remaining gas: 1039861.703 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.639 units remaining) - [ 4 - (Pair 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 4 + (Pair 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 171 (remaining gas: 1039861.624 units remaining) - [ (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.599 units remaining) - [ 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.589 units remaining) - [ 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.579 units remaining) - [ 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.569 units remaining) - [ 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.559 units remaining) - [ 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.549 units remaining) - [ 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.539 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.529 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.519 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.509 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.499 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 168 (remaining gas: 1039861.489 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.427 units remaining) - [ 11 - (Pair 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 11 + (Pair 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 175 (remaining gas: 1039861.412 units remaining) - [ (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.387 units remaining) - [ 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.377 units remaining) - [ 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.367 units remaining) - [ 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.357 units remaining) - [ 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.347 units remaining) - [ 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.337 units remaining) - [ 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.327 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.317 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.307 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.297 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 172 (remaining gas: 1039861.287 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.226 units remaining) - [ 8 - (Pair 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 8 + (Pair 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 179 (remaining gas: 1039861.211 units remaining) - [ (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.186 units remaining) - [ 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.176 units remaining) - [ 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.166 units remaining) - [ 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.156 units remaining) - [ 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.146 units remaining) - [ 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.136 units remaining) - [ 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.126 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.116 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.106 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 176 (remaining gas: 1039861.096 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039861.037 units remaining) - [ 6 - (Pair 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 6 + (Pair 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 183 (remaining gas: 1039861.022 units remaining) - [ (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.997 units remaining) - [ 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.987 units remaining) - [ 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.977 units remaining) - [ 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.967 units remaining) - [ 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.957 units remaining) - [ 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.947 units remaining) - [ 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.937 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.927 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 180 (remaining gas: 1039860.917 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.859 units remaining) - [ 18 - (Pair 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 18 + (Pair 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 187 (remaining gas: 1039860.844 units remaining) - [ (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.819 units remaining) - [ 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.809 units remaining) - [ 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.799 units remaining) - [ 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.789 units remaining) - [ 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.779 units remaining) - [ 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.769 units remaining) - [ 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.759 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 184 (remaining gas: 1039860.749 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.694 units remaining) - [ 9 - (Pair 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 9 + (Pair 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 191 (remaining gas: 1039860.679 units remaining) - [ (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.654 units remaining) - [ 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.644 units remaining) - [ 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.634 units remaining) - [ 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.624 units remaining) - [ 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.614 units remaining) - [ 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.604 units remaining) - [ 3 - 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 188 (remaining gas: 1039860.594 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.540 units remaining) - [ 19 - (Pair 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 19 + (Pair 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 195 (remaining gas: 1039860.525 units remaining) - [ (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.500 units remaining) - [ 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.490 units remaining) - [ 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.480 units remaining) - [ 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.470 units remaining) - [ 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.460 units remaining) - [ 3 - 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 192 (remaining gas: 1039860.450 units remaining) - [ 2 - 3 - 12 - 16 - 10 - 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.398 units remaining) - [ 14 - (Pair 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 14 + (Pair 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 199 (remaining gas: 1039860.383 units remaining) - [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.358 units remaining) - [ 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.348 units remaining) - [ 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.338 units remaining) - [ 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.328 units remaining) - [ 3 - 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) - [ 2 - 3 - 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 196 (remaining gas: 1039860.318 units remaining) - [ 2 - 3 - 12 - 16 - 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.267 units remaining) - [ 10 - (Pair 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 10 + (Pair 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 203 (remaining gas: 1039860.252 units remaining) - [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.227 units remaining) - [ 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.217 units remaining) - [ 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.207 units remaining) - [ 3 - 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) - [ 2 - 3 - 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 200 (remaining gas: 1039860.197 units remaining) - [ 2 - 3 - 12 - 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.148 units remaining) - [ 16 - (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 16 + (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 207 (remaining gas: 1039860.133 units remaining) - [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.108 units remaining) - [ 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.098 units remaining) - [ 3 - 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) - [ 2 - 3 - 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 204 (remaining gas: 1039860.088 units remaining) - [ 2 - 3 - 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039860.040 units remaining) - [ 12 - (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 12 + (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 211 (remaining gas: 1039860.025 units remaining) - [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039860 units remaining) - [ 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) - [ 2 - 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 208 (remaining gas: 1039859.990 units remaining) - [ 2 - 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + 3 + (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 212 (remaining gas: 1039859.975 units remaining) - [ 3 - (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 3 + (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 214 (remaining gas: 1039859.960 units remaining) - [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 212 (remaining gas: 1039859.930 units remaining) - [ 2 - (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ 2 + (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 215 (remaining gas: 1039859.915 units remaining) - [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) - (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] + [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) + (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ] - location: 218 (remaining gas: 1039859.160 units remaining) - [ 0 ] + [ 0 ] - location: 219 (remaining gas: 1039859.145 units remaining) - [ True ] + [ True ] - location: 220 (remaining gas: 1039859.135 units remaining) [ ] - location: 220 (remaining gas: 1039859.120 units remaining) [ ] - location: 226 (remaining gas: 1039859.110 units remaining) - [ Unit ] + [ Unit ] - location: 227 (remaining gas: 1039859.095 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 229 (remaining gas: 1039859.080 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out index e1d10184f32e..ade6c6bd5e3b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out @@ -8,54 +8,54 @@ big_map diff trace - location: 15 (remaining gas: 1039987.170 units remaining) - [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] + [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039987.160 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039987.150 units remaining) - [ (Pair (Pair (Pair 1 2) 3) 4) - 5 ] + [ (Pair (Pair (Pair 1 2) 3) 4) + 5 ] - location: 17 (remaining gas: 1039987.140 units remaining) - [ (Pair (Pair 1 2) 3) - 4 - 5 ] + [ (Pair (Pair 1 2) 3) + 4 + 5 ] - location: 18 (remaining gas: 1039987.130 units remaining) - [ (Pair 1 2) - 3 - 4 - 5 ] + [ (Pair 1 2) + 3 + 4 + 5 ] - location: 19 (remaining gas: 1039987.120 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 20 (remaining gas: 1039987.033 units remaining) - [ 5 - 1 - 2 - 3 - 4 ] + [ 5 + 1 + 2 + 3 + 4 ] - location: 22 (remaining gas: 1039987.018 units remaining) - [ 1 - 2 - 3 - 4 ] + [ 1 + 2 + 3 + 4 ] - location: 24 (remaining gas: 1039987.008 units remaining) - [ 2 - 3 - 4 ] + [ 2 + 3 + 4 ] - location: 25 (remaining gas: 1039986.998 units remaining) - [ 3 - 4 ] + [ 3 + 4 ] - location: 26 (remaining gas: 1039986.988 units remaining) - [ 4 ] + [ 4 ] - location: 27 (remaining gas: 1039986.978 units remaining) [ ] - location: 22 (remaining gas: 1039986.948 units remaining) - [ 5 ] + [ 5 ] - location: 28 (remaining gas: 1039986.933 units remaining) - [ {} - 5 ] + [ {} + 5 ] - location: 30 (remaining gas: 1039986.918 units remaining) - [ (Pair {} 5) ] + [ (Pair {} 5) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out index b98b2ee007dc..a7c4a8ebd79f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out @@ -8,29 +8,29 @@ big_map diff trace - location: 11 (remaining gas: 1039990.758 units remaining) - [ (Pair (Pair 1 1) 0 0) ] + [ (Pair (Pair 1 1) 0 0) ] - location: 11 (remaining gas: 1039990.748 units remaining) - [ (Pair 1 1) ] + [ (Pair 1 1) ] - location: 12 (remaining gas: 1039990.738 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 13 (remaining gas: 1039990.728 units remaining) - [ 1 - 1 - 1 ] + [ 1 + 1 + 1 ] - location: 14 (remaining gas: 1039990.713 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 16 (remaining gas: 1039990.658 units remaining) - [ 2 ] + [ 2 ] - location: 14 (remaining gas: 1039990.628 units remaining) - [ 1 - 2 ] + [ 1 + 2 ] - location: 17 (remaining gas: 1039990.613 units remaining) - [ (Pair 1 2) ] + [ (Pair 1 2) ] - location: 18 (remaining gas: 1039990.598 units remaining) - [ {} - (Pair 1 2) ] + [ {} + (Pair 1 2) ] - location: 20 (remaining gas: 1039990.583 units remaining) - [ (Pair {} 1 2) ] + [ (Pair {} 1 2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out index 615354dba801..3246148af33e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out @@ -8,29 +8,29 @@ big_map diff trace - location: 11 (remaining gas: 1039990.758 units remaining) - [ (Pair (Pair 15 9) 0 0) ] + [ (Pair (Pair 15 9) 0 0) ] - location: 11 (remaining gas: 1039990.748 units remaining) - [ (Pair 15 9) ] + [ (Pair 15 9) ] - location: 12 (remaining gas: 1039990.738 units remaining) - [ 15 - 9 ] + [ 15 + 9 ] - location: 13 (remaining gas: 1039990.728 units remaining) - [ 15 - 15 - 9 ] + [ 15 + 15 + 9 ] - location: 14 (remaining gas: 1039990.713 units remaining) - [ 15 - 9 ] + [ 15 + 9 ] - location: 16 (remaining gas: 1039990.658 units remaining) - [ 24 ] + [ 24 ] - location: 14 (remaining gas: 1039990.628 units remaining) - [ 15 - 24 ] + [ 15 + 24 ] - location: 17 (remaining gas: 1039990.613 units remaining) - [ (Pair 15 24) ] + [ (Pair 15 24) ] - location: 18 (remaining gas: 1039990.598 units remaining) - [ {} - (Pair 15 24) ] + [ {} + (Pair 15 24) ] - location: 20 (remaining gas: 1039990.583 units remaining) - [ (Pair {} 15 24) ] + [ (Pair {} 15 24) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out index a4e1e7b56614..47c2e282f80d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out @@ -8,86 +8,86 @@ big_map diff trace - location: 15 (remaining gas: 1039986.010 units remaining) - [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] + [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039986 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039985.990 units remaining) - [ (Pair (Pair (Pair 1 2) 3) 4) - 5 ] + [ (Pair (Pair (Pair 1 2) 3) 4) + 5 ] - location: 17 (remaining gas: 1039985.980 units remaining) - [ (Pair (Pair 1 2) 3) - 4 - 5 ] + [ (Pair (Pair 1 2) 3) + 4 + 5 ] - location: 18 (remaining gas: 1039985.970 units remaining) - [ (Pair 1 2) - 3 - 4 - 5 ] + [ (Pair 1 2) + 3 + 4 + 5 ] - location: 19 (remaining gas: 1039985.960 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 20 (remaining gas: 1039985.908 units remaining) [ ] - location: 23 (remaining gas: 1039985.898 units remaining) - [ 6 ] + [ 6 ] - location: 20 (remaining gas: 1039985.873 units remaining) - [ 5 - 6 ] + [ 5 + 6 ] - location: 20 (remaining gas: 1039985.863 units remaining) - [ 4 - 5 - 6 ] + [ 4 + 5 + 6 ] - location: 20 (remaining gas: 1039985.853 units remaining) - [ 3 - 4 - 5 - 6 ] + [ 3 + 4 + 5 + 6 ] - location: 20 (remaining gas: 1039985.843 units remaining) - [ 2 - 3 - 4 - 5 - 6 ] + [ 2 + 3 + 4 + 5 + 6 ] - location: 20 (remaining gas: 1039985.833 units remaining) - [ 1 - 2 - 3 - 4 - 5 - 6 ] + [ 1 + 2 + 3 + 4 + 5 + 6 ] - location: 20 (remaining gas: 1039985.833 units remaining) - [ 1 - 2 - 3 - 4 - 5 - 6 ] + [ 1 + 2 + 3 + 4 + 5 + 6 ] - location: 26 (remaining gas: 1039985.823 units remaining) - [ 2 - 3 - 4 - 5 - 6 ] + [ 2 + 3 + 4 + 5 + 6 ] - location: 27 (remaining gas: 1039985.813 units remaining) - [ 3 - 4 - 5 - 6 ] + [ 3 + 4 + 5 + 6 ] - location: 28 (remaining gas: 1039985.803 units remaining) - [ 4 - 5 - 6 ] + [ 4 + 5 + 6 ] - location: 29 (remaining gas: 1039985.793 units remaining) - [ 5 - 6 ] + [ 5 + 6 ] - location: 30 (remaining gas: 1039985.783 units remaining) - [ 6 ] + [ 6 ] - location: 31 (remaining gas: 1039985.768 units remaining) - [ {} - 6 ] + [ {} + 6 ] - location: 33 (remaining gas: 1039985.753 units remaining) - [ (Pair {} 6) ] + [ (Pair {} 6) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out index 991924cbeb95..b25d8283552c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out @@ -8,32 +8,32 @@ big_map diff trace - location: 15 (remaining gas: 1039990.347 units remaining) - [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] + [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039990.337 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039990.327 units remaining) - [ (Pair (Pair (Pair 1 2) 3) 4) - 5 ] + [ (Pair (Pair (Pair 1 2) 3) 4) + 5 ] - location: 17 (remaining gas: 1039990.317 units remaining) - [ (Pair (Pair 1 2) 3) - 4 - 5 ] + [ (Pair (Pair 1 2) 3) + 4 + 5 ] - location: 18 (remaining gas: 1039990.307 units remaining) - [ (Pair 1 2) - 3 - 4 - 5 ] + [ (Pair 1 2) + 3 + 4 + 5 ] - location: 19 (remaining gas: 1039990.297 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 20 (remaining gas: 1039990.227 units remaining) - [ 5 ] + [ 5 ] - location: 22 (remaining gas: 1039990.212 units remaining) - [ {} - 5 ] + [ {} + 5 ] - location: 24 (remaining gas: 1039990.197 units remaining) - [ (Pair {} 5) ] + [ (Pair {} 5) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out index fd9a9d358608..548d4395ae5b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out @@ -8,50 +8,50 @@ big_map diff trace - location: 15 (remaining gas: 1039987.936 units remaining) - [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] + [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039987.926 units remaining) - [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] + [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ] - location: 16 (remaining gas: 1039987.916 units remaining) - [ (Pair (Pair (Pair 1 2) 3) 4) - 5 ] + [ (Pair (Pair (Pair 1 2) 3) 4) + 5 ] - location: 17 (remaining gas: 1039987.906 units remaining) - [ (Pair (Pair 1 2) 3) - 4 - 5 ] + [ (Pair (Pair 1 2) 3) + 4 + 5 ] - location: 18 (remaining gas: 1039987.896 units remaining) - [ (Pair 1 2) - 3 - 4 - 5 ] + [ (Pair 1 2) + 3 + 4 + 5 ] - location: 19 (remaining gas: 1039987.886 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 20 (remaining gas: 1039987.799 units remaining) - [ 2 - 3 - 4 - 5 - 1 ] + [ 2 + 3 + 4 + 5 + 1 ] - location: 22 (remaining gas: 1039987.789 units remaining) - [ 3 - 4 - 5 - 1 ] + [ 3 + 4 + 5 + 1 ] - location: 23 (remaining gas: 1039987.779 units remaining) - [ 4 - 5 - 1 ] + [ 4 + 5 + 1 ] - location: 24 (remaining gas: 1039987.769 units remaining) - [ 5 - 1 ] + [ 5 + 1 ] - location: 25 (remaining gas: 1039987.759 units remaining) - [ 1 ] + [ 1 ] - location: 26 (remaining gas: 1039987.744 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 28 (remaining gas: 1039987.729 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out index 1fe5426e4869..203847e7e66e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out @@ -8,241 +8,241 @@ big_map diff trace - location: 7 (remaining gas: 1039951.987 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039951.977 units remaining) [ ] - location: 8 (remaining gas: 1039951.967 units remaining) - [ 5 ] + [ 5 ] - location: 11 (remaining gas: 1039951.957 units remaining) - [ 4 - 5 ] + [ 4 + 5 ] - location: 14 (remaining gas: 1039951.947 units remaining) - [ 3 - 4 - 5 ] + [ 3 + 4 + 5 ] - location: 17 (remaining gas: 1039951.937 units remaining) - [ 2 - 3 - 4 - 5 ] + [ 2 + 3 + 4 + 5 ] - location: 20 (remaining gas: 1039951.927 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 23 (remaining gas: 1039951.906 units remaining) - [ 1 - 1 - 2 - 3 - 4 - 5 ] + [ 1 + 1 + 2 + 3 + 4 + 5 ] - location: 25 (remaining gas: 1039951.896 units remaining) - [ 1 - 1 - 1 - 2 - 3 - 4 - 5 ] + [ 1 + 1 + 1 + 2 + 3 + 4 + 5 ] - location: 30 (remaining gas: 1039951.861 units remaining) - [ 0 - 1 - 2 - 3 - 4 - 5 ] + [ 0 + 1 + 2 + 3 + 4 + 5 ] - location: 31 (remaining gas: 1039951.846 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] + [ True + 1 + 2 + 3 + 4 + 5 ] - location: 32 (remaining gas: 1039951.836 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 32 (remaining gas: 1039951.821 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 38 (remaining gas: 1039951.799 units remaining) - [ 2 - 1 - 2 - 3 - 4 - 5 ] + [ 2 + 1 + 2 + 3 + 4 + 5 ] - location: 40 (remaining gas: 1039951.789 units remaining) - [ 2 - 2 - 1 - 2 - 3 - 4 - 5 ] + [ 2 + 2 + 1 + 2 + 3 + 4 + 5 ] - location: 45 (remaining gas: 1039951.754 units remaining) - [ 0 - 1 - 2 - 3 - 4 - 5 ] + [ 0 + 1 + 2 + 3 + 4 + 5 ] - location: 46 (remaining gas: 1039951.739 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] + [ True + 1 + 2 + 3 + 4 + 5 ] - location: 47 (remaining gas: 1039951.729 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 47 (remaining gas: 1039951.714 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 53 (remaining gas: 1039951.691 units remaining) - [ 3 - 1 - 2 - 3 - 4 - 5 ] + [ 3 + 1 + 2 + 3 + 4 + 5 ] - location: 55 (remaining gas: 1039951.681 units remaining) - [ 3 - 3 - 1 - 2 - 3 - 4 - 5 ] + [ 3 + 3 + 1 + 2 + 3 + 4 + 5 ] - location: 60 (remaining gas: 1039951.646 units remaining) - [ 0 - 1 - 2 - 3 - 4 - 5 ] + [ 0 + 1 + 2 + 3 + 4 + 5 ] - location: 61 (remaining gas: 1039951.631 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] + [ True + 1 + 2 + 3 + 4 + 5 ] - location: 62 (remaining gas: 1039951.621 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 62 (remaining gas: 1039951.606 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 68 (remaining gas: 1039951.582 units remaining) - [ 4 - 1 - 2 - 3 - 4 - 5 ] + [ 4 + 1 + 2 + 3 + 4 + 5 ] - location: 70 (remaining gas: 1039951.572 units remaining) - [ 4 - 4 - 1 - 2 - 3 - 4 - 5 ] + [ 4 + 4 + 1 + 2 + 3 + 4 + 5 ] - location: 75 (remaining gas: 1039951.537 units remaining) - [ 0 - 1 - 2 - 3 - 4 - 5 ] + [ 0 + 1 + 2 + 3 + 4 + 5 ] - location: 76 (remaining gas: 1039951.522 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] + [ True + 1 + 2 + 3 + 4 + 5 ] - location: 77 (remaining gas: 1039951.512 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 77 (remaining gas: 1039951.497 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 83 (remaining gas: 1039951.472 units remaining) - [ 5 - 1 - 2 - 3 - 4 - 5 ] + [ 5 + 1 + 2 + 3 + 4 + 5 ] - location: 85 (remaining gas: 1039951.462 units remaining) - [ 5 - 5 - 1 - 2 - 3 - 4 - 5 ] + [ 5 + 5 + 1 + 2 + 3 + 4 + 5 ] - location: 90 (remaining gas: 1039951.427 units remaining) - [ 0 - 1 - 2 - 3 - 4 - 5 ] + [ 0 + 1 + 2 + 3 + 4 + 5 ] - location: 91 (remaining gas: 1039951.412 units remaining) - [ True - 1 - 2 - 3 - 4 - 5 ] + [ True + 1 + 2 + 3 + 4 + 5 ] - location: 92 (remaining gas: 1039951.402 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 92 (remaining gas: 1039951.387 units remaining) - [ 1 - 2 - 3 - 4 - 5 ] + [ 1 + 2 + 3 + 4 + 5 ] - location: 98 (remaining gas: 1039951.315 units remaining) [ ] - location: 100 (remaining gas: 1039951.305 units remaining) - [ Unit ] + [ Unit ] - location: 101 (remaining gas: 1039951.290 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 103 (remaining gas: 1039951.275 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out index c46413e02a2f..f6a21e9db0bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out @@ -8,135 +8,135 @@ big_map diff trace - location: 25 (remaining gas: 1039969.963 units remaining) - [ (Pair (Pair -8 2) None None None None) ] + [ (Pair (Pair -8 2) None None None None) ] - location: 25 (remaining gas: 1039969.953 units remaining) - [ (Pair -8 2) ] + [ (Pair -8 2) ] - location: 26 (remaining gas: 1039969.943 units remaining) - [ (Pair -8 2) - (Pair -8 2) ] + [ (Pair -8 2) + (Pair -8 2) ] - location: 27 (remaining gas: 1039969.933 units remaining) - [ -8 - 2 - (Pair -8 2) ] + [ -8 + 2 + (Pair -8 2) ] - location: 28 (remaining gas: 1039969.908 units remaining) - [ 8 - 2 - (Pair -8 2) ] + [ 8 + 2 + (Pair -8 2) ] - location: 29 (remaining gas: 1039969.893 units remaining) - [ 2 - (Pair -8 2) ] + [ 2 + (Pair -8 2) ] - location: 31 (remaining gas: 1039969.868 units remaining) - [ 2 - (Pair -8 2) ] + [ 2 + (Pair -8 2) ] - location: 29 (remaining gas: 1039969.838 units remaining) - [ 8 - 2 - (Pair -8 2) ] + [ 8 + 2 + (Pair -8 2) ] - location: 32 (remaining gas: 1039969.698 units remaining) - [ (Some (Pair 4 0)) - (Pair -8 2) ] + [ (Some (Pair 4 0)) + (Pair -8 2) ] - location: 33 (remaining gas: 1039969.688 units remaining) - [ (Pair -8 2) - (Some (Pair 4 0)) ] + [ (Pair -8 2) + (Some (Pair 4 0)) ] - location: 34 (remaining gas: 1039969.678 units remaining) - [ (Pair -8 2) - (Pair -8 2) - (Some (Pair 4 0)) ] + [ (Pair -8 2) + (Pair -8 2) + (Some (Pair 4 0)) ] - location: 35 (remaining gas: 1039969.668 units remaining) - [ -8 - 2 - (Pair -8 2) - (Some (Pair 4 0)) ] + [ -8 + 2 + (Pair -8 2) + (Some (Pair 4 0)) ] - location: 36 (remaining gas: 1039969.643 units remaining) - [ 8 - 2 - (Pair -8 2) - (Some (Pair 4 0)) ] + [ 8 + 2 + (Pair -8 2) + (Some (Pair 4 0)) ] - location: 37 (remaining gas: 1039969.503 units remaining) - [ (Some (Pair 4 0)) - (Pair -8 2) - (Some (Pair 4 0)) ] + [ (Some (Pair 4 0)) + (Pair -8 2) + (Some (Pair 4 0)) ] - location: 38 (remaining gas: 1039969.493 units remaining) - [ (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 39 (remaining gas: 1039969.483 units remaining) - [ (Pair -8 2) - (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ (Pair -8 2) + (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 40 (remaining gas: 1039969.473 units remaining) - [ -8 - 2 - (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ -8 + 2 + (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 41 (remaining gas: 1039969.458 units remaining) - [ 2 - (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ 2 + (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 43 (remaining gas: 1039969.433 units remaining) - [ 2 - (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ 2 + (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 41 (remaining gas: 1039969.403 units remaining) - [ -8 - 2 - (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ -8 + 2 + (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 44 (remaining gas: 1039969.263 units remaining) - [ (Some (Pair -4 0)) - (Pair -8 2) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ (Some (Pair -4 0)) + (Pair -8 2) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 45 (remaining gas: 1039969.253 units remaining) - [ (Pair -8 2) - (Some (Pair -4 0)) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ (Pair -8 2) + (Some (Pair -4 0)) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 46 (remaining gas: 1039969.243 units remaining) - [ -8 - 2 - (Some (Pair -4 0)) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ -8 + 2 + (Some (Pair -4 0)) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 47 (remaining gas: 1039969.103 units remaining) - [ (Some (Pair -4 0)) - (Some (Pair -4 0)) - (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ (Some (Pair -4 0)) + (Some (Pair -4 0)) + (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 49 (remaining gas: 1039969.055 units remaining) - [ (Some (Pair 4 0)) - (Some (Pair 4 0)) ] + [ (Some (Pair 4 0)) + (Some (Pair 4 0)) ] - location: 52 (remaining gas: 1039969.040 units remaining) - [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 49 (remaining gas: 1039969.015 units remaining) - [ (Some (Pair -4 0)) - (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Some (Pair -4 0)) + (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 49 (remaining gas: 1039969.005 units remaining) - [ (Some (Pair -4 0)) - (Some (Pair -4 0)) - (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Some (Pair -4 0)) + (Some (Pair -4 0)) + (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 49 (remaining gas: 1039969.005 units remaining) - [ (Some (Pair -4 0)) - (Some (Pair -4 0)) - (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Some (Pair -4 0)) + (Some (Pair -4 0)) + (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 53 (remaining gas: 1039968.990 units remaining) - [ (Some (Pair -4 0)) - (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Some (Pair -4 0)) + (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 55 (remaining gas: 1039968.975 units remaining) - [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 53 (remaining gas: 1039968.945 units remaining) - [ (Some (Pair -4 0)) - (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Some (Pair -4 0)) + (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 56 (remaining gas: 1039968.930 units remaining) - [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 57 (remaining gas: 1039968.915 units remaining) - [ {} - (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ {} + (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] - location: 59 (remaining gas: 1039968.900 units remaining) - [ (Pair {} (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] + [ (Pair {} (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out index 295db124ac92..b2d3aa4b773f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out @@ -8,135 +8,135 @@ big_map diff trace - location: 25 (remaining gas: 1039969.963 units remaining) - [ (Pair (Pair 10 -3) None None None None) ] + [ (Pair (Pair 10 -3) None None None None) ] - location: 25 (remaining gas: 1039969.953 units remaining) - [ (Pair 10 -3) ] + [ (Pair 10 -3) ] - location: 26 (remaining gas: 1039969.943 units remaining) - [ (Pair 10 -3) - (Pair 10 -3) ] + [ (Pair 10 -3) + (Pair 10 -3) ] - location: 27 (remaining gas: 1039969.933 units remaining) - [ 10 - -3 - (Pair 10 -3) ] + [ 10 + -3 + (Pair 10 -3) ] - location: 28 (remaining gas: 1039969.908 units remaining) - [ 10 - -3 - (Pair 10 -3) ] + [ 10 + -3 + (Pair 10 -3) ] - location: 29 (remaining gas: 1039969.893 units remaining) - [ -3 - (Pair 10 -3) ] + [ -3 + (Pair 10 -3) ] - location: 31 (remaining gas: 1039969.868 units remaining) - [ 3 - (Pair 10 -3) ] + [ 3 + (Pair 10 -3) ] - location: 29 (remaining gas: 1039969.838 units remaining) - [ 10 - 3 - (Pair 10 -3) ] + [ 10 + 3 + (Pair 10 -3) ] - location: 32 (remaining gas: 1039969.698 units remaining) - [ (Some (Pair 3 1)) - (Pair 10 -3) ] + [ (Some (Pair 3 1)) + (Pair 10 -3) ] - location: 33 (remaining gas: 1039969.688 units remaining) - [ (Pair 10 -3) - (Some (Pair 3 1)) ] + [ (Pair 10 -3) + (Some (Pair 3 1)) ] - location: 34 (remaining gas: 1039969.678 units remaining) - [ (Pair 10 -3) - (Pair 10 -3) - (Some (Pair 3 1)) ] + [ (Pair 10 -3) + (Pair 10 -3) + (Some (Pair 3 1)) ] - location: 35 (remaining gas: 1039969.668 units remaining) - [ 10 - -3 - (Pair 10 -3) - (Some (Pair 3 1)) ] + [ 10 + -3 + (Pair 10 -3) + (Some (Pair 3 1)) ] - location: 36 (remaining gas: 1039969.643 units remaining) - [ 10 - -3 - (Pair 10 -3) - (Some (Pair 3 1)) ] + [ 10 + -3 + (Pair 10 -3) + (Some (Pair 3 1)) ] - location: 37 (remaining gas: 1039969.503 units remaining) - [ (Some (Pair -3 1)) - (Pair 10 -3) - (Some (Pair 3 1)) ] + [ (Some (Pair -3 1)) + (Pair 10 -3) + (Some (Pair 3 1)) ] - location: 38 (remaining gas: 1039969.493 units remaining) - [ (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 39 (remaining gas: 1039969.483 units remaining) - [ (Pair 10 -3) - (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ (Pair 10 -3) + (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 40 (remaining gas: 1039969.473 units remaining) - [ 10 - -3 - (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ 10 + -3 + (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 41 (remaining gas: 1039969.458 units remaining) - [ -3 - (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ -3 + (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 43 (remaining gas: 1039969.433 units remaining) - [ 3 - (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ 3 + (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 41 (remaining gas: 1039969.403 units remaining) - [ 10 - 3 - (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ 10 + 3 + (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 44 (remaining gas: 1039969.263 units remaining) - [ (Some (Pair 3 1)) - (Pair 10 -3) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ (Some (Pair 3 1)) + (Pair 10 -3) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 45 (remaining gas: 1039969.253 units remaining) - [ (Pair 10 -3) - (Some (Pair 3 1)) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ (Pair 10 -3) + (Some (Pair 3 1)) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 46 (remaining gas: 1039969.243 units remaining) - [ 10 - -3 - (Some (Pair 3 1)) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ 10 + -3 + (Some (Pair 3 1)) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 47 (remaining gas: 1039969.103 units remaining) - [ (Some (Pair -3 1)) - (Some (Pair 3 1)) - (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ (Some (Pair -3 1)) + (Some (Pair 3 1)) + (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 49 (remaining gas: 1039969.055 units remaining) - [ (Some (Pair -3 1)) - (Some (Pair 3 1)) ] + [ (Some (Pair -3 1)) + (Some (Pair 3 1)) ] - location: 52 (remaining gas: 1039969.040 units remaining) - [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 49 (remaining gas: 1039969.015 units remaining) - [ (Some (Pair 3 1)) - (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Some (Pair 3 1)) + (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 49 (remaining gas: 1039969.005 units remaining) - [ (Some (Pair -3 1)) - (Some (Pair 3 1)) - (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Some (Pair -3 1)) + (Some (Pair 3 1)) + (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 49 (remaining gas: 1039969.005 units remaining) - [ (Some (Pair -3 1)) - (Some (Pair 3 1)) - (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Some (Pair -3 1)) + (Some (Pair 3 1)) + (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 53 (remaining gas: 1039968.990 units remaining) - [ (Some (Pair 3 1)) - (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Some (Pair 3 1)) + (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 55 (remaining gas: 1039968.975 units remaining) - [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 53 (remaining gas: 1039968.945 units remaining) - [ (Some (Pair -3 1)) - (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Some (Pair -3 1)) + (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 56 (remaining gas: 1039968.930 units remaining) - [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 57 (remaining gas: 1039968.915 units remaining) - [ {} - (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ {} + (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] - location: 59 (remaining gas: 1039968.900 units remaining) - [ (Pair {} (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] + [ (Pair {} (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out index 0c9837dca3a3..d60041e6b509 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out @@ -8,135 +8,135 @@ big_map diff trace - location: 25 (remaining gas: 1039969.963 units remaining) - [ (Pair (Pair 10 0) None None None None) ] + [ (Pair (Pair 10 0) None None None None) ] - location: 25 (remaining gas: 1039969.953 units remaining) - [ (Pair 10 0) ] + [ (Pair 10 0) ] - location: 26 (remaining gas: 1039969.943 units remaining) - [ (Pair 10 0) - (Pair 10 0) ] + [ (Pair 10 0) + (Pair 10 0) ] - location: 27 (remaining gas: 1039969.933 units remaining) - [ 10 - 0 - (Pair 10 0) ] + [ 10 + 0 + (Pair 10 0) ] - location: 28 (remaining gas: 1039969.908 units remaining) - [ 10 - 0 - (Pair 10 0) ] + [ 10 + 0 + (Pair 10 0) ] - location: 29 (remaining gas: 1039969.893 units remaining) - [ 0 - (Pair 10 0) ] + [ 0 + (Pair 10 0) ] - location: 31 (remaining gas: 1039969.868 units remaining) - [ 0 - (Pair 10 0) ] + [ 0 + (Pair 10 0) ] - location: 29 (remaining gas: 1039969.838 units remaining) - [ 10 - 0 - (Pair 10 0) ] + [ 10 + 0 + (Pair 10 0) ] - location: 32 (remaining gas: 1039969.698 units remaining) - [ None - (Pair 10 0) ] + [ None + (Pair 10 0) ] - location: 33 (remaining gas: 1039969.688 units remaining) - [ (Pair 10 0) - None ] + [ (Pair 10 0) + None ] - location: 34 (remaining gas: 1039969.678 units remaining) - [ (Pair 10 0) - (Pair 10 0) - None ] + [ (Pair 10 0) + (Pair 10 0) + None ] - location: 35 (remaining gas: 1039969.668 units remaining) - [ 10 - 0 - (Pair 10 0) - None ] + [ 10 + 0 + (Pair 10 0) + None ] - location: 36 (remaining gas: 1039969.643 units remaining) - [ 10 - 0 - (Pair 10 0) - None ] + [ 10 + 0 + (Pair 10 0) + None ] - location: 37 (remaining gas: 1039969.503 units remaining) - [ None - (Pair 10 0) - None ] + [ None + (Pair 10 0) + None ] - location: 38 (remaining gas: 1039969.493 units remaining) - [ (Pair 10 0) - None - None ] + [ (Pair 10 0) + None + None ] - location: 39 (remaining gas: 1039969.483 units remaining) - [ (Pair 10 0) - (Pair 10 0) - None - None ] + [ (Pair 10 0) + (Pair 10 0) + None + None ] - location: 40 (remaining gas: 1039969.473 units remaining) - [ 10 - 0 - (Pair 10 0) - None - None ] + [ 10 + 0 + (Pair 10 0) + None + None ] - location: 41 (remaining gas: 1039969.458 units remaining) - [ 0 - (Pair 10 0) - None - None ] + [ 0 + (Pair 10 0) + None + None ] - location: 43 (remaining gas: 1039969.433 units remaining) - [ 0 - (Pair 10 0) - None - None ] + [ 0 + (Pair 10 0) + None + None ] - location: 41 (remaining gas: 1039969.403 units remaining) - [ 10 - 0 - (Pair 10 0) - None - None ] + [ 10 + 0 + (Pair 10 0) + None + None ] - location: 44 (remaining gas: 1039969.263 units remaining) - [ None - (Pair 10 0) - None - None ] + [ None + (Pair 10 0) + None + None ] - location: 45 (remaining gas: 1039969.253 units remaining) - [ (Pair 10 0) - None - None - None ] + [ (Pair 10 0) + None + None + None ] - location: 46 (remaining gas: 1039969.243 units remaining) - [ 10 - 0 - None - None - None ] + [ 10 + 0 + None + None + None ] - location: 47 (remaining gas: 1039969.103 units remaining) - [ None - None - None - None ] + [ None + None + None + None ] - location: 49 (remaining gas: 1039969.055 units remaining) - [ None - None ] + [ None + None ] - location: 52 (remaining gas: 1039969.040 units remaining) - [ (Pair None None) ] + [ (Pair None None) ] - location: 49 (remaining gas: 1039969.015 units remaining) - [ None - (Pair None None) ] + [ None + (Pair None None) ] - location: 49 (remaining gas: 1039969.005 units remaining) - [ None - None - (Pair None None) ] + [ None + None + (Pair None None) ] - location: 49 (remaining gas: 1039969.005 units remaining) - [ None - None - (Pair None None) ] + [ None + None + (Pair None None) ] - location: 53 (remaining gas: 1039968.990 units remaining) - [ None - (Pair None None) ] + [ None + (Pair None None) ] - location: 55 (remaining gas: 1039968.975 units remaining) - [ (Pair None None None) ] + [ (Pair None None None) ] - location: 53 (remaining gas: 1039968.945 units remaining) - [ None - (Pair None None None) ] + [ None + (Pair None None None) ] - location: 56 (remaining gas: 1039968.930 units remaining) - [ (Pair None None None None) ] + [ (Pair None None None None) ] - location: 57 (remaining gas: 1039968.915 units remaining) - [ {} - (Pair None None None None) ] + [ {} + (Pair None None None None) ] - location: 59 (remaining gas: 1039968.900 units remaining) - [ (Pair {} None None None None) ] + [ (Pair {} None None None None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out index d03218b92527..dfd3b4405591 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 10 (Left 0)) (Left None)) ] + [ (Pair (Pair 10 (Left 0)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Left 0)) ] + [ (Pair 10 (Left 0)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 10 - (Left 0) ] + [ 10 + (Left 0) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Left 0) - 10 ] + [ (Left 0) + 10 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 0 - 10 ] + [ 0 + 10 ] - location: 24 (remaining gas: 1039981.851 units remaining) - [ 10 - 0 ] + [ 10 + 0 ] - location: 25 (remaining gas: 1039981.711 units remaining) - [ None ] + [ None ] - location: 26 (remaining gas: 1039981.696 units remaining) - [ (Left None) ] + [ (Left None) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Left None) ] + [ (Left None) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Left None) ] + [ {} + (Left None) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Left None)) ] + [ (Pair {} (Left None)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out index 0b8dd05a2c3e..547a688c5b29 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 10 (Left 10)) (Left None)) ] + [ (Pair (Pair 10 (Left 10)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Left 10)) ] + [ (Pair 10 (Left 10)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 10 - (Left 10) ] + [ 10 + (Left 10) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Left 10) - 10 ] + [ (Left 10) + 10 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 10 - 10 ] + [ 10 + 10 ] - location: 24 (remaining gas: 1039981.851 units remaining) - [ 10 - 10 ] + [ 10 + 10 ] - location: 25 (remaining gas: 1039981.711 units remaining) - [ (Some (Pair 1 0)) ] + [ (Some (Pair 1 0)) ] - location: 26 (remaining gas: 1039981.696 units remaining) - [ (Left (Some (Pair 1 0))) ] + [ (Left (Some (Pair 1 0))) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Left (Some (Pair 1 0))) ] + [ (Left (Some (Pair 1 0))) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Left (Some (Pair 1 0))) ] + [ {} + (Left (Some (Pair 1 0))) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Left (Some (Pair 1 0)))) ] + [ (Pair {} (Left (Some (Pair 1 0)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out index f656456cfffe..7981f7eaf5b5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 10 (Left 3)) (Left None)) ] + [ (Pair (Pair 10 (Left 3)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Left 3)) ] + [ (Pair 10 (Left 3)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 10 - (Left 3) ] + [ 10 + (Left 3) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Left 3) - 10 ] + [ (Left 3) + 10 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 3 - 10 ] + [ 3 + 10 ] - location: 24 (remaining gas: 1039981.851 units remaining) - [ 10 - 3 ] + [ 10 + 3 ] - location: 25 (remaining gas: 1039981.711 units remaining) - [ (Some (Pair 3 1)) ] + [ (Some (Pair 3 1)) ] - location: 26 (remaining gas: 1039981.696 units remaining) - [ (Left (Some (Pair 3 1))) ] + [ (Left (Some (Pair 3 1))) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Left (Some (Pair 3 1))) ] + [ (Left (Some (Pair 3 1))) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Left (Some (Pair 3 1))) ] + [ {} + (Left (Some (Pair 3 1))) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Left (Some (Pair 3 1)))) ] + [ (Pair {} (Left (Some (Pair 3 1)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out index 0891eabab011..349bd9d7f219 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 10 (Right 0)) (Left None)) ] + [ (Pair (Pair 10 (Right 0)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Right 0)) ] + [ (Pair 10 (Right 0)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 10 - (Right 0) ] + [ 10 + (Right 0) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Right 0) - 10 ] + [ (Right 0) + 10 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 0 - 10 ] + [ 0 + 10 ] - location: 32 (remaining gas: 1039981.851 units remaining) - [ 10 - 0 ] + [ 10 + 0 ] - location: 33 (remaining gas: 1039981.711 units remaining) - [ None ] + [ None ] - location: 34 (remaining gas: 1039981.696 units remaining) - [ (Right None) ] + [ (Right None) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Right None) ] + [ (Right None) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Right None) ] + [ {} + (Right None) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Right None)) ] + [ (Pair {} (Right None)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out index 0ea0e02fe85c..d3ad8f699115 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 10 (Right 10)) (Left None)) ] + [ (Pair (Pair 10 (Right 10)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Right 10)) ] + [ (Pair 10 (Right 10)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 10 - (Right 10) ] + [ 10 + (Right 10) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Right 10) - 10 ] + [ (Right 10) + 10 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 10 - 10 ] + [ 10 + 10 ] - location: 32 (remaining gas: 1039981.851 units remaining) - [ 10 - 10 ] + [ 10 + 10 ] - location: 33 (remaining gas: 1039981.711 units remaining) - [ (Some (Pair 1 0)) ] + [ (Some (Pair 1 0)) ] - location: 34 (remaining gas: 1039981.696 units remaining) - [ (Right (Some (Pair 1 0))) ] + [ (Right (Some (Pair 1 0))) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Right (Some (Pair 1 0))) ] + [ (Right (Some (Pair 1 0))) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Right (Some (Pair 1 0))) ] + [ {} + (Right (Some (Pair 1 0))) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Right (Some (Pair 1 0)))) ] + [ (Pair {} (Right (Some (Pair 1 0)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out index 6bc3b0df798d..2fa368526f1f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 10 (Right 3)) (Left None)) ] + [ (Pair (Pair 10 (Right 3)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 10 (Right 3)) ] + [ (Pair 10 (Right 3)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 10 - (Right 3) ] + [ 10 + (Right 3) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Right 3) - 10 ] + [ (Right 3) + 10 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 3 - 10 ] + [ 3 + 10 ] - location: 32 (remaining gas: 1039981.851 units remaining) - [ 10 - 3 ] + [ 10 + 3 ] - location: 33 (remaining gas: 1039981.711 units remaining) - [ (Some (Pair 3 1)) ] + [ (Some (Pair 3 1)) ] - location: 34 (remaining gas: 1039981.696 units remaining) - [ (Right (Some (Pair 3 1))) ] + [ (Right (Some (Pair 3 1))) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Right (Some (Pair 3 1))) ] + [ (Right (Some (Pair 3 1))) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Right (Some (Pair 3 1))) ] + [ {} + (Right (Some (Pair 3 1))) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Right (Some (Pair 3 1)))) ] + [ (Pair {} (Right (Some (Pair 3 1)))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out index 63713ec9ab71..acdb678ccf73 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out @@ -8,30 +8,30 @@ big_map diff trace - location: 19 (remaining gas: 1039981.901 units remaining) - [ (Pair (Pair 5 (Right 10)) (Left None)) ] + [ (Pair (Pair 5 (Right 10)) (Left None)) ] - location: 19 (remaining gas: 1039981.891 units remaining) - [ (Pair 5 (Right 10)) ] + [ (Pair 5 (Right 10)) ] - location: 20 (remaining gas: 1039981.881 units remaining) - [ 5 - (Right 10) ] + [ 5 + (Right 10) ] - location: 21 (remaining gas: 1039981.871 units remaining) - [ (Right 10) - 5 ] + [ (Right 10) + 5 ] - location: 22 (remaining gas: 1039981.861 units remaining) - [ 10 - 5 ] + [ 10 + 5 ] - location: 32 (remaining gas: 1039981.851 units remaining) - [ 5 - 10 ] + [ 5 + 10 ] - location: 33 (remaining gas: 1039981.711 units remaining) - [ (Some (Pair 0 5)) ] + [ (Some (Pair 0 5)) ] - location: 34 (remaining gas: 1039981.696 units remaining) - [ (Right (Some (Pair 0 5))) ] + [ (Right (Some (Pair 0 5))) ] - location: 22 (remaining gas: 1039981.681 units remaining) - [ (Right (Some (Pair 0 5))) ] + [ (Right (Some (Pair 0 5))) ] - location: 39 (remaining gas: 1039981.666 units remaining) - [ {} - (Right (Some (Pair 0 5))) ] + [ {} + (Right (Some (Pair 0 5))) ] - location: 41 (remaining gas: 1039981.651 units remaining) - [ (Pair {} (Right (Some (Pair 0 5)))) ] + [ (Pair {} (Right (Some (Pair 0 5)))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" index 7580d35e10c9..1ec854ed7f52 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" @@ -8,26 +8,26 @@ big_map diff trace - location: 9 (remaining gas: 1039989.971 units remaining) - [ (Pair Unit {}) ] + [ (Pair Unit {}) ] - location: 9 (remaining gas: 1039989.961 units remaining) [ ] - location: 10 (remaining gas: 1039989.741 units remaining) - [ {} ] + [ {} ] - location: 13 (remaining gas: 1039989.731 units remaining) - [ "world" - {} ] + [ "world" + {} ] - location: 16 (remaining gas: 1039989.716 units remaining) - [ (Some "world") - {} ] + [ (Some "world") + {} ] - location: 17 (remaining gas: 1039989.706 units remaining) - [ "hello" - (Some "world") - {} ] + [ "hello" + (Some "world") + {} ] - location: 20 (remaining gas: 1039989.556 units remaining) - [ { Elt "hello" "world" } ] + [ { Elt "hello" "world" } ] - location: 21 (remaining gas: 1039989.541 units remaining) - [ {} - { Elt "hello" "world" } ] + [ {} + { Elt "hello" "world" } ] - location: 23 (remaining gas: 1039989.526 units remaining) - [ (Pair {} { Elt "hello" "world" }) ] + [ (Pair {} { Elt "hello" "world" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" index 3c63fd948e1f..2e05fec539c5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" @@ -8,41 +8,41 @@ big_map diff trace - location: 7 (remaining gas: 1039987.134 units remaining) - [ (Pair "" "?") ] + [ (Pair "" "?") ] - location: 7 (remaining gas: 1039987.124 units remaining) - [ "" ] + [ "" ] - location: 8 (remaining gas: 1039987.114 units remaining) - [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } - "" ] + [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } + "" ] - location: 22 (remaining gas: 1039987.104 units remaining) - [ "" - { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] + [ "" + { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - location: 12 (remaining gas: 1039987.094 units remaining) - [ "_abc" - "" ] + [ "_abc" + "" ] - location: 15 (remaining gas: 1039987.079 units remaining) - [ {} - "_abc" - "" ] + [ {} + "_abc" + "" ] - location: 17 (remaining gas: 1039987.069 units remaining) - [ "_abc" - {} - "" ] + [ "_abc" + {} + "" ] - location: 18 (remaining gas: 1039987.054 units remaining) - [ { "_abc" } - "" ] + [ { "_abc" } + "" ] - location: 19 (remaining gas: 1039987.044 units remaining) - [ "" - { "_abc" } ] + [ "" + { "_abc" } ] - location: 20 (remaining gas: 1039987.029 units remaining) - [ { "" ; "_abc" } ] + [ { "" ; "_abc" } ] - location: 21 (remaining gas: 1039986.909 units remaining) - [ "_abc" ] + [ "_abc" ] - location: 23 (remaining gas: 1039986.879 units remaining) - [ "_abc" ] + [ "_abc" ] - location: 24 (remaining gas: 1039986.864 units remaining) - [ {} - "_abc" ] + [ {} + "_abc" ] - location: 26 (remaining gas: 1039986.849 units remaining) - [ (Pair {} "_abc") ] + [ (Pair {} "_abc") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" index 809363aa4c97..efbecfee0761 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" @@ -8,41 +8,41 @@ big_map diff trace - location: 7 (remaining gas: 1039987.094 units remaining) - [ (Pair "test" "?") ] + [ (Pair "test" "?") ] - location: 7 (remaining gas: 1039987.084 units remaining) - [ "test" ] + [ "test" ] - location: 8 (remaining gas: 1039987.074 units remaining) - [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } - "test" ] + [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } + "test" ] - location: 22 (remaining gas: 1039987.064 units remaining) - [ "test" - { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] + [ "test" + { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - location: 12 (remaining gas: 1039987.054 units remaining) - [ "_abc" - "test" ] + [ "_abc" + "test" ] - location: 15 (remaining gas: 1039987.039 units remaining) - [ {} - "_abc" - "test" ] + [ {} + "_abc" + "test" ] - location: 17 (remaining gas: 1039987.029 units remaining) - [ "_abc" - {} - "test" ] + [ "_abc" + {} + "test" ] - location: 18 (remaining gas: 1039987.014 units remaining) - [ { "_abc" } - "test" ] + [ { "_abc" } + "test" ] - location: 19 (remaining gas: 1039987.004 units remaining) - [ "test" - { "_abc" } ] + [ "test" + { "_abc" } ] - location: 20 (remaining gas: 1039986.989 units remaining) - [ { "test" ; "_abc" } ] + [ { "test" ; "_abc" } ] - location: 21 (remaining gas: 1039986.869 units remaining) - [ "test_abc" ] + [ "test_abc" ] - location: 23 (remaining gas: 1039986.839 units remaining) - [ "test_abc" ] + [ "test_abc" ] - location: 24 (remaining gas: 1039986.824 units remaining) - [ {} - "test_abc" ] + [ {} + "test_abc" ] - location: 26 (remaining gas: 1039986.809 units remaining) - [ (Pair {} "test_abc") ] + [ (Pair {} "test_abc") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out index 83f84401ca7e..98493699ef01 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out @@ -8,23 +8,23 @@ big_map diff trace - location: 8 (remaining gas: 1039991.033 units remaining) - [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] + [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] - location: 8 (remaining gas: 1039991.023 units remaining) - [ { 1 ; 2 ; 3 ; 4 } ] + [ { 1 ; 2 ; 3 ; 4 } ] - location: 9 (remaining gas: 1039991.013 units remaining) - [ 1 - { 2 ; 3 ; 4 } ] + [ 1 + { 2 ; 3 ; 4 } ] - location: 11 (remaining gas: 1039990.998 units remaining) - [ { 2 ; 3 ; 4 } ] + [ { 2 ; 3 ; 4 } ] - location: 13 (remaining gas: 1039990.988 units remaining) [ ] - location: 11 (remaining gas: 1039990.958 units remaining) - [ 1 ] + [ 1 ] - location: 9 (remaining gas: 1039990.943 units remaining) - [ 1 ] + [ 1 ] - location: 18 (remaining gas: 1039990.928 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 20 (remaining gas: 1039990.913 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out index aee64d547d32..2379dd4a38fb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out @@ -8,23 +8,23 @@ big_map diff trace - location: 8 (remaining gas: 1039991.333 units remaining) - [ (Pair { 4 } 111) ] + [ (Pair { 4 } 111) ] - location: 8 (remaining gas: 1039991.323 units remaining) - [ { 4 } ] + [ { 4 } ] - location: 9 (remaining gas: 1039991.313 units remaining) - [ 4 - {} ] + [ 4 + {} ] - location: 11 (remaining gas: 1039991.298 units remaining) - [ {} ] + [ {} ] - location: 13 (remaining gas: 1039991.288 units remaining) [ ] - location: 11 (remaining gas: 1039991.258 units remaining) - [ 4 ] + [ 4 ] - location: 9 (remaining gas: 1039991.243 units remaining) - [ 4 ] + [ 4 ] - location: 18 (remaining gas: 1039991.228 units remaining) - [ {} - 4 ] + [ {} + 4 ] - location: 20 (remaining gas: 1039991.213 units remaining) - [ (Pair {} 4) ] + [ (Pair {} 4) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" index 80c5813fb374..2f62f59c3b8e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.746 units remaining) - [ (Pair "hello" (Some 4) {}) ] + [ (Pair "hello" (Some 4) {}) ] - location: 13 (remaining gas: 1039989.736 units remaining) - [ "hello" - (Pair (Some 4) {}) ] + [ "hello" + (Pair (Some 4) {}) ] - location: 14 (remaining gas: 1039989.721 units remaining) - [ (Pair (Some 4) {}) ] + [ (Pair (Some 4) {}) ] - location: 16 (remaining gas: 1039989.711 units remaining) - [ (Some 4) - {} ] + [ (Some 4) + {} ] - location: 14 (remaining gas: 1039989.681 units remaining) - [ "hello" - (Some 4) - {} ] + [ "hello" + (Some 4) + {} ] - location: 17 (remaining gas: 1039989.496 units remaining) - [ None - { Elt "hello" 4 } ] + [ None + { Elt "hello" 4 } ] - location: 18 (remaining gas: 1039989.481 units remaining) - [ (Pair None { Elt "hello" 4 }) ] + [ (Pair None { Elt "hello" 4 }) ] - location: 19 (remaining gas: 1039989.466 units remaining) - [ {} - (Pair None { Elt "hello" 4 }) ] + [ {} + (Pair None { Elt "hello" 4 }) ] - location: 21 (remaining gas: 1039989.451 units remaining) - [ (Pair {} None { Elt "hello" 4 }) ] + [ (Pair {} None { Elt "hello" 4 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" index 38555de5e32e..c2dc9980dbd5 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.362 units remaining) - [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] + [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039989.352 units remaining) - [ "hi" - (Pair (Some 5) { Elt "hello" 4 }) ] + [ "hi" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039989.337 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039989.327 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] + [ (Some 5) + { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039989.297 units remaining) - [ "hi" - (Some 5) - { Elt "hello" 4 } ] + [ "hi" + (Some 5) + { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039989.007 units remaining) - [ None - { Elt "hello" 4 ; Elt "hi" 5 } ] + [ None + { Elt "hello" 4 ; Elt "hi" 5 } ] - location: 18 (remaining gas: 1039988.992 units remaining) - [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] + [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - location: 19 (remaining gas: 1039988.977 units remaining) - [ {} - (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] + [ {} + (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ] - location: 21 (remaining gas: 1039988.962 units remaining) - [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] + [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" index 0d59859b7386..278285df4c7b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.332 units remaining) - [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] + [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039989.322 units remaining) - [ "hello" - (Pair (Some 5) { Elt "hello" 4 }) ] + [ "hello" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039989.307 units remaining) - [ (Pair (Some 5) { Elt "hello" 4 }) ] + [ (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039989.297 units remaining) - [ (Some 5) - { Elt "hello" 4 } ] + [ (Some 5) + { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039989.267 units remaining) - [ "hello" - (Some 5) - { Elt "hello" 4 } ] + [ "hello" + (Some 5) + { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039988.977 units remaining) - [ (Some 4) - { Elt "hello" 5 } ] + [ (Some 4) + { Elt "hello" 5 } ] - location: 18 (remaining gas: 1039988.962 units remaining) - [ (Pair (Some 4) { Elt "hello" 5 }) ] + [ (Pair (Some 4) { Elt "hello" 5 }) ] - location: 19 (remaining gas: 1039988.947 units remaining) - [ {} - (Pair (Some 4) { Elt "hello" 5 }) ] + [ {} + (Pair (Some 4) { Elt "hello" 5 }) ] - location: 21 (remaining gas: 1039988.932 units remaining) - [ (Pair {} (Some 4) { Elt "hello" 5 }) ] + [ (Pair {} (Some 4) { Elt "hello" 5 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" index 0d516b3b8719..821f58aa9d24 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .6900b1da14.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.033 units remaining) - [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039989.023 units remaining) - [ "1" - (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039989.008 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039988.998 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] + [ None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039988.968 units remaining) - [ "1" - None - { Elt "1" 1 ; Elt "2" 2 } ] + [ "1" + None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039988.573 units remaining) - [ (Some 1) - { Elt "2" 2 } ] + [ (Some 1) + { Elt "2" 2 } ] - location: 18 (remaining gas: 1039988.558 units remaining) - [ (Pair (Some 1) { Elt "2" 2 }) ] + [ (Pair (Some 1) { Elt "2" 2 }) ] - location: 19 (remaining gas: 1039988.543 units remaining) - [ {} - (Pair (Some 1) { Elt "2" 2 }) ] + [ {} + (Pair (Some 1) { Elt "2" 2 }) ] - location: 21 (remaining gas: 1039988.528 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] + [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" index 07bde688a19b..487825f06e0e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ; .bca0ede8be.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.033 units remaining) - [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039989.023 units remaining) - [ "1" - (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 14 (remaining gas: 1039989.008 units remaining) - [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] + [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039988.998 units remaining) - [ None - { Elt "1" 1 ; Elt "2" 2 } ] + [ None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039988.968 units remaining) - [ "1" - None - { Elt "1" 1 ; Elt "2" 2 } ] + [ "1" + None + { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039988.573 units remaining) - [ (Some 1) - { Elt "2" 2 } ] + [ (Some 1) + { Elt "2" 2 } ] - location: 18 (remaining gas: 1039988.558 units remaining) - [ (Pair (Some 1) { Elt "2" 2 }) ] + [ (Pair (Some 1) { Elt "2" 2 }) ] - location: 19 (remaining gas: 1039988.543 units remaining) - [ {} - (Pair (Some 1) { Elt "2" 2 }) ] + [ {} + (Pair (Some 1) { Elt "2" 2 }) ] - location: 21 (remaining gas: 1039988.528 units remaining) - [ (Pair {} (Some 1) { Elt "2" 2 }) ] + [ (Pair {} (Some 1) { Elt "2" 2 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" index 55750ee46d42..1ecdc175d21b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.432 units remaining) - [ (Pair "hello" None { Elt "hello" 4 }) ] + [ (Pair "hello" None { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039989.422 units remaining) - [ "hello" - (Pair None { Elt "hello" 4 }) ] + [ "hello" + (Pair None { Elt "hello" 4 }) ] - location: 14 (remaining gas: 1039989.407 units remaining) - [ (Pair None { Elt "hello" 4 }) ] + [ (Pair None { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039989.397 units remaining) - [ None - { Elt "hello" 4 } ] + [ None + { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039989.367 units remaining) - [ "hello" - None - { Elt "hello" 4 } ] + [ "hello" + None + { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039989.077 units remaining) - [ (Some 4) - {} ] + [ (Some 4) + {} ] - location: 18 (remaining gas: 1039989.062 units remaining) - [ (Pair (Some 4) {}) ] + [ (Pair (Some 4) {}) ] - location: 19 (remaining gas: 1039989.047 units remaining) - [ {} - (Pair (Some 4) {}) ] + [ {} + (Pair (Some 4) {}) ] - location: 21 (remaining gas: 1039989.032 units remaining) - [ (Pair {} (Some 4) {}) ] + [ (Pair {} (Some 4) {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" index 0fe838d7a2d2..d20d43daa64a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" @@ -8,27 +8,27 @@ big_map diff trace - location: 13 (remaining gas: 1039989.846 units remaining) - [ (Pair "hello" None {}) ] + [ (Pair "hello" None {}) ] - location: 13 (remaining gas: 1039989.836 units remaining) - [ "hello" - (Pair None {}) ] + [ "hello" + (Pair None {}) ] - location: 14 (remaining gas: 1039989.821 units remaining) - [ (Pair None {}) ] + [ (Pair None {}) ] - location: 16 (remaining gas: 1039989.811 units remaining) - [ None - {} ] + [ None + {} ] - location: 14 (remaining gas: 1039989.781 units remaining) - [ "hello" - None - {} ] + [ "hello" + None + {} ] - location: 17 (remaining gas: 1039989.596 units remaining) - [ None - {} ] + [ None + {} ] - location: 18 (remaining gas: 1039989.581 units remaining) - [ (Pair None {}) ] + [ (Pair None {}) ] - location: 19 (remaining gas: 1039989.566 units remaining) - [ {} - (Pair None {}) ] + [ {} + (Pair None {}) ] - location: 21 (remaining gas: 1039989.551 units remaining) - [ (Pair {} None {}) ] + [ (Pair {} None {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" index 0af169aa3a81..21fb40db2d53 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ; .bc4127094e.out" @@ -8,34 +8,34 @@ big_map diff trace - location: 12 (remaining gas: 1039986.547 units remaining) - [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] + [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 12 (remaining gas: 1039986.537 units remaining) - [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) - (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] + [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) + (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 13 (remaining gas: 1039986.527 units remaining) - [ "1" - (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] + [ "1" + (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 14 (remaining gas: 1039986.512 units remaining) - [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] + [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 17 (remaining gas: 1039986.502 units remaining) - [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ] + [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 18 (remaining gas: 1039986.492 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } ] + [ { Elt "1" "one" ; Elt "2" "two" } ] - location: 19 (remaining gas: 1039986.482 units remaining) - [ { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] + [ { Elt "1" "one" ; Elt "2" "two" } + { Elt "1" "one" ; Elt "2" "two" } ] - location: 14 (remaining gas: 1039986.452 units remaining) - [ "1" - { Elt "1" "one" ; Elt "2" "two" } - { Elt "1" "one" ; Elt "2" "two" } ] + [ "1" + { Elt "1" "one" ; Elt "2" "two" } + { Elt "1" "one" ; Elt "2" "two" } ] - location: 20 (remaining gas: 1039986.267 units remaining) - [ (Some "one") - { Elt "1" "one" ; Elt "2" "two" } ] + [ (Some "one") + { Elt "1" "one" ; Elt "2" "two" } ] - location: 21 (remaining gas: 1039986.252 units remaining) - [ (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] + [ (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - location: 22 (remaining gas: 1039986.237 units remaining) - [ {} - (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] + [ {} + (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] - location: 24 (remaining gas: 1039986.222 units remaining) - [ (Pair {} (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] + [ (Pair {} (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" index 23ea6d60b099..661527f607b2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" @@ -8,34 +8,34 @@ big_map diff trace - location: 12 (remaining gas: 1039987.050 units remaining) - [ (Pair "" None { Elt "hello" "hi" }) ] + [ (Pair "" None { Elt "hello" "hi" }) ] - location: 12 (remaining gas: 1039987.040 units remaining) - [ (Pair "" None { Elt "hello" "hi" }) - (Pair "" None { Elt "hello" "hi" }) ] + [ (Pair "" None { Elt "hello" "hi" }) + (Pair "" None { Elt "hello" "hi" }) ] - location: 13 (remaining gas: 1039987.030 units remaining) - [ "" - (Pair "" None { Elt "hello" "hi" }) ] + [ "" + (Pair "" None { Elt "hello" "hi" }) ] - location: 14 (remaining gas: 1039987.015 units remaining) - [ (Pair "" None { Elt "hello" "hi" }) ] + [ (Pair "" None { Elt "hello" "hi" }) ] - location: 17 (remaining gas: 1039987.005 units remaining) - [ (Pair None { Elt "hello" "hi" }) ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 18 (remaining gas: 1039986.995 units remaining) - [ { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039986.985 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039986.955 units remaining) - [ "" - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ "" + { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039986.805 units remaining) - [ None - { Elt "hello" "hi" } ] + [ None + { Elt "hello" "hi" } ] - location: 21 (remaining gas: 1039986.790 units remaining) - [ (Pair None { Elt "hello" "hi" }) ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 22 (remaining gas: 1039986.775 units remaining) - [ {} - (Pair None { Elt "hello" "hi" }) ] + [ {} + (Pair None { Elt "hello" "hi" }) ] - location: 24 (remaining gas: 1039986.760 units remaining) - [ (Pair {} None { Elt "hello" "hi" }) ] + [ (Pair {} None { Elt "hello" "hi" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" index d15efb73b718..47b5f1d0a74f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" @@ -8,34 +8,34 @@ big_map diff trace - location: 12 (remaining gas: 1039987 units remaining) - [ (Pair "hello" None { Elt "hello" "hi" }) ] + [ (Pair "hello" None { Elt "hello" "hi" }) ] - location: 12 (remaining gas: 1039986.990 units remaining) - [ (Pair "hello" None { Elt "hello" "hi" }) - (Pair "hello" None { Elt "hello" "hi" }) ] + [ (Pair "hello" None { Elt "hello" "hi" }) + (Pair "hello" None { Elt "hello" "hi" }) ] - location: 13 (remaining gas: 1039986.980 units remaining) - [ "hello" - (Pair "hello" None { Elt "hello" "hi" }) ] + [ "hello" + (Pair "hello" None { Elt "hello" "hi" }) ] - location: 14 (remaining gas: 1039986.965 units remaining) - [ (Pair "hello" None { Elt "hello" "hi" }) ] + [ (Pair "hello" None { Elt "hello" "hi" }) ] - location: 17 (remaining gas: 1039986.955 units remaining) - [ (Pair None { Elt "hello" "hi" }) ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 18 (remaining gas: 1039986.945 units remaining) - [ { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } ] - location: 19 (remaining gas: 1039986.935 units remaining) - [ { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039986.905 units remaining) - [ "hello" - { Elt "hello" "hi" } - { Elt "hello" "hi" } ] + [ "hello" + { Elt "hello" "hi" } + { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039986.755 units remaining) - [ (Some "hi") - { Elt "hello" "hi" } ] + [ (Some "hi") + { Elt "hello" "hi" } ] - location: 21 (remaining gas: 1039986.740 units remaining) - [ (Pair (Some "hi") { Elt "hello" "hi" }) ] + [ (Pair (Some "hi") { Elt "hello" "hi" }) ] - location: 22 (remaining gas: 1039986.725 units remaining) - [ {} - (Pair (Some "hi") { Elt "hello" "hi" }) ] + [ {} + (Pair (Some "hi") { Elt "hello" "hi" }) ] - location: 24 (remaining gas: 1039986.710 units remaining) - [ (Pair {} (Some "hi") { Elt "hello" "hi" }) ] + [ (Pair {} (Some "hi") { Elt "hello" "hi" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" index f800fb08ec96..962bc6cd74ac 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039668.957 units remaining) - [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ] + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ] - location: 8 (remaining gas: 1039668.947 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - location: 9 (remaining gas: 1039668.292 units remaining) - [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] + [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 10 (remaining gas: 1039668.277 units remaining) - [ (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] + [ (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] - location: 11 (remaining gas: 1039668.262 units remaining) - [ {} - (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] + [ {} + (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ] - location: 13 (remaining gas: 1039668.247 units remaining) - [ (Pair {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")) ] + [ (Pair {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" index a385023af562..0a5b1b75d2e7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039668.957 units remaining) - [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ] + [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ] - location: 8 (remaining gas: 1039668.947 units remaining) - [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" ] + [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" ] - location: 9 (remaining gas: 1039668.292 units remaining) - [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ] + [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ] - location: 10 (remaining gas: 1039668.277 units remaining) - [ (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] + [ (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] - location: 11 (remaining gas: 1039668.262 units remaining) - [ {} - (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] + [ {} + (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ] - location: 13 (remaining gas: 1039668.247 units remaining) - [ (Pair {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")) ] + [ (Pair {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" index ed0093d77896..d1bae668b06b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" @@ -8,16 +8,16 @@ big_map diff trace - location: 7 (remaining gas: 1039994.241 units remaining) - [ (Pair "12345" 0x00) ] + [ (Pair "12345" 0x00) ] - location: 7 (remaining gas: 1039994.231 units remaining) - [ "12345" ] + [ "12345" ] - location: 8 (remaining gas: 1039993.740 units remaining) - [ 0x0501000000053132333435 ] + [ 0x0501000000053132333435 ] - location: 9 (remaining gas: 1039993.298 units remaining) - [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] + [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - location: 10 (remaining gas: 1039993.283 units remaining) - [ {} - 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] + [ {} + 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - location: 12 (remaining gas: 1039993.268 units remaining) - [ (Pair {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f) ] + [ (Pair {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" index 3eeab4cf2a13..4bdd4b8c90b2 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" @@ -8,16 +8,16 @@ big_map diff trace - location: 7 (remaining gas: 1039994.221 units remaining) - [ (Pair "abcdefg" 0x00) ] + [ (Pair "abcdefg" 0x00) ] - location: 7 (remaining gas: 1039994.211 units remaining) - [ "abcdefg" ] + [ "abcdefg" ] - location: 8 (remaining gas: 1039993.654 units remaining) - [ 0x05010000000761626364656667 ] + [ 0x05010000000761626364656667 ] - location: 9 (remaining gas: 1039993.210 units remaining) - [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] + [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - location: 10 (remaining gas: 1039993.195 units remaining) - [ {} - 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] + [ {} + 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - location: 12 (remaining gas: 1039993.180 units remaining) - [ (Pair {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e) ] + [ (Pair {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out index 65bc46d8f53d..78000447bc99 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039991.305 units remaining) - [ (Pair False None) ] + [ (Pair False None) ] - location: 8 (remaining gas: 1039991.295 units remaining) - [ False ] + [ False ] - location: 9 (remaining gas: 1039991.285 units remaining) [ ] - location: 15 (remaining gas: 1039991.275 units remaining) - [ False ] + [ False ] - location: 9 (remaining gas: 1039991.260 units remaining) - [ False ] + [ False ] - location: 18 (remaining gas: 1039991.245 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 19 (remaining gas: 1039991.230 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 21 (remaining gas: 1039991.215 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out index ac0ecede9c1f..c5bbb20cc517 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039991.305 units remaining) - [ (Pair True None) ] + [ (Pair True None) ] - location: 8 (remaining gas: 1039991.295 units remaining) - [ True ] + [ True ] - location: 9 (remaining gas: 1039991.285 units remaining) [ ] - location: 11 (remaining gas: 1039991.275 units remaining) - [ True ] + [ True ] - location: 9 (remaining gas: 1039991.260 units remaining) - [ True ] + [ True ] - location: 18 (remaining gas: 1039991.245 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 19 (remaining gas: 1039991.230 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 21 (remaining gas: 1039991.215 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" index b8dfcab8f042..4de67a4117e8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039992.411 units remaining) - [ (Pair (Some "hello") "?") ] + [ (Pair (Some "hello") "?") ] - location: 8 (remaining gas: 1039992.401 units remaining) - [ (Some "hello") ] + [ (Some "hello") ] - location: 10 (remaining gas: 1039992.391 units remaining) - [ "hello" ] + [ "hello" ] - location: 10 (remaining gas: 1039992.376 units remaining) - [ "hello" ] + [ "hello" ] - location: 16 (remaining gas: 1039992.361 units remaining) - [ {} - "hello" ] + [ {} + "hello" ] - location: 18 (remaining gas: 1039992.346 units remaining) - [ (Pair {} "hello") ] + [ (Pair {} "hello") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" index c9aeb55c20ec..f0aeb837b13c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" @@ -8,18 +8,18 @@ big_map diff trace - location: 8 (remaining gas: 1039992.575 units remaining) - [ (Pair None "?") ] + [ (Pair None "?") ] - location: 8 (remaining gas: 1039992.565 units remaining) - [ None ] + [ None ] - location: 10 (remaining gas: 1039992.555 units remaining) [ ] - location: 12 (remaining gas: 1039992.545 units remaining) - [ "" ] + [ "" ] - location: 10 (remaining gas: 1039992.530 units remaining) - [ "" ] + [ "" ] - location: 16 (remaining gas: 1039992.515 units remaining) - [ {} - "" ] + [ {} + "" ] - location: 18 (remaining gas: 1039992.500 units remaining) - [ (Pair {} "") ] + [ (Pair {} "") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out index f7af5422bdde..1059a78650d4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair 0 None) ] + [ (Pair 0 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 0 ] + [ 0 ] - location: 9 (remaining gas: 1039993.932 units remaining) - [ 0 ] + [ 0 ] - location: 10 (remaining gas: 1039993.917 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 11 (remaining gas: 1039993.902 units remaining) - [ {} - (Some 0) ] + [ {} + (Some 0) ] - location: 13 (remaining gas: 1039993.887 units remaining) - [ (Pair {} (Some 0)) ] + [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out index 2daa1a980a2d..1c24805d4b05 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair 1 None) ] + [ (Pair 1 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 1 ] + [ 1 ] - location: 9 (remaining gas: 1039993.932 units remaining) - [ 1 ] + [ 1 ] - location: 10 (remaining gas: 1039993.917 units remaining) - [ (Some 1) ] + [ (Some 1) ] - location: 11 (remaining gas: 1039993.902 units remaining) - [ {} - (Some 1) ] + [ {} + (Some 1) ] - location: 13 (remaining gas: 1039993.887 units remaining) - [ (Pair {} (Some 1)) ] + [ (Pair {} (Some 1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out index 9e1c33548e1a..578f60d987c6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair 9999 None) ] + [ (Pair 9999 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 9999 ] + [ 9999 ] - location: 9 (remaining gas: 1039993.932 units remaining) - [ 9999 ] + [ 9999 ] - location: 10 (remaining gas: 1039993.917 units remaining) - [ (Some 9999) ] + [ (Some 9999) ] - location: 11 (remaining gas: 1039993.902 units remaining) - [ {} - (Some 9999) ] + [ {} + (Some 9999) ] - location: 13 (remaining gas: 1039993.887 units remaining) - [ (Pair {} (Some 9999)) ] + [ (Pair {} (Some 9999)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out index bcf4f56a9049..25fae40bf954 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out @@ -8,17 +8,17 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] + [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 0x48656c6c6f2c20776f726c6421 ] + [ 0x48656c6c6f2c20776f726c6421 ] - location: 9 (remaining gas: 1039992.490 units remaining) - [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ] + [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ] - location: 10 (remaining gas: 1039992.475 units remaining) - [ (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] + [ (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] - location: 11 (remaining gas: 1039992.460 units remaining) - [ {} - (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] + [ {} + (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ] - location: 13 (remaining gas: 1039992.445 units remaining) [ (Pair {} - (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4)) ] + (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" index b6314ede3cca..512b3b74988a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" @@ -8,18 +8,18 @@ big_map diff trace - location: 11 (remaining gas: 1039990.926 units remaining) - [ (Pair (Left True) (Left "X")) ] + [ (Pair (Left True) (Left "X")) ] - location: 11 (remaining gas: 1039990.916 units remaining) - [ (Left True) ] + [ (Left True) ] - location: 12 (remaining gas: 1039990.906 units remaining) - [ True ] + [ True ] - location: 14 (remaining gas: 1039990.891 units remaining) - [ (Right True) ] + [ (Right True) ] - location: 12 (remaining gas: 1039990.876 units remaining) - [ (Right True) ] + [ (Right True) ] - location: 19 (remaining gas: 1039990.861 units remaining) - [ {} - (Right True) ] + [ {} + (Right True) ] - location: 21 (remaining gas: 1039990.846 units remaining) - [ (Pair {} (Right True)) ] + [ (Pair {} (Right True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" index be4206f95581..1a22dd4c63d8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" @@ -8,18 +8,18 @@ big_map diff trace - location: 11 (remaining gas: 1039990.902 units remaining) - [ (Pair (Right "a") (Left "X")) ] + [ (Pair (Right "a") (Left "X")) ] - location: 11 (remaining gas: 1039990.892 units remaining) - [ (Right "a") ] + [ (Right "a") ] - location: 12 (remaining gas: 1039990.882 units remaining) - [ "a" ] + [ "a" ] - location: 17 (remaining gas: 1039990.867 units remaining) - [ (Left "a") ] + [ (Left "a") ] - location: 12 (remaining gas: 1039990.852 units remaining) - [ (Left "a") ] + [ (Left "a") ] - location: 19 (remaining gas: 1039990.837 units remaining) - [ {} - (Left "a") ] + [ {} + (Left "a") ] - location: 21 (remaining gas: 1039990.822 units remaining) - [ (Pair {} (Left "a")) ] + [ (Pair {} (Left "a")) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out index ae0044aef76b..d9be7a6b468c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 111) ] + [ (Pair Unit 111) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039994.923 units remaining) - [ 1 ] + [ 1 ] - location: 9 (remaining gas: 1039994.908 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 11 (remaining gas: 1039994.893 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" index 71d995345101..b06bba5cdf30 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039992.898 units remaining) - [ (Pair { "d" ; "e" ; "f" } "abc") ] + [ (Pair { "d" ; "e" ; "f" } "abc") ] - location: 8 (remaining gas: 1039992.888 units remaining) - [ { "d" ; "e" ; "f" } - "abc" ] + [ { "d" ; "e" ; "f" } + "abc" ] - location: 9 (remaining gas: 1039992.878 units remaining) - [ "abc" - { "d" ; "e" ; "f" } ] + [ "abc" + { "d" ; "e" ; "f" } ] - location: 10 (remaining gas: 1039992.863 units remaining) - [ { "abc" ; "d" ; "e" ; "f" } ] + [ { "abc" ; "d" ; "e" ; "f" } ] - location: 11 (remaining gas: 1039992.723 units remaining) - [ "abcdef" ] + [ "abcdef" ] - location: 12 (remaining gas: 1039992.708 units remaining) - [ {} - "abcdef" ] + [ {} + "abcdef" ] - location: 14 (remaining gas: 1039992.693 units remaining) - [ (Pair {} "abcdef") ] + [ (Pair {} "abcdef") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" index bde91d38bab1..150760d68327 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039993.270 units remaining) - [ (Pair {} "abc") ] + [ (Pair {} "abc") ] - location: 8 (remaining gas: 1039993.260 units remaining) - [ {} - "abc" ] + [ {} + "abc" ] - location: 9 (remaining gas: 1039993.250 units remaining) - [ "abc" - {} ] + [ "abc" + {} ] - location: 10 (remaining gas: 1039993.235 units remaining) - [ { "abc" } ] + [ { "abc" } ] - location: 11 (remaining gas: 1039993.125 units remaining) - [ "abc" ] + [ "abc" ] - location: 12 (remaining gas: 1039993.110 units remaining) - [ {} - "abc" ] + [ {} + "abc" ] - location: 14 (remaining gas: 1039993.095 units remaining) - [ (Pair {} "abc") ] + [ (Pair {} "abc") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out index 60eca6eb14de..338ab9e96d29 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039993.014 units remaining) - [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ] + [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ] - location: 8 (remaining gas: 1039993.004 units remaining) - [ { 0x00 ; 0x11 ; 0x00 } - 0x ] + [ { 0x00 ; 0x11 ; 0x00 } + 0x ] - location: 9 (remaining gas: 1039992.994 units remaining) - [ 0x - { 0x00 ; 0x11 ; 0x00 } ] + [ 0x + { 0x00 ; 0x11 ; 0x00 } ] - location: 10 (remaining gas: 1039992.979 units remaining) - [ { 0x ; 0x00 ; 0x11 ; 0x00 } ] + [ { 0x ; 0x00 ; 0x11 ; 0x00 } ] - location: 11 (remaining gas: 1039992.839 units remaining) - [ 0x001100 ] + [ 0x001100 ] - location: 12 (remaining gas: 1039992.824 units remaining) - [ {} - 0x001100 ] + [ {} + 0x001100 ] - location: 14 (remaining gas: 1039992.809 units remaining) - [ (Pair {} 0x001100) ] + [ (Pair {} 0x001100) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out index 183bb534914e..127d27fa0eab 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039993.314 units remaining) - [ (Pair {} 0x) ] + [ (Pair {} 0x) ] - location: 8 (remaining gas: 1039993.304 units remaining) - [ {} - 0x ] + [ {} + 0x ] - location: 9 (remaining gas: 1039993.294 units remaining) - [ 0x - {} ] + [ 0x + {} ] - location: 10 (remaining gas: 1039993.279 units remaining) - [ { 0x } ] + [ { 0x } ] - location: 11 (remaining gas: 1039993.169 units remaining) - [ 0x ] + [ 0x ] - location: 12 (remaining gas: 1039993.154 units remaining) - [ {} - 0x ] + [ {} + 0x ] - location: 14 (remaining gas: 1039993.139 units remaining) - [ (Pair {} 0x) ] + [ (Pair {} 0x) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out index 30bfcfc39bb4..bd7f5da25b05 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039993.014 units remaining) - [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ] + [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ] - location: 8 (remaining gas: 1039993.004 units remaining) - [ { 0xcd ; 0xef ; 0x00 } - 0x00ab ] + [ { 0xcd ; 0xef ; 0x00 } + 0x00ab ] - location: 9 (remaining gas: 1039992.994 units remaining) - [ 0x00ab - { 0xcd ; 0xef ; 0x00 } ] + [ 0x00ab + { 0xcd ; 0xef ; 0x00 } ] - location: 10 (remaining gas: 1039992.979 units remaining) - [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ] + [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ] - location: 11 (remaining gas: 1039992.839 units remaining) - [ 0x00abcdef00 ] + [ 0x00abcdef00 ] - location: 12 (remaining gas: 1039992.824 units remaining) - [ {} - 0x00abcdef00 ] + [ {} + 0x00abcdef00 ] - location: 14 (remaining gas: 1039992.809 units remaining) - [ (Pair {} 0x00abcdef00) ] + [ (Pair {} 0x00abcdef00) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out index 6ba8ad2d6cb2..3020010ddbf2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039993.314 units remaining) - [ (Pair {} 0xabcd) ] + [ (Pair {} 0xabcd) ] - location: 8 (remaining gas: 1039993.304 units remaining) - [ {} - 0xabcd ] + [ {} + 0xabcd ] - location: 9 (remaining gas: 1039993.294 units remaining) - [ 0xabcd - {} ] + [ 0xabcd + {} ] - location: 10 (remaining gas: 1039993.279 units remaining) - [ { 0xabcd } ] + [ { 0xabcd } ] - location: 11 (remaining gas: 1039993.169 units remaining) - [ 0xabcd ] + [ 0xabcd ] - location: 12 (remaining gas: 1039993.154 units remaining) - [ {} - 0xabcd ] + [ {} + 0xabcd ] - location: 14 (remaining gas: 1039993.139 units remaining) - [ (Pair {} 0xabcd) ] + [ (Pair {} 0xabcd) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" index a0012cd4b7b6..0bedb95ed4a1 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" @@ -8,12 +8,12 @@ big_map diff trace - location: 9 (remaining gas: 1039994.539 units remaining) - [ (Pair { "1" ; "2" ; "3" } { "" }) ] + [ (Pair { "1" ; "2" ; "3" } { "" }) ] - location: 9 (remaining gas: 1039994.529 units remaining) - [ { "1" ; "2" ; "3" } ] + [ { "1" ; "2" ; "3" } ] - location: 10 (remaining gas: 1039994.514 units remaining) - [ {} - { "1" ; "2" ; "3" } ] + [ {} + { "1" ; "2" ; "3" } ] - location: 12 (remaining gas: 1039994.499 units remaining) - [ (Pair {} { "1" ; "2" ; "3" }) ] + [ (Pair {} { "1" ; "2" ; "3" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index fb905b75e416..c3c30cc3783c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -8,12 +8,12 @@ big_map diff trace - location: 9 (remaining gas: 1039994.539 units remaining) - [ (Pair { "a" ; "b" ; "c" } { "" }) ] + [ (Pair { "a" ; "b" ; "c" } { "" }) ] - location: 9 (remaining gas: 1039994.529 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039994.514 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039994.499 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" index 1e996e5fa5c0..6deb204e20a4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" @@ -8,12 +8,12 @@ big_map diff trace - location: 9 (remaining gas: 1039994.911 units remaining) - [ (Pair {} { "" }) ] + [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039994.901 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039994.886 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 12 (remaining gas: 1039994.871 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" index 7cda833ccbd2..85f6274d0a6d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" @@ -8,20 +8,20 @@ big_map diff trace - location: 9 (remaining gas: 1039993.518 units remaining) - [ (Pair { "1" ; "2" ; "3" } { "" }) ] + [ (Pair { "1" ; "2" ; "3" } { "" }) ] - location: 9 (remaining gas: 1039993.508 units remaining) - [ { "1" ; "2" ; "3" } ] + [ { "1" ; "2" ; "3" } ] - location: 10 (remaining gas: 1039993.508 units remaining) - [ "1" ] + [ "1" ] - location: 10 (remaining gas: 1039993.493 units remaining) - [ "2" ] + [ "2" ] - location: 10 (remaining gas: 1039993.478 units remaining) - [ "3" ] + [ "3" ] - location: 10 (remaining gas: 1039993.463 units remaining) - [ { "1" ; "2" ; "3" } ] + [ { "1" ; "2" ; "3" } ] - location: 12 (remaining gas: 1039993.448 units remaining) - [ {} - { "1" ; "2" ; "3" } ] + [ {} + { "1" ; "2" ; "3" } ] - location: 14 (remaining gas: 1039993.433 units remaining) - [ (Pair {} { "1" ; "2" ; "3" }) ] + [ (Pair {} { "1" ; "2" ; "3" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 8b5d6c57de5e..6f971cdfea11 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -8,20 +8,20 @@ big_map diff trace - location: 9 (remaining gas: 1039993.518 units remaining) - [ (Pair { "a" ; "b" ; "c" } { "" }) ] + [ (Pair { "a" ; "b" ; "c" } { "" }) ] - location: 9 (remaining gas: 1039993.508 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039993.508 units remaining) - [ "a" ] + [ "a" ] - location: 10 (remaining gas: 1039993.493 units remaining) - [ "b" ] + [ "b" ] - location: 10 (remaining gas: 1039993.478 units remaining) - [ "c" ] + [ "c" ] - location: 10 (remaining gas: 1039993.463 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039993.448 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 14 (remaining gas: 1039993.433 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" index e8cef350193e..afdb1ab4330e 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039993.890 units remaining) - [ (Pair {} { "" }) ] + [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039993.880 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039993.880 units remaining) - [ {} ] + [ {} ] - location: 12 (remaining gas: 1039993.865 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 14 (remaining gas: 1039993.850 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out index db1f2c635b29..9887e15868ce 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out @@ -8,35 +8,35 @@ big_map diff trace - location: 8 (remaining gas: 1039991.873 units remaining) - [ (Pair { 10 ; 2 ; 1 } 0) ] + [ (Pair { 10 ; 2 ; 1 } 0) ] - location: 8 (remaining gas: 1039991.863 units remaining) - [ { 10 ; 2 ; 1 } ] + [ { 10 ; 2 ; 1 } ] - location: 9 (remaining gas: 1039991.853 units remaining) - [ 1 - { 10 ; 2 ; 1 } ] + [ 1 + { 10 ; 2 ; 1 } ] - location: 12 (remaining gas: 1039991.843 units remaining) - [ { 10 ; 2 ; 1 } - 1 ] + [ { 10 ; 2 ; 1 } + 1 ] - location: 13 (remaining gas: 1039991.843 units remaining) - [ 10 - 1 ] + [ 10 + 1 ] - location: 15 (remaining gas: 1039991.739 units remaining) - [ 10 ] + [ 10 ] - location: 13 (remaining gas: 1039991.724 units remaining) - [ 2 - 10 ] + [ 2 + 10 ] - location: 15 (remaining gas: 1039991.620 units remaining) - [ 20 ] + [ 20 ] - location: 13 (remaining gas: 1039991.605 units remaining) - [ 1 - 20 ] + [ 1 + 20 ] - location: 15 (remaining gas: 1039991.501 units remaining) - [ 20 ] + [ 20 ] - location: 13 (remaining gas: 1039991.486 units remaining) - [ 20 ] + [ 20 ] - location: 16 (remaining gas: 1039991.471 units remaining) - [ {} - 20 ] + [ {} + 20 ] - location: 18 (remaining gas: 1039991.456 units remaining) - [ (Pair {} 20) ] + [ (Pair {} 20) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out index 367f7ba2a8f1..eda57844eb97 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out @@ -8,35 +8,35 @@ big_map diff trace - location: 8 (remaining gas: 1039991.873 units remaining) - [ (Pair { 3 ; 6 ; 9 } 0) ] + [ (Pair { 3 ; 6 ; 9 } 0) ] - location: 8 (remaining gas: 1039991.863 units remaining) - [ { 3 ; 6 ; 9 } ] + [ { 3 ; 6 ; 9 } ] - location: 9 (remaining gas: 1039991.853 units remaining) - [ 1 - { 3 ; 6 ; 9 } ] + [ 1 + { 3 ; 6 ; 9 } ] - location: 12 (remaining gas: 1039991.843 units remaining) - [ { 3 ; 6 ; 9 } - 1 ] + [ { 3 ; 6 ; 9 } + 1 ] - location: 13 (remaining gas: 1039991.843 units remaining) - [ 3 - 1 ] + [ 3 + 1 ] - location: 15 (remaining gas: 1039991.739 units remaining) - [ 3 ] + [ 3 ] - location: 13 (remaining gas: 1039991.724 units remaining) - [ 6 - 3 ] + [ 6 + 3 ] - location: 15 (remaining gas: 1039991.620 units remaining) - [ 18 ] + [ 18 ] - location: 13 (remaining gas: 1039991.605 units remaining) - [ 9 - 18 ] + [ 9 + 18 ] - location: 15 (remaining gas: 1039991.501 units remaining) - [ 162 ] + [ 162 ] - location: 13 (remaining gas: 1039991.486 units remaining) - [ 162 ] + [ 162 ] - location: 16 (remaining gas: 1039991.471 units remaining) - [ {} - 162 ] + [ {} + 162 ] - location: 18 (remaining gas: 1039991.456 units remaining) - [ (Pair {} 162) ] + [ (Pair {} 162) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out index f975e57d503b..a21be156f630 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out @@ -8,129 +8,129 @@ big_map diff trace - location: 9 (remaining gas: 1039985.969 units remaining) - [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ] + [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ] - location: 9 (remaining gas: 1039985.959 units remaining) - [ { 1 ; 1 ; 1 ; 1 } ] + [ { 1 ; 1 ; 1 ; 1 } ] - location: 10 (remaining gas: 1039985.949 units remaining) - [ 0 - { 1 ; 1 ; 1 ; 1 } ] + [ 0 + { 1 ; 1 ; 1 ; 1 } ] - location: 13 (remaining gas: 1039985.939 units remaining) - [ { 1 ; 1 ; 1 ; 1 } - 0 ] + [ { 1 ; 1 ; 1 ; 1 } + 0 ] - location: 14 (remaining gas: 1039985.939 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 16 (remaining gas: 1039985.924 units remaining) - [ 0 ] + [ 0 ] - location: 18 (remaining gas: 1039985.914 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 16 (remaining gas: 1039985.884 units remaining) - [ 1 - 0 - 0 ] + [ 1 + 0 + 0 ] - location: 19 (remaining gas: 1039985.829 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 20 (remaining gas: 1039985.814 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039985.804 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 25 (remaining gas: 1039985.749 units remaining) - [ 1 ] + [ 1 ] - location: 20 (remaining gas: 1039985.719 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 14 (remaining gas: 1039985.704 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 16 (remaining gas: 1039985.689 units remaining) - [ 1 ] + [ 1 ] - location: 18 (remaining gas: 1039985.679 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 16 (remaining gas: 1039985.649 units remaining) - [ 1 - 1 - 1 ] + [ 1 + 1 + 1 ] - location: 19 (remaining gas: 1039985.594 units remaining) - [ 2 - 1 ] + [ 2 + 1 ] - location: 20 (remaining gas: 1039985.579 units remaining) - [ 1 ] + [ 1 ] - location: 22 (remaining gas: 1039985.569 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 25 (remaining gas: 1039985.514 units remaining) - [ 2 ] + [ 2 ] - location: 20 (remaining gas: 1039985.484 units remaining) - [ 2 - 2 ] + [ 2 + 2 ] - location: 14 (remaining gas: 1039985.469 units remaining) - [ 1 - 2 ] + [ 1 + 2 ] - location: 16 (remaining gas: 1039985.454 units remaining) - [ 2 ] + [ 2 ] - location: 18 (remaining gas: 1039985.444 units remaining) - [ 2 - 2 ] + [ 2 + 2 ] - location: 16 (remaining gas: 1039985.414 units remaining) - [ 1 - 2 - 2 ] + [ 1 + 2 + 2 ] - location: 19 (remaining gas: 1039985.359 units remaining) - [ 3 - 2 ] + [ 3 + 2 ] - location: 20 (remaining gas: 1039985.344 units remaining) - [ 2 ] + [ 2 ] - location: 22 (remaining gas: 1039985.334 units remaining) - [ 1 - 2 ] + [ 1 + 2 ] - location: 25 (remaining gas: 1039985.279 units remaining) - [ 3 ] + [ 3 ] - location: 20 (remaining gas: 1039985.249 units remaining) - [ 3 - 3 ] + [ 3 + 3 ] - location: 14 (remaining gas: 1039985.234 units remaining) - [ 1 - 3 ] + [ 1 + 3 ] - location: 16 (remaining gas: 1039985.219 units remaining) - [ 3 ] + [ 3 ] - location: 18 (remaining gas: 1039985.209 units remaining) - [ 3 - 3 ] + [ 3 + 3 ] - location: 16 (remaining gas: 1039985.179 units remaining) - [ 1 - 3 - 3 ] + [ 1 + 3 + 3 ] - location: 19 (remaining gas: 1039985.124 units remaining) - [ 4 - 3 ] + [ 4 + 3 ] - location: 20 (remaining gas: 1039985.109 units remaining) - [ 3 ] + [ 3 ] - location: 22 (remaining gas: 1039985.099 units remaining) - [ 1 - 3 ] + [ 1 + 3 ] - location: 25 (remaining gas: 1039985.044 units remaining) - [ 4 ] + [ 4 ] - location: 20 (remaining gas: 1039985.014 units remaining) - [ 4 - 4 ] + [ 4 + 4 ] - location: 14 (remaining gas: 1039984.999 units remaining) - [ { 1 ; 2 ; 3 ; 4 } - 4 ] + [ { 1 ; 2 ; 3 ; 4 } + 4 ] - location: 26 (remaining gas: 1039984.984 units remaining) - [ {} - { 1 ; 2 ; 3 ; 4 } - 4 ] + [ {} + { 1 ; 2 ; 3 ; 4 } + 4 ] - location: 28 (remaining gas: 1039984.969 units remaining) - [ (Pair {} { 1 ; 2 ; 3 ; 4 }) - 4 ] + [ (Pair {} { 1 ; 2 ; 3 ; 4 }) + 4 ] - location: 29 (remaining gas: 1039984.954 units remaining) - [ 4 ] + [ 4 ] - location: 31 (remaining gas: 1039984.944 units remaining) [ ] - location: 29 (remaining gas: 1039984.914 units remaining) - [ (Pair {} { 1 ; 2 ; 3 ; 4 }) ] + [ (Pair {} { 1 ; 2 ; 3 ; 4 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out index 31e06d8b1e16..37cadd2fbd3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out @@ -8,129 +8,129 @@ big_map diff trace - location: 9 (remaining gas: 1039985.969 units remaining) - [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ] + [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ] - location: 9 (remaining gas: 1039985.959 units remaining) - [ { 1 ; 2 ; 3 ; 0 } ] + [ { 1 ; 2 ; 3 ; 0 } ] - location: 10 (remaining gas: 1039985.949 units remaining) - [ 0 - { 1 ; 2 ; 3 ; 0 } ] + [ 0 + { 1 ; 2 ; 3 ; 0 } ] - location: 13 (remaining gas: 1039985.939 units remaining) - [ { 1 ; 2 ; 3 ; 0 } - 0 ] + [ { 1 ; 2 ; 3 ; 0 } + 0 ] - location: 14 (remaining gas: 1039985.939 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 16 (remaining gas: 1039985.924 units remaining) - [ 0 ] + [ 0 ] - location: 18 (remaining gas: 1039985.914 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 16 (remaining gas: 1039985.884 units remaining) - [ 1 - 0 - 0 ] + [ 1 + 0 + 0 ] - location: 19 (remaining gas: 1039985.829 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 20 (remaining gas: 1039985.814 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039985.804 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 25 (remaining gas: 1039985.749 units remaining) - [ 1 ] + [ 1 ] - location: 20 (remaining gas: 1039985.719 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 14 (remaining gas: 1039985.704 units remaining) - [ 2 - 1 ] + [ 2 + 1 ] - location: 16 (remaining gas: 1039985.689 units remaining) - [ 1 ] + [ 1 ] - location: 18 (remaining gas: 1039985.679 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 16 (remaining gas: 1039985.649 units remaining) - [ 2 - 1 - 1 ] + [ 2 + 1 + 1 ] - location: 19 (remaining gas: 1039985.594 units remaining) - [ 3 - 1 ] + [ 3 + 1 ] - location: 20 (remaining gas: 1039985.579 units remaining) - [ 1 ] + [ 1 ] - location: 22 (remaining gas: 1039985.569 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 25 (remaining gas: 1039985.514 units remaining) - [ 2 ] + [ 2 ] - location: 20 (remaining gas: 1039985.484 units remaining) - [ 3 - 2 ] + [ 3 + 2 ] - location: 14 (remaining gas: 1039985.469 units remaining) - [ 3 - 2 ] + [ 3 + 2 ] - location: 16 (remaining gas: 1039985.454 units remaining) - [ 2 ] + [ 2 ] - location: 18 (remaining gas: 1039985.444 units remaining) - [ 2 - 2 ] + [ 2 + 2 ] - location: 16 (remaining gas: 1039985.414 units remaining) - [ 3 - 2 - 2 ] + [ 3 + 2 + 2 ] - location: 19 (remaining gas: 1039985.359 units remaining) - [ 5 - 2 ] + [ 5 + 2 ] - location: 20 (remaining gas: 1039985.344 units remaining) - [ 2 ] + [ 2 ] - location: 22 (remaining gas: 1039985.334 units remaining) - [ 1 - 2 ] + [ 1 + 2 ] - location: 25 (remaining gas: 1039985.279 units remaining) - [ 3 ] + [ 3 ] - location: 20 (remaining gas: 1039985.249 units remaining) - [ 5 - 3 ] + [ 5 + 3 ] - location: 14 (remaining gas: 1039985.234 units remaining) - [ 0 - 3 ] + [ 0 + 3 ] - location: 16 (remaining gas: 1039985.219 units remaining) - [ 3 ] + [ 3 ] - location: 18 (remaining gas: 1039985.209 units remaining) - [ 3 - 3 ] + [ 3 + 3 ] - location: 16 (remaining gas: 1039985.179 units remaining) - [ 0 - 3 - 3 ] + [ 0 + 3 + 3 ] - location: 19 (remaining gas: 1039985.124 units remaining) - [ 3 - 3 ] + [ 3 + 3 ] - location: 20 (remaining gas: 1039985.109 units remaining) - [ 3 ] + [ 3 ] - location: 22 (remaining gas: 1039985.099 units remaining) - [ 1 - 3 ] + [ 1 + 3 ] - location: 25 (remaining gas: 1039985.044 units remaining) - [ 4 ] + [ 4 ] - location: 20 (remaining gas: 1039985.014 units remaining) - [ 3 - 4 ] + [ 3 + 4 ] - location: 14 (remaining gas: 1039984.999 units remaining) - [ { 1 ; 3 ; 5 ; 3 } - 4 ] + [ { 1 ; 3 ; 5 ; 3 } + 4 ] - location: 26 (remaining gas: 1039984.984 units remaining) - [ {} - { 1 ; 3 ; 5 ; 3 } - 4 ] + [ {} + { 1 ; 3 ; 5 ; 3 } + 4 ] - location: 28 (remaining gas: 1039984.969 units remaining) - [ (Pair {} { 1 ; 3 ; 5 ; 3 }) - 4 ] + [ (Pair {} { 1 ; 3 ; 5 ; 3 }) + 4 ] - location: 29 (remaining gas: 1039984.954 units remaining) - [ 4 ] + [ 4 ] - location: 31 (remaining gas: 1039984.944 units remaining) [ ] - location: 29 (remaining gas: 1039984.914 units remaining) - [ (Pair {} { 1 ; 3 ; 5 ; 3 }) ] + [ (Pair {} { 1 ; 3 ; 5 ; 3 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out index 1b1de1382389..cab0bbf5e03d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out @@ -8,29 +8,29 @@ big_map diff trace - location: 9 (remaining gas: 1039986.369 units remaining) - [ (Pair {} { 0 }) ] + [ (Pair {} { 0 }) ] - location: 9 (remaining gas: 1039986.359 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039986.349 units remaining) - [ 0 - {} ] + [ 0 + {} ] - location: 13 (remaining gas: 1039986.339 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 14 (remaining gas: 1039986.339 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 26 (remaining gas: 1039986.324 units remaining) - [ {} - {} - 0 ] + [ {} + {} + 0 ] - location: 28 (remaining gas: 1039986.309 units remaining) - [ (Pair {} {}) - 0 ] + [ (Pair {} {}) + 0 ] - location: 29 (remaining gas: 1039986.294 units remaining) - [ 0 ] + [ 0 ] - location: 31 (remaining gas: 1039986.284 units remaining) [ ] - location: 29 (remaining gas: 1039986.254 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out index 31cb3b9633fb..b09709703df3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.220 units remaining) - [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] + [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - location: 8 (remaining gas: 1039994.210 units remaining) - [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] + [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - location: 9 (remaining gas: 1039994.195 units remaining) - [ 6 ] + [ 6 ] - location: 10 (remaining gas: 1039994.180 units remaining) - [ {} - 6 ] + [ {} + 6 ] - location: 12 (remaining gas: 1039994.165 units remaining) - [ (Pair {} 6) ] + [ (Pair {} 6) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out index ddbb611ef939..e0d9021dfb8c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.520 units remaining) - [ (Pair { 1 ; 2 ; 3 } 111) ] + [ (Pair { 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039994.510 units remaining) - [ { 1 ; 2 ; 3 } ] + [ { 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039994.495 units remaining) - [ 3 ] + [ 3 ] - location: 10 (remaining gas: 1039994.480 units remaining) - [ {} - 3 ] + [ {} + 3 ] - location: 12 (remaining gas: 1039994.465 units remaining) - [ (Pair {} 3) ] + [ (Pair {} 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out index 11e89dfc0a47..10654a706a3d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.720 units remaining) - [ (Pair { 1 } 111) ] + [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039994.710 units remaining) - [ { 1 } ] + [ { 1 } ] - location: 9 (remaining gas: 1039994.695 units remaining) - [ 1 ] + [ 1 ] - location: 10 (remaining gas: 1039994.680 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 12 (remaining gas: 1039994.665 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out index b0075b0afd81..68e11d5ca14b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.820 units remaining) - [ (Pair {} 111) ] + [ (Pair {} 111) ] - location: 8 (remaining gas: 1039994.810 units remaining) - [ {} ] + [ {} ] - location: 9 (remaining gas: 1039994.795 units remaining) - [ 0 ] + [ 0 ] - location: 10 (remaining gas: 1039994.780 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 12 (remaining gas: 1039994.765 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 48cef89f59fb..eb75db54d14f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -8,156 +8,156 @@ big_map diff trace - location: 9 (remaining gas: 1039977.710 units remaining) - [ (Pair { "c" ; "b" ; "a" } { "" }) ] + [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039977.700 units remaining) - [ { "c" ; "b" ; "a" } ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039977.685 units remaining) - [ {} - { "c" ; "b" ; "a" } ] + [ {} + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039977.675 units remaining) - [ { "c" ; "b" ; "a" } - {} ] + [ { "c" ; "b" ; "a" } + {} ] - location: 13 (remaining gas: 1039977.660 units remaining) - [ (Pair { "c" ; "b" ; "a" } {}) ] + [ (Pair { "c" ; "b" ; "a" } {}) ] - location: 14 (remaining gas: 1039977.645 units remaining) - [ (Left (Pair { "c" ; "b" ; "a" } {})) ] + [ (Left (Pair { "c" ; "b" ; "a" } {})) ] - location: 17 (remaining gas: 1039977.645 units remaining) - [ (Pair { "c" ; "b" ; "a" } {}) ] + [ (Pair { "c" ; "b" ; "a" } {}) ] - location: 19 (remaining gas: 1039977.635 units remaining) - [ (Pair { "c" ; "b" ; "a" } {}) - (Pair { "c" ; "b" ; "a" } {}) ] + [ (Pair { "c" ; "b" ; "a" } {}) + (Pair { "c" ; "b" ; "a" } {}) ] - location: 20 (remaining gas: 1039977.625 units remaining) - [ { "c" ; "b" ; "a" } - (Pair { "c" ; "b" ; "a" } {}) ] + [ { "c" ; "b" ; "a" } + (Pair { "c" ; "b" ; "a" } {}) ] - location: 21 (remaining gas: 1039977.610 units remaining) - [ (Pair { "c" ; "b" ; "a" } {}) ] + [ (Pair { "c" ; "b" ; "a" } {}) ] - location: 23 (remaining gas: 1039977.600 units remaining) - [ {} ] + [ {} ] - location: 21 (remaining gas: 1039977.570 units remaining) - [ { "c" ; "b" ; "a" } - {} ] + [ { "c" ; "b" ; "a" } + {} ] - location: 24 (remaining gas: 1039977.560 units remaining) - [ "c" - { "b" ; "a" } - {} ] + [ "c" + { "b" ; "a" } + {} ] - location: 26 (remaining gas: 1039977.550 units remaining) - [ { "b" ; "a" } - "c" - {} ] + [ { "b" ; "a" } + "c" + {} ] - location: 27 (remaining gas: 1039977.535 units remaining) - [ "c" - {} ] + [ "c" + {} ] - location: 29 (remaining gas: 1039977.520 units remaining) - [ { "c" } ] + [ { "c" } ] - location: 27 (remaining gas: 1039977.490 units remaining) - [ { "b" ; "a" } - { "c" } ] + [ { "b" ; "a" } + { "c" } ] - location: 30 (remaining gas: 1039977.475 units remaining) - [ (Pair { "b" ; "a" } { "c" }) ] + [ (Pair { "b" ; "a" } { "c" }) ] - location: 31 (remaining gas: 1039977.460 units remaining) - [ (Left (Pair { "b" ; "a" } { "c" })) ] + [ (Left (Pair { "b" ; "a" } { "c" })) ] - location: 24 (remaining gas: 1039977.445 units remaining) - [ (Left (Pair { "b" ; "a" } { "c" })) ] + [ (Left (Pair { "b" ; "a" } { "c" })) ] - location: 17 (remaining gas: 1039977.430 units remaining) - [ (Pair { "b" ; "a" } { "c" }) ] + [ (Pair { "b" ; "a" } { "c" }) ] - location: 19 (remaining gas: 1039977.420 units remaining) - [ (Pair { "b" ; "a" } { "c" }) - (Pair { "b" ; "a" } { "c" }) ] + [ (Pair { "b" ; "a" } { "c" }) + (Pair { "b" ; "a" } { "c" }) ] - location: 20 (remaining gas: 1039977.410 units remaining) - [ { "b" ; "a" } - (Pair { "b" ; "a" } { "c" }) ] + [ { "b" ; "a" } + (Pair { "b" ; "a" } { "c" }) ] - location: 21 (remaining gas: 1039977.395 units remaining) - [ (Pair { "b" ; "a" } { "c" }) ] + [ (Pair { "b" ; "a" } { "c" }) ] - location: 23 (remaining gas: 1039977.385 units remaining) - [ { "c" } ] + [ { "c" } ] - location: 21 (remaining gas: 1039977.355 units remaining) - [ { "b" ; "a" } - { "c" } ] + [ { "b" ; "a" } + { "c" } ] - location: 24 (remaining gas: 1039977.345 units remaining) - [ "b" - { "a" } - { "c" } ] + [ "b" + { "a" } + { "c" } ] - location: 26 (remaining gas: 1039977.335 units remaining) - [ { "a" } - "b" - { "c" } ] + [ { "a" } + "b" + { "c" } ] - location: 27 (remaining gas: 1039977.320 units remaining) - [ "b" - { "c" } ] + [ "b" + { "c" } ] - location: 29 (remaining gas: 1039977.305 units remaining) - [ { "b" ; "c" } ] + [ { "b" ; "c" } ] - location: 27 (remaining gas: 1039977.275 units remaining) - [ { "a" } - { "b" ; "c" } ] + [ { "a" } + { "b" ; "c" } ] - location: 30 (remaining gas: 1039977.260 units remaining) - [ (Pair { "a" } { "b" ; "c" }) ] + [ (Pair { "a" } { "b" ; "c" }) ] - location: 31 (remaining gas: 1039977.245 units remaining) - [ (Left (Pair { "a" } { "b" ; "c" })) ] + [ (Left (Pair { "a" } { "b" ; "c" })) ] - location: 24 (remaining gas: 1039977.230 units remaining) - [ (Left (Pair { "a" } { "b" ; "c" })) ] + [ (Left (Pair { "a" } { "b" ; "c" })) ] - location: 17 (remaining gas: 1039977.215 units remaining) - [ (Pair { "a" } { "b" ; "c" }) ] + [ (Pair { "a" } { "b" ; "c" }) ] - location: 19 (remaining gas: 1039977.205 units remaining) - [ (Pair { "a" } { "b" ; "c" }) - (Pair { "a" } { "b" ; "c" }) ] + [ (Pair { "a" } { "b" ; "c" }) + (Pair { "a" } { "b" ; "c" }) ] - location: 20 (remaining gas: 1039977.195 units remaining) - [ { "a" } - (Pair { "a" } { "b" ; "c" }) ] + [ { "a" } + (Pair { "a" } { "b" ; "c" }) ] - location: 21 (remaining gas: 1039977.180 units remaining) - [ (Pair { "a" } { "b" ; "c" }) ] + [ (Pair { "a" } { "b" ; "c" }) ] - location: 23 (remaining gas: 1039977.170 units remaining) - [ { "b" ; "c" } ] + [ { "b" ; "c" } ] - location: 21 (remaining gas: 1039977.140 units remaining) - [ { "a" } - { "b" ; "c" } ] + [ { "a" } + { "b" ; "c" } ] - location: 24 (remaining gas: 1039977.130 units remaining) - [ "a" - {} - { "b" ; "c" } ] + [ "a" + {} + { "b" ; "c" } ] - location: 26 (remaining gas: 1039977.120 units remaining) - [ {} - "a" - { "b" ; "c" } ] + [ {} + "a" + { "b" ; "c" } ] - location: 27 (remaining gas: 1039977.105 units remaining) - [ "a" - { "b" ; "c" } ] + [ "a" + { "b" ; "c" } ] - location: 29 (remaining gas: 1039977.090 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 27 (remaining gas: 1039977.060 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 30 (remaining gas: 1039977.045 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] - location: 31 (remaining gas: 1039977.030 units remaining) - [ (Left (Pair {} { "a" ; "b" ; "c" })) ] + [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - location: 24 (remaining gas: 1039977.015 units remaining) - [ (Left (Pair {} { "a" ; "b" ; "c" })) ] + [ (Left (Pair {} { "a" ; "b" ; "c" })) ] - location: 17 (remaining gas: 1039977 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] - location: 19 (remaining gas: 1039976.990 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) - (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) + (Pair {} { "a" ; "b" ; "c" }) ] - location: 20 (remaining gas: 1039976.980 units remaining) - [ {} - (Pair {} { "a" ; "b" ; "c" }) ] + [ {} + (Pair {} { "a" ; "b" ; "c" }) ] - location: 21 (remaining gas: 1039976.965 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] - location: 23 (remaining gas: 1039976.955 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 21 (remaining gas: 1039976.925 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 24 (remaining gas: 1039976.915 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 35 (remaining gas: 1039976.900 units remaining) - [ (Right { "a" ; "b" ; "c" }) ] + [ (Right { "a" ; "b" ; "c" }) ] - location: 24 (remaining gas: 1039976.885 units remaining) - [ (Right { "a" ; "b" ; "c" }) ] + [ (Right { "a" ; "b" ; "c" }) ] - location: 17 (remaining gas: 1039976.870 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 41 (remaining gas: 1039976.855 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 43 (remaining gas: 1039976.840 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" index a21e3c0f099a..7f462a9179e3 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" @@ -8,45 +8,45 @@ big_map diff trace - location: 9 (remaining gas: 1039978.082 units remaining) - [ (Pair {} { "" }) ] + [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039978.072 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039978.057 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 12 (remaining gas: 1039978.047 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039978.032 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 14 (remaining gas: 1039978.017 units remaining) - [ (Left (Pair {} {})) ] + [ (Left (Pair {} {})) ] - location: 17 (remaining gas: 1039978.017 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 19 (remaining gas: 1039978.007 units remaining) - [ (Pair {} {}) - (Pair {} {}) ] + [ (Pair {} {}) + (Pair {} {}) ] - location: 20 (remaining gas: 1039977.997 units remaining) - [ {} - (Pair {} {}) ] + [ {} + (Pair {} {}) ] - location: 21 (remaining gas: 1039977.982 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 23 (remaining gas: 1039977.972 units remaining) - [ {} ] + [ {} ] - location: 21 (remaining gas: 1039977.942 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 24 (remaining gas: 1039977.932 units remaining) - [ {} ] + [ {} ] - location: 35 (remaining gas: 1039977.917 units remaining) - [ (Right {}) ] + [ (Right {}) ] - location: 24 (remaining gas: 1039977.902 units remaining) - [ (Right {}) ] + [ (Right {}) ] - location: 17 (remaining gas: 1039977.887 units remaining) - [ {} ] + [ {} ] - location: 41 (remaining gas: 1039977.872 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 43 (remaining gas: 1039977.857 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out index 7ae28a043fa3..c82e1f9d784b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out @@ -8,12 +8,12 @@ big_map diff trace - location: 11 (remaining gas: 1039993.699 units remaining) - [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ] + [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ] - location: 11 (remaining gas: 1039993.689 units remaining) - [ { Elt 0 0 ; Elt 3 4 } ] + [ { Elt 0 0 ; Elt 3 4 } ] - location: 12 (remaining gas: 1039993.674 units remaining) - [ {} - { Elt 0 0 ; Elt 3 4 } ] + [ {} + { Elt 0 0 ; Elt 3 4 } ] - location: 14 (remaining gas: 1039993.659 units remaining) - [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ] + [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out index f85745c8299f..f12c37d60aa2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out @@ -8,12 +8,12 @@ big_map diff trace - location: 11 (remaining gas: 1039994.154 units remaining) - [ (Pair { Elt 0 0 } {}) ] + [ (Pair { Elt 0 0 } {}) ] - location: 11 (remaining gas: 1039994.144 units remaining) - [ { Elt 0 0 } ] + [ { Elt 0 0 } ] - location: 12 (remaining gas: 1039994.129 units remaining) - [ {} - { Elt 0 0 } ] + [ {} + { Elt 0 0 } ] - location: 14 (remaining gas: 1039994.114 units remaining) - [ (Pair {} { Elt 0 0 }) ] + [ (Pair {} { Elt 0 0 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out index 230c2e7ed159..d73d851b21a6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out @@ -8,12 +8,12 @@ big_map diff trace - location: 11 (remaining gas: 1039994.154 units remaining) - [ (Pair { Elt 0 1 } {}) ] + [ (Pair { Elt 0 1 } {}) ] - location: 11 (remaining gas: 1039994.144 units remaining) - [ { Elt 0 1 } ] + [ { Elt 0 1 } ] - location: 12 (remaining gas: 1039994.129 units remaining) - [ {} - { Elt 0 1 } ] + [ {} + { Elt 0 1 } ] - location: 14 (remaining gas: 1039994.114 units remaining) - [ (Pair {} { Elt 0 1 }) ] + [ (Pair {} { Elt 0 1 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out index 4cb25109ad68..60478164d757 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out @@ -8,145 +8,145 @@ big_map diff trace - location: 11 (remaining gas: 1039978.509 units remaining) - [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ] + [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ] - location: 11 (remaining gas: 1039978.499 units remaining) - [ { Elt 0 100 ; Elt 2 100 } ] + [ { Elt 0 100 ; Elt 2 100 } ] - location: 12 (remaining gas: 1039978.489 units remaining) - [ 0 - { Elt 0 100 ; Elt 2 100 } ] + [ 0 + { Elt 0 100 ; Elt 2 100 } ] - location: 15 (remaining gas: 1039978.479 units remaining) - [ 0 - 0 - { Elt 0 100 ; Elt 2 100 } ] + [ 0 + 0 + { Elt 0 100 ; Elt 2 100 } ] - location: 18 (remaining gas: 1039978.464 units remaining) - [ (Pair 0 0) - { Elt 0 100 ; Elt 2 100 } ] + [ (Pair 0 0) + { Elt 0 100 ; Elt 2 100 } ] - location: 19 (remaining gas: 1039978.454 units remaining) - [ { Elt 0 100 ; Elt 2 100 } - (Pair 0 0) ] + [ { Elt 0 100 ; Elt 2 100 } + (Pair 0 0) ] - location: 20 (remaining gas: 1039978.454 units remaining) - [ (Pair 0 100) - (Pair 0 0) ] + [ (Pair 0 100) + (Pair 0 0) ] - location: 22 (remaining gas: 1039978.439 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 24 (remaining gas: 1039978.429 units remaining) - [ (Pair 0 0) - (Pair 0 0) ] + [ (Pair 0 0) + (Pair 0 0) ] - location: 25 (remaining gas: 1039978.419 units remaining) - [ 0 - (Pair 0 0) ] + [ 0 + (Pair 0 0) ] - location: 26 (remaining gas: 1039978.404 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 28 (remaining gas: 1039978.394 units remaining) - [ 0 ] + [ 0 ] - location: 26 (remaining gas: 1039978.364 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 22 (remaining gas: 1039978.334 units remaining) - [ (Pair 0 100) - 0 - 0 ] + [ (Pair 0 100) + 0 + 0 ] - location: 29 (remaining gas: 1039978.324 units remaining) - [ (Pair 0 100) - (Pair 0 100) - 0 - 0 ] + [ (Pair 0 100) + (Pair 0 100) + 0 + 0 ] - location: 30 (remaining gas: 1039978.309 units remaining) - [ (Pair 0 100) - 0 - 0 ] + [ (Pair 0 100) + 0 + 0 ] - location: 32 (remaining gas: 1039978.299 units remaining) - [ 0 - 0 - 0 ] + [ 0 + 0 + 0 ] - location: 33 (remaining gas: 1039978.244 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 30 (remaining gas: 1039978.214 units remaining) - [ (Pair 0 100) - 0 - 0 ] + [ (Pair 0 100) + 0 + 0 ] - location: 34 (remaining gas: 1039978.204 units remaining) - [ 0 - (Pair 0 100) - 0 ] + [ 0 + (Pair 0 100) + 0 ] - location: 35 (remaining gas: 1039978.189 units remaining) - [ (Pair 0 100) - 0 ] + [ (Pair 0 100) + 0 ] - location: 37 (remaining gas: 1039978.179 units remaining) - [ 100 - 0 ] + [ 100 + 0 ] - location: 38 (remaining gas: 1039978.124 units remaining) - [ 100 ] + [ 100 ] - location: 35 (remaining gas: 1039978.094 units remaining) - [ 0 - 100 ] + [ 0 + 100 ] - location: 39 (remaining gas: 1039978.079 units remaining) - [ (Pair 0 100) ] + [ (Pair 0 100) ] - location: 20 (remaining gas: 1039978.064 units remaining) - [ (Pair 2 100) - (Pair 0 100) ] + [ (Pair 2 100) + (Pair 0 100) ] - location: 22 (remaining gas: 1039978.049 units remaining) - [ (Pair 0 100) ] + [ (Pair 0 100) ] - location: 24 (remaining gas: 1039978.039 units remaining) - [ (Pair 0 100) - (Pair 0 100) ] + [ (Pair 0 100) + (Pair 0 100) ] - location: 25 (remaining gas: 1039978.029 units remaining) - [ 0 - (Pair 0 100) ] + [ 0 + (Pair 0 100) ] - location: 26 (remaining gas: 1039978.014 units remaining) - [ (Pair 0 100) ] + [ (Pair 0 100) ] - location: 28 (remaining gas: 1039978.004 units remaining) - [ 100 ] + [ 100 ] - location: 26 (remaining gas: 1039977.974 units remaining) - [ 0 - 100 ] + [ 0 + 100 ] - location: 22 (remaining gas: 1039977.944 units remaining) - [ (Pair 2 100) - 0 - 100 ] + [ (Pair 2 100) + 0 + 100 ] - location: 29 (remaining gas: 1039977.934 units remaining) - [ (Pair 2 100) - (Pair 2 100) - 0 - 100 ] + [ (Pair 2 100) + (Pair 2 100) + 0 + 100 ] - location: 30 (remaining gas: 1039977.919 units remaining) - [ (Pair 2 100) - 0 - 100 ] + [ (Pair 2 100) + 0 + 100 ] - location: 32 (remaining gas: 1039977.909 units remaining) - [ 2 - 0 - 100 ] + [ 2 + 0 + 100 ] - location: 33 (remaining gas: 1039977.854 units remaining) - [ 2 - 100 ] + [ 2 + 100 ] - location: 30 (remaining gas: 1039977.824 units remaining) - [ (Pair 2 100) - 2 - 100 ] + [ (Pair 2 100) + 2 + 100 ] - location: 34 (remaining gas: 1039977.814 units remaining) - [ 2 - (Pair 2 100) - 100 ] + [ 2 + (Pair 2 100) + 100 ] - location: 35 (remaining gas: 1039977.799 units remaining) - [ (Pair 2 100) - 100 ] + [ (Pair 2 100) + 100 ] - location: 37 (remaining gas: 1039977.789 units remaining) - [ 100 - 100 ] + [ 100 + 100 ] - location: 38 (remaining gas: 1039977.734 units remaining) - [ 200 ] + [ 200 ] - location: 35 (remaining gas: 1039977.704 units remaining) - [ 2 - 200 ] + [ 2 + 200 ] - location: 39 (remaining gas: 1039977.689 units remaining) - [ (Pair 2 200) ] + [ (Pair 2 200) ] - location: 20 (remaining gas: 1039977.674 units remaining) - [ (Pair 2 200) ] + [ (Pair 2 200) ] - location: 40 (remaining gas: 1039977.659 units remaining) - [ {} - (Pair 2 200) ] + [ {} + (Pair 2 200) ] - location: 42 (remaining gas: 1039977.644 units remaining) - [ (Pair {} 2 200) ] + [ (Pair {} 2 200) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out index 1150a5a6e645..0935fc6df613 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out @@ -8,145 +8,145 @@ big_map diff trace - location: 11 (remaining gas: 1039978.509 units remaining) - [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ] + [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ] - location: 11 (remaining gas: 1039978.499 units remaining) - [ { Elt 1 1 ; Elt 2 100 } ] + [ { Elt 1 1 ; Elt 2 100 } ] - location: 12 (remaining gas: 1039978.489 units remaining) - [ 0 - { Elt 1 1 ; Elt 2 100 } ] + [ 0 + { Elt 1 1 ; Elt 2 100 } ] - location: 15 (remaining gas: 1039978.479 units remaining) - [ 0 - 0 - { Elt 1 1 ; Elt 2 100 } ] + [ 0 + 0 + { Elt 1 1 ; Elt 2 100 } ] - location: 18 (remaining gas: 1039978.464 units remaining) - [ (Pair 0 0) - { Elt 1 1 ; Elt 2 100 } ] + [ (Pair 0 0) + { Elt 1 1 ; Elt 2 100 } ] - location: 19 (remaining gas: 1039978.454 units remaining) - [ { Elt 1 1 ; Elt 2 100 } - (Pair 0 0) ] + [ { Elt 1 1 ; Elt 2 100 } + (Pair 0 0) ] - location: 20 (remaining gas: 1039978.454 units remaining) - [ (Pair 1 1) - (Pair 0 0) ] + [ (Pair 1 1) + (Pair 0 0) ] - location: 22 (remaining gas: 1039978.439 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 24 (remaining gas: 1039978.429 units remaining) - [ (Pair 0 0) - (Pair 0 0) ] + [ (Pair 0 0) + (Pair 0 0) ] - location: 25 (remaining gas: 1039978.419 units remaining) - [ 0 - (Pair 0 0) ] + [ 0 + (Pair 0 0) ] - location: 26 (remaining gas: 1039978.404 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 28 (remaining gas: 1039978.394 units remaining) - [ 0 ] + [ 0 ] - location: 26 (remaining gas: 1039978.364 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 22 (remaining gas: 1039978.334 units remaining) - [ (Pair 1 1) - 0 - 0 ] + [ (Pair 1 1) + 0 + 0 ] - location: 29 (remaining gas: 1039978.324 units remaining) - [ (Pair 1 1) - (Pair 1 1) - 0 - 0 ] + [ (Pair 1 1) + (Pair 1 1) + 0 + 0 ] - location: 30 (remaining gas: 1039978.309 units remaining) - [ (Pair 1 1) - 0 - 0 ] + [ (Pair 1 1) + 0 + 0 ] - location: 32 (remaining gas: 1039978.299 units remaining) - [ 1 - 0 - 0 ] + [ 1 + 0 + 0 ] - location: 33 (remaining gas: 1039978.244 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 30 (remaining gas: 1039978.214 units remaining) - [ (Pair 1 1) - 1 - 0 ] + [ (Pair 1 1) + 1 + 0 ] - location: 34 (remaining gas: 1039978.204 units remaining) - [ 1 - (Pair 1 1) - 0 ] + [ 1 + (Pair 1 1) + 0 ] - location: 35 (remaining gas: 1039978.189 units remaining) - [ (Pair 1 1) - 0 ] + [ (Pair 1 1) + 0 ] - location: 37 (remaining gas: 1039978.179 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 38 (remaining gas: 1039978.124 units remaining) - [ 1 ] + [ 1 ] - location: 35 (remaining gas: 1039978.094 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 39 (remaining gas: 1039978.079 units remaining) - [ (Pair 1 1) ] + [ (Pair 1 1) ] - location: 20 (remaining gas: 1039978.064 units remaining) - [ (Pair 2 100) - (Pair 1 1) ] + [ (Pair 2 100) + (Pair 1 1) ] - location: 22 (remaining gas: 1039978.049 units remaining) - [ (Pair 1 1) ] + [ (Pair 1 1) ] - location: 24 (remaining gas: 1039978.039 units remaining) - [ (Pair 1 1) - (Pair 1 1) ] + [ (Pair 1 1) + (Pair 1 1) ] - location: 25 (remaining gas: 1039978.029 units remaining) - [ 1 - (Pair 1 1) ] + [ 1 + (Pair 1 1) ] - location: 26 (remaining gas: 1039978.014 units remaining) - [ (Pair 1 1) ] + [ (Pair 1 1) ] - location: 28 (remaining gas: 1039978.004 units remaining) - [ 1 ] + [ 1 ] - location: 26 (remaining gas: 1039977.974 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 22 (remaining gas: 1039977.944 units remaining) - [ (Pair 2 100) - 1 - 1 ] + [ (Pair 2 100) + 1 + 1 ] - location: 29 (remaining gas: 1039977.934 units remaining) - [ (Pair 2 100) - (Pair 2 100) - 1 - 1 ] + [ (Pair 2 100) + (Pair 2 100) + 1 + 1 ] - location: 30 (remaining gas: 1039977.919 units remaining) - [ (Pair 2 100) - 1 - 1 ] + [ (Pair 2 100) + 1 + 1 ] - location: 32 (remaining gas: 1039977.909 units remaining) - [ 2 - 1 - 1 ] + [ 2 + 1 + 1 ] - location: 33 (remaining gas: 1039977.854 units remaining) - [ 3 - 1 ] + [ 3 + 1 ] - location: 30 (remaining gas: 1039977.824 units remaining) - [ (Pair 2 100) - 3 - 1 ] + [ (Pair 2 100) + 3 + 1 ] - location: 34 (remaining gas: 1039977.814 units remaining) - [ 3 - (Pair 2 100) - 1 ] + [ 3 + (Pair 2 100) + 1 ] - location: 35 (remaining gas: 1039977.799 units remaining) - [ (Pair 2 100) - 1 ] + [ (Pair 2 100) + 1 ] - location: 37 (remaining gas: 1039977.789 units remaining) - [ 100 - 1 ] + [ 100 + 1 ] - location: 38 (remaining gas: 1039977.734 units remaining) - [ 101 ] + [ 101 ] - location: 35 (remaining gas: 1039977.704 units remaining) - [ 3 - 101 ] + [ 3 + 101 ] - location: 39 (remaining gas: 1039977.689 units remaining) - [ (Pair 3 101) ] + [ (Pair 3 101) ] - location: 20 (remaining gas: 1039977.674 units remaining) - [ (Pair 3 101) ] + [ (Pair 3 101) ] - location: 40 (remaining gas: 1039977.659 units remaining) - [ {} - (Pair 3 101) ] + [ {} + (Pair 3 101) ] - location: 42 (remaining gas: 1039977.644 units remaining) - [ (Pair {} 3 101) ] + [ (Pair {} 3 101) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" index 87857063f8b2..8cfcbddf2845 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" @@ -8,61 +8,61 @@ big_map diff trace - location: 9 (remaining gas: 1039988.041 units remaining) - [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ] + [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ] - location: 9 (remaining gas: 1039988.031 units remaining) - [ 15 - { Elt "bar" 5 ; Elt "foo" 1 } ] + [ 15 + { Elt "bar" 5 ; Elt "foo" 1 } ] - location: 10 (remaining gas: 1039988.021 units remaining) - [ { Elt "bar" 5 ; Elt "foo" 1 } - 15 ] + [ { Elt "bar" 5 ; Elt "foo" 1 } + 15 ] - location: 11 (remaining gas: 1039988.021 units remaining) - [ (Pair "bar" 5) - 15 ] + [ (Pair "bar" 5) + 15 ] - location: 13 (remaining gas: 1039988.011 units remaining) - [ 5 - 15 ] + [ 5 + 15 ] - location: 14 (remaining gas: 1039987.996 units remaining) - [ 15 ] + [ 15 ] - location: 16 (remaining gas: 1039987.986 units remaining) - [ 15 - 15 ] + [ 15 + 15 ] - location: 14 (remaining gas: 1039987.956 units remaining) - [ 5 - 15 - 15 ] + [ 5 + 15 + 15 ] - location: 17 (remaining gas: 1039987.901 units remaining) - [ 20 - 15 ] + [ 20 + 15 ] - location: 11 (remaining gas: 1039987.886 units remaining) - [ (Pair "foo" 1) - 15 ] + [ (Pair "foo" 1) + 15 ] - location: 13 (remaining gas: 1039987.876 units remaining) - [ 1 - 15 ] + [ 1 + 15 ] - location: 14 (remaining gas: 1039987.861 units remaining) - [ 15 ] + [ 15 ] - location: 16 (remaining gas: 1039987.851 units remaining) - [ 15 - 15 ] + [ 15 + 15 ] - location: 14 (remaining gas: 1039987.821 units remaining) - [ 1 - 15 - 15 ] + [ 1 + 15 + 15 ] - location: 17 (remaining gas: 1039987.766 units remaining) - [ 16 - 15 ] + [ 16 + 15 ] - location: 11 (remaining gas: 1039987.751 units remaining) - [ { Elt "bar" 20 ; Elt "foo" 16 } - 15 ] + [ { Elt "bar" 20 ; Elt "foo" 16 } + 15 ] - location: 18 (remaining gas: 1039987.736 units remaining) - [ 15 ] + [ 15 ] - location: 20 (remaining gas: 1039987.726 units remaining) [ ] - location: 18 (remaining gas: 1039987.696 units remaining) - [ { Elt "bar" 20 ; Elt "foo" 16 } ] + [ { Elt "bar" 20 ; Elt "foo" 16 } ] - location: 21 (remaining gas: 1039987.681 units remaining) - [ {} - { Elt "bar" 20 ; Elt "foo" 16 } ] + [ {} + { Elt "bar" 20 ; Elt "foo" 16 } ] - location: 23 (remaining gas: 1039987.666 units remaining) - [ (Pair {} { Elt "bar" 20 ; Elt "foo" 16 }) ] + [ (Pair {} { Elt "bar" 20 ; Elt "foo" 16 }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" index 655c363584b5..5897851b7ff1 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" @@ -8,43 +8,43 @@ big_map diff trace - location: 9 (remaining gas: 1039988.540 units remaining) - [ (Pair 10 { Elt "foo" 1 }) ] + [ (Pair 10 { Elt "foo" 1 }) ] - location: 9 (remaining gas: 1039988.530 units remaining) - [ 10 - { Elt "foo" 1 } ] + [ 10 + { Elt "foo" 1 } ] - location: 10 (remaining gas: 1039988.520 units remaining) - [ { Elt "foo" 1 } - 10 ] + [ { Elt "foo" 1 } + 10 ] - location: 11 (remaining gas: 1039988.520 units remaining) - [ (Pair "foo" 1) - 10 ] + [ (Pair "foo" 1) + 10 ] - location: 13 (remaining gas: 1039988.510 units remaining) - [ 1 - 10 ] + [ 1 + 10 ] - location: 14 (remaining gas: 1039988.495 units remaining) - [ 10 ] + [ 10 ] - location: 16 (remaining gas: 1039988.485 units remaining) - [ 10 - 10 ] + [ 10 + 10 ] - location: 14 (remaining gas: 1039988.455 units remaining) - [ 1 - 10 - 10 ] + [ 1 + 10 + 10 ] - location: 17 (remaining gas: 1039988.400 units remaining) - [ 11 - 10 ] + [ 11 + 10 ] - location: 11 (remaining gas: 1039988.385 units remaining) - [ { Elt "foo" 11 } - 10 ] + [ { Elt "foo" 11 } + 10 ] - location: 18 (remaining gas: 1039988.370 units remaining) - [ 10 ] + [ 10 ] - location: 20 (remaining gas: 1039988.360 units remaining) [ ] - location: 18 (remaining gas: 1039988.330 units remaining) - [ { Elt "foo" 11 } ] + [ { Elt "foo" 11 } ] - location: 21 (remaining gas: 1039988.315 units remaining) - [ {} - { Elt "foo" 11 } ] + [ {} + { Elt "foo" 11 } ] - location: 23 (remaining gas: 1039988.300 units remaining) - [ (Pair {} { Elt "foo" 11 }) ] + [ (Pair {} { Elt "foo" 11 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out index f5c60c85a481..0ca64ebf5d18 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out @@ -8,25 +8,25 @@ big_map diff trace - location: 9 (remaining gas: 1039988.934 units remaining) - [ (Pair 10 {}) ] + [ (Pair 10 {}) ] - location: 9 (remaining gas: 1039988.924 units remaining) - [ 10 - {} ] + [ 10 + {} ] - location: 10 (remaining gas: 1039988.914 units remaining) - [ {} - 10 ] + [ {} + 10 ] - location: 11 (remaining gas: 1039988.914 units remaining) - [ {} - 10 ] + [ {} + 10 ] - location: 18 (remaining gas: 1039988.899 units remaining) - [ 10 ] + [ 10 ] - location: 20 (remaining gas: 1039988.889 units remaining) [ ] - location: 18 (remaining gas: 1039988.859 units remaining) - [ {} ] + [ {} ] - location: 21 (remaining gas: 1039988.844 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 23 (remaining gas: 1039988.829 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out index 7c19df198ceb..c5f013f84022 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039988.154 units remaining) - [ (Pair 1 { Elt 0 1 } None) ] + [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039988.144 units remaining) - [ 1 - (Pair { Elt 0 1 } None) ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 13 (remaining gas: 1039988.129 units remaining) - [ (Pair { Elt 0 1 } None) ] + [ (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039988.119 units remaining) - [ { Elt 0 1 } ] + [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039988.109 units remaining) - [ { Elt 0 1 } - { Elt 0 1 } ] + [ { Elt 0 1 } + { Elt 0 1 } ] - location: 13 (remaining gas: 1039988.079 units remaining) - [ 1 - { Elt 0 1 } - { Elt 0 1 } ] + [ 1 + { Elt 0 1 } + { Elt 0 1 } ] - location: 17 (remaining gas: 1039987.929 units remaining) - [ False - { Elt 0 1 } ] + [ False + { Elt 0 1 } ] - location: 18 (remaining gas: 1039987.914 units remaining) - [ (Some False) - { Elt 0 1 } ] + [ (Some False) + { Elt 0 1 } ] - location: 19 (remaining gas: 1039987.904 units remaining) - [ { Elt 0 1 } - (Some False) ] + [ { Elt 0 1 } + (Some False) ] - location: 20 (remaining gas: 1039987.889 units remaining) - [ (Pair { Elt 0 1 } (Some False)) ] + [ (Pair { Elt 0 1 } (Some False)) ] - location: 21 (remaining gas: 1039987.874 units remaining) - [ {} - (Pair { Elt 0 1 } (Some False)) ] + [ {} + (Pair { Elt 0 1 } (Some False)) ] - location: 23 (remaining gas: 1039987.859 units remaining) - [ (Pair {} { Elt 0 1 } (Some False)) ] + [ (Pair {} { Elt 0 1 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out index 112cc660911f..0ae9faf00e8a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039988.154 units remaining) - [ (Pair 1 { Elt 1 0 } None) ] + [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039988.144 units remaining) - [ 1 - (Pair { Elt 1 0 } None) ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 13 (remaining gas: 1039988.129 units remaining) - [ (Pair { Elt 1 0 } None) ] + [ (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039988.119 units remaining) - [ { Elt 1 0 } ] + [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039988.109 units remaining) - [ { Elt 1 0 } - { Elt 1 0 } ] + [ { Elt 1 0 } + { Elt 1 0 } ] - location: 13 (remaining gas: 1039988.079 units remaining) - [ 1 - { Elt 1 0 } - { Elt 1 0 } ] + [ 1 + { Elt 1 0 } + { Elt 1 0 } ] - location: 17 (remaining gas: 1039987.929 units remaining) - [ True - { Elt 1 0 } ] + [ True + { Elt 1 0 } ] - location: 18 (remaining gas: 1039987.914 units remaining) - [ (Some True) - { Elt 1 0 } ] + [ (Some True) + { Elt 1 0 } ] - location: 19 (remaining gas: 1039987.904 units remaining) - [ { Elt 1 0 } - (Some True) ] + [ { Elt 1 0 } + (Some True) ] - location: 20 (remaining gas: 1039987.889 units remaining) - [ (Pair { Elt 1 0 } (Some True)) ] + [ (Pair { Elt 1 0 } (Some True)) ] - location: 21 (remaining gas: 1039987.874 units remaining) - [ {} - (Pair { Elt 1 0 } (Some True)) ] + [ {} + (Pair { Elt 1 0 } (Some True)) ] - location: 23 (remaining gas: 1039987.859 units remaining) - [ (Pair {} { Elt 1 0 } (Some True)) ] + [ (Pair {} { Elt 1 0 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out index d77284435423..fbfcb4b062a0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039987.699 units remaining) - [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039987.689 units remaining) - [ 1 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039987.674 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039987.664 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039987.654 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039987.624 units remaining) - [ 1 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 1 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039987.439 units remaining) - [ True - { Elt 1 4 ; Elt 2 11 } ] + [ True + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039987.424 units remaining) - [ (Some True) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some True) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039987.414 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some True) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some True) ] - location: 20 (remaining gas: 1039987.399 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 21 (remaining gas: 1039987.384 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 23 (remaining gas: 1039987.369 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out index 7be6a7ac230e..258a7023a461 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039987.699 units remaining) - [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039987.689 units remaining) - [ 2 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039987.674 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039987.664 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039987.654 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039987.624 units remaining) - [ 2 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 2 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039987.439 units remaining) - [ True - { Elt 1 4 ; Elt 2 11 } ] + [ True + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039987.424 units remaining) - [ (Some True) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some True) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039987.414 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some True) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some True) ] - location: 20 (remaining gas: 1039987.399 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 21 (remaining gas: 1039987.384 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ] - location: 23 (remaining gas: 1039987.369 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out index 30c9112baaa2..a4e8a62b75f3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039987.699 units remaining) - [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039987.689 units remaining) - [ 3 - (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 13 (remaining gas: 1039987.674 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039987.664 units remaining) - [ { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039987.654 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039987.624 units remaining) - [ 3 - { Elt 1 4 ; Elt 2 11 } - { Elt 1 4 ; Elt 2 11 } ] + [ 3 + { Elt 1 4 ; Elt 2 11 } + { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039987.439 units remaining) - [ False - { Elt 1 4 ; Elt 2 11 } ] + [ False + { Elt 1 4 ; Elt 2 11 } ] - location: 18 (remaining gas: 1039987.424 units remaining) - [ (Some False) - { Elt 1 4 ; Elt 2 11 } ] + [ (Some False) + { Elt 1 4 ; Elt 2 11 } ] - location: 19 (remaining gas: 1039987.414 units remaining) - [ { Elt 1 4 ; Elt 2 11 } - (Some False) ] + [ { Elt 1 4 ; Elt 2 11 } + (Some False) ] - location: 20 (remaining gas: 1039987.399 units remaining) - [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - location: 21 (remaining gas: 1039987.384 units remaining) - [ {} - (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ {} + (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ] - location: 23 (remaining gas: 1039987.369 units remaining) - [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] + [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out index 8e3894a348a8..6d5c95773cf3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039988.504 units remaining) - [ (Pair 1 {} None) ] + [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039988.494 units remaining) - [ 1 - (Pair {} None) ] + [ 1 + (Pair {} None) ] - location: 13 (remaining gas: 1039988.479 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039988.469 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039988.459 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039988.429 units remaining) - [ 1 - {} - {} ] + [ 1 + {} + {} ] - location: 17 (remaining gas: 1039988.314 units remaining) - [ False - {} ] + [ False + {} ] - location: 18 (remaining gas: 1039988.299 units remaining) - [ (Some False) - {} ] + [ (Some False) + {} ] - location: 19 (remaining gas: 1039988.289 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 20 (remaining gas: 1039988.274 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 21 (remaining gas: 1039988.259 units remaining) - [ {} - (Pair {} (Some False)) ] + [ {} + (Pair {} (Some False)) ] - location: 23 (remaining gas: 1039988.244 units remaining) - [ (Pair {} {} (Some False)) ] + [ (Pair {} {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" index c90067d0fbcf..23c7eb87344d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039987.567 units remaining) - [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039987.557 units remaining) - [ "bar" - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ "bar" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039987.542 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039987.532 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039987.522 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039987.492 units remaining) - [ "bar" - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ "bar" + { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039987.307 units remaining) - [ True - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ True + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 18 (remaining gas: 1039987.292 units remaining) - [ (Some True) - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ (Some True) + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 19 (remaining gas: 1039987.282 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - (Some True) ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + (Some True) ] - location: 20 (remaining gas: 1039987.267 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 21 (remaining gas: 1039987.252 units remaining) - [ {} - (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ {} + (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 23 (remaining gas: 1039987.237 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" index 1711e929a0b2..281368a76454 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039987.567 units remaining) - [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039987.557 units remaining) - [ "foo" - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ "foo" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039987.542 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039987.532 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039987.522 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039987.492 units remaining) - [ "foo" - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ "foo" + { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039987.307 units remaining) - [ True - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ True + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 18 (remaining gas: 1039987.292 units remaining) - [ (Some True) - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ (Some True) + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 19 (remaining gas: 1039987.282 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - (Some True) ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + (Some True) ] - location: 20 (remaining gas: 1039987.267 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 21 (remaining gas: 1039987.252 units remaining) - [ {} - (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ {} + (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] - location: 23 (remaining gas: 1039987.237 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] + [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" index aa11b1f42f79..8a566fac9d76 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039987.567 units remaining) - [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039987.557 units remaining) - [ "baz" - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ "baz" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 13 (remaining gas: 1039987.542 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039987.532 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039987.522 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039987.492 units remaining) - [ "baz" - { Elt "bar" 4 ; Elt "foo" 11 } - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ "baz" + { Elt "bar" 4 ; Elt "foo" 11 } + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039987.307 units remaining) - [ False - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ False + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 18 (remaining gas: 1039987.292 units remaining) - [ (Some False) - { Elt "bar" 4 ; Elt "foo" 11 } ] + [ (Some False) + { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 19 (remaining gas: 1039987.282 units remaining) - [ { Elt "bar" 4 ; Elt "foo" 11 } - (Some False) ] + [ { Elt "bar" 4 ; Elt "foo" 11 } + (Some False) ] - location: 20 (remaining gas: 1039987.267 units remaining) - [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] + [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - location: 21 (remaining gas: 1039987.252 units remaining) - [ {} - (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] + [ {} + (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] - location: 23 (remaining gas: 1039987.237 units remaining) - [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] + [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" index f027be34db16..9ecfc7adbfbc 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039988.066 units remaining) - [ (Pair "foo" { Elt "foo" 0 } None) ] + [ (Pair "foo" { Elt "foo" 0 } None) ] - location: 12 (remaining gas: 1039988.056 units remaining) - [ "foo" - (Pair { Elt "foo" 0 } None) ] + [ "foo" + (Pair { Elt "foo" 0 } None) ] - location: 13 (remaining gas: 1039988.041 units remaining) - [ (Pair { Elt "foo" 0 } None) ] + [ (Pair { Elt "foo" 0 } None) ] - location: 15 (remaining gas: 1039988.031 units remaining) - [ { Elt "foo" 0 } ] + [ { Elt "foo" 0 } ] - location: 16 (remaining gas: 1039988.021 units remaining) - [ { Elt "foo" 0 } - { Elt "foo" 0 } ] + [ { Elt "foo" 0 } + { Elt "foo" 0 } ] - location: 13 (remaining gas: 1039987.991 units remaining) - [ "foo" - { Elt "foo" 0 } - { Elt "foo" 0 } ] + [ "foo" + { Elt "foo" 0 } + { Elt "foo" 0 } ] - location: 17 (remaining gas: 1039987.841 units remaining) - [ True - { Elt "foo" 0 } ] + [ True + { Elt "foo" 0 } ] - location: 18 (remaining gas: 1039987.826 units remaining) - [ (Some True) - { Elt "foo" 0 } ] + [ (Some True) + { Elt "foo" 0 } ] - location: 19 (remaining gas: 1039987.816 units remaining) - [ { Elt "foo" 0 } - (Some True) ] + [ { Elt "foo" 0 } + (Some True) ] - location: 20 (remaining gas: 1039987.801 units remaining) - [ (Pair { Elt "foo" 0 } (Some True)) ] + [ (Pair { Elt "foo" 0 } (Some True)) ] - location: 21 (remaining gas: 1039987.786 units remaining) - [ {} - (Pair { Elt "foo" 0 } (Some True)) ] + [ {} + (Pair { Elt "foo" 0 } (Some True)) ] - location: 23 (remaining gas: 1039987.771 units remaining) - [ (Pair {} { Elt "foo" 0 } (Some True)) ] + [ (Pair {} { Elt "foo" 0 } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" index 51ff7af99288..6a2472436bc7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039988.066 units remaining) - [ (Pair "bar" { Elt "foo" 1 } None) ] + [ (Pair "bar" { Elt "foo" 1 } None) ] - location: 12 (remaining gas: 1039988.056 units remaining) - [ "bar" - (Pair { Elt "foo" 1 } None) ] + [ "bar" + (Pair { Elt "foo" 1 } None) ] - location: 13 (remaining gas: 1039988.041 units remaining) - [ (Pair { Elt "foo" 1 } None) ] + [ (Pair { Elt "foo" 1 } None) ] - location: 15 (remaining gas: 1039988.031 units remaining) - [ { Elt "foo" 1 } ] + [ { Elt "foo" 1 } ] - location: 16 (remaining gas: 1039988.021 units remaining) - [ { Elt "foo" 1 } - { Elt "foo" 1 } ] + [ { Elt "foo" 1 } + { Elt "foo" 1 } ] - location: 13 (remaining gas: 1039987.991 units remaining) - [ "bar" - { Elt "foo" 1 } - { Elt "foo" 1 } ] + [ "bar" + { Elt "foo" 1 } + { Elt "foo" 1 } ] - location: 17 (remaining gas: 1039987.841 units remaining) - [ False - { Elt "foo" 1 } ] + [ False + { Elt "foo" 1 } ] - location: 18 (remaining gas: 1039987.826 units remaining) - [ (Some False) - { Elt "foo" 1 } ] + [ (Some False) + { Elt "foo" 1 } ] - location: 19 (remaining gas: 1039987.816 units remaining) - [ { Elt "foo" 1 } - (Some False) ] + [ { Elt "foo" 1 } + (Some False) ] - location: 20 (remaining gas: 1039987.801 units remaining) - [ (Pair { Elt "foo" 1 } (Some False)) ] + [ (Pair { Elt "foo" 1 } (Some False)) ] - location: 21 (remaining gas: 1039987.786 units remaining) - [ {} - (Pair { Elt "foo" 1 } (Some False)) ] + [ {} + (Pair { Elt "foo" 1 } (Some False)) ] - location: 23 (remaining gas: 1039987.771 units remaining) - [ (Pair {} { Elt "foo" 1 } (Some False)) ] + [ (Pair {} { Elt "foo" 1 } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" index 38000ca0768f..1747fa61361c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" @@ -8,35 +8,35 @@ big_map diff trace - location: 12 (remaining gas: 1039988.460 units remaining) - [ (Pair "bar" {} None) ] + [ (Pair "bar" {} None) ] - location: 12 (remaining gas: 1039988.450 units remaining) - [ "bar" - (Pair {} None) ] + [ "bar" + (Pair {} None) ] - location: 13 (remaining gas: 1039988.435 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] - location: 15 (remaining gas: 1039988.425 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039988.415 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039988.385 units remaining) - [ "bar" - {} - {} ] + [ "bar" + {} + {} ] - location: 17 (remaining gas: 1039988.270 units remaining) - [ False - {} ] + [ False + {} ] - location: 18 (remaining gas: 1039988.255 units remaining) - [ (Some False) - {} ] + [ (Some False) + {} ] - location: 19 (remaining gas: 1039988.245 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 20 (remaining gas: 1039988.230 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 21 (remaining gas: 1039988.215 units remaining) - [ {} - (Pair {} (Some False)) ] + [ {} + (Pair {} (Some False)) ] - location: 23 (remaining gas: 1039988.200 units remaining) - [ (Pair {} {} (Some False)) ] + [ (Pair {} {} (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" index ba3ede7a5493..bfe70cf6aa34 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ; .1da2c2c3fa.out" @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039991.503 units remaining) - [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } 111) ] + [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } 111) ] - location: 9 (remaining gas: 1039991.493 units remaining) - [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } ] + [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } ] - location: 10 (remaining gas: 1039991.478 units remaining) - [ 6 ] + [ 6 ] - location: 11 (remaining gas: 1039991.463 units remaining) - [ {} - 6 ] + [ {} + 6 ] - location: 13 (remaining gas: 1039991.448 units remaining) - [ (Pair {} 6) ] + [ (Pair {} 6) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" index 8310f15e2661..014289173791 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039993.290 units remaining) - [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ] + [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ] - location: 9 (remaining gas: 1039993.280 units remaining) - [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } ] + [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } ] - location: 10 (remaining gas: 1039993.265 units remaining) - [ 3 ] + [ 3 ] - location: 11 (remaining gas: 1039993.250 units remaining) - [ {} - 3 ] + [ {} + 3 ] - location: 13 (remaining gas: 1039993.235 units remaining) - [ (Pair {} 3) ] + [ (Pair {} 3) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" index 60c751d37f3a..2c18a9098385 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039994.318 units remaining) - [ (Pair { Elt "a" 1 } 111) ] + [ (Pair { Elt "a" 1 } 111) ] - location: 9 (remaining gas: 1039994.308 units remaining) - [ { Elt "a" 1 } ] + [ { Elt "a" 1 } ] - location: 10 (remaining gas: 1039994.293 units remaining) - [ 1 ] + [ 1 ] - location: 11 (remaining gas: 1039994.278 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 13 (remaining gas: 1039994.263 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out index 1fcc8b627c3d..33a295f6177a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 9 (remaining gas: 1039994.692 units remaining) - [ (Pair {} 111) ] + [ (Pair {} 111) ] - location: 9 (remaining gas: 1039994.682 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039994.667 units remaining) - [ 0 ] + [ 0 ] - location: 11 (remaining gas: 1039994.652 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 13 (remaining gas: 1039994.637 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out index 5d345cdc2f69..256307a9aa96 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out @@ -8,124 +8,124 @@ big_map diff trace - location: 7 (remaining gas: 1039944.576 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039944.566 units remaining) - [ Unit ] + [ Unit ] - location: 8 (remaining gas: 1039944.556 units remaining) [ ] - location: 9 (remaining gas: 1039944.546 units remaining) - [ 7987 ] + [ 7987 ] - location: 12 (remaining gas: 1039944.536 units remaining) - [ 10 - 7987 ] + [ 10 + 7987 ] - location: 15 (remaining gas: 1039944.536 units remaining) - [ 79870 ] + [ 79870 ] - location: 16 (remaining gas: 1039944.526 units remaining) - [ 79870 - 79870 ] + [ 79870 + 79870 ] - location: 19 (remaining gas: 1039944.491 units remaining) - [ 0 ] + [ 0 ] - location: 21 (remaining gas: 1039944.476 units remaining) - [ True ] + [ True ] - location: 22 (remaining gas: 1039944.466 units remaining) [ ] - location: 22 (remaining gas: 1039944.451 units remaining) [ ] - location: 28 (remaining gas: 1039944.441 units remaining) - [ 10 ] + [ 10 ] - location: 31 (remaining gas: 1039944.431 units remaining) - [ 7987 - 10 ] + [ 7987 + 10 ] - location: 34 (remaining gas: 1039944.431 units remaining) - [ 79870 ] + [ 79870 ] - location: 35 (remaining gas: 1039944.421 units remaining) - [ 79870 - 79870 ] + [ 79870 + 79870 ] - location: 38 (remaining gas: 1039944.386 units remaining) - [ 0 ] + [ 0 ] - location: 40 (remaining gas: 1039944.371 units remaining) - [ True ] + [ True ] - location: 41 (remaining gas: 1039944.361 units remaining) [ ] - location: 41 (remaining gas: 1039944.346 units remaining) [ ] - location: 47 (remaining gas: 1039944.336 units remaining) - [ 10 ] + [ 10 ] - location: 50 (remaining gas: 1039944.326 units remaining) - [ -7987 - 10 ] + [ -7987 + 10 ] - location: 53 (remaining gas: 1039944.220 units remaining) - [ -79870 ] + [ -79870 ] - location: 54 (remaining gas: 1039944.210 units remaining) - [ -79870 - -79870 ] + [ -79870 + -79870 ] - location: 57 (remaining gas: 1039944.175 units remaining) - [ 0 ] + [ 0 ] - location: 59 (remaining gas: 1039944.160 units remaining) - [ True ] + [ True ] - location: 60 (remaining gas: 1039944.150 units remaining) [ ] - location: 60 (remaining gas: 1039944.135 units remaining) [ ] - location: 66 (remaining gas: 1039944.125 units remaining) - [ 10 ] + [ 10 ] - location: 69 (remaining gas: 1039944.115 units remaining) - [ -7987 - 10 ] + [ -7987 + 10 ] - location: 72 (remaining gas: 1039944.009 units remaining) - [ -79870 ] + [ -79870 ] - location: 73 (remaining gas: 1039943.999 units remaining) - [ -79870 - -79870 ] + [ -79870 + -79870 ] - location: 76 (remaining gas: 1039943.964 units remaining) - [ 0 ] + [ 0 ] - location: 78 (remaining gas: 1039943.949 units remaining) - [ True ] + [ True ] - location: 79 (remaining gas: 1039943.939 units remaining) [ ] - location: 79 (remaining gas: 1039943.924 units remaining) [ ] - location: 85 (remaining gas: 1039943.914 units remaining) - [ -10 ] + [ -10 ] - location: 88 (remaining gas: 1039943.904 units remaining) - [ 7987 - -10 ] + [ 7987 + -10 ] - location: 91 (remaining gas: 1039943.798 units remaining) - [ -79870 ] + [ -79870 ] - location: 92 (remaining gas: 1039943.788 units remaining) - [ -79870 - -79870 ] + [ -79870 + -79870 ] - location: 95 (remaining gas: 1039943.753 units remaining) - [ 0 ] + [ 0 ] - location: 97 (remaining gas: 1039943.738 units remaining) - [ True ] + [ True ] - location: 98 (remaining gas: 1039943.728 units remaining) [ ] - location: 98 (remaining gas: 1039943.713 units remaining) [ ] - location: 104 (remaining gas: 1039943.703 units remaining) - [ 10 ] + [ 10 ] - location: 107 (remaining gas: 1039943.693 units remaining) - [ 7987 - 10 ] + [ 7987 + 10 ] - location: 110 (remaining gas: 1039943.587 units remaining) - [ 79870 ] + [ 79870 ] - location: 111 (remaining gas: 1039943.577 units remaining) - [ 79870 - 79870 ] + [ 79870 + 79870 ] - location: 114 (remaining gas: 1039943.542 units remaining) - [ 0 ] + [ 0 ] - location: 116 (remaining gas: 1039943.527 units remaining) - [ True ] + [ True ] - location: 117 (remaining gas: 1039943.517 units remaining) [ ] - location: 117 (remaining gas: 1039943.502 units remaining) [ ] - location: 123 (remaining gas: 1039943.492 units remaining) - [ Unit ] + [ Unit ] - location: 124 (remaining gas: 1039943.477 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 126 (remaining gas: 1039943.462 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out index b106914476bc..6192d4f1bf13 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out @@ -8,31 +8,31 @@ big_map diff trace - location: 7 (remaining gas: 1039987.713 units remaining) - [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039987.703 units remaining) - [ 257 ] + [ 257 ] - location: 8 (remaining gas: 1039987.693 units remaining) - [ 1 - 257 ] + [ 1 + 257 ] - location: 11 (remaining gas: 1039987.683 units remaining) - [ 257 - 1 ] + [ 257 + 1 ] - location: 12 (remaining gas: 1039987.543 units remaining) - [ (Some (Pair 257 0)) ] + [ (Some (Pair 257 0)) ] - location: 14 (remaining gas: 1039987.533 units remaining) - [ (Pair 257 0) ] + [ (Pair 257 0) ] - location: 14 (remaining gas: 1039987.518 units remaining) - [ (Pair 257 0) ] + [ (Pair 257 0) ] - location: 20 (remaining gas: 1039987.508 units remaining) - [ 257 ] + [ 257 ] - location: 21 (remaining gas: 1039987.498 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 257 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 257 ] - location: 24 (remaining gas: 1039987.166 units remaining) - [ 0x0101000000000000000000000000000000000000000000000000000000000000 ] + [ 0x0101000000000000000000000000000000000000000000000000000000000000 ] - location: 25 (remaining gas: 1039987.151 units remaining) - [ {} - 0x0101000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x0101000000000000000000000000000000000000000000000000000000000000 ] - location: 27 (remaining gas: 1039987.136 units remaining) - [ (Pair {} 0x0101000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x0101000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out index 18773f0bd250..56e069daa229 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out @@ -8,31 +8,31 @@ big_map diff trace - location: 7 (remaining gas: 1039987.713 units remaining) - [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039987.703 units remaining) - [ 16 ] + [ 16 ] - location: 8 (remaining gas: 1039987.693 units remaining) - [ 1 - 16 ] + [ 1 + 16 ] - location: 11 (remaining gas: 1039987.683 units remaining) - [ 16 - 1 ] + [ 16 + 1 ] - location: 12 (remaining gas: 1039987.543 units remaining) - [ (Some (Pair 16 0)) ] + [ (Some (Pair 16 0)) ] - location: 14 (remaining gas: 1039987.533 units remaining) - [ (Pair 16 0) ] + [ (Pair 16 0) ] - location: 14 (remaining gas: 1039987.518 units remaining) - [ (Pair 16 0) ] + [ (Pair 16 0) ] - location: 20 (remaining gas: 1039987.508 units remaining) - [ 16 ] + [ 16 ] - location: 21 (remaining gas: 1039987.498 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 - 16 ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 16 ] - location: 24 (remaining gas: 1039987.167 units remaining) - [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] + [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - location: 25 (remaining gas: 1039987.152 units remaining) - [ {} - 0x1000000000000000000000000000000000000000000000000000000000000000 ] + [ {} + 0x1000000000000000000000000000000000000000000000000000000000000000 ] - location: 27 (remaining gas: 1039987.137 units remaining) - [ (Pair {} 0x1000000000000000000000000000000000000000000000000000000000000000) ] + [ (Pair {} 0x1000000000000000000000000000000000000000000000000000000000000000) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out index 8c176e5f2eb5..b7bcb1bd13c4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out @@ -8,18 +8,18 @@ big_map diff trace - location: 9 (remaining gas: 1039992.641 units remaining) - [ (Pair (Left -2) 0) ] + [ (Pair (Left -2) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Left -2) ] + [ (Left -2) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ -2 ] + [ -2 ] - location: 12 (remaining gas: 1039992.581 units remaining) - [ 2 ] + [ 2 ] - location: 10 (remaining gas: 1039992.566 units remaining) - [ 2 ] + [ 2 ] - location: 15 (remaining gas: 1039992.551 units remaining) - [ {} - 2 ] + [ {} + 2 ] - location: 17 (remaining gas: 1039992.536 units remaining) - [ (Pair {} 2) ] + [ (Pair {} 2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out index 6fa2b91327e0..e920ea30d1ed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out @@ -8,18 +8,18 @@ big_map diff trace - location: 9 (remaining gas: 1039992.641 units remaining) - [ (Pair (Left 0) 0) ] + [ (Pair (Left 0) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Left 0) ] + [ (Left 0) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 0 ] + [ 0 ] - location: 12 (remaining gas: 1039992.581 units remaining) - [ 0 ] + [ 0 ] - location: 10 (remaining gas: 1039992.566 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039992.551 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 17 (remaining gas: 1039992.536 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out index 067fdeb43910..0e2abe480443 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out @@ -8,18 +8,18 @@ big_map diff trace - location: 9 (remaining gas: 1039992.641 units remaining) - [ (Pair (Left 2) 0) ] + [ (Pair (Left 2) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Left 2) ] + [ (Left 2) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 2 ] + [ 2 ] - location: 12 (remaining gas: 1039992.581 units remaining) - [ -2 ] + [ -2 ] - location: 10 (remaining gas: 1039992.566 units remaining) - [ -2 ] + [ -2 ] - location: 15 (remaining gas: 1039992.551 units remaining) - [ {} - -2 ] + [ {} + -2 ] - location: 17 (remaining gas: 1039992.536 units remaining) - [ (Pair {} -2) ] + [ (Pair {} -2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out index 046d77c81096..41e4517b3fd8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out @@ -8,18 +8,18 @@ big_map diff trace - location: 9 (remaining gas: 1039992.641 units remaining) - [ (Pair (Right 0) 0) ] + [ (Pair (Right 0) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Right 0) ] + [ (Right 0) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 0 ] + [ 0 ] - location: 14 (remaining gas: 1039992.581 units remaining) - [ 0 ] + [ 0 ] - location: 10 (remaining gas: 1039992.566 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039992.551 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 17 (remaining gas: 1039992.536 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out index 131c8218a598..a86d80d254a5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out @@ -8,18 +8,18 @@ big_map diff trace - location: 9 (remaining gas: 1039992.641 units remaining) - [ (Pair (Right 2) 0) ] + [ (Pair (Right 2) 0) ] - location: 9 (remaining gas: 1039992.631 units remaining) - [ (Right 2) ] + [ (Right 2) ] - location: 10 (remaining gas: 1039992.621 units remaining) - [ 2 ] + [ 2 ] - location: 14 (remaining gas: 1039992.581 units remaining) - [ -2 ] + [ -2 ] - location: 10 (remaining gas: 1039992.566 units remaining) - [ -2 ] + [ -2 ] - location: 15 (remaining gas: 1039992.551 units remaining) - [ {} - -2 ] + [ {} + -2 ] - location: 17 (remaining gas: 1039992.536 units remaining) - [ (Pair {} -2) ] + [ (Pair {} -2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out index dcaa6f03e1b2..47adcfb5b6df 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.327 units remaining) - [ (Pair Unit (Some 10)) ] + [ (Pair Unit (Some 10)) ] - location: 8 (remaining gas: 1039994.317 units remaining) [ ] - location: 9 (remaining gas: 1039994.302 units remaining) - [ None ] + [ None ] - location: 11 (remaining gas: 1039994.287 units remaining) - [ {} - None ] + [ {} + None ] - location: 13 (remaining gas: 1039994.272 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out index 705a78df93be..5db82f3f26e3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair False None) ] + [ (Pair False None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ False ] + [ False ] - location: 9 (remaining gas: 1039993.937 units remaining) - [ True ] + [ True ] - location: 10 (remaining gas: 1039993.922 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 11 (remaining gas: 1039993.907 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 13 (remaining gas: 1039993.892 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out index f1a2055b36b8..02d7b0a455c1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair True None) ] + [ (Pair True None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ True ] + [ True ] - location: 9 (remaining gas: 1039993.937 units remaining) - [ False ] + [ False ] - location: 10 (remaining gas: 1039993.922 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 11 (remaining gas: 1039993.907 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 13 (remaining gas: 1039993.892 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out index 027bc9dd1389..236d7e4647f1 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Left -8) None) ] + [ (Pair (Left -8) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left -8) ] + [ (Left -8) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ -8 ] + [ -8 ] - location: 13 (remaining gas: 1039991.570 units remaining) - [ 7 ] + [ 7 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ 7 ] + [ 7 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some 7) ] + [ (Some 7) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some 7) ] + [ {} + (Some 7) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some 7)) ] + [ (Pair {} (Some 7)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out index 5c977428a71c..b86d5364e840 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Left -9) None) ] + [ (Pair (Left -9) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left -9) ] + [ (Left -9) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ -9 ] + [ -9 ] - location: 13 (remaining gas: 1039991.570 units remaining) - [ 8 ] + [ 8 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ 8 ] + [ 8 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some 8) ] + [ (Some 8) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some 8) ] + [ {} + (Some 8) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some 8)) ] + [ (Pair {} (Some 8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out index e1063d1d8dce..335c27f4e031 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Left 0) None) ] + [ (Pair (Left 0) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left 0) ] + [ (Left 0) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 0 ] + [ 0 ] - location: 13 (remaining gas: 1039991.570 units remaining) - [ -1 ] + [ -1 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ -1 ] + [ -1 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some -1) ] + [ (Some -1) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some -1) ] + [ {} + (Some -1) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some -1)) ] + [ (Pair {} (Some -1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out index fc0b8aaed267..f6450b7e6797 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Left 7) None) ] + [ (Pair (Left 7) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left 7) ] + [ (Left 7) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 7 ] + [ 7 ] - location: 13 (remaining gas: 1039991.570 units remaining) - [ -8 ] + [ -8 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ -8 ] + [ -8 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some -8) ] + [ (Some -8) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some -8) ] + [ {} + (Some -8) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some -8)) ] + [ (Pair {} (Some -8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out index 69b10e9314e0..e9f9849226ae 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Left 8) None) ] + [ (Pair (Left 8) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Left 8) ] + [ (Left 8) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 8 ] + [ 8 ] - location: 13 (remaining gas: 1039991.570 units remaining) - [ -9 ] + [ -9 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ -9 ] + [ -9 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some -9) ] + [ (Some -9) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some -9) ] + [ {} + (Some -9) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some -9)) ] + [ (Pair {} (Some -9)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out index 46a79e7f2bd4..cc26e4c6929e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Right 0) None) ] + [ (Pair (Right 0) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Right 0) ] + [ (Right 0) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039991.570 units remaining) - [ -1 ] + [ -1 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ -1 ] + [ -1 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some -1) ] + [ (Some -1) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some -1) ] + [ {} + (Some -1) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some -1)) ] + [ (Pair {} (Some -1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out index b8df3be05003..0f59b809125d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Right 7) None) ] + [ (Pair (Right 7) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Right 7) ] + [ (Right 7) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 7 ] + [ 7 ] - location: 15 (remaining gas: 1039991.570 units remaining) - [ -8 ] + [ -8 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ -8 ] + [ -8 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some -8) ] + [ (Some -8) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some -8) ] + [ {} + (Some -8) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some -8)) ] + [ (Pair {} (Some -8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out index 22b4db9f10a1..91239643b8c3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out @@ -8,20 +8,20 @@ big_map diff trace - location: 10 (remaining gas: 1039991.640 units remaining) - [ (Pair (Right 8) None) ] + [ (Pair (Right 8) None) ] - location: 10 (remaining gas: 1039991.630 units remaining) - [ (Right 8) ] + [ (Right 8) ] - location: 11 (remaining gas: 1039991.620 units remaining) - [ 8 ] + [ 8 ] - location: 15 (remaining gas: 1039991.570 units remaining) - [ -9 ] + [ -9 ] - location: 11 (remaining gas: 1039991.555 units remaining) - [ -9 ] + [ -9 ] - location: 16 (remaining gas: 1039991.540 units remaining) - [ (Some -9) ] + [ (Some -9) ] - location: 17 (remaining gas: 1039991.525 units remaining) - [ {} - (Some -9) ] + [ {} + (Some -9) ] - location: 19 (remaining gas: 1039991.510 units remaining) - [ (Pair {} (Some -9)) ] + [ (Pair {} (Some -9)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out index 504a0a83784f..d55e810c3130 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out @@ -8,28 +8,28 @@ big_map diff trace - location: 10 (remaining gas: 1039990.715 units remaining) - [ (Pair (Pair False False) None) ] + [ (Pair (Pair False False) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair False False) ] + [ (Pair False False) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair False False) - (Pair False False) ] + [ (Pair False False) + (Pair False False) ] - location: 12 (remaining gas: 1039990.685 units remaining) - [ False - (Pair False False) ] + [ False + (Pair False False) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair False False) - False ] + [ (Pair False False) + False ] - location: 14 (remaining gas: 1039990.665 units remaining) - [ False - False ] + [ False + False ] - location: 15 (remaining gas: 1039990.650 units remaining) - [ False ] + [ False ] - location: 16 (remaining gas: 1039990.635 units remaining) - [ (Some False) ] + [ (Some False) ] - location: 17 (remaining gas: 1039990.620 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 19 (remaining gas: 1039990.605 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out index a69727294757..7d17223ca924 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out @@ -8,28 +8,28 @@ big_map diff trace - location: 10 (remaining gas: 1039990.715 units remaining) - [ (Pair (Pair False True) None) ] + [ (Pair (Pair False True) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair False True) ] + [ (Pair False True) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair False True) - (Pair False True) ] + [ (Pair False True) + (Pair False True) ] - location: 12 (remaining gas: 1039990.685 units remaining) - [ False - (Pair False True) ] + [ False + (Pair False True) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair False True) - False ] + [ (Pair False True) + False ] - location: 14 (remaining gas: 1039990.665 units remaining) - [ True - False ] + [ True + False ] - location: 15 (remaining gas: 1039990.650 units remaining) - [ True ] + [ True ] - location: 16 (remaining gas: 1039990.635 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 17 (remaining gas: 1039990.620 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 19 (remaining gas: 1039990.605 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out index a648b4357548..81cc0bf90dad 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out @@ -8,28 +8,28 @@ big_map diff trace - location: 10 (remaining gas: 1039990.715 units remaining) - [ (Pair (Pair True False) None) ] + [ (Pair (Pair True False) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair True False) ] + [ (Pair True False) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair True False) - (Pair True False) ] + [ (Pair True False) + (Pair True False) ] - location: 12 (remaining gas: 1039990.685 units remaining) - [ True - (Pair True False) ] + [ True + (Pair True False) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair True False) - True ] + [ (Pair True False) + True ] - location: 14 (remaining gas: 1039990.665 units remaining) - [ False - True ] + [ False + True ] - location: 15 (remaining gas: 1039990.650 units remaining) - [ True ] + [ True ] - location: 16 (remaining gas: 1039990.635 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 17 (remaining gas: 1039990.620 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 19 (remaining gas: 1039990.605 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out index 7bc0539caeea..50735e670ce9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out @@ -8,28 +8,28 @@ big_map diff trace - location: 10 (remaining gas: 1039990.715 units remaining) - [ (Pair (Pair True True) None) ] + [ (Pair (Pair True True) None) ] - location: 10 (remaining gas: 1039990.705 units remaining) - [ (Pair True True) ] + [ (Pair True True) ] - location: 11 (remaining gas: 1039990.695 units remaining) - [ (Pair True True) - (Pair True True) ] + [ (Pair True True) + (Pair True True) ] - location: 12 (remaining gas: 1039990.685 units remaining) - [ True - (Pair True True) ] + [ True + (Pair True True) ] - location: 13 (remaining gas: 1039990.675 units remaining) - [ (Pair True True) - True ] + [ (Pair True True) + True ] - location: 14 (remaining gas: 1039990.665 units remaining) - [ True - True ] + [ True + True ] - location: 15 (remaining gas: 1039990.650 units remaining) - [ True ] + [ True ] - location: 16 (remaining gas: 1039990.635 units remaining) - [ (Some True) ] + [ (Some True) ] - location: 17 (remaining gas: 1039990.620 units remaining) - [ {} - (Some True) ] + [ {} + (Some True) ] - location: 19 (remaining gas: 1039990.605 units remaining) - [ (Pair {} (Some True)) ] + [ (Pair {} (Some True)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out index ab5913c76c8b..1e36e297499d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out @@ -8,19 +8,19 @@ big_map diff trace - location: 10 (remaining gas: 1039992.824 units remaining) - [ (Pair (Pair 0 8) None) ] + [ (Pair (Pair 0 8) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 0 8) ] + [ (Pair 0 8) ] - location: 11 (remaining gas: 1039992.804 units remaining) - [ 0 - 8 ] + [ 0 + 8 ] - location: 12 (remaining gas: 1039992.749 units remaining) - [ 8 ] + [ 8 ] - location: 13 (remaining gas: 1039992.734 units remaining) - [ (Some 8) ] + [ (Some 8) ] - location: 14 (remaining gas: 1039992.719 units remaining) - [ {} - (Some 8) ] + [ {} + (Some 8) ] - location: 16 (remaining gas: 1039992.704 units remaining) - [ (Pair {} (Some 8)) ] + [ (Pair {} (Some 8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out index 6490633766f3..080987a3a6ba 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out @@ -8,19 +8,19 @@ big_map diff trace - location: 10 (remaining gas: 1039992.824 units remaining) - [ (Pair (Pair 14 1) None) ] + [ (Pair (Pair 14 1) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 14 1) ] + [ (Pair 14 1) ] - location: 11 (remaining gas: 1039992.804 units remaining) - [ 14 - 1 ] + [ 14 + 1 ] - location: 12 (remaining gas: 1039992.749 units remaining) - [ 15 ] + [ 15 ] - location: 13 (remaining gas: 1039992.734 units remaining) - [ (Some 15) ] + [ (Some 15) ] - location: 14 (remaining gas: 1039992.719 units remaining) - [ {} - (Some 15) ] + [ {} + (Some 15) ] - location: 16 (remaining gas: 1039992.704 units remaining) - [ (Pair {} (Some 15)) ] + [ (Pair {} (Some 15)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out index 49bf8f478395..0fdfdbc56b7d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out @@ -8,19 +8,19 @@ big_map diff trace - location: 10 (remaining gas: 1039992.824 units remaining) - [ (Pair (Pair 15 4) None) ] + [ (Pair (Pair 15 4) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 15 4) ] + [ (Pair 15 4) ] - location: 11 (remaining gas: 1039992.804 units remaining) - [ 15 - 4 ] + [ 15 + 4 ] - location: 12 (remaining gas: 1039992.749 units remaining) - [ 15 ] + [ 15 ] - location: 13 (remaining gas: 1039992.734 units remaining) - [ (Some 15) ] + [ (Some 15) ] - location: 14 (remaining gas: 1039992.719 units remaining) - [ {} - (Some 15) ] + [ {} + (Some 15) ] - location: 16 (remaining gas: 1039992.704 units remaining) - [ (Pair {} (Some 15)) ] + [ (Pair {} (Some 15)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out index a0ad9e92ed6e..b1617f9c8d9f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out @@ -8,19 +8,19 @@ big_map diff trace - location: 10 (remaining gas: 1039992.824 units remaining) - [ (Pair (Pair 4 8) None) ] + [ (Pair (Pair 4 8) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 4 8) ] + [ (Pair 4 8) ] - location: 11 (remaining gas: 1039992.804 units remaining) - [ 4 - 8 ] + [ 4 + 8 ] - location: 12 (remaining gas: 1039992.749 units remaining) - [ 12 ] + [ 12 ] - location: 13 (remaining gas: 1039992.734 units remaining) - [ (Some 12) ] + [ (Some 12) ] - location: 14 (remaining gas: 1039992.719 units remaining) - [ {} - (Some 12) ] + [ {} + (Some 12) ] - location: 16 (remaining gas: 1039992.704 units remaining) - [ (Pair {} (Some 12)) ] + [ (Pair {} (Some 12)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out index 4a6a9901361c..1d631c0f25bc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out @@ -8,19 +8,19 @@ big_map diff trace - location: 10 (remaining gas: 1039992.824 units remaining) - [ (Pair (Pair 7 7) None) ] + [ (Pair (Pair 7 7) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 7 7) ] + [ (Pair 7 7) ] - location: 11 (remaining gas: 1039992.804 units remaining) - [ 7 - 7 ] + [ 7 + 7 ] - location: 12 (remaining gas: 1039992.749 units remaining) - [ 7 ] + [ 7 ] - location: 13 (remaining gas: 1039992.734 units remaining) - [ (Some 7) ] + [ (Some 7) ] - location: 14 (remaining gas: 1039992.719 units remaining) - [ {} - (Some 7) ] + [ {} + (Some 7) ] - location: 16 (remaining gas: 1039992.704 units remaining) - [ (Pair {} (Some 7)) ] + [ (Pair {} (Some 7)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out index e8f565308a2a..c2afc7fa249a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out @@ -8,19 +8,19 @@ big_map diff trace - location: 10 (remaining gas: 1039992.824 units remaining) - [ (Pair (Pair 8 0) None) ] + [ (Pair (Pair 8 0) None) ] - location: 10 (remaining gas: 1039992.814 units remaining) - [ (Pair 8 0) ] + [ (Pair 8 0) ] - location: 11 (remaining gas: 1039992.804 units remaining) - [ 8 - 0 ] + [ 8 + 0 ] - location: 12 (remaining gas: 1039992.749 units remaining) - [ 8 ] + [ 8 ] - location: 13 (remaining gas: 1039992.734 units remaining) - [ (Some 8) ] + [ (Some 8) ] - location: 14 (remaining gas: 1039992.719 units remaining) - [ {} - (Some 8) ] + [ {} + (Some 8) ] - location: 16 (remaining gas: 1039992.704 units remaining) - [ (Pair {} (Some 8)) ] + [ (Pair {} (Some 8)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" index 0c1780cfa0cf..d5ff5550e326 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".368bdfd73a.out" @@ -17,7 +17,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - Unit) ] + Unit) ] - location: 16 (remaining gas: 1039185.295 units remaining) [ (Pair -1 1 @@ -27,7 +27,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 17 (remaining gas: 1039185.285 units remaining) [ (Pair -1 1 @@ -37,7 +37,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair -1 1 "foobar" @@ -46,9 +46,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 18 (remaining gas: 1039185.275 units remaining) - [ -1 + [ -1 (Pair -1 1 "foobar" @@ -57,7 +57,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 19 (remaining gas: 1039185.260 units remaining) [ (Pair -1 1 @@ -67,9 +67,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 21 (remaining gas: 1039185.250 units remaining) - [ -1 + [ -1 (Pair 1 "foobar" 0x00aabbcc @@ -77,10 +77,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 19 (remaining gas: 1039185.220 units remaining) - [ -1 - -1 + [ -1 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -88,10 +88,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 22 (remaining gas: 1039184.993 units remaining) - [ 0x050041 - -1 + [ 0x050041 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -99,10 +99,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 23 (remaining gas: 1039184.573 units remaining) - [ (Some -1) - -1 + [ (Some -1) + -1 (Pair 1 "foobar" 0x00aabbcc @@ -110,10 +110,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.563 units remaining) - [ -1 - -1 + [ -1 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -121,10 +121,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.548 units remaining) - [ -1 - -1 + [ -1 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -132,9 +132,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 34 (remaining gas: 1039184.513 units remaining) - [ 0 + [ 0 (Pair 1 "foobar" 0x00aabbcc @@ -142,9 +142,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 35 (remaining gas: 1039184.498 units remaining) - [ True + [ True (Pair 1 "foobar" 0x00aabbcc @@ -152,7 +152,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 36 (remaining gas: 1039184.488 units remaining) [ (Pair 1 "foobar" @@ -161,7 +161,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 36 (remaining gas: 1039184.473 units remaining) [ (Pair 1 "foobar" @@ -170,7 +170,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 42 (remaining gas: 1039184.463 units remaining) [ (Pair 1 "foobar" @@ -179,7 +179,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair 1 "foobar" 0x00aabbcc @@ -187,9 +187,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 43 (remaining gas: 1039184.453 units remaining) - [ 1 + [ 1 (Pair 1 "foobar" 0x00aabbcc @@ -197,7 +197,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 44 (remaining gas: 1039184.438 units remaining) [ (Pair 1 "foobar" @@ -206,84 +206,84 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 46 (remaining gas: 1039184.428 units remaining) - [ 1 + [ 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 44 (remaining gas: 1039184.398 units remaining) - [ 1 - 1 + [ 1 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 47 (remaining gas: 1039184.171 units remaining) - [ 0x050001 - 1 + [ 0x050001 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 48 (remaining gas: 1039183.751 units remaining) - [ (Some 1) - 1 + [ (Some 1) + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.741 units remaining) - [ 1 - 1 + [ 1 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.726 units remaining) - [ 1 - 1 + [ 1 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 59 (remaining gas: 1039183.691 units remaining) - [ 0 + [ 0 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 60 (remaining gas: 1039183.676 units remaining) - [ True + [ True (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 61 (remaining gas: 1039183.666 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -291,7 +291,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 61 (remaining gas: 1039183.651 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -299,7 +299,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 67 (remaining gas: 1039183.641 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -307,23 +307,23 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 68 (remaining gas: 1039183.631 units remaining) - [ "foobar" + [ "foobar" (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 69 (remaining gas: 1039183.616 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -331,515 +331,515 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 71 (remaining gas: 1039183.606 units remaining) - [ "foobar" + [ "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 69 (remaining gas: 1039183.576 units remaining) - [ "foobar" - "foobar" + [ "foobar" + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 72 (remaining gas: 1039183.052 units remaining) - [ 0x050100000006666f6f626172 - "foobar" + [ 0x050100000006666f6f626172 + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 73 (remaining gas: 1039182.377 units remaining) - [ (Some "foobar") - "foobar" + [ (Some "foobar") + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.367 units remaining) - [ "foobar" - "foobar" + [ "foobar" + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.352 units remaining) - [ "foobar" - "foobar" + [ "foobar" + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 84 (remaining gas: 1039182.317 units remaining) - [ 0 + [ 0 (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 85 (remaining gas: 1039182.302 units remaining) - [ True + [ True (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 86 (remaining gas: 1039182.292 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 86 (remaining gas: 1039182.277 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 92 (remaining gas: 1039182.267 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 93 (remaining gas: 1039182.257 units remaining) - [ 0x00aabbcc + [ 0x00aabbcc (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 94 (remaining gas: 1039182.242 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 96 (remaining gas: 1039182.232 units remaining) - [ 0x00aabbcc + [ 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 94 (remaining gas: 1039182.202 units remaining) - [ 0x00aabbcc - 0x00aabbcc + [ 0x00aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 97 (remaining gas: 1039181.744 units remaining) - [ 0x050a0000000400aabbcc - 0x00aabbcc + [ 0x050a0000000400aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 98 (remaining gas: 1039181.183 units remaining) - [ (Some 0x00aabbcc) - 0x00aabbcc + [ (Some 0x00aabbcc) + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.173 units remaining) - [ 0x00aabbcc - 0x00aabbcc + [ 0x00aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.158 units remaining) - [ 0x00aabbcc - 0x00aabbcc + [ 0x00aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 109 (remaining gas: 1039181.123 units remaining) - [ 0 + [ 0 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 110 (remaining gas: 1039181.108 units remaining) - [ True + [ True (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 111 (remaining gas: 1039181.098 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 111 (remaining gas: 1039181.083 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 117 (remaining gas: 1039181.073 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 118 (remaining gas: 1039181.063 units remaining) - [ 1000 + [ 1000 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 119 (remaining gas: 1039181.048 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 121 (remaining gas: 1039181.038 units remaining) - [ 1000 + [ 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 119 (remaining gas: 1039181.008 units remaining) - [ 1000 - 1000 + [ 1000 + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 122 (remaining gas: 1039180.748 units remaining) - [ 0x0500a80f - 1000 + [ 0x0500a80f + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 123 (remaining gas: 1039180.308 units remaining) - [ (Some 1000) - 1000 + [ (Some 1000) + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.298 units remaining) - [ 1000 - 1000 + [ 1000 + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.283 units remaining) - [ 1000 - 1000 + [ 1000 + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 134 (remaining gas: 1039180.248 units remaining) - [ 0 + [ 0 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 135 (remaining gas: 1039180.233 units remaining) - [ True + [ True (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 136 (remaining gas: 1039180.223 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 136 (remaining gas: 1039180.208 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 142 (remaining gas: 1039180.198 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 143 (remaining gas: 1039180.188 units remaining) - [ False + [ False (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 144 (remaining gas: 1039180.173 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 146 (remaining gas: 1039180.163 units remaining) - [ False + [ False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 144 (remaining gas: 1039180.133 units remaining) - [ False - False + [ False + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 147 (remaining gas: 1039179.906 units remaining) - [ 0x050303 - False + [ 0x050303 + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 148 (remaining gas: 1039179.486 units remaining) - [ (Some False) - False + [ (Some False) + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.476 units remaining) - [ False - False + [ False + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.461 units remaining) - [ False - False + [ False + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 159 (remaining gas: 1039179.426 units remaining) - [ 0 + [ 0 (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 160 (remaining gas: 1039179.411 units remaining) - [ True + [ True (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 161 (remaining gas: 1039179.401 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 161 (remaining gas: 1039179.386 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 167 (remaining gas: 1039179.376 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 168 (remaining gas: 1039179.366 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 169 (remaining gas: 1039179.351 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 171 (remaining gas: 1039179.341 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 169 (remaining gas: 1039179.311 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 172 (remaining gas: 1039178.221 units remaining) - [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 173 (remaining gas: 1039177.268 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.258 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.243 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 184 (remaining gas: 1039177.207 units remaining) - [ 0 - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ 0 + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 185 (remaining gas: 1039177.192 units remaining) - [ True - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ True + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 186 (remaining gas: 1039177.182 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 186 (remaining gas: 1039177.167 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 192 (remaining gas: 1039177.157 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 193 (remaining gas: 1039177.147 units remaining) - [ "2019-09-09T08:35:33Z" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "2019-09-09T08:35:33Z" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 194 (remaining gas: 1039177.132 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 196 (remaining gas: 1039177.122 units remaining) - [ "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 194 (remaining gas: 1039177.092 units remaining) - [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 197 (remaining gas: 1039176.733 units remaining) - [ 0x050095bbb0d70b - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ 0x050095bbb0d70b + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 198 (remaining gas: 1039176.233 units remaining) - [ (Some "2019-09-09T08:35:33Z") - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ (Some "2019-09-09T08:35:33Z") + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.223 units remaining) - [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.208 units remaining) - [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 209 (remaining gas: 1039176.173 units remaining) - [ 0 - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ 0 + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 210 (remaining gas: 1039176.158 units remaining) - [ True - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ True + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 211 (remaining gas: 1039176.148 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 211 (remaining gas: 1039176.133 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 217 (remaining gas: 1039176.123 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 218 (remaining gas: 1039165.170 units remaining) - [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 219 (remaining gas: 1038514.247 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.237 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.222 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 230 (remaining gas: 1038514.186 units remaining) - [ 0 ] + [ 0 ] - location: 231 (remaining gas: 1038514.171 units remaining) - [ True ] + [ True ] - location: 232 (remaining gas: 1038514.161 units remaining) [ ] - location: 232 (remaining gas: 1038514.146 units remaining) [ ] - location: 238 (remaining gas: 1038514.136 units remaining) - [ 0 ] + [ 0 ] - location: 241 (remaining gas: 1038513.909 units remaining) - [ 0x050000 ] + [ 0x050000 ] - location: 242 (remaining gas: 1038513.489 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 245 (remaining gas: 1038513.479 units remaining) - [ 0 ] + [ 0 ] - location: 245 (remaining gas: 1038513.464 units remaining) - [ 0 ] + [ 0 ] - location: 251 (remaining gas: 1038513.454 units remaining) [ ] - location: 252 (remaining gas: 1038513.444 units remaining) - [ -1 ] + [ -1 ] - location: 255 (remaining gas: 1038513.217 units remaining) - [ 0x050041 ] + [ 0x050041 ] - location: 256 (remaining gas: 1038416.897 units remaining) - [ None ] + [ None ] - location: 259 (remaining gas: 1038416.887 units remaining) [ ] - location: 259 (remaining gas: 1038416.872 units remaining) [ ] - location: 265 (remaining gas: 1038416.862 units remaining) - [ 0x ] + [ 0x ] - location: 268 (remaining gas: 1038416.602 units remaining) - [ None ] + [ None ] - location: 271 (remaining gas: 1038416.592 units remaining) [ ] - location: 271 (remaining gas: 1038416.577 units remaining) [ ] - location: 277 (remaining gas: 1038416.567 units remaining) - [ 0x04 ] + [ 0x04 ] - location: 280 (remaining gas: 1038416.287 units remaining) - [ None ] + [ None ] - location: 283 (remaining gas: 1038416.277 units remaining) [ ] - location: 283 (remaining gas: 1038416.262 units remaining) [ ] - location: 289 (remaining gas: 1038416.252 units remaining) - [ 0x05 ] + [ 0x05 ] - location: 292 (remaining gas: 1038415.972 units remaining) - [ None ] + [ None ] - location: 295 (remaining gas: 1038415.962 units remaining) [ ] - location: 295 (remaining gas: 1038415.947 units remaining) [ ] - location: 301 (remaining gas: 1038415.937 units remaining) - [ Unit ] + [ Unit ] - location: 302 (remaining gas: 1038415.922 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 304 (remaining gas: 1038415.907 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" index eb4ffcb76224..f609a0094ae4 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1 (Pair 1 (Pair \"foobar\".735d9ae802.out" @@ -17,7 +17,7 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - Unit) ] + Unit) ] - location: 16 (remaining gas: 1039185.295 units remaining) [ (Pair -1 1 @@ -27,7 +27,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 17 (remaining gas: 1039185.285 units remaining) [ (Pair -1 1 @@ -37,7 +37,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair -1 1 "foobar" @@ -46,9 +46,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 18 (remaining gas: 1039185.275 units remaining) - [ -1 + [ -1 (Pair -1 1 "foobar" @@ -57,7 +57,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 19 (remaining gas: 1039185.260 units remaining) [ (Pair -1 1 @@ -67,9 +67,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 21 (remaining gas: 1039185.250 units remaining) - [ -1 + [ -1 (Pair 1 "foobar" 0x00aabbcc @@ -77,10 +77,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 19 (remaining gas: 1039185.220 units remaining) - [ -1 - -1 + [ -1 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -88,10 +88,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 22 (remaining gas: 1039184.993 units remaining) - [ 0x050041 - -1 + [ 0x050041 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -99,10 +99,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 23 (remaining gas: 1039184.573 units remaining) - [ (Some -1) - -1 + [ (Some -1) + -1 (Pair 1 "foobar" 0x00aabbcc @@ -110,10 +110,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.563 units remaining) - [ -1 - -1 + [ -1 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -121,10 +121,10 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 26 (remaining gas: 1039184.548 units remaining) - [ -1 - -1 + [ -1 + -1 (Pair 1 "foobar" 0x00aabbcc @@ -132,9 +132,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 34 (remaining gas: 1039184.513 units remaining) - [ 0 + [ 0 (Pair 1 "foobar" 0x00aabbcc @@ -142,9 +142,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 35 (remaining gas: 1039184.498 units remaining) - [ True + [ True (Pair 1 "foobar" 0x00aabbcc @@ -152,7 +152,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 36 (remaining gas: 1039184.488 units remaining) [ (Pair 1 "foobar" @@ -161,7 +161,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 36 (remaining gas: 1039184.473 units remaining) [ (Pair 1 "foobar" @@ -170,7 +170,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 42 (remaining gas: 1039184.463 units remaining) [ (Pair 1 "foobar" @@ -179,7 +179,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair 1 "foobar" 0x00aabbcc @@ -187,9 +187,9 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 43 (remaining gas: 1039184.453 units remaining) - [ 1 + [ 1 (Pair 1 "foobar" 0x00aabbcc @@ -197,7 +197,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 44 (remaining gas: 1039184.438 units remaining) [ (Pair 1 "foobar" @@ -206,84 +206,84 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 46 (remaining gas: 1039184.428 units remaining) - [ 1 + [ 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 44 (remaining gas: 1039184.398 units remaining) - [ 1 - 1 + [ 1 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 47 (remaining gas: 1039184.171 units remaining) - [ 0x050001 - 1 + [ 0x050001 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 48 (remaining gas: 1039183.751 units remaining) - [ (Some 1) - 1 + [ (Some 1) + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.741 units remaining) - [ 1 - 1 + [ 1 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 51 (remaining gas: 1039183.726 units remaining) - [ 1 - 1 + [ 1 + 1 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 59 (remaining gas: 1039183.691 units remaining) - [ 0 + [ 0 (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 60 (remaining gas: 1039183.676 units remaining) - [ True + [ True (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 61 (remaining gas: 1039183.666 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -291,7 +291,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 61 (remaining gas: 1039183.651 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -299,7 +299,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 67 (remaining gas: 1039183.641 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -307,23 +307,23 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 68 (remaining gas: 1039183.631 units remaining) - [ "foobar" + [ "foobar" (Pair "foobar" 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 69 (remaining gas: 1039183.616 units remaining) [ (Pair "foobar" 0x00aabbcc @@ -331,515 +331,515 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 71 (remaining gas: 1039183.606 units remaining) - [ "foobar" + [ "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 69 (remaining gas: 1039183.576 units remaining) - [ "foobar" - "foobar" + [ "foobar" + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 72 (remaining gas: 1039183.052 units remaining) - [ 0x050100000006666f6f626172 - "foobar" + [ 0x050100000006666f6f626172 + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 73 (remaining gas: 1039182.377 units remaining) - [ (Some "foobar") - "foobar" + [ (Some "foobar") + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.367 units remaining) - [ "foobar" - "foobar" + [ "foobar" + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 76 (remaining gas: 1039182.352 units remaining) - [ "foobar" - "foobar" + [ "foobar" + "foobar" (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 84 (remaining gas: 1039182.317 units remaining) - [ 0 + [ 0 (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 85 (remaining gas: 1039182.302 units remaining) - [ True + [ True (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 86 (remaining gas: 1039182.292 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 86 (remaining gas: 1039182.277 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 92 (remaining gas: 1039182.267 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 93 (remaining gas: 1039182.257 units remaining) - [ 0x00aabbcc + [ 0x00aabbcc (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 94 (remaining gas: 1039182.242 units remaining) [ (Pair 0x00aabbcc 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 96 (remaining gas: 1039182.232 units remaining) - [ 0x00aabbcc + [ 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 94 (remaining gas: 1039182.202 units remaining) - [ 0x00aabbcc - 0x00aabbcc + [ 0x00aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 97 (remaining gas: 1039181.744 units remaining) - [ 0x050a0000000400aabbcc - 0x00aabbcc + [ 0x050a0000000400aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 98 (remaining gas: 1039181.183 units remaining) - [ (Some 0x00aabbcc) - 0x00aabbcc + [ (Some 0x00aabbcc) + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.173 units remaining) - [ 0x00aabbcc - 0x00aabbcc + [ 0x00aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 101 (remaining gas: 1039181.158 units remaining) - [ 0x00aabbcc - 0x00aabbcc + [ 0x00aabbcc + 0x00aabbcc (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 109 (remaining gas: 1039181.123 units remaining) - [ 0 + [ 0 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 110 (remaining gas: 1039181.108 units remaining) - [ True + [ True (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 111 (remaining gas: 1039181.098 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 111 (remaining gas: 1039181.083 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 117 (remaining gas: 1039181.073 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 118 (remaining gas: 1039181.063 units remaining) - [ 1000 + [ 1000 (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 119 (remaining gas: 1039181.048 units remaining) [ (Pair 1000 False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 121 (remaining gas: 1039181.038 units remaining) - [ 1000 + [ 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 119 (remaining gas: 1039181.008 units remaining) - [ 1000 - 1000 + [ 1000 + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 122 (remaining gas: 1039180.748 units remaining) - [ 0x0500a80f - 1000 + [ 0x0500a80f + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 123 (remaining gas: 1039180.308 units remaining) - [ (Some 1000) - 1000 + [ (Some 1000) + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.298 units remaining) - [ 1000 - 1000 + [ 1000 + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 126 (remaining gas: 1039180.283 units remaining) - [ 1000 - 1000 + [ 1000 + 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 134 (remaining gas: 1039180.248 units remaining) - [ 0 + [ 0 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 135 (remaining gas: 1039180.233 units remaining) - [ True + [ True (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 136 (remaining gas: 1039180.223 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 136 (remaining gas: 1039180.208 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 142 (remaining gas: 1039180.198 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 143 (remaining gas: 1039180.188 units remaining) - [ False + [ False (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 144 (remaining gas: 1039180.173 units remaining) [ (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 146 (remaining gas: 1039180.163 units remaining) - [ False + [ False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 144 (remaining gas: 1039180.133 units remaining) - [ False - False + [ False + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 147 (remaining gas: 1039179.906 units remaining) - [ 0x050303 - False + [ 0x050303 + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 148 (remaining gas: 1039179.486 units remaining) - [ (Some False) - False + [ (Some False) + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.476 units remaining) - [ False - False + [ False + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 151 (remaining gas: 1039179.461 units remaining) - [ False - False + [ False + False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 159 (remaining gas: 1039179.426 units remaining) - [ 0 + [ 0 (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 160 (remaining gas: 1039179.411 units remaining) - [ True + [ True (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 161 (remaining gas: 1039179.401 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 161 (remaining gas: 1039179.386 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 167 (remaining gas: 1039179.376 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 168 (remaining gas: 1039179.366 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 169 (remaining gas: 1039179.351 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 171 (remaining gas: 1039179.341 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 169 (remaining gas: 1039179.311 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 172 (remaining gas: 1039178.221 units remaining) - [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 173 (remaining gas: 1039177.268 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.258 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 176 (remaining gas: 1039177.243 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 184 (remaining gas: 1039177.207 units remaining) - [ 0 - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ 0 + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 185 (remaining gas: 1039177.192 units remaining) - [ True - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ True + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 186 (remaining gas: 1039177.182 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 186 (remaining gas: 1039177.167 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 192 (remaining gas: 1039177.157 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 193 (remaining gas: 1039177.147 units remaining) - [ "2019-09-09T08:35:33Z" - (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ "2019-09-09T08:35:33Z" + (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 194 (remaining gas: 1039177.132 units remaining) - [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] + [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 196 (remaining gas: 1039177.122 units remaining) - [ "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 194 (remaining gas: 1039177.092 units remaining) - [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 197 (remaining gas: 1039176.733 units remaining) - [ 0x050095bbb0d70b - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ 0x050095bbb0d70b + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 198 (remaining gas: 1039176.233 units remaining) - [ (Some "2019-09-09T08:35:33Z") - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ (Some "2019-09-09T08:35:33Z") + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.223 units remaining) - [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 201 (remaining gas: 1039176.208 units remaining) - [ "2019-09-09T08:35:33Z" - "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "2019-09-09T08:35:33Z" + "2019-09-09T08:35:33Z" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 209 (remaining gas: 1039176.173 units remaining) - [ 0 - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ 0 + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 210 (remaining gas: 1039176.158 units remaining) - [ True - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ True + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 211 (remaining gas: 1039176.148 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 211 (remaining gas: 1039176.133 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 217 (remaining gas: 1039176.123 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 218 (remaining gas: 1039165.170 units remaining) - [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 219 (remaining gas: 1038514.247 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.237 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 222 (remaining gas: 1038514.222 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 230 (remaining gas: 1038514.186 units remaining) - [ 0 ] + [ 0 ] - location: 231 (remaining gas: 1038514.171 units remaining) - [ True ] + [ True ] - location: 232 (remaining gas: 1038514.161 units remaining) [ ] - location: 232 (remaining gas: 1038514.146 units remaining) [ ] - location: 238 (remaining gas: 1038514.136 units remaining) - [ 0 ] + [ 0 ] - location: 241 (remaining gas: 1038513.909 units remaining) - [ 0x050000 ] + [ 0x050000 ] - location: 242 (remaining gas: 1038513.489 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 245 (remaining gas: 1038513.479 units remaining) - [ 0 ] + [ 0 ] - location: 245 (remaining gas: 1038513.464 units remaining) - [ 0 ] + [ 0 ] - location: 251 (remaining gas: 1038513.454 units remaining) [ ] - location: 252 (remaining gas: 1038513.444 units remaining) - [ -1 ] + [ -1 ] - location: 255 (remaining gas: 1038513.217 units remaining) - [ 0x050041 ] + [ 0x050041 ] - location: 256 (remaining gas: 1038416.897 units remaining) - [ None ] + [ None ] - location: 259 (remaining gas: 1038416.887 units remaining) [ ] - location: 259 (remaining gas: 1038416.872 units remaining) [ ] - location: 265 (remaining gas: 1038416.862 units remaining) - [ 0x ] + [ 0x ] - location: 268 (remaining gas: 1038416.602 units remaining) - [ None ] + [ None ] - location: 271 (remaining gas: 1038416.592 units remaining) [ ] - location: 271 (remaining gas: 1038416.577 units remaining) [ ] - location: 277 (remaining gas: 1038416.567 units remaining) - [ 0x04 ] + [ 0x04 ] - location: 280 (remaining gas: 1038416.287 units remaining) - [ None ] + [ None ] - location: 283 (remaining gas: 1038416.277 units remaining) [ ] - location: 283 (remaining gas: 1038416.262 units remaining) [ ] - location: 289 (remaining gas: 1038416.252 units remaining) - [ 0x05 ] + [ 0x05 ] - location: 292 (remaining gas: 1038415.972 units remaining) - [ None ] + [ None ] - location: 295 (remaining gas: 1038415.962 units remaining) [ ] - location: 295 (remaining gas: 1038415.947 units remaining) [ ] - location: 301 (remaining gas: 1038415.937 units remaining) - [ Unit ] + [ Unit ] - location: 302 (remaining gas: 1038415.922 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 304 (remaining gas: 1038415.907 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" index cc3d90a14ba7..5c63b603a7c6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" @@ -18,7 +18,7 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) - Unit) ] + Unit) ] - location: 28 (remaining gas: 1039468.010 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -29,7 +29,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 29 (remaining gas: 1039468 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -40,7 +40,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -50,9 +50,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 30 (remaining gas: 1039467.990 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -62,7 +62,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 31 (remaining gas: 1039467.975 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -73,9 +73,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 33 (remaining gas: 1039467.965 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -84,10 +84,10 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 31 (remaining gas: 1039467.935 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -96,10 +96,10 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 34 (remaining gas: 1039466.063 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f - "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -108,9 +108,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 35 (remaining gas: 1039466.048 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -119,9 +119,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 37 (remaining gas: 1039464.176 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -130,9 +130,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 38 (remaining gas: 1039143.032 units remaining) - [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") + [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -141,9 +141,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 41 (remaining gas: 1039143.022 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -152,9 +152,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 41 (remaining gas: 1039143.007 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -163,9 +163,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 47 (remaining gas: 1039141.135 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -174,10 +174,10 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 35 (remaining gas: 1039141.105 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -186,9 +186,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 50 (remaining gas: 1039141.070 units remaining) - [ 0 + [ 0 (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -197,9 +197,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 51 (remaining gas: 1039141.055 units remaining) - [ True + [ True (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -208,7 +208,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 52 (remaining gas: 1039141.045 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -218,7 +218,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 52 (remaining gas: 1039141.030 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -228,7 +228,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 58 (remaining gas: 1039141.020 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -238,7 +238,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -247,9 +247,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 59 (remaining gas: 1039141.010 units remaining) - [ Unit + [ Unit (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -258,7 +258,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 60 (remaining gas: 1039140.995 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -268,9 +268,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 62 (remaining gas: 1039140.985 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -278,10 +278,10 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 60 (remaining gas: 1039140.955 units remaining) - [ Unit - Unit + [ Unit + Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -289,10 +289,10 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 63 (remaining gas: 1039140.728 units remaining) - [ 0x05030b - Unit + [ 0x05030b + Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -300,9 +300,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 64 (remaining gas: 1039140.713 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -310,9 +310,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 66 (remaining gas: 1039140.486 units remaining) - [ 0x05030b + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -320,9 +320,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 67 (remaining gas: 1039140.066 units remaining) - [ (Some Unit) + [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -330,9 +330,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 70 (remaining gas: 1039140.056 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -340,9 +340,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 70 (remaining gas: 1039140.041 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -350,9 +350,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 76 (remaining gas: 1039139.814 units remaining) - [ 0x05030b + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -360,10 +360,10 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 64 (remaining gas: 1039139.784 units remaining) - [ 0x05030b - 0x05030b + [ 0x05030b + 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -371,9 +371,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 79 (remaining gas: 1039139.749 units remaining) - [ 0 + [ 0 (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -381,9 +381,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 80 (remaining gas: 1039139.734 units remaining) - [ True + [ True (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -391,7 +391,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 81 (remaining gas: 1039139.724 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -400,7 +400,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 81 (remaining gas: 1039139.709 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -409,7 +409,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 87 (remaining gas: 1039139.699 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -418,7 +418,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -426,9 +426,9 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 88 (remaining gas: 1039139.689 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -436,7 +436,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 89 (remaining gas: 1039139.674 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -445,118 +445,118 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 91 (remaining gas: 1039139.664 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 89 (remaining gas: 1039139.634 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 92 (remaining gas: 1039137.147 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 93 (remaining gas: 1039137.132 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 95 (remaining gas: 1039134.645 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 96 (remaining gas: 1039132.842 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 99 (remaining gas: 1039132.832 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 99 (remaining gas: 1039132.817 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 105 (remaining gas: 1039130.330 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 93 (remaining gas: 1039130.300 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 108 (remaining gas: 1039130.264 units remaining) - [ 0 + [ 0 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 109 (remaining gas: 1039130.249 units remaining) - [ True + [ True (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 110 (remaining gas: 1039130.239 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -564,7 +564,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 110 (remaining gas: 1039130.224 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -572,7 +572,7 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 116 (remaining gas: 1039130.214 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -580,23 +580,23 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 117 (remaining gas: 1039130.204 units remaining) - [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 118 (remaining gas: 1039130.189 units remaining) [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -604,591 +604,591 @@ trace (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 120 (remaining gas: 1039130.179 units remaining) - [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 118 (remaining gas: 1039130.149 units remaining) - [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 121 (remaining gas: 1039127.500 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 - (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 122 (remaining gas: 1039127.485 units remaining) - [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") + [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 124 (remaining gas: 1039124.836 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 125 (remaining gas: 1039122.892 units remaining) - [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) + [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 129 (remaining gas: 1039122.882 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 129 (remaining gas: 1039122.867 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 135 (remaining gas: 1039120.218 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 122 (remaining gas: 1039120.188 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 - 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 138 (remaining gas: 1039120.152 units remaining) - [ 0 + [ 0 (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 139 (remaining gas: 1039120.137 units remaining) - [ True + [ True (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 140 (remaining gas: 1039120.127 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 140 (remaining gas: 1039120.112 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 146 (remaining gas: 1039120.102 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 147 (remaining gas: 1039120.092 units remaining) - [ { Unit } + [ { Unit } (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 148 (remaining gas: 1039120.077 units remaining) [ (Pair { Unit } { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 150 (remaining gas: 1039120.067 units remaining) - [ { Unit } + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 148 (remaining gas: 1039120.037 units remaining) - [ { Unit } - { Unit } + [ { Unit } + { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 151 (remaining gas: 1039119.549 units remaining) - [ 0x050200000002030b - { Unit } + [ 0x050200000002030b + { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 152 (remaining gas: 1039119.534 units remaining) - [ { Unit } + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 154 (remaining gas: 1039119.046 units remaining) - [ 0x050200000002030b + [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 155 (remaining gas: 1039118.425 units remaining) - [ (Some { Unit }) + [ (Some { Unit }) (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 159 (remaining gas: 1039118.415 units remaining) - [ { Unit } + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 159 (remaining gas: 1039118.400 units remaining) - [ { Unit } + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 165 (remaining gas: 1039117.912 units remaining) - [ 0x050200000002030b + [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 152 (remaining gas: 1039117.882 units remaining) - [ 0x050200000002030b - 0x050200000002030b + [ 0x050200000002030b + 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 168 (remaining gas: 1039117.847 units remaining) - [ 0 + [ 0 (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 169 (remaining gas: 1039117.832 units remaining) - [ True + [ True (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 170 (remaining gas: 1039117.822 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 170 (remaining gas: 1039117.807 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 176 (remaining gas: 1039117.797 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 177 (remaining gas: 1039117.787 units remaining) - [ { True } + [ { True } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 178 (remaining gas: 1039117.772 units remaining) [ (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 180 (remaining gas: 1039117.762 units remaining) - [ { True } + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 178 (remaining gas: 1039117.732 units remaining) - [ { True } - { True } + [ { True } + { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 181 (remaining gas: 1039117.244 units remaining) - [ 0x050200000002030a - { True } + [ 0x050200000002030a + { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 182 (remaining gas: 1039117.229 units remaining) - [ { True } + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 184 (remaining gas: 1039116.741 units remaining) - [ 0x050200000002030a + [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 185 (remaining gas: 1039115.920 units remaining) - [ (Some { True }) + [ (Some { True }) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 189 (remaining gas: 1039115.910 units remaining) - [ { True } + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 189 (remaining gas: 1039115.895 units remaining) - [ { True } + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 195 (remaining gas: 1039115.407 units remaining) - [ 0x050200000002030a + [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 182 (remaining gas: 1039115.377 units remaining) - [ 0x050200000002030a - 0x050200000002030a + [ 0x050200000002030a + 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 198 (remaining gas: 1039115.342 units remaining) - [ 0 + [ 0 (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 199 (remaining gas: 1039115.327 units remaining) - [ True + [ True (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 200 (remaining gas: 1039115.317 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 200 (remaining gas: 1039115.302 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 206 (remaining gas: 1039115.292 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 207 (remaining gas: 1039115.282 units remaining) - [ (Pair 19 10) + [ (Pair 19 10) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 208 (remaining gas: 1039115.267 units remaining) [ (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 210 (remaining gas: 1039115.257 units remaining) - [ (Pair 19 10) + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 208 (remaining gas: 1039115.227 units remaining) - [ (Pair 19 10) - (Pair 19 10) + [ (Pair 19 10) + (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 211 (remaining gas: 1039114.676 units remaining) - [ 0x0507070013000a - (Pair 19 10) + [ 0x0507070013000a + (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 212 (remaining gas: 1039114.661 units remaining) - [ (Pair 19 10) + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 214 (remaining gas: 1039114.110 units remaining) - [ 0x0507070013000a + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 215 (remaining gas: 1039113.410 units remaining) - [ (Some (Pair 19 10)) + [ (Some (Pair 19 10)) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 220 (remaining gas: 1039113.400 units remaining) - [ (Pair 19 10) + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 220 (remaining gas: 1039113.385 units remaining) - [ (Pair 19 10) + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 226 (remaining gas: 1039112.834 units remaining) - [ 0x0507070013000a + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 212 (remaining gas: 1039112.804 units remaining) - [ 0x0507070013000a - 0x0507070013000a + [ 0x0507070013000a + 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 229 (remaining gas: 1039112.769 units remaining) - [ 0 + [ 0 (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 230 (remaining gas: 1039112.754 units remaining) - [ True + [ True (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 231 (remaining gas: 1039112.744 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 231 (remaining gas: 1039112.729 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 237 (remaining gas: 1039112.719 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) + { PACK }) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 238 (remaining gas: 1039112.709 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 239 (remaining gas: 1039112.694 units remaining) [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } - { PACK }) ] + { PACK }) ] - location: 241 (remaining gas: 1039112.684 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 239 (remaining gas: 1039112.654 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 242 (remaining gas: 1039111.402 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 243 (remaining gas: 1039111.387 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 245 (remaining gas: 1039110.135 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 246 (remaining gas: 1039109.042 units remaining) - [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 251 (remaining gas: 1039109.032 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 251 (remaining gas: 1039109.017 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 257 (remaining gas: 1039107.765 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 243 (remaining gas: 1039107.735 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 260 (remaining gas: 1039107.700 units remaining) - [ 0 - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ 0 + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 261 (remaining gas: 1039107.685 units remaining) - [ True - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ True + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 262 (remaining gas: 1039107.675 units remaining) - [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 262 (remaining gas: 1039107.660 units remaining) - [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 268 (remaining gas: 1039107.650 units remaining) - [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 269 (remaining gas: 1039107.640 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ { Elt 0 "foo" ; Elt 1 "bar" } + (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 270 (remaining gas: 1039107.625 units remaining) - [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] + [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 272 (remaining gas: 1039107.615 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] + [ { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] - location: 270 (remaining gas: 1039107.585 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] + [ { Elt 0 "foo" ; Elt 1 "bar" } + { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] - location: 273 (remaining gas: 1039105.980 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 - { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] + [ 0x050200000018070400000100000003666f6f070400010100000003626172 + { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] - location: 274 (remaining gas: 1039105.965 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] + [ { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] - location: 276 (remaining gas: 1039104.360 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 - { PACK } ] + [ 0x050200000018070400000100000003666f6f070400010100000003626172 + { PACK } ] - location: 277 (remaining gas: 1039102.504 units remaining) - [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) - { PACK } ] + [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) + { PACK } ] - location: 282 (remaining gas: 1039102.494 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] + [ { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] - location: 282 (remaining gas: 1039102.479 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } - { PACK } ] + [ { Elt 0 "foo" ; Elt 1 "bar" } + { PACK } ] - location: 288 (remaining gas: 1039100.874 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 - { PACK } ] + [ 0x050200000018070400000100000003666f6f070400010100000003626172 + { PACK } ] - location: 274 (remaining gas: 1039100.844 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 - 0x050200000018070400000100000003666f6f070400010100000003626172 - { PACK } ] + [ 0x050200000018070400000100000003666f6f070400010100000003626172 + 0x050200000018070400000100000003666f6f070400010100000003626172 + { PACK } ] - location: 291 (remaining gas: 1039100.809 units remaining) - [ 0 - { PACK } ] + [ 0 + { PACK } ] - location: 292 (remaining gas: 1039100.794 units remaining) - [ True - { PACK } ] + [ True + { PACK } ] - location: 293 (remaining gas: 1039100.784 units remaining) - [ { PACK } ] + [ { PACK } ] - location: 293 (remaining gas: 1039100.769 units remaining) - [ { PACK } ] + [ { PACK } ] - location: 299 (remaining gas: 1039100.759 units remaining) - [ { PACK } - { PACK } ] + [ { PACK } + { PACK } ] - location: 300 (remaining gas: 1039100.086 units remaining) - [ 0x050200000002030c - { PACK } ] + [ 0x050200000002030c + { PACK } ] - location: 301 (remaining gas: 1039100.071 units remaining) - [ { PACK } ] + [ { PACK } ] - location: 303 (remaining gas: 1039099.398 units remaining) - [ 0x050200000002030c ] + [ 0x050200000002030c ] - location: 304 (remaining gas: 1039098.217 units remaining) - [ (Some { PACK }) ] + [ (Some { PACK }) ] - location: 309 (remaining gas: 1039098.207 units remaining) - [ { PACK } ] + [ { PACK } ] - location: 309 (remaining gas: 1039098.192 units remaining) - [ { PACK } ] + [ { PACK } ] - location: 315 (remaining gas: 1039097.519 units remaining) - [ 0x050200000002030c ] + [ 0x050200000002030c ] - location: 301 (remaining gas: 1039097.489 units remaining) - [ 0x050200000002030c - 0x050200000002030c ] + [ 0x050200000002030c + 0x050200000002030c ] - location: 318 (remaining gas: 1039097.454 units remaining) - [ 0 ] + [ 0 ] - location: 319 (remaining gas: 1039097.439 units remaining) - [ True ] + [ True ] - location: 320 (remaining gas: 1039097.429 units remaining) [ ] - location: 320 (remaining gas: 1039097.414 units remaining) [ ] - location: 326 (remaining gas: 1039097.404 units remaining) - [ Unit ] + [ Unit ] - location: 327 (remaining gas: 1039097.389 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 329 (remaining gas: 1039097.374 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" index 8370889dd70c..5d88b0765272 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" @@ -18,7 +18,7 @@ trace (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) - Unit) ] + Unit) ] - location: 28 (remaining gas: 1039478.023 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -29,7 +29,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 29 (remaining gas: 1039478.013 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -40,7 +40,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) + { DUP ; DROP ; PACK }) (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -50,9 +50,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 30 (remaining gas: 1039478.003 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -62,7 +62,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 31 (remaining gas: 1039477.988 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" Unit @@ -73,9 +73,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 33 (remaining gas: 1039477.978 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -84,10 +84,10 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 31 (remaining gas: 1039477.948 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" - "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -96,10 +96,10 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 34 (remaining gas: 1039476.076 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f - "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -108,9 +108,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 35 (remaining gas: 1039476.061 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -119,9 +119,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 37 (remaining gas: 1039474.189 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -130,9 +130,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 38 (remaining gas: 1039153.045 units remaining) - [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") + [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -141,9 +141,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 41 (remaining gas: 1039153.035 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -152,9 +152,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 41 (remaining gas: 1039153.020 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -163,9 +163,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 47 (remaining gas: 1039151.148 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -174,10 +174,10 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 35 (remaining gas: 1039151.118 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -186,9 +186,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 50 (remaining gas: 1039151.083 units remaining) - [ 0 + [ 0 (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -197,9 +197,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 51 (remaining gas: 1039151.068 units remaining) - [ True + [ True (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -208,7 +208,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 52 (remaining gas: 1039151.058 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -218,7 +218,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 52 (remaining gas: 1039151.043 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -228,7 +228,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 58 (remaining gas: 1039151.033 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -238,7 +238,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) + { DUP ; DROP ; PACK }) (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -247,9 +247,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 59 (remaining gas: 1039151.023 units remaining) - [ Unit + [ Unit (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -258,7 +258,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 60 (remaining gas: 1039151.008 units remaining) [ (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -268,9 +268,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 62 (remaining gas: 1039150.998 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -278,10 +278,10 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 60 (remaining gas: 1039150.968 units remaining) - [ Unit - Unit + [ Unit + Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -289,10 +289,10 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 63 (remaining gas: 1039150.741 units remaining) - [ 0x05030b - Unit + [ 0x05030b + Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -300,9 +300,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 64 (remaining gas: 1039150.726 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -310,9 +310,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 66 (remaining gas: 1039150.499 units remaining) - [ 0x05030b + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -320,9 +320,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 67 (remaining gas: 1039150.079 units remaining) - [ (Some Unit) + [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -330,9 +330,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 70 (remaining gas: 1039150.069 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -340,9 +340,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 70 (remaining gas: 1039150.054 units remaining) - [ Unit + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -350,9 +350,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 76 (remaining gas: 1039149.827 units remaining) - [ 0x05030b + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -360,10 +360,10 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 64 (remaining gas: 1039149.797 units remaining) - [ 0x05030b - 0x05030b + [ 0x05030b + 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -371,9 +371,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 79 (remaining gas: 1039149.762 units remaining) - [ 0 + [ 0 (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -381,9 +381,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 80 (remaining gas: 1039149.747 units remaining) - [ True + [ True (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -391,7 +391,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 81 (remaining gas: 1039149.737 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -400,7 +400,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 81 (remaining gas: 1039149.722 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -409,7 +409,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 87 (remaining gas: 1039149.712 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -418,7 +418,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) + { DUP ; DROP ; PACK }) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -426,9 +426,9 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 88 (remaining gas: 1039149.702 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -436,7 +436,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 89 (remaining gas: 1039149.687 units remaining) [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -445,118 +445,118 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 91 (remaining gas: 1039149.677 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 89 (remaining gas: 1039149.647 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 92 (remaining gas: 1039147.160 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 - "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 93 (remaining gas: 1039147.145 units remaining) - [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" + [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 95 (remaining gas: 1039144.658 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 96 (remaining gas: 1039142.855 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 99 (remaining gas: 1039142.845 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 99 (remaining gas: 1039142.830 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 105 (remaining gas: 1039140.343 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 93 (remaining gas: 1039140.313 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 108 (remaining gas: 1039140.277 units remaining) - [ 0 + [ 0 (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 109 (remaining gas: 1039140.262 units remaining) - [ True + [ True (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 110 (remaining gas: 1039140.252 units remaining) [ (Pair None {} @@ -564,7 +564,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 110 (remaining gas: 1039140.237 units remaining) [ (Pair None {} @@ -572,7 +572,7 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 116 (remaining gas: 1039140.227 units remaining) [ (Pair None {} @@ -580,23 +580,23 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) + { DUP ; DROP ; PACK }) (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 117 (remaining gas: 1039140.217 units remaining) - [ None + [ None (Pair None {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 118 (remaining gas: 1039140.202 units remaining) [ (Pair None {} @@ -604,429 +604,429 @@ trace (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 120 (remaining gas: 1039140.192 units remaining) - [ None + [ None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 118 (remaining gas: 1039140.162 units remaining) - [ None - None + [ None + None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 121 (remaining gas: 1039139.935 units remaining) - [ 0x050306 - None + [ 0x050306 + None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 122 (remaining gas: 1039139.920 units remaining) - [ None + [ None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 124 (remaining gas: 1039139.693 units remaining) - [ 0x050306 + [ 0x050306 (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 125 (remaining gas: 1039139.273 units remaining) - [ (Some None) + [ (Some None) (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 129 (remaining gas: 1039139.263 units remaining) - [ None + [ None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 129 (remaining gas: 1039139.248 units remaining) - [ None + [ None (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 135 (remaining gas: 1039139.021 units remaining) - [ 0x050306 + [ 0x050306 (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 122 (remaining gas: 1039138.991 units remaining) - [ 0x050306 - 0x050306 + [ 0x050306 + 0x050306 (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 138 (remaining gas: 1039138.956 units remaining) - [ 0 + [ 0 (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 139 (remaining gas: 1039138.941 units remaining) - [ True + [ True (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 140 (remaining gas: 1039138.931 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 140 (remaining gas: 1039138.916 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 146 (remaining gas: 1039138.906 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) + { DUP ; DROP ; PACK }) (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 147 (remaining gas: 1039138.896 units remaining) - [ {} + [ {} (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 148 (remaining gas: 1039138.881 units remaining) [ (Pair {} {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} - { DUP ; DROP ; PACK }) ] + { DUP ; DROP ; PACK }) ] - location: 150 (remaining gas: 1039138.871 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 148 (remaining gas: 1039138.841 units remaining) - [ {} - {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 151 (remaining gas: 1039138.515 units remaining) - [ 0x050200000000 - {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 152 (remaining gas: 1039138.500 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 154 (remaining gas: 1039138.174 units remaining) - [ 0x050200000000 - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 155 (remaining gas: 1039137.694 units remaining) - [ (Some {}) - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Some {}) + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 159 (remaining gas: 1039137.684 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 159 (remaining gas: 1039137.669 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 165 (remaining gas: 1039137.343 units remaining) - [ 0x050200000000 - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 152 (remaining gas: 1039137.313 units remaining) - [ 0x050200000000 - 0x050200000000 - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + 0x050200000000 + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 168 (remaining gas: 1039137.278 units remaining) - [ 0 - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0 + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 169 (remaining gas: 1039137.263 units remaining) - [ True - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ True + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 170 (remaining gas: 1039137.253 units remaining) - [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 170 (remaining gas: 1039137.238 units remaining) - [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 176 (remaining gas: 1039137.228 units remaining) - [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 177 (remaining gas: 1039137.218 units remaining) - [ {} - (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 178 (remaining gas: 1039137.203 units remaining) - [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 180 (remaining gas: 1039137.193 units remaining) - [ {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 178 (remaining gas: 1039137.163 units remaining) - [ {} - {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 181 (remaining gas: 1039136.837 units remaining) - [ 0x050200000000 - {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 182 (remaining gas: 1039136.822 units remaining) - [ {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 184 (remaining gas: 1039136.496 units remaining) - [ 0x050200000000 - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 185 (remaining gas: 1039136.016 units remaining) - [ (Some {}) - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Some {}) + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 189 (remaining gas: 1039136.006 units remaining) - [ {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 189 (remaining gas: 1039135.991 units remaining) - [ {} - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 195 (remaining gas: 1039135.665 units remaining) - [ 0x050200000000 - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 182 (remaining gas: 1039135.635 units remaining) - [ 0x050200000000 - 0x050200000000 - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x050200000000 + 0x050200000000 + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 198 (remaining gas: 1039135.600 units remaining) - [ 0 - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0 + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 199 (remaining gas: 1039135.585 units remaining) - [ True - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ True + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 200 (remaining gas: 1039135.575 units remaining) - [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 200 (remaining gas: 1039135.560 units remaining) - [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 206 (remaining gas: 1039135.550 units remaining) - [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 207 (remaining gas: 1039135.540 units remaining) - [ (Pair 40 -10) - (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair 40 -10) + (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 208 (remaining gas: 1039135.525 units remaining) - [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 210 (remaining gas: 1039135.515 units remaining) - [ (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 208 (remaining gas: 1039135.485 units remaining) - [ (Pair 40 -10) - (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair 40 -10) + (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 211 (remaining gas: 1039134.934 units remaining) - [ 0x0507070028004a - (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x0507070028004a + (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 212 (remaining gas: 1039134.919 units remaining) - [ (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 214 (remaining gas: 1039134.368 units remaining) - [ 0x0507070028004a - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x0507070028004a + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 215 (remaining gas: 1039133.668 units remaining) - [ (Some (Pair 40 -10)) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Some (Pair 40 -10)) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 220 (remaining gas: 1039133.658 units remaining) - [ (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 220 (remaining gas: 1039133.643 units remaining) - [ (Pair 40 -10) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair 40 -10) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 226 (remaining gas: 1039133.092 units remaining) - [ 0x0507070028004a - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x0507070028004a + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 212 (remaining gas: 1039133.062 units remaining) - [ 0x0507070028004a - 0x0507070028004a - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0x0507070028004a + 0x0507070028004a + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 229 (remaining gas: 1039133.027 units remaining) - [ 0 - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ 0 + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 230 (remaining gas: 1039133.012 units remaining) - [ True - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ True + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 231 (remaining gas: 1039133.002 units remaining) - [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 231 (remaining gas: 1039132.987 units remaining) - [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 237 (remaining gas: 1039132.977 units remaining) - [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 238 (remaining gas: 1039132.967 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Right "2019-09-09T08:35:33Z") + (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 239 (remaining gas: 1039132.952 units remaining) - [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] + [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 241 (remaining gas: 1039132.942 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] - location: 239 (remaining gas: 1039132.912 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Right "2019-09-09T08:35:33Z") + (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] - location: 242 (remaining gas: 1039132.391 units remaining) - [ 0x0505080095bbb0d70b - (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] + [ 0x0505080095bbb0d70b + (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] - location: 243 (remaining gas: 1039132.376 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] - location: 245 (remaining gas: 1039131.855 units remaining) - [ 0x0505080095bbb0d70b - (Pair {} { DUP ; DROP ; PACK }) ] + [ 0x0505080095bbb0d70b + (Pair {} { DUP ; DROP ; PACK }) ] - location: 246 (remaining gas: 1039131.214 units remaining) - [ (Some (Right "2019-09-09T08:35:33Z")) - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Some (Right "2019-09-09T08:35:33Z")) + (Pair {} { DUP ; DROP ; PACK }) ] - location: 251 (remaining gas: 1039131.204 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] - location: 251 (remaining gas: 1039131.189 units remaining) - [ (Right "2019-09-09T08:35:33Z") - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Right "2019-09-09T08:35:33Z") + (Pair {} { DUP ; DROP ; PACK }) ] - location: 257 (remaining gas: 1039130.668 units remaining) - [ 0x0505080095bbb0d70b - (Pair {} { DUP ; DROP ; PACK }) ] + [ 0x0505080095bbb0d70b + (Pair {} { DUP ; DROP ; PACK }) ] - location: 243 (remaining gas: 1039130.638 units remaining) - [ 0x0505080095bbb0d70b - 0x0505080095bbb0d70b - (Pair {} { DUP ; DROP ; PACK }) ] + [ 0x0505080095bbb0d70b + 0x0505080095bbb0d70b + (Pair {} { DUP ; DROP ; PACK }) ] - location: 260 (remaining gas: 1039130.603 units remaining) - [ 0 - (Pair {} { DUP ; DROP ; PACK }) ] + [ 0 + (Pair {} { DUP ; DROP ; PACK }) ] - location: 261 (remaining gas: 1039130.588 units remaining) - [ True - (Pair {} { DUP ; DROP ; PACK }) ] + [ True + (Pair {} { DUP ; DROP ; PACK }) ] - location: 262 (remaining gas: 1039130.578 units remaining) - [ (Pair {} { DUP ; DROP ; PACK }) ] + [ (Pair {} { DUP ; DROP ; PACK }) ] - location: 262 (remaining gas: 1039130.563 units remaining) - [ (Pair {} { DUP ; DROP ; PACK }) ] + [ (Pair {} { DUP ; DROP ; PACK }) ] - location: 268 (remaining gas: 1039130.553 units remaining) - [ (Pair {} { DUP ; DROP ; PACK }) - (Pair {} { DUP ; DROP ; PACK }) ] + [ (Pair {} { DUP ; DROP ; PACK }) + (Pair {} { DUP ; DROP ; PACK }) ] - location: 269 (remaining gas: 1039130.543 units remaining) - [ {} - (Pair {} { DUP ; DROP ; PACK }) ] + [ {} + (Pair {} { DUP ; DROP ; PACK }) ] - location: 270 (remaining gas: 1039130.528 units remaining) - [ (Pair {} { DUP ; DROP ; PACK }) ] + [ (Pair {} { DUP ; DROP ; PACK }) ] - location: 272 (remaining gas: 1039130.518 units remaining) - [ {} - { DUP ; DROP ; PACK } ] + [ {} + { DUP ; DROP ; PACK } ] - location: 270 (remaining gas: 1039130.488 units remaining) - [ {} - {} - { DUP ; DROP ; PACK } ] + [ {} + {} + { DUP ; DROP ; PACK } ] - location: 273 (remaining gas: 1039130.162 units remaining) - [ 0x050200000000 - {} - { DUP ; DROP ; PACK } ] + [ 0x050200000000 + {} + { DUP ; DROP ; PACK } ] - location: 274 (remaining gas: 1039130.147 units remaining) - [ {} - { DUP ; DROP ; PACK } ] + [ {} + { DUP ; DROP ; PACK } ] - location: 276 (remaining gas: 1039129.821 units remaining) - [ 0x050200000000 - { DUP ; DROP ; PACK } ] + [ 0x050200000000 + { DUP ; DROP ; PACK } ] - location: 277 (remaining gas: 1039129.341 units remaining) - [ (Some {}) - { DUP ; DROP ; PACK } ] + [ (Some {}) + { DUP ; DROP ; PACK } ] - location: 282 (remaining gas: 1039129.331 units remaining) - [ {} - { DUP ; DROP ; PACK } ] + [ {} + { DUP ; DROP ; PACK } ] - location: 282 (remaining gas: 1039129.316 units remaining) - [ {} - { DUP ; DROP ; PACK } ] + [ {} + { DUP ; DROP ; PACK } ] - location: 288 (remaining gas: 1039128.990 units remaining) - [ 0x050200000000 - { DUP ; DROP ; PACK } ] + [ 0x050200000000 + { DUP ; DROP ; PACK } ] - location: 274 (remaining gas: 1039128.960 units remaining) - [ 0x050200000000 - 0x050200000000 - { DUP ; DROP ; PACK } ] + [ 0x050200000000 + 0x050200000000 + { DUP ; DROP ; PACK } ] - location: 291 (remaining gas: 1039128.925 units remaining) - [ 0 - { DUP ; DROP ; PACK } ] + [ 0 + { DUP ; DROP ; PACK } ] - location: 292 (remaining gas: 1039128.910 units remaining) - [ True - { DUP ; DROP ; PACK } ] + [ True + { DUP ; DROP ; PACK } ] - location: 293 (remaining gas: 1039128.900 units remaining) - [ { DUP ; DROP ; PACK } ] + [ { DUP ; DROP ; PACK } ] - location: 293 (remaining gas: 1039128.885 units remaining) - [ { DUP ; DROP ; PACK } ] + [ { DUP ; DROP ; PACK } ] - location: 299 (remaining gas: 1039128.875 units remaining) - [ { DUP ; DROP ; PACK } - { DUP ; DROP ; PACK } ] + [ { DUP ; DROP ; PACK } + { DUP ; DROP ; PACK } ] - location: 300 (remaining gas: 1039127.738 units remaining) - [ 0x05020000000603210320030c - { DUP ; DROP ; PACK } ] + [ 0x05020000000603210320030c + { DUP ; DROP ; PACK } ] - location: 301 (remaining gas: 1039127.723 units remaining) - [ { DUP ; DROP ; PACK } ] + [ { DUP ; DROP ; PACK } ] - location: 303 (remaining gas: 1039126.586 units remaining) - [ 0x05020000000603210320030c ] + [ 0x05020000000603210320030c ] - location: 304 (remaining gas: 1039124.345 units remaining) - [ (Some { DUP ; DROP ; PACK }) ] + [ (Some { DUP ; DROP ; PACK }) ] - location: 309 (remaining gas: 1039124.335 units remaining) - [ { DUP ; DROP ; PACK } ] + [ { DUP ; DROP ; PACK } ] - location: 309 (remaining gas: 1039124.320 units remaining) - [ { DUP ; DROP ; PACK } ] + [ { DUP ; DROP ; PACK } ] - location: 315 (remaining gas: 1039123.183 units remaining) - [ 0x05020000000603210320030c ] + [ 0x05020000000603210320030c ] - location: 301 (remaining gas: 1039123.153 units remaining) - [ 0x05020000000603210320030c - 0x05020000000603210320030c ] + [ 0x05020000000603210320030c + 0x05020000000603210320030c ] - location: 318 (remaining gas: 1039123.118 units remaining) - [ 0 ] + [ 0 ] - location: 319 (remaining gas: 1039123.103 units remaining) - [ True ] + [ True ] - location: 320 (remaining gas: 1039123.093 units remaining) [ ] - location: 320 (remaining gas: 1039123.078 units remaining) [ ] - location: 326 (remaining gas: 1039123.068 units remaining) - [ Unit ] + [ Unit ] - location: 327 (remaining gas: 1039123.053 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 329 (remaining gas: 1039123.038 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out index e3f3b1fd9c8c..f5b495d10629 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out @@ -8,14 +8,14 @@ big_map diff trace - location: 12 (remaining gas: 1039993.234 units remaining) - [ (Pair (Pair False False) None) ] + [ (Pair (Pair False False) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair False False) ] + [ (Pair False False) ] - location: 13 (remaining gas: 1039993.209 units remaining) - [ (Some (Pair False False)) ] + [ (Some (Pair False False)) ] - location: 14 (remaining gas: 1039993.194 units remaining) - [ {} - (Some (Pair False False)) ] + [ {} + (Some (Pair False False)) ] - location: 16 (remaining gas: 1039993.179 units remaining) - [ (Pair {} (Some (Pair False False))) ] + [ (Pair {} (Some (Pair False False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out index dfdc30f1dbb6..b720033e0a4a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out @@ -8,14 +8,14 @@ big_map diff trace - location: 12 (remaining gas: 1039993.234 units remaining) - [ (Pair (Pair False True) None) ] + [ (Pair (Pair False True) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair False True) ] + [ (Pair False True) ] - location: 13 (remaining gas: 1039993.209 units remaining) - [ (Some (Pair False True)) ] + [ (Some (Pair False True)) ] - location: 14 (remaining gas: 1039993.194 units remaining) - [ {} - (Some (Pair False True)) ] + [ {} + (Some (Pair False True)) ] - location: 16 (remaining gas: 1039993.179 units remaining) - [ (Pair {} (Some (Pair False True))) ] + [ (Pair {} (Some (Pair False True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out index 643b65d49970..b71fe71bfa76 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out @@ -8,14 +8,14 @@ big_map diff trace - location: 12 (remaining gas: 1039993.234 units remaining) - [ (Pair (Pair True False) None) ] + [ (Pair (Pair True False) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair True False) ] + [ (Pair True False) ] - location: 13 (remaining gas: 1039993.209 units remaining) - [ (Some (Pair True False)) ] + [ (Some (Pair True False)) ] - location: 14 (remaining gas: 1039993.194 units remaining) - [ {} - (Some (Pair True False)) ] + [ {} + (Some (Pair True False)) ] - location: 16 (remaining gas: 1039993.179 units remaining) - [ (Pair {} (Some (Pair True False))) ] + [ (Pair {} (Some (Pair True False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out index 44f9f436f641..ae810aeb4cfb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out @@ -8,14 +8,14 @@ big_map diff trace - location: 12 (remaining gas: 1039993.234 units remaining) - [ (Pair (Pair True True) None) ] + [ (Pair (Pair True True) None) ] - location: 12 (remaining gas: 1039993.224 units remaining) - [ (Pair True True) ] + [ (Pair True True) ] - location: 13 (remaining gas: 1039993.209 units remaining) - [ (Some (Pair True True)) ] + [ (Some (Pair True True)) ] - location: 14 (remaining gas: 1039993.194 units remaining) - [ {} - (Some (Pair True True)) ] + [ {} + (Some (Pair True True)) ] - location: 16 (remaining gas: 1039993.179 units remaining) - [ (Pair {} (Some (Pair True True))) ] + [ (Pair {} (Some (Pair True True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out index 9141ea4d867c..c1083e7a2826 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out @@ -8,40 +8,40 @@ big_map diff trace - location: 7 (remaining gas: 1039989.309 units remaining) - [ (Pair 38 14) ] + [ (Pair 38 14) ] - location: 7 (remaining gas: 1039989.299 units remaining) - [ { UNPAIR ; ADD } - (Pair 38 14) ] + [ { UNPAIR ; ADD } + (Pair 38 14) ] - location: 15 (remaining gas: 1039989.289 units remaining) - [ (Pair 38 14) - { UNPAIR ; ADD } ] + [ (Pair 38 14) + { UNPAIR ; ADD } ] - location: 16 (remaining gas: 1039989.279 units remaining) - [ 38 - 14 - { UNPAIR ; ADD } ] + [ 38 + 14 + { UNPAIR ; ADD } ] - location: 17 (remaining gas: 1039989.264 units remaining) - [ 14 - { UNPAIR ; ADD } ] + [ 14 + { UNPAIR ; ADD } ] - location: 19 (remaining gas: 1039989.039 units remaining) - [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] + [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 17 (remaining gas: 1039989.009 units remaining) - [ 38 - { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] + [ 38 + { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 12 (remaining gas: 1039988.999 units remaining) - [ 14 - 38 ] + [ 14 + 38 ] - location: 12 (remaining gas: 1039988.984 units remaining) - [ (Pair 14 38) ] + [ (Pair 14 38) ] - location: 13 (remaining gas: 1039988.974 units remaining) - [ 14 - 38 ] + [ 14 + 38 ] - location: 14 (remaining gas: 1039988.919 units remaining) - [ 52 ] + [ 52 ] - location: 20 (remaining gas: 1039988.889 units remaining) - [ 52 ] + [ 52 ] - location: 21 (remaining gas: 1039988.874 units remaining) - [ {} - 52 ] + [ {} + 52 ] - location: 23 (remaining gas: 1039988.859 units remaining) - [ (Pair {} 52) ] + [ (Pair {} 52) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out index b497c3c52fdb..b34efcabf6e2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out @@ -8,275 +8,275 @@ big_map diff trace - location: 8 (remaining gas: 1039979.891 units remaining) - [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ] + [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ] - location: 8 (remaining gas: 1039979.881 units remaining) - [ 4 - { 0 ; 1 ; 2 ; 3 } ] + [ 4 + { 0 ; 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039979.871 units remaining) - [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } - 4 - { 0 ; 1 ; 2 ; 3 } ] + [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } + 4 + { 0 ; 1 ; 2 ; 3 } ] - location: 23 (remaining gas: 1039979.861 units remaining) - [ 4 - { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } - { 0 ; 1 ; 2 ; 3 } ] + [ 4 + { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } + { 0 ; 1 ; 2 ; 3 } ] - location: 24 (remaining gas: 1039979.636 units remaining) - [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } - { 0 ; 1 ; 2 ; 3 } ] + [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } + { 0 ; 1 ; 2 ; 3 } ] - location: 25 (remaining gas: 1039979.626 units remaining) - [ 3 - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } - { 0 ; 1 ; 2 ; 3 } ] + [ 3 + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } + { 0 ; 1 ; 2 ; 3 } ] - location: 28 (remaining gas: 1039979.401 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } - { 0 ; 1 ; 2 ; 3 } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { 0 ; 1 ; 2 ; 3 } ] - location: 29 (remaining gas: 1039979.391 units remaining) - [ { 0 ; 1 ; 2 ; 3 } + [ { 0 ; 1 ; 2 ; 3 } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039979.391 units remaining) - [ 0 + [ 0 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039979.376 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 34 (remaining gas: 1039979.366 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039979.336 units remaining) - [ 0 + [ 0 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 16 (remaining gas: 1039979.326 units remaining) - [ 3 - 0 ] + [ 3 + 0 ] - location: 16 (remaining gas: 1039979.311 units remaining) - [ (Pair 3 0) ] + [ (Pair 3 0) ] - location: 16 (remaining gas: 1039979.301 units remaining) - [ 4 - (Pair 3 0) ] + [ 4 + (Pair 3 0) ] - location: 16 (remaining gas: 1039979.286 units remaining) - [ (Pair 4 3 0) ] + [ (Pair 4 3 0) ] - location: 17 (remaining gas: 1039979.276 units remaining) - [ 4 - (Pair 3 0) ] + [ 4 + (Pair 3 0) ] - location: 18 (remaining gas: 1039979.261 units remaining) - [ (Pair 3 0) ] + [ (Pair 3 0) ] - location: 20 (remaining gas: 1039979.251 units remaining) - [ 3 - 0 ] + [ 3 + 0 ] - location: 18 (remaining gas: 1039979.221 units remaining) - [ 4 - 3 - 0 ] + [ 4 + 3 + 0 ] - location: 21 (remaining gas: 1039979.166 units remaining) - [ 7 - 0 ] + [ 7 + 0 ] - location: 22 (remaining gas: 1039979.065 units remaining) - [ 0 ] + [ 0 ] - location: 35 (remaining gas: 1039979.035 units remaining) - [ 0 + [ 0 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039979.020 units remaining) - [ 1 + [ 1 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039979.005 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 34 (remaining gas: 1039978.995 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.965 units remaining) - [ 1 + [ 1 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 16 (remaining gas: 1039978.955 units remaining) - [ 3 - 1 ] + [ 3 + 1 ] - location: 16 (remaining gas: 1039978.940 units remaining) - [ (Pair 3 1) ] + [ (Pair 3 1) ] - location: 16 (remaining gas: 1039978.930 units remaining) - [ 4 - (Pair 3 1) ] + [ 4 + (Pair 3 1) ] - location: 16 (remaining gas: 1039978.915 units remaining) - [ (Pair 4 3 1) ] + [ (Pair 4 3 1) ] - location: 17 (remaining gas: 1039978.905 units remaining) - [ 4 - (Pair 3 1) ] + [ 4 + (Pair 3 1) ] - location: 18 (remaining gas: 1039978.890 units remaining) - [ (Pair 3 1) ] + [ (Pair 3 1) ] - location: 20 (remaining gas: 1039978.880 units remaining) - [ 3 - 1 ] + [ 3 + 1 ] - location: 18 (remaining gas: 1039978.850 units remaining) - [ 4 - 3 - 1 ] + [ 4 + 3 + 1 ] - location: 21 (remaining gas: 1039978.795 units remaining) - [ 7 - 1 ] + [ 7 + 1 ] - location: 22 (remaining gas: 1039978.691 units remaining) - [ 7 ] + [ 7 ] - location: 35 (remaining gas: 1039978.661 units remaining) - [ 7 + [ 7 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039978.646 units remaining) - [ 2 + [ 2 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.631 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 34 (remaining gas: 1039978.621 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.591 units remaining) - [ 2 + [ 2 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 16 (remaining gas: 1039978.581 units remaining) - [ 3 - 2 ] + [ 3 + 2 ] - location: 16 (remaining gas: 1039978.566 units remaining) - [ (Pair 3 2) ] + [ (Pair 3 2) ] - location: 16 (remaining gas: 1039978.556 units remaining) - [ 4 - (Pair 3 2) ] + [ 4 + (Pair 3 2) ] - location: 16 (remaining gas: 1039978.541 units remaining) - [ (Pair 4 3 2) ] + [ (Pair 4 3 2) ] - location: 17 (remaining gas: 1039978.531 units remaining) - [ 4 - (Pair 3 2) ] + [ 4 + (Pair 3 2) ] - location: 18 (remaining gas: 1039978.516 units remaining) - [ (Pair 3 2) ] + [ (Pair 3 2) ] - location: 20 (remaining gas: 1039978.506 units remaining) - [ 3 - 2 ] + [ 3 + 2 ] - location: 18 (remaining gas: 1039978.476 units remaining) - [ 4 - 3 - 2 ] + [ 4 + 3 + 2 ] - location: 21 (remaining gas: 1039978.421 units remaining) - [ 7 - 2 ] + [ 7 + 2 ] - location: 22 (remaining gas: 1039978.317 units remaining) - [ 14 ] + [ 14 ] - location: 35 (remaining gas: 1039978.287 units remaining) - [ 14 + [ 14 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039978.272 units remaining) - [ 3 + [ 3 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.257 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 34 (remaining gas: 1039978.247 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039978.217 units remaining) - [ 3 + [ 3 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 16 (remaining gas: 1039978.207 units remaining) - [ 3 - 3 ] + [ 3 + 3 ] - location: 16 (remaining gas: 1039978.192 units remaining) - [ (Pair 3 3) ] + [ (Pair 3 3) ] - location: 16 (remaining gas: 1039978.182 units remaining) - [ 4 - (Pair 3 3) ] + [ 4 + (Pair 3 3) ] - location: 16 (remaining gas: 1039978.167 units remaining) - [ (Pair 4 3 3) ] + [ (Pair 4 3 3) ] - location: 17 (remaining gas: 1039978.157 units remaining) - [ 4 - (Pair 3 3) ] + [ 4 + (Pair 3 3) ] - location: 18 (remaining gas: 1039978.142 units remaining) - [ (Pair 3 3) ] + [ (Pair 3 3) ] - location: 20 (remaining gas: 1039978.132 units remaining) - [ 3 - 3 ] + [ 3 + 3 ] - location: 18 (remaining gas: 1039978.102 units remaining) - [ 4 - 3 - 3 ] + [ 4 + 3 + 3 ] - location: 21 (remaining gas: 1039978.047 units remaining) - [ 7 - 3 ] + [ 7 + 3 ] - location: 22 (remaining gas: 1039977.943 units remaining) - [ 21 ] + [ 21 ] - location: 35 (remaining gas: 1039977.913 units remaining) - [ 21 + [ 21 { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 30 (remaining gas: 1039977.898 units remaining) - [ { 0 ; 7 ; 14 ; 21 } + [ { 0 ; 7 ; 14 ; 21 } { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 36 (remaining gas: 1039977.883 units remaining) [ { PUSH int 3 ; PAIR ; - { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] + { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 38 (remaining gas: 1039977.873 units remaining) [ ] - location: 36 (remaining gas: 1039977.843 units remaining) - [ { 0 ; 7 ; 14 ; 21 } ] + [ { 0 ; 7 ; 14 ; 21 } ] - location: 39 (remaining gas: 1039977.828 units remaining) - [ {} - { 0 ; 7 ; 14 ; 21 } ] + [ {} + { 0 ; 7 ; 14 ; 21 } ] - location: 41 (remaining gas: 1039977.813 units remaining) - [ (Pair {} { 0 ; 7 ; 14 ; 21 }) ] + [ (Pair {} { 0 ; 7 ; 14 ; 21 }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out index 44514a1ea424..5ccc4d0bc958 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out @@ -8,16 +8,16 @@ big_map diff trace - location: 8 (remaining gas: 1039993.541 units remaining) - [ (Pair Unit None) ] + [ (Pair Unit None) ] - location: 8 (remaining gas: 1039993.531 units remaining) [ ] - location: 9 (remaining gas: 1039993.521 units remaining) - [ 300 ] + [ 300 ] - location: 12 (remaining gas: 1039993.506 units remaining) - [ (Some 300) ] + [ (Some 300) ] - location: 13 (remaining gas: 1039993.491 units remaining) - [ {} - (Some 300) ] + [ {} + (Some 300) ] - location: 15 (remaining gas: 1039993.476 units remaining) - [ (Pair {} (Some 300)) ] + [ (Pair {} (Some 300)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 9230c50f081e..055db4acc281 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -8,35 +8,35 @@ big_map diff trace - location: 9 (remaining gas: 1039990.977 units remaining) - [ (Pair { "c" ; "b" ; "a" } { "" }) ] + [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039990.967 units remaining) - [ { "c" ; "b" ; "a" } ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039990.952 units remaining) - [ {} - { "c" ; "b" ; "a" } ] + [ {} + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039990.942 units remaining) - [ { "c" ; "b" ; "a" } - {} ] + [ { "c" ; "b" ; "a" } + {} ] - location: 13 (remaining gas: 1039990.942 units remaining) - [ "c" - {} ] + [ "c" + {} ] - location: 15 (remaining gas: 1039990.927 units remaining) - [ { "c" } ] + [ { "c" } ] - location: 13 (remaining gas: 1039990.912 units remaining) - [ "b" - { "c" } ] + [ "b" + { "c" } ] - location: 15 (remaining gas: 1039990.897 units remaining) - [ { "b" ; "c" } ] + [ { "b" ; "c" } ] - location: 13 (remaining gas: 1039990.882 units remaining) - [ "a" - { "b" ; "c" } ] + [ "a" + { "b" ; "c" } ] - location: 15 (remaining gas: 1039990.867 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 13 (remaining gas: 1039990.852 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 16 (remaining gas: 1039990.837 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039990.822 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" index 30c8cbb40fcf..9ffcd7995b33 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" @@ -8,20 +8,20 @@ big_map diff trace - location: 9 (remaining gas: 1039991.349 units remaining) - [ (Pair {} { "" }) ] + [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039991.339 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039991.324 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 12 (remaining gas: 1039991.314 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039991.314 units remaining) - [ {} ] + [ {} ] - location: 16 (remaining gas: 1039991.299 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 18 (remaining gas: 1039991.284 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index ea2ad6533d0b..633d6da2d723 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -8,124 +8,124 @@ big_map diff trace - location: 9 (remaining gas: 1039982.192 units remaining) - [ (Pair { "c" ; "b" ; "a" } { "" }) ] + [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039982.182 units remaining) - [ { "c" ; "b" ; "a" } ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039982.167 units remaining) - [ {} - { "c" ; "b" ; "a" } ] + [ {} + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039982.157 units remaining) - [ { "c" ; "b" ; "a" } - {} ] + [ { "c" ; "b" ; "a" } + {} ] - location: 13 (remaining gas: 1039982.147 units remaining) - [ True - { "c" ; "b" ; "a" } - {} ] + [ True + { "c" ; "b" ; "a" } + {} ] - location: 16 (remaining gas: 1039982.147 units remaining) - [ { "c" ; "b" ; "a" } - {} ] + [ { "c" ; "b" ; "a" } + {} ] - location: 18 (remaining gas: 1039982.137 units remaining) - [ "c" - { "b" ; "a" } - {} ] + [ "c" + { "b" ; "a" } + {} ] - location: 20 (remaining gas: 1039982.127 units remaining) - [ { "b" ; "a" } - "c" - {} ] + [ { "b" ; "a" } + "c" + {} ] - location: 21 (remaining gas: 1039982.112 units remaining) - [ "c" - {} ] + [ "c" + {} ] - location: 23 (remaining gas: 1039982.097 units remaining) - [ { "c" } ] + [ { "c" } ] - location: 21 (remaining gas: 1039982.067 units remaining) - [ { "b" ; "a" } - { "c" } ] + [ { "b" ; "a" } + { "c" } ] - location: 24 (remaining gas: 1039982.057 units remaining) - [ True - { "b" ; "a" } - { "c" } ] + [ True + { "b" ; "a" } + { "c" } ] - location: 18 (remaining gas: 1039982.042 units remaining) - [ True - { "b" ; "a" } - { "c" } ] + [ True + { "b" ; "a" } + { "c" } ] - location: 16 (remaining gas: 1039982.027 units remaining) - [ { "b" ; "a" } - { "c" } ] + [ { "b" ; "a" } + { "c" } ] - location: 18 (remaining gas: 1039982.017 units remaining) - [ "b" - { "a" } - { "c" } ] + [ "b" + { "a" } + { "c" } ] - location: 20 (remaining gas: 1039982.007 units remaining) - [ { "a" } - "b" - { "c" } ] + [ { "a" } + "b" + { "c" } ] - location: 21 (remaining gas: 1039981.992 units remaining) - [ "b" - { "c" } ] + [ "b" + { "c" } ] - location: 23 (remaining gas: 1039981.977 units remaining) - [ { "b" ; "c" } ] + [ { "b" ; "c" } ] - location: 21 (remaining gas: 1039981.947 units remaining) - [ { "a" } - { "b" ; "c" } ] + [ { "a" } + { "b" ; "c" } ] - location: 24 (remaining gas: 1039981.937 units remaining) - [ True - { "a" } - { "b" ; "c" } ] + [ True + { "a" } + { "b" ; "c" } ] - location: 18 (remaining gas: 1039981.922 units remaining) - [ True - { "a" } - { "b" ; "c" } ] + [ True + { "a" } + { "b" ; "c" } ] - location: 16 (remaining gas: 1039981.907 units remaining) - [ { "a" } - { "b" ; "c" } ] + [ { "a" } + { "b" ; "c" } ] - location: 18 (remaining gas: 1039981.897 units remaining) - [ "a" - {} - { "b" ; "c" } ] + [ "a" + {} + { "b" ; "c" } ] - location: 20 (remaining gas: 1039981.887 units remaining) - [ {} - "a" - { "b" ; "c" } ] + [ {} + "a" + { "b" ; "c" } ] - location: 21 (remaining gas: 1039981.872 units remaining) - [ "a" - { "b" ; "c" } ] + [ "a" + { "b" ; "c" } ] - location: 23 (remaining gas: 1039981.857 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 21 (remaining gas: 1039981.827 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 24 (remaining gas: 1039981.817 units remaining) - [ True - {} - { "a" ; "b" ; "c" } ] + [ True + {} + { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039981.802 units remaining) - [ True - {} - { "a" ; "b" ; "c" } ] + [ True + {} + { "a" ; "b" ; "c" } ] - location: 16 (remaining gas: 1039981.787 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039981.777 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 28 (remaining gas: 1039981.762 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 30 (remaining gas: 1039981.752 units remaining) - [ False - {} - { "a" ; "b" ; "c" } ] + [ False + {} + { "a" ; "b" ; "c" } ] - location: 18 (remaining gas: 1039981.737 units remaining) - [ False - {} - { "a" ; "b" ; "c" } ] + [ False + {} + { "a" ; "b" ; "c" } ] - location: 16 (remaining gas: 1039981.722 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 33 (remaining gas: 1039981.712 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 34 (remaining gas: 1039981.697 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 36 (remaining gas: 1039981.682 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" index 98377598609b..08e0aada69cc 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" @@ -8,43 +8,43 @@ big_map diff trace - location: 9 (remaining gas: 1039982.564 units remaining) - [ (Pair {} { "" }) ] + [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039982.554 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039982.539 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 12 (remaining gas: 1039982.529 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039982.519 units remaining) - [ True - {} - {} ] + [ True + {} + {} ] - location: 16 (remaining gas: 1039982.519 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 18 (remaining gas: 1039982.509 units remaining) - [ {} ] + [ {} ] - location: 28 (remaining gas: 1039982.494 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 30 (remaining gas: 1039982.484 units remaining) - [ False - {} - {} ] + [ False + {} + {} ] - location: 18 (remaining gas: 1039982.469 units remaining) - [ False - {} - {} ] + [ False + {} + {} ] - location: 16 (remaining gas: 1039982.454 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 33 (remaining gas: 1039982.444 units remaining) - [ {} ] + [ {} ] - location: 34 (remaining gas: 1039982.429 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 36 (remaining gas: 1039982.414 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out index dbe6de2ddb3a..65bd131c0f54 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.857 units remaining) - [ (Pair Unit {}) ] + [ (Pair Unit {}) ] - location: 8 (remaining gas: 1039994.847 units remaining) [ ] - location: 9 (remaining gas: 1039994.832 units remaining) - [ {} ] + [ {} ] - location: 11 (remaining gas: 1039994.817 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 13 (remaining gas: 1039994.802 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out index aace306d543c..cd4edf2e27c5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out @@ -8,39 +8,39 @@ big_map diff trace - location: 7 (remaining gas: 1039984.339 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039984.329 units remaining) [ ] - location: 8 (remaining gas: 1039984.319 units remaining) - [ { DROP ; SELF_ADDRESS } ] + [ { DROP ; SELF_ADDRESS } ] - location: 14 (remaining gas: 1039984.309 units remaining) - [ Unit - { DROP ; SELF_ADDRESS } ] + [ Unit + { DROP ; SELF_ADDRESS } ] - location: 12 (remaining gas: 1039984.299 units remaining) [ ] - location: 13 (remaining gas: 1039984.284 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 15 (remaining gas: 1039984.254 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 16 (remaining gas: 1039984.239 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" - "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 17 (remaining gas: 1039984.229 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" - "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 20 (remaining gas: 1039984.193 units remaining) - [ 0 ] + [ 0 ] - location: 21 (remaining gas: 1039984.178 units remaining) - [ True ] + [ True ] - location: 22 (remaining gas: 1039984.168 units remaining) [ ] - location: 22 (remaining gas: 1039984.153 units remaining) [ ] - location: 28 (remaining gas: 1039984.143 units remaining) - [ Unit ] + [ Unit ] - location: 29 (remaining gas: 1039984.128 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 31 (remaining gas: 1039984.113 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out index 8ad3c234e015..fb138d3ee369 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out @@ -8,40 +8,40 @@ big_map diff trace - location: 13 (remaining gas: 1039983.500 units remaining) - [ (Pair (Right (Left Unit)) Unit) ] + [ (Pair (Right (Left Unit)) Unit) ] - location: 13 (remaining gas: 1039983.490 units remaining) [ ] - location: 14 (remaining gas: 1039983.475 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 15 (remaining gas: 1039983.465 units remaining) [ ] - location: 16 (remaining gas: 1039983.450 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 17 (remaining gas: 1039983.440 units remaining) [ ] - location: 18 (remaining gas: 1039983.425 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 19 (remaining gas: 1039972.472 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 20 (remaining gas: 1039972.457 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 21 (remaining gas: 1039961.504 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 24 (remaining gas: 1039961.469 units remaining) - [ 0 ] + [ 0 ] - location: 25 (remaining gas: 1039961.454 units remaining) - [ True ] + [ True ] - location: 26 (remaining gas: 1039961.444 units remaining) [ ] - location: 26 (remaining gas: 1039961.429 units remaining) [ ] - location: 32 (remaining gas: 1039961.419 units remaining) - [ Unit ] + [ Unit ] - location: 33 (remaining gas: 1039961.404 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 35 (remaining gas: 1039961.389 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out index 82d4d0d93804..75ac09514eec 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out @@ -8,86 +8,86 @@ big_map diff trace - location: 13 (remaining gas: 1039954.631 units remaining) - [ (Pair (Left (Left 0)) Unit) ] + [ (Pair (Left (Left 0)) Unit) ] - location: 13 (remaining gas: 1039954.621 units remaining) [ ] - location: 14 (remaining gas: 1039954.606 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 15 (remaining gas: 1039943.620 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 16 (remaining gas: 1039943.605 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 17 (remaining gas: 1039932.652 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 18 (remaining gas: 1039932.642 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 19 (remaining gas: 1039932.627 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 21 (remaining gas: 1039932.617 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 19 (remaining gas: 1039932.587 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 24 (remaining gas: 1039932.552 units remaining) - [ -1 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ -1 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 25 (remaining gas: 1039932.537 units remaining) - [ True - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ True + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 26 (remaining gas: 1039932.527 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 26 (remaining gas: 1039932.512 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 32 (remaining gas: 1039932.497 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 33 (remaining gas: 1039921.544 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 36 (remaining gas: 1039921.509 units remaining) - [ 0 ] + [ 0 ] - location: 37 (remaining gas: 1039921.494 units remaining) - [ True ] + [ True ] - location: 38 (remaining gas: 1039921.484 units remaining) [ ] - location: 38 (remaining gas: 1039921.469 units remaining) [ ] - location: 44 (remaining gas: 1039921.454 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 48 (remaining gas: 1039921.444 units remaining) [ ] - location: 49 (remaining gas: 1039921.429 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] - location: 53 (remaining gas: 1039921.419 units remaining) [ ] - location: 54 (remaining gas: 1039921.404 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] - location: 60 (remaining gas: 1039921.394 units remaining) [ ] - location: 61 (remaining gas: 1039921.379 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] - location: 65 (remaining gas: 1039921.369 units remaining) [ ] - location: 66 (remaining gas: 1039921.354 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 76 (remaining gas: 1039921.344 units remaining) [ ] - location: 77 (remaining gas: 1039921.329 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 87 (remaining gas: 1039921.319 units remaining) [ ] - location: 88 (remaining gas: 1039921.309 units remaining) - [ Unit ] + [ Unit ] - location: 89 (remaining gas: 1039921.294 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 91 (remaining gas: 1039921.279 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" index 05f706bdcd5e..b52075bceb2d 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" @@ -8,42 +8,42 @@ big_map diff trace - location: 9 (remaining gas: 1039987.561 units remaining) - [ (Pair "" "hello" 0) ] + [ (Pair "" "hello" 0) ] - location: 9 (remaining gas: 1039987.551 units remaining) - [ (Pair "" "hello" 0) - (Pair "" "hello" 0) ] + [ (Pair "" "hello" 0) + (Pair "" "hello" 0) ] - location: 10 (remaining gas: 1039987.541 units remaining) - [ (Pair "hello" 0) - (Pair "" "hello" 0) ] + [ (Pair "hello" 0) + (Pair "" "hello" 0) ] - location: 11 (remaining gas: 1039987.526 units remaining) - [ (Pair "" "hello" 0) ] + [ (Pair "" "hello" 0) ] - location: 13 (remaining gas: 1039987.516 units remaining) - [ "" ] + [ "" ] - location: 11 (remaining gas: 1039987.486 units remaining) - [ (Pair "hello" 0) - "" ] + [ (Pair "hello" 0) + "" ] - location: 15 (remaining gas: 1039987.476 units remaining) - [ (Pair "hello" 0) - (Pair "hello" 0) - "" ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "" ] - location: 16 (remaining gas: 1039987.466 units remaining) - [ "hello" - (Pair "hello" 0) - "" ] + [ "hello" + (Pair "hello" 0) + "" ] - location: 17 (remaining gas: 1039987.456 units remaining) - [ (Pair "hello" 0) - "" ] + [ (Pair "hello" 0) + "" ] - location: 18 (remaining gas: 1039987.446 units remaining) - [ 0 - "" ] + [ 0 + "" ] - location: 19 (remaining gas: 1039987.436 units remaining) - [ "" - 0 ] + [ "" + 0 ] - location: 20 (remaining gas: 1039987.421 units remaining) - [ (Pair "" 0) ] + [ (Pair "" 0) ] - location: 21 (remaining gas: 1039987.406 units remaining) - [ {} - (Pair "" 0) ] + [ {} + (Pair "" 0) ] - location: 23 (remaining gas: 1039987.391 units remaining) - [ (Pair {} "" 0) ] + [ (Pair {} "" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" index 7aa7e30addf8..58358307a610 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" @@ -8,42 +8,42 @@ big_map diff trace - location: 9 (remaining gas: 1039987.531 units remaining) - [ (Pair "abc" "hello" 0) ] + [ (Pair "abc" "hello" 0) ] - location: 9 (remaining gas: 1039987.521 units remaining) - [ (Pair "abc" "hello" 0) - (Pair "abc" "hello" 0) ] + [ (Pair "abc" "hello" 0) + (Pair "abc" "hello" 0) ] - location: 10 (remaining gas: 1039987.511 units remaining) - [ (Pair "hello" 0) - (Pair "abc" "hello" 0) ] + [ (Pair "hello" 0) + (Pair "abc" "hello" 0) ] - location: 11 (remaining gas: 1039987.496 units remaining) - [ (Pair "abc" "hello" 0) ] + [ (Pair "abc" "hello" 0) ] - location: 13 (remaining gas: 1039987.486 units remaining) - [ "abc" ] + [ "abc" ] - location: 11 (remaining gas: 1039987.456 units remaining) - [ (Pair "hello" 0) - "abc" ] + [ (Pair "hello" 0) + "abc" ] - location: 15 (remaining gas: 1039987.446 units remaining) - [ (Pair "hello" 0) - (Pair "hello" 0) - "abc" ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "abc" ] - location: 16 (remaining gas: 1039987.436 units remaining) - [ "hello" - (Pair "hello" 0) - "abc" ] + [ "hello" + (Pair "hello" 0) + "abc" ] - location: 17 (remaining gas: 1039987.426 units remaining) - [ (Pair "hello" 0) - "abc" ] + [ (Pair "hello" 0) + "abc" ] - location: 18 (remaining gas: 1039987.416 units remaining) - [ 0 - "abc" ] + [ 0 + "abc" ] - location: 19 (remaining gas: 1039987.406 units remaining) - [ "abc" - 0 ] + [ "abc" + 0 ] - location: 20 (remaining gas: 1039987.391 units remaining) - [ (Pair "abc" 0) ] + [ (Pair "abc" 0) ] - location: 21 (remaining gas: 1039987.376 units remaining) - [ {} - (Pair "abc" 0) ] + [ {} + (Pair "abc" 0) ] - location: 23 (remaining gas: 1039987.361 units remaining) - [ (Pair {} "abc" 0) ] + [ (Pair {} "abc" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" index 209613e5711a..8cea6ca5aaa0 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" @@ -8,42 +8,42 @@ big_map diff trace - location: 9 (remaining gas: 1039987.511 units remaining) - [ (Pair "world" "hello" 0) ] + [ (Pair "world" "hello" 0) ] - location: 9 (remaining gas: 1039987.501 units remaining) - [ (Pair "world" "hello" 0) - (Pair "world" "hello" 0) ] + [ (Pair "world" "hello" 0) + (Pair "world" "hello" 0) ] - location: 10 (remaining gas: 1039987.491 units remaining) - [ (Pair "hello" 0) - (Pair "world" "hello" 0) ] + [ (Pair "hello" 0) + (Pair "world" "hello" 0) ] - location: 11 (remaining gas: 1039987.476 units remaining) - [ (Pair "world" "hello" 0) ] + [ (Pair "world" "hello" 0) ] - location: 13 (remaining gas: 1039987.466 units remaining) - [ "world" ] + [ "world" ] - location: 11 (remaining gas: 1039987.436 units remaining) - [ (Pair "hello" 0) - "world" ] + [ (Pair "hello" 0) + "world" ] - location: 15 (remaining gas: 1039987.426 units remaining) - [ (Pair "hello" 0) - (Pair "hello" 0) - "world" ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "world" ] - location: 16 (remaining gas: 1039987.416 units remaining) - [ "hello" - (Pair "hello" 0) - "world" ] + [ "hello" + (Pair "hello" 0) + "world" ] - location: 17 (remaining gas: 1039987.406 units remaining) - [ (Pair "hello" 0) - "world" ] + [ (Pair "hello" 0) + "world" ] - location: 18 (remaining gas: 1039987.396 units remaining) - [ 0 - "world" ] + [ 0 + "world" ] - location: 19 (remaining gas: 1039987.386 units remaining) - [ "world" - 0 ] + [ "world" + 0 ] - location: 20 (remaining gas: 1039987.371 units remaining) - [ (Pair "world" 0) ] + [ (Pair "world" 0) ] - location: 21 (remaining gas: 1039987.356 units remaining) - [ {} - (Pair "world" 0) ] + [ {} + (Pair "world" 0) ] - location: 23 (remaining gas: 1039987.341 units remaining) - [ (Pair {} "world" 0) ] + [ (Pair {} "world" 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" index fb0d3ede36c2..abcb3d0f8799 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" @@ -8,39 +8,39 @@ big_map diff trace - location: 9 (remaining gas: 1039988.178 units remaining) - [ (Pair 1 "hello" 0) ] + [ (Pair 1 "hello" 0) ] - location: 9 (remaining gas: 1039988.168 units remaining) - [ (Pair 1 "hello" 0) - (Pair 1 "hello" 0) ] + [ (Pair 1 "hello" 0) + (Pair 1 "hello" 0) ] - location: 10 (remaining gas: 1039988.158 units remaining) - [ (Pair "hello" 0) - (Pair 1 "hello" 0) ] + [ (Pair "hello" 0) + (Pair 1 "hello" 0) ] - location: 11 (remaining gas: 1039988.143 units remaining) - [ (Pair 1 "hello" 0) ] + [ (Pair 1 "hello" 0) ] - location: 13 (remaining gas: 1039988.133 units remaining) - [ 1 ] + [ 1 ] - location: 11 (remaining gas: 1039988.103 units remaining) - [ (Pair "hello" 0) - 1 ] + [ (Pair "hello" 0) + 1 ] - location: 15 (remaining gas: 1039988.093 units remaining) - [ (Pair "hello" 0) - (Pair "hello" 0) - 1 ] + [ (Pair "hello" 0) + (Pair "hello" 0) + 1 ] - location: 16 (remaining gas: 1039988.083 units remaining) - [ 0 - (Pair "hello" 0) - 1 ] + [ 0 + (Pair "hello" 0) + 1 ] - location: 17 (remaining gas: 1039988.073 units remaining) - [ (Pair "hello" 0) - 1 ] + [ (Pair "hello" 0) + 1 ] - location: 18 (remaining gas: 1039988.063 units remaining) - [ "hello" - 1 ] + [ "hello" + 1 ] - location: 19 (remaining gas: 1039988.048 units remaining) - [ (Pair "hello" 1) ] + [ (Pair "hello" 1) ] - location: 20 (remaining gas: 1039988.033 units remaining) - [ {} - (Pair "hello" 1) ] + [ {} + (Pair "hello" 1) ] - location: 22 (remaining gas: 1039988.018 units remaining) - [ (Pair {} "hello" 1) ] + [ (Pair {} "hello" 1) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" index 9c87b488d077..9b0e7122fd1c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" @@ -8,39 +8,39 @@ big_map diff trace - location: 9 (remaining gas: 1039988.178 units remaining) - [ (Pair 3 "hello" 500) ] + [ (Pair 3 "hello" 500) ] - location: 9 (remaining gas: 1039988.168 units remaining) - [ (Pair 3 "hello" 500) - (Pair 3 "hello" 500) ] + [ (Pair 3 "hello" 500) + (Pair 3 "hello" 500) ] - location: 10 (remaining gas: 1039988.158 units remaining) - [ (Pair "hello" 500) - (Pair 3 "hello" 500) ] + [ (Pair "hello" 500) + (Pair 3 "hello" 500) ] - location: 11 (remaining gas: 1039988.143 units remaining) - [ (Pair 3 "hello" 500) ] + [ (Pair 3 "hello" 500) ] - location: 13 (remaining gas: 1039988.133 units remaining) - [ 3 ] + [ 3 ] - location: 11 (remaining gas: 1039988.103 units remaining) - [ (Pair "hello" 500) - 3 ] + [ (Pair "hello" 500) + 3 ] - location: 15 (remaining gas: 1039988.093 units remaining) - [ (Pair "hello" 500) - (Pair "hello" 500) - 3 ] + [ (Pair "hello" 500) + (Pair "hello" 500) + 3 ] - location: 16 (remaining gas: 1039988.083 units remaining) - [ 500 - (Pair "hello" 500) - 3 ] + [ 500 + (Pair "hello" 500) + 3 ] - location: 17 (remaining gas: 1039988.073 units remaining) - [ (Pair "hello" 500) - 3 ] + [ (Pair "hello" 500) + 3 ] - location: 18 (remaining gas: 1039988.063 units remaining) - [ "hello" - 3 ] + [ "hello" + 3 ] - location: 19 (remaining gas: 1039988.048 units remaining) - [ (Pair "hello" 3) ] + [ (Pair "hello" 3) ] - location: 20 (remaining gas: 1039988.033 units remaining) - [ {} - (Pair "hello" 3) ] + [ {} + (Pair "hello" 3) ] - location: 22 (remaining gas: 1039988.018 units remaining) - [ (Pair {} "hello" 3) ] + [ (Pair {} "hello" 3) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" index 73ffe70d7747..34dda4f6de29 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" @@ -8,39 +8,39 @@ big_map diff trace - location: 9 (remaining gas: 1039988.178 units remaining) - [ (Pair 100 "hello" 7) ] + [ (Pair 100 "hello" 7) ] - location: 9 (remaining gas: 1039988.168 units remaining) - [ (Pair 100 "hello" 7) - (Pair 100 "hello" 7) ] + [ (Pair 100 "hello" 7) + (Pair 100 "hello" 7) ] - location: 10 (remaining gas: 1039988.158 units remaining) - [ (Pair "hello" 7) - (Pair 100 "hello" 7) ] + [ (Pair "hello" 7) + (Pair 100 "hello" 7) ] - location: 11 (remaining gas: 1039988.143 units remaining) - [ (Pair 100 "hello" 7) ] + [ (Pair 100 "hello" 7) ] - location: 13 (remaining gas: 1039988.133 units remaining) - [ 100 ] + [ 100 ] - location: 11 (remaining gas: 1039988.103 units remaining) - [ (Pair "hello" 7) - 100 ] + [ (Pair "hello" 7) + 100 ] - location: 15 (remaining gas: 1039988.093 units remaining) - [ (Pair "hello" 7) - (Pair "hello" 7) - 100 ] + [ (Pair "hello" 7) + (Pair "hello" 7) + 100 ] - location: 16 (remaining gas: 1039988.083 units remaining) - [ 7 - (Pair "hello" 7) - 100 ] + [ 7 + (Pair "hello" 7) + 100 ] - location: 17 (remaining gas: 1039988.073 units remaining) - [ (Pair "hello" 7) - 100 ] + [ (Pair "hello" 7) + 100 ] - location: 18 (remaining gas: 1039988.063 units remaining) - [ "hello" - 100 ] + [ "hello" + 100 ] - location: 19 (remaining gas: 1039988.048 units remaining) - [ (Pair "hello" 100) ] + [ (Pair "hello" 100) ] - location: 20 (remaining gas: 1039988.033 units remaining) - [ {} - (Pair "hello" 100) ] + [ {} + (Pair "hello" 100) ] - location: 22 (remaining gas: 1039988.018 units remaining) - [ (Pair {} "hello" 100) ] + [ (Pair {} "hello" 100) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" index 88751834ec56..5cc952222acc 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" @@ -8,12 +8,12 @@ big_map diff trace - location: 9 (remaining gas: 1039993.773 units remaining) - [ (Pair { "a" ; "b" ; "c" } {}) ] + [ (Pair { "a" ; "b" ; "c" } {}) ] - location: 9 (remaining gas: 1039993.763 units remaining) - [ { "a" ; "b" ; "c" } ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039993.748 units remaining) - [ {} - { "a" ; "b" ; "c" } ] + [ {} + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039993.733 units remaining) - [ (Pair {} { "a" ; "b" ; "c" }) ] + [ (Pair {} { "a" ; "b" ; "c" }) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" index 3cdd999dbc72..98b4125d002a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" @@ -8,12 +8,12 @@ big_map diff trace - location: 9 (remaining gas: 1039994.212 units remaining) - [ (Pair { "asdf" ; "bcde" } {}) ] + [ (Pair { "asdf" ; "bcde" } {}) ] - location: 9 (remaining gas: 1039994.202 units remaining) - [ { "asdf" ; "bcde" } ] + [ { "asdf" ; "bcde" } ] - location: 10 (remaining gas: 1039994.187 units remaining) - [ {} - { "asdf" ; "bcde" } ] + [ {} + { "asdf" ; "bcde" } ] - location: 12 (remaining gas: 1039994.172 units remaining) - [ (Pair {} { "asdf" ; "bcde" }) ] + [ (Pair {} { "asdf" ; "bcde" }) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out index 5ccce502fc4a..184f982b586e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out @@ -8,12 +8,12 @@ big_map diff trace - location: 9 (remaining gas: 1039995.025 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] - location: 9 (remaining gas: 1039995.015 units remaining) - [ {} ] + [ {} ] - location: 10 (remaining gas: 1039995 units remaining) - [ {} - {} ] + [ {} + {} ] - location: 12 (remaining gas: 1039994.985 units remaining) - [ (Pair {} {}) ] + [ (Pair {} {}) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out index 4ccecfc9f634..2fbb3eeffb17 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out @@ -8,40 +8,40 @@ big_map diff trace - location: 8 (remaining gas: 1039990.518 units remaining) - [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ] + [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039990.508 units remaining) - [ { -100 ; 1 ; 2 ; 3 } ] + [ { -100 ; 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039990.498 units remaining) - [ 0 - { -100 ; 1 ; 2 ; 3 } ] + [ 0 + { -100 ; 1 ; 2 ; 3 } ] - location: 12 (remaining gas: 1039990.488 units remaining) - [ { -100 ; 1 ; 2 ; 3 } - 0 ] + [ { -100 ; 1 ; 2 ; 3 } + 0 ] - location: 13 (remaining gas: 1039990.488 units remaining) - [ -100 - 0 ] + [ -100 + 0 ] - location: 15 (remaining gas: 1039990.433 units remaining) - [ -100 ] + [ -100 ] - location: 13 (remaining gas: 1039990.418 units remaining) - [ 1 - -100 ] + [ 1 + -100 ] - location: 15 (remaining gas: 1039990.363 units remaining) - [ -99 ] + [ -99 ] - location: 13 (remaining gas: 1039990.348 units remaining) - [ 2 - -99 ] + [ 2 + -99 ] - location: 15 (remaining gas: 1039990.293 units remaining) - [ -97 ] + [ -97 ] - location: 13 (remaining gas: 1039990.278 units remaining) - [ 3 - -97 ] + [ 3 + -97 ] - location: 15 (remaining gas: 1039990.223 units remaining) - [ -94 ] + [ -94 ] - location: 13 (remaining gas: 1039990.208 units remaining) - [ -94 ] + [ -94 ] - location: 16 (remaining gas: 1039990.193 units remaining) - [ {} - -94 ] + [ {} + -94 ] - location: 18 (remaining gas: 1039990.178 units remaining) - [ (Pair {} -94) ] + [ (Pair {} -94) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out index 15ac0c0590cc..1dc128f3c849 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out @@ -8,25 +8,25 @@ big_map diff trace - location: 8 (remaining gas: 1039991.873 units remaining) - [ (Pair { 1 } 111) ] + [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039991.863 units remaining) - [ { 1 } ] + [ { 1 } ] - location: 9 (remaining gas: 1039991.853 units remaining) - [ 0 - { 1 } ] + [ 0 + { 1 } ] - location: 12 (remaining gas: 1039991.843 units remaining) - [ { 1 } - 0 ] + [ { 1 } + 0 ] - location: 13 (remaining gas: 1039991.843 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 15 (remaining gas: 1039991.788 units remaining) - [ 1 ] + [ 1 ] - location: 13 (remaining gas: 1039991.773 units remaining) - [ 1 ] + [ 1 ] - location: 16 (remaining gas: 1039991.758 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 18 (remaining gas: 1039991.743 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out index 7ed8ceee7b68..8aa528cfa8b0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out @@ -8,20 +8,20 @@ big_map diff trace - location: 8 (remaining gas: 1039992.173 units remaining) - [ (Pair {} 111) ] + [ (Pair {} 111) ] - location: 8 (remaining gas: 1039992.163 units remaining) - [ {} ] + [ {} ] - location: 9 (remaining gas: 1039992.153 units remaining) - [ 0 - {} ] + [ 0 + {} ] - location: 12 (remaining gas: 1039992.143 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 13 (remaining gas: 1039992.143 units remaining) - [ 0 ] + [ 0 ] - location: 16 (remaining gas: 1039992.128 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 18 (remaining gas: 1039992.113 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" index 6cf013df5c19..e562ab59814f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" @@ -8,54 +8,54 @@ big_map diff trace - location: 11 (remaining gas: 1039983.293 units remaining) - [ (Pair "" { "Hello" ; "World" } None) ] + [ (Pair "" { "Hello" ; "World" } None) ] - location: 11 (remaining gas: 1039983.283 units remaining) - [ (Pair "" { "Hello" ; "World" } None) - (Pair "" { "Hello" ; "World" } None) ] + [ (Pair "" { "Hello" ; "World" } None) + (Pair "" { "Hello" ; "World" } None) ] - location: 12 (remaining gas: 1039983.273 units remaining) - [ (Pair "" { "Hello" ; "World" } None) - (Pair "" { "Hello" ; "World" } None) - (Pair "" { "Hello" ; "World" } None) ] + [ (Pair "" { "Hello" ; "World" } None) + (Pair "" { "Hello" ; "World" } None) + (Pair "" { "Hello" ; "World" } None) ] - location: 13 (remaining gas: 1039983.263 units remaining) - [ "" - (Pair "" { "Hello" ; "World" } None) - (Pair "" { "Hello" ; "World" } None) ] + [ "" + (Pair "" { "Hello" ; "World" } None) + (Pair "" { "Hello" ; "World" } None) ] - location: 14 (remaining gas: 1039983.248 units remaining) - [ (Pair "" { "Hello" ; "World" } None) - (Pair "" { "Hello" ; "World" } None) ] + [ (Pair "" { "Hello" ; "World" } None) + (Pair "" { "Hello" ; "World" } None) ] - location: 17 (remaining gas: 1039983.238 units remaining) - [ (Pair { "Hello" ; "World" } None) - (Pair "" { "Hello" ; "World" } None) ] + [ (Pair { "Hello" ; "World" } None) + (Pair "" { "Hello" ; "World" } None) ] - location: 18 (remaining gas: 1039983.228 units remaining) - [ { "Hello" ; "World" } - (Pair "" { "Hello" ; "World" } None) ] + [ { "Hello" ; "World" } + (Pair "" { "Hello" ; "World" } None) ] - location: 14 (remaining gas: 1039983.198 units remaining) - [ "" - { "Hello" ; "World" } - (Pair "" { "Hello" ; "World" } None) ] + [ "" + { "Hello" ; "World" } + (Pair "" { "Hello" ; "World" } None) ] - location: 19 (remaining gas: 1039982.978 units remaining) - [ False - (Pair "" { "Hello" ; "World" } None) ] + [ False + (Pair "" { "Hello" ; "World" } None) ] - location: 20 (remaining gas: 1039982.963 units remaining) - [ (Some False) - (Pair "" { "Hello" ; "World" } None) ] + [ (Some False) + (Pair "" { "Hello" ; "World" } None) ] - location: 21 (remaining gas: 1039982.948 units remaining) - [ (Pair "" { "Hello" ; "World" } None) ] + [ (Pair "" { "Hello" ; "World" } None) ] - location: 24 (remaining gas: 1039982.938 units remaining) - [ (Pair { "Hello" ; "World" } None) ] + [ (Pair { "Hello" ; "World" } None) ] - location: 25 (remaining gas: 1039982.928 units remaining) - [ { "Hello" ; "World" } ] + [ { "Hello" ; "World" } ] - location: 21 (remaining gas: 1039982.898 units remaining) - [ (Some False) - { "Hello" ; "World" } ] + [ (Some False) + { "Hello" ; "World" } ] - location: 26 (remaining gas: 1039982.888 units remaining) - [ { "Hello" ; "World" } - (Some False) ] + [ { "Hello" ; "World" } + (Some False) ] - location: 27 (remaining gas: 1039982.873 units remaining) - [ (Pair { "Hello" ; "World" } (Some False)) ] + [ (Pair { "Hello" ; "World" } (Some False)) ] - location: 28 (remaining gas: 1039982.858 units remaining) - [ {} - (Pair { "Hello" ; "World" } (Some False)) ] + [ {} + (Pair { "Hello" ; "World" } (Some False)) ] - location: 30 (remaining gas: 1039982.843 units remaining) - [ (Pair {} { "Hello" ; "World" } (Some False)) ] + [ (Pair {} { "Hello" ; "World" } (Some False)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" index b61a373ba988..ea34b86221a8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" @@ -8,54 +8,54 @@ big_map diff trace - location: 11 (remaining gas: 1039983.772 units remaining) - [ (Pair "Hi" { "Hi" } None) ] + [ (Pair "Hi" { "Hi" } None) ] - location: 11 (remaining gas: 1039983.762 units remaining) - [ (Pair "Hi" { "Hi" } None) - (Pair "Hi" { "Hi" } None) ] + [ (Pair "Hi" { "Hi" } None) + (Pair "Hi" { "Hi" } None) ] - location: 12 (remaining gas: 1039983.752 units remaining) - [ (Pair "Hi" { "Hi" } None) - (Pair "Hi" { "Hi" } None) - (Pair "Hi" { "Hi" } None) ] + [ (Pair "Hi" { "Hi" } None) + (Pair "Hi" { "Hi" } None) + (Pair "Hi" { "Hi" } None) ] - location: 13 (remaining gas: 1039983.742 units remaining) - [ "Hi" - (Pair "Hi" { "Hi" } None) - (Pair "Hi" { "Hi" } None) ] + [ "Hi" + (Pair "Hi" { "Hi" } None) + (Pair "Hi" { "Hi" } None) ] - location: 14 (remaining gas: 1039983.727 units remaining) - [ (Pair "Hi" { "Hi" } None) - (Pair "Hi" { "Hi" } None) ] + [ (Pair "Hi" { "Hi" } None) + (Pair "Hi" { "Hi" } None) ] - location: 17 (remaining gas: 1039983.717 units remaining) - [ (Pair { "Hi" } None) - (Pair "Hi" { "Hi" } None) ] + [ (Pair { "Hi" } None) + (Pair "Hi" { "Hi" } None) ] - location: 18 (remaining gas: 1039983.707 units remaining) - [ { "Hi" } - (Pair "Hi" { "Hi" } None) ] + [ { "Hi" } + (Pair "Hi" { "Hi" } None) ] - location: 14 (remaining gas: 1039983.677 units remaining) - [ "Hi" - { "Hi" } - (Pair "Hi" { "Hi" } None) ] + [ "Hi" + { "Hi" } + (Pair "Hi" { "Hi" } None) ] - location: 19 (remaining gas: 1039983.492 units remaining) - [ True - (Pair "Hi" { "Hi" } None) ] + [ True + (Pair "Hi" { "Hi" } None) ] - location: 20 (remaining gas: 1039983.477 units remaining) - [ (Some True) - (Pair "Hi" { "Hi" } None) ] + [ (Some True) + (Pair "Hi" { "Hi" } None) ] - location: 21 (remaining gas: 1039983.462 units remaining) - [ (Pair "Hi" { "Hi" } None) ] + [ (Pair "Hi" { "Hi" } None) ] - location: 24 (remaining gas: 1039983.452 units remaining) - [ (Pair { "Hi" } None) ] + [ (Pair { "Hi" } None) ] - location: 25 (remaining gas: 1039983.442 units remaining) - [ { "Hi" } ] + [ { "Hi" } ] - location: 21 (remaining gas: 1039983.412 units remaining) - [ (Some True) - { "Hi" } ] + [ (Some True) + { "Hi" } ] - location: 26 (remaining gas: 1039983.402 units remaining) - [ { "Hi" } - (Some True) ] + [ { "Hi" } + (Some True) ] - location: 27 (remaining gas: 1039983.387 units remaining) - [ (Pair { "Hi" } (Some True)) ] + [ (Pair { "Hi" } (Some True)) ] - location: 28 (remaining gas: 1039983.372 units remaining) - [ {} - (Pair { "Hi" } (Some True)) ] + [ {} + (Pair { "Hi" } (Some True)) ] - location: 30 (remaining gas: 1039983.357 units remaining) - [ (Pair {} { "Hi" } (Some True)) ] + [ (Pair {} { "Hi" } (Some True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" index d0742d488a98..37f94a047b49 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" @@ -8,54 +8,54 @@ big_map diff trace - location: 11 (remaining gas: 1039984.106 units remaining) - [ (Pair "Hi" {} None) ] + [ (Pair "Hi" {} None) ] - location: 11 (remaining gas: 1039984.096 units remaining) - [ (Pair "Hi" {} None) - (Pair "Hi" {} None) ] + [ (Pair "Hi" {} None) + (Pair "Hi" {} None) ] - location: 12 (remaining gas: 1039984.086 units remaining) - [ (Pair "Hi" {} None) - (Pair "Hi" {} None) - (Pair "Hi" {} None) ] + [ (Pair "Hi" {} None) + (Pair "Hi" {} None) + (Pair "Hi" {} None) ] - location: 13 (remaining gas: 1039984.076 units remaining) - [ "Hi" - (Pair "Hi" {} None) - (Pair "Hi" {} None) ] + [ "Hi" + (Pair "Hi" {} None) + (Pair "Hi" {} None) ] - location: 14 (remaining gas: 1039984.061 units remaining) - [ (Pair "Hi" {} None) - (Pair "Hi" {} None) ] + [ (Pair "Hi" {} None) + (Pair "Hi" {} None) ] - location: 17 (remaining gas: 1039984.051 units remaining) - [ (Pair {} None) - (Pair "Hi" {} None) ] + [ (Pair {} None) + (Pair "Hi" {} None) ] - location: 18 (remaining gas: 1039984.041 units remaining) - [ {} - (Pair "Hi" {} None) ] + [ {} + (Pair "Hi" {} None) ] - location: 14 (remaining gas: 1039984.011 units remaining) - [ "Hi" - {} - (Pair "Hi" {} None) ] + [ "Hi" + {} + (Pair "Hi" {} None) ] - location: 19 (remaining gas: 1039983.861 units remaining) - [ False - (Pair "Hi" {} None) ] + [ False + (Pair "Hi" {} None) ] - location: 20 (remaining gas: 1039983.846 units remaining) - [ (Some False) - (Pair "Hi" {} None) ] + [ (Some False) + (Pair "Hi" {} None) ] - location: 21 (remaining gas: 1039983.831 units remaining) - [ (Pair "Hi" {} None) ] + [ (Pair "Hi" {} None) ] - location: 24 (remaining gas: 1039983.821 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] - location: 25 (remaining gas: 1039983.811 units remaining) - [ {} ] + [ {} ] - location: 21 (remaining gas: 1039983.781 units remaining) - [ (Some False) - {} ] + [ (Some False) + {} ] - location: 26 (remaining gas: 1039983.771 units remaining) - [ {} - (Some False) ] + [ {} + (Some False) ] - location: 27 (remaining gas: 1039983.756 units remaining) - [ (Pair {} (Some False)) ] + [ (Pair {} (Some False)) ] - location: 28 (remaining gas: 1039983.741 units remaining) - [ {} - (Pair {} (Some False)) ] + [ {} + (Pair {} (Some False)) ] - location: 30 (remaining gas: 1039983.726 units remaining) - [ (Pair {} {} (Some False)) ] + [ (Pair {} {} (Some False)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out index cbcda725463d..36242823326c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039992.075 units remaining) - [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] + [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - location: 8 (remaining gas: 1039992.065 units remaining) - [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] + [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - location: 9 (remaining gas: 1039992.050 units remaining) - [ 6 ] + [ 6 ] - location: 10 (remaining gas: 1039992.035 units remaining) - [ {} - 6 ] + [ {} + 6 ] - location: 12 (remaining gas: 1039992.020 units remaining) - [ (Pair {} 6) ] + [ (Pair {} 6) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out index a4102e7a4f08..3465eb3fe178 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039993.640 units remaining) - [ (Pair { 1 ; 2 ; 3 } 111) ] + [ (Pair { 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039993.630 units remaining) - [ { 1 ; 2 ; 3 } ] + [ { 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039993.615 units remaining) - [ 3 ] + [ 3 ] - location: 10 (remaining gas: 1039993.600 units remaining) - [ {} - 3 ] + [ {} + 3 ] - location: 12 (remaining gas: 1039993.585 units remaining) - [ (Pair {} 3) ] + [ (Pair {} 3) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out index 3966466cf83a..3fcf0ff652bf 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.520 units remaining) - [ (Pair { 1 } 111) ] + [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039994.510 units remaining) - [ { 1 } ] + [ { 1 } ] - location: 9 (remaining gas: 1039994.495 units remaining) - [ 1 ] + [ 1 ] - location: 10 (remaining gas: 1039994.480 units remaining) - [ {} - 1 ] + [ {} + 1 ] - location: 12 (remaining gas: 1039994.465 units remaining) - [ (Pair {} 1) ] + [ (Pair {} 1) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out index 2bfd8860ad59..86b65bd3f9b5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.820 units remaining) - [ (Pair {} 111) ] + [ (Pair {} 111) ] - location: 8 (remaining gas: 1039994.810 units remaining) - [ {} ] + [ {} ] - location: 9 (remaining gas: 1039994.795 units remaining) - [ 0 ] + [ 0 ] - location: 10 (remaining gas: 1039994.780 units remaining) - [ {} - 0 ] + [ {} + 0 ] - location: 12 (remaining gas: 1039994.765 units remaining) - [ (Pair {} 0) ] + [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out index 59dc58fbf7c2..037cba14881e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out @@ -8,17 +8,17 @@ big_map diff trace - location: 8 (remaining gas: 1039993.957 units remaining) - [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] + [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - location: 8 (remaining gas: 1039993.947 units remaining) - [ 0x48656c6c6f2c20776f726c6421 ] + [ 0x48656c6c6f2c20776f726c6421 ] - location: 9 (remaining gas: 1039992.490 units remaining) - [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ] + [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ] - location: 10 (remaining gas: 1039992.475 units remaining) - [ (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] + [ (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] - location: 11 (remaining gas: 1039992.460 units remaining) - [ {} - (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] + [ {} + (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ] - location: 13 (remaining gas: 1039992.445 units remaining) [ (Pair {} - (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722)) ] + (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out index ac7b2ab5a3e5..0a3d8d08292b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Left (Pair 0 0)) None) ] + [ (Pair (Left (Pair 0 0)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 0 0)) ] + [ (Left (Pair 0 0)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 17 (remaining gas: 1039989.674 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 18 (remaining gas: 1039989.674 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 0) ] + [ {} + (Some 0) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 0)) ] + [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out index 3f89a04feeb6..58b068a2ce1d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Left (Pair 0 1)) None) ] + [ (Pair (Left (Pair 0 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 0 1)) ] + [ (Left (Pair 0 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 1) ] + [ (Pair 0 1) ] - location: 17 (remaining gas: 1039989.674 units remaining) - [ 0 - 1 ] + [ 0 + 1 ] - location: 18 (remaining gas: 1039989.674 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 0) ] + [ {} + (Some 0) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 0)) ] + [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out index 277265f138c3..cb41dd04d3f4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Left (Pair 1 2)) None) ] + [ (Pair (Left (Pair 1 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 1 2)) ] + [ (Left (Pair 1 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 1 2) ] + [ (Pair 1 2) ] - location: 17 (remaining gas: 1039989.674 units remaining) - [ 1 - 2 ] + [ 1 + 2 ] - location: 18 (remaining gas: 1039989.674 units remaining) - [ 4 ] + [ 4 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 4 ] + [ 4 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 4) ] + [ (Some 4) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 4) ] + [ {} + (Some 4) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 4)) ] + [ (Pair {} (Some 4)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out index 9aa9f0d3ac31..8ea431ec0fd3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Left (Pair 15 2)) None) ] + [ (Pair (Left (Pair 15 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 15 2)) ] + [ (Left (Pair 15 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 15 2) ] + [ (Pair 15 2) ] - location: 17 (remaining gas: 1039989.674 units remaining) - [ 15 - 2 ] + [ 15 + 2 ] - location: 18 (remaining gas: 1039989.674 units remaining) - [ 60 ] + [ 60 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 60 ] + [ 60 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 60) ] + [ (Some 60) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 60) ] + [ {} + (Some 60) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 60)) ] + [ (Pair {} (Some 60)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out index b380876cac4c..0edde0de1638 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Left (Pair 8 1)) None) ] + [ (Pair (Left (Pair 8 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Left (Pair 8 1)) ] + [ (Left (Pair 8 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 8 1) ] + [ (Pair 8 1) ] - location: 17 (remaining gas: 1039989.674 units remaining) - [ 8 - 1 ] + [ 8 + 1 ] - location: 18 (remaining gas: 1039989.674 units remaining) - [ 16 ] + [ 16 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 16 ] + [ 16 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 16) ] + [ (Some 16) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 16) ] + [ {} + (Some 16) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 16)) ] + [ (Pair {} (Some 16)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out index 688dedb22ecd..1e5aabfa953d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Right (Pair 0 0)) None) ] + [ (Pair (Right (Pair 0 0)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 0 0)) ] + [ (Right (Pair 0 0)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 20 (remaining gas: 1039989.674 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 21 (remaining gas: 1039989.674 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 0) ] + [ {} + (Some 0) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 0)) ] + [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out index 28b5aecf0182..2e48a6c8ed8b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Right (Pair 0 1)) None) ] + [ (Pair (Right (Pair 0 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 0 1)) ] + [ (Right (Pair 0 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 0 1) ] + [ (Pair 0 1) ] - location: 20 (remaining gas: 1039989.674 units remaining) - [ 0 - 1 ] + [ 0 + 1 ] - location: 21 (remaining gas: 1039989.674 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 0) ] + [ {} + (Some 0) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 0)) ] + [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out index 337efc9a9293..f6e4a4cdaf2a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Right (Pair 1 2)) None) ] + [ (Pair (Right (Pair 1 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 1 2)) ] + [ (Right (Pair 1 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 1 2) ] + [ (Pair 1 2) ] - location: 20 (remaining gas: 1039989.674 units remaining) - [ 1 - 2 ] + [ 1 + 2 ] - location: 21 (remaining gas: 1039989.674 units remaining) - [ 0 ] + [ 0 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 0 ] + [ 0 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 0) ] + [ (Some 0) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 0) ] + [ {} + (Some 0) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 0)) ] + [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out index 0474a65ff64c..88118280c7c4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Right (Pair 15 2)) None) ] + [ (Pair (Right (Pair 15 2)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 15 2)) ] + [ (Right (Pair 15 2)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 15 2) ] + [ (Pair 15 2) ] - location: 20 (remaining gas: 1039989.674 units remaining) - [ 15 - 2 ] + [ 15 + 2 ] - location: 21 (remaining gas: 1039989.674 units remaining) - [ 3 ] + [ 3 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 3 ] + [ 3 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 3) ] + [ (Some 3) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 3) ] + [ {} + (Some 3) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 3)) ] + [ (Pair {} (Some 3)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out index 58178a7a49fa..e6485727f569 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out @@ -8,23 +8,23 @@ big_map diff trace - location: 14 (remaining gas: 1039989.704 units remaining) - [ (Pair (Right (Pair 8 1)) None) ] + [ (Pair (Right (Pair 8 1)) None) ] - location: 14 (remaining gas: 1039989.694 units remaining) - [ (Right (Pair 8 1)) ] + [ (Right (Pair 8 1)) ] - location: 15 (remaining gas: 1039989.684 units remaining) - [ (Pair 8 1) ] + [ (Pair 8 1) ] - location: 20 (remaining gas: 1039989.674 units remaining) - [ 8 - 1 ] + [ 8 + 1 ] - location: 21 (remaining gas: 1039989.674 units remaining) - [ 4 ] + [ 4 ] - location: 15 (remaining gas: 1039989.659 units remaining) - [ 4 ] + [ 4 ] - location: 22 (remaining gas: 1039989.644 units remaining) - [ (Some 4) ] + [ (Some 4) ] - location: 23 (remaining gas: 1039989.629 units remaining) - [ {} - (Some 4) ] + [ {} + (Some 4) ] - location: 25 (remaining gas: 1039989.614 units remaining) - [ (Pair {} (Some 4)) ] + [ (Pair {} (Some 4)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out index d1ce3c5a2b6b..4144b7dc1289 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out @@ -8,24 +8,24 @@ big_map diff trace - location: 10 (remaining gas: 1039989.042 units remaining) - [ (Pair (Pair 0 0) None) ] + [ (Pair (Pair 0 0) None) ] - location: 10 (remaining gas: 1039989.032 units remaining) - [ (Pair 0 0) - None ] + [ (Pair 0 0) + None ] - location: 11 (remaining gas: 1039989.022 units remaining) - [ None - (Pair 0 0) ] + [ None + (Pair 0 0) ] - location: 13 (remaining gas: 1039989.012 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 15 (remaining gas: 1039989.002 units remaining) [ ] - location: 16 (remaining gas: 1039988.987 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.972 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.957 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.942 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" index e560b460da7e..349e29eba10c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.898 units remaining) - [ (Pair (Pair 0 0) (Some "Foo")) ] + [ (Pair (Pair 0 0) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 0 0) - (Some "Foo") ] + [ (Pair 0 0) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") - (Pair 0 0) ] + [ (Some "Foo") + (Pair 0 0) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" - (Pair 0 0) ] + [ "Foo" + (Pair 0 0) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 0 0) - "Foo" ] + [ (Pair 0 0) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) - [ 0 - 0 - "Foo" ] + [ 0 + 0 + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) - [ (Some "") ] + [ (Some "") ] - location: 13 (remaining gas: 1039988.793 units remaining) - [ (Some "") ] + [ (Some "") ] - location: 22 (remaining gas: 1039988.778 units remaining) - [ {} - (Some "") ] + [ {} + (Some "") ] - location: 24 (remaining gas: 1039988.763 units remaining) - [ (Pair {} (Some "")) ] + [ (Pair {} (Some "")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" index 21b844f60392..3533558a483b 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.898 units remaining) - [ (Pair (Pair 0 10) (Some "Foo")) ] + [ (Pair (Pair 0 10) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 0 10) - (Some "Foo") ] + [ (Pair 0 10) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") - (Pair 0 10) ] + [ (Some "Foo") + (Pair 0 10) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" - (Pair 0 10) ] + [ "Foo" + (Pair 0 10) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 0 10) - "Foo" ] + [ (Pair 0 10) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) - [ 0 - 10 - "Foo" ] + [ 0 + 10 + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.793 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.778 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.763 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" index 076c6ab5b7a9..ba50cb0230d7 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.898 units remaining) - [ (Pair (Pair 0 2) (Some "Foo")) ] + [ (Pair (Pair 0 2) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 0 2) - (Some "Foo") ] + [ (Pair 0 2) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") - (Pair 0 2) ] + [ (Some "Foo") + (Pair 0 2) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" - (Pair 0 2) ] + [ "Foo" + (Pair 0 2) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 0 2) - "Foo" ] + [ (Pair 0 2) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) - [ 0 - 2 - "Foo" ] + [ 0 + 2 + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) - [ (Some "Fo") ] + [ (Some "Fo") ] - location: 13 (remaining gas: 1039988.793 units remaining) - [ (Some "Fo") ] + [ (Some "Fo") ] - location: 22 (remaining gas: 1039988.778 units remaining) - [ {} - (Some "Fo") ] + [ {} + (Some "Fo") ] - location: 24 (remaining gas: 1039988.763 units remaining) - [ (Pair {} (Some "Fo")) ] + [ (Pair {} (Some "Fo")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" index 0a7caac8bbc5..1c443085a5ae 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.898 units remaining) - [ (Pair (Pair 1 1) (Some "Foo")) ] + [ (Pair (Pair 1 1) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 1 1) - (Some "Foo") ] + [ (Pair 1 1) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") - (Pair 1 1) ] + [ (Some "Foo") + (Pair 1 1) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" - (Pair 1 1) ] + [ "Foo" + (Pair 1 1) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 1 1) - "Foo" ] + [ (Pair 1 1) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) - [ 1 - 1 - "Foo" ] + [ 1 + 1 + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) - [ (Some "o") ] + [ (Some "o") ] - location: 13 (remaining gas: 1039988.793 units remaining) - [ (Some "o") ] + [ (Some "o") ] - location: 22 (remaining gas: 1039988.778 units remaining) - [ {} - (Some "o") ] + [ {} + (Some "o") ] - location: 24 (remaining gas: 1039988.763 units remaining) - [ (Pair {} (Some "o")) ] + [ (Pair {} (Some "o")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" index c5cd69a0a23e..2dafeff84582 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.898 units remaining) - [ (Pair (Pair 1 3) (Some "Foo")) ] + [ (Pair (Pair 1 3) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 1 3) - (Some "Foo") ] + [ (Pair 1 3) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") - (Pair 1 3) ] + [ (Some "Foo") + (Pair 1 3) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" - (Pair 1 3) ] + [ "Foo" + (Pair 1 3) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 1 3) - "Foo" ] + [ (Pair 1 3) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) - [ 1 - 3 - "Foo" ] + [ 1 + 3 + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.793 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.778 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.763 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" index 8a1ce998ac4f..61141f784a6a 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.898 units remaining) - [ (Pair (Pair 10 5) (Some "Foo")) ] + [ (Pair (Pair 10 5) (Some "Foo")) ] - location: 10 (remaining gas: 1039988.888 units remaining) - [ (Pair 10 5) - (Some "Foo") ] + [ (Pair 10 5) + (Some "Foo") ] - location: 11 (remaining gas: 1039988.878 units remaining) - [ (Some "Foo") - (Pair 10 5) ] + [ (Some "Foo") + (Pair 10 5) ] - location: 13 (remaining gas: 1039988.868 units remaining) - [ "Foo" - (Pair 10 5) ] + [ "Foo" + (Pair 10 5) ] - location: 19 (remaining gas: 1039988.858 units remaining) - [ (Pair 10 5) - "Foo" ] + [ (Pair 10 5) + "Foo" ] - location: 20 (remaining gas: 1039988.848 units remaining) - [ 10 - 5 - "Foo" ] + [ 10 + 5 + "Foo" ] - location: 21 (remaining gas: 1039988.808 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.793 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.778 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.763 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" index 2c1100d4113e..3ca363b4ab5f 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" @@ -9,30 +9,30 @@ big_map diff trace - location: 10 (remaining gas: 1039928.928 units remaining) [ (Pair (Pair 1 10000) - (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ] + (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ] - location: 10 (remaining gas: 1039928.918 units remaining) - [ (Pair 1 10000) - (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") ] + [ (Pair 1 10000) + (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") ] - location: 11 (remaining gas: 1039928.908 units remaining) - [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") - (Pair 1 10000) ] + [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") + (Pair 1 10000) ] - location: 13 (remaining gas: 1039928.898 units remaining) - [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" - (Pair 1 10000) ] + [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" + (Pair 1 10000) ] - location: 19 (remaining gas: 1039928.888 units remaining) - [ (Pair 1 10000) - "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] + [ (Pair 1 10000) + "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - location: 20 (remaining gas: 1039928.878 units remaining) - [ 1 - 10000 - "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] + [ 1 + 10000 + "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - location: 21 (remaining gas: 1039928.463 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039928.448 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039928.433 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039928.418 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out index bcdb1245d465..a2407a1ea7af 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out @@ -8,24 +8,24 @@ big_map diff trace - location: 10 (remaining gas: 1039989.042 units remaining) - [ (Pair (Pair 0 1) None) ] + [ (Pair (Pair 0 1) None) ] - location: 10 (remaining gas: 1039989.032 units remaining) - [ (Pair 0 1) - None ] + [ (Pair 0 1) + None ] - location: 11 (remaining gas: 1039989.022 units remaining) - [ None - (Pair 0 1) ] + [ None + (Pair 0 1) ] - location: 13 (remaining gas: 1039989.012 units remaining) - [ (Pair 0 1) ] + [ (Pair 0 1) ] - location: 15 (remaining gas: 1039989.002 units remaining) [ ] - location: 16 (remaining gas: 1039988.987 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.972 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.957 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.942 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out index d31938e3a103..11b6fa358851 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) - [ (Pair (Pair 0 0) (Some 0xaabbcc)) ] + [ (Pair (Pair 0 0) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 0 0) - (Some 0xaabbcc) ] + [ (Pair 0 0) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) - (Pair 0 0) ] + [ (Some 0xaabbcc) + (Pair 0 0) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc - (Pair 0 0) ] + [ 0xaabbcc + (Pair 0 0) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 0 0) - 0xaabbcc ] + [ (Pair 0 0) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 0 - 0 - 0xaabbcc ] + [ 0 + 0 + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) - [ (Some 0x) ] + [ (Some 0x) ] - location: 13 (remaining gas: 1039988.837 units remaining) - [ (Some 0x) ] + [ (Some 0x) ] - location: 22 (remaining gas: 1039988.822 units remaining) - [ {} - (Some 0x) ] + [ {} + (Some 0x) ] - location: 24 (remaining gas: 1039988.807 units remaining) - [ (Pair {} (Some 0x)) ] + [ (Pair {} (Some 0x)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out index a8d0bb71cd58..fa51f068f742 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) - [ (Pair (Pair 0 1) (Some 0xaabbcc)) ] + [ (Pair (Pair 0 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 0 1) - (Some 0xaabbcc) ] + [ (Pair 0 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) - (Pair 0 1) ] + [ (Some 0xaabbcc) + (Pair 0 1) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc - (Pair 0 1) ] + [ 0xaabbcc + (Pair 0 1) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 0 1) - 0xaabbcc ] + [ (Pair 0 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 0 - 1 - 0xaabbcc ] + [ 0 + 1 + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) - [ (Some 0xaa) ] + [ (Some 0xaa) ] - location: 13 (remaining gas: 1039988.837 units remaining) - [ (Some 0xaa) ] + [ (Some 0xaa) ] - location: 22 (remaining gas: 1039988.822 units remaining) - [ {} - (Some 0xaa) ] + [ {} + (Some 0xaa) ] - location: 24 (remaining gas: 1039988.807 units remaining) - [ (Pair {} (Some 0xaa)) ] + [ (Pair {} (Some 0xaa)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out index 5e8cef70aab8..c09e671c1fc5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) - [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] + [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 1) - (Some 0xaabbcc) ] + [ (Pair 1 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) - (Pair 1 1) ] + [ (Some 0xaabbcc) + (Pair 1 1) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc - (Pair 1 1) ] + [ 0xaabbcc + (Pair 1 1) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 1) - 0xaabbcc ] + [ (Pair 1 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 1 - 1 - 0xaabbcc ] + [ 1 + 1 + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) - [ (Some 0xbb) ] + [ (Some 0xbb) ] - location: 13 (remaining gas: 1039988.837 units remaining) - [ (Some 0xbb) ] + [ (Some 0xbb) ] - location: 22 (remaining gas: 1039988.822 units remaining) - [ {} - (Some 0xbb) ] + [ {} + (Some 0xbb) ] - location: 24 (remaining gas: 1039988.807 units remaining) - [ (Pair {} (Some 0xbb)) ] + [ (Pair {} (Some 0xbb)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out index 29c349e130c5..cf4a9254cb30 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) - [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] + [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 1) - (Some 0xaabbcc) ] + [ (Pair 1 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) - (Pair 1 1) ] + [ (Some 0xaabbcc) + (Pair 1 1) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc - (Pair 1 1) ] + [ 0xaabbcc + (Pair 1 1) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 1) - 0xaabbcc ] + [ (Pair 1 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 1 - 1 - 0xaabbcc ] + [ 1 + 1 + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) - [ (Some 0xbb) ] + [ (Some 0xbb) ] - location: 13 (remaining gas: 1039988.837 units remaining) - [ (Some 0xbb) ] + [ (Some 0xbb) ] - location: 22 (remaining gas: 1039988.822 units remaining) - [ {} - (Some 0xbb) ] + [ {} + (Some 0xbb) ] - location: 24 (remaining gas: 1039988.807 units remaining) - [ (Pair {} (Some 0xbb)) ] + [ (Pair {} (Some 0xbb)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out index 19d285d644c0..eda8d397d836 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) - [ (Pair (Pair 1 2) (Some 0xaabbcc)) ] + [ (Pair (Pair 1 2) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 2) - (Some 0xaabbcc) ] + [ (Pair 1 2) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) - (Pair 1 2) ] + [ (Some 0xaabbcc) + (Pair 1 2) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc - (Pair 1 2) ] + [ 0xaabbcc + (Pair 1 2) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 2) - 0xaabbcc ] + [ (Pair 1 2) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 1 - 2 - 0xaabbcc ] + [ 1 + 2 + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) - [ (Some 0xbbcc) ] + [ (Some 0xbbcc) ] - location: 13 (remaining gas: 1039988.837 units remaining) - [ (Some 0xbbcc) ] + [ (Some 0xbbcc) ] - location: 22 (remaining gas: 1039988.822 units remaining) - [ {} - (Some 0xbbcc) ] + [ {} + (Some 0xbbcc) ] - location: 24 (remaining gas: 1039988.807 units remaining) - [ (Pair {} (Some 0xbbcc)) ] + [ (Pair {} (Some 0xbbcc)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out index eb73897b75de..e94bee51a0f3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out @@ -8,30 +8,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) - [ (Pair (Pair 1 3) (Some 0xaabbcc)) ] + [ (Pair (Pair 1 3) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 3) - (Some 0xaabbcc) ] + [ (Pair 1 3) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbcc) - (Pair 1 3) ] + [ (Some 0xaabbcc) + (Pair 1 3) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbcc - (Pair 1 3) ] + [ 0xaabbcc + (Pair 1 3) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 3) - 0xaabbcc ] + [ (Pair 1 3) + 0xaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 1 - 3 - 0xaabbcc ] + [ 1 + 3 + 0xaabbcc ] - location: 21 (remaining gas: 1039988.852 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.837 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.822 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.807 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out index c799f7b1fc87..9d0eb6d2803d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out @@ -9,30 +9,30 @@ big_map diff trace - location: 10 (remaining gas: 1039988.942 units remaining) [ (Pair (Pair 1 10000) - (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ] + (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ] - location: 10 (remaining gas: 1039988.932 units remaining) - [ (Pair 1 10000) - (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) ] + [ (Pair 1 10000) + (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) ] - location: 11 (remaining gas: 1039988.922 units remaining) - [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) - (Pair 1 10000) ] + [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) + (Pair 1 10000) ] - location: 13 (remaining gas: 1039988.912 units remaining) - [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc - (Pair 1 10000) ] + [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc + (Pair 1 10000) ] - location: 19 (remaining gas: 1039988.902 units remaining) - [ (Pair 1 10000) - 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] + [ (Pair 1 10000) + 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - location: 20 (remaining gas: 1039988.892 units remaining) - [ 1 - 10000 - 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] + [ 1 + 10000 + 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - location: 21 (remaining gas: 1039988.477 units remaining) - [ None ] + [ None ] - location: 13 (remaining gas: 1039988.462 units remaining) - [ None ] + [ None ] - location: 22 (remaining gas: 1039988.447 units remaining) - [ {} - None ] + [ {} + None ] - location: 24 (remaining gas: 1039988.432 units remaining) - [ (Pair {} None) ] + [ (Pair {} None) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" index 1546d7521796..7770e20a35a8 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.491 units remaining) - [ (Pair "Hello" None) ] + [ (Pair "Hello" None) ] - location: 8 (remaining gas: 1039994.481 units remaining) - [ "Hello" ] + [ "Hello" ] - location: 9 (remaining gas: 1039994.466 units remaining) - [ (Some "Hello") ] + [ (Some "Hello") ] - location: 10 (remaining gas: 1039994.451 units remaining) - [ {} - (Some "Hello") ] + [ {} + (Some "Hello") ] - location: 12 (remaining gas: 1039994.436 units remaining) - [ (Pair {} (Some "Hello")) ] + [ (Pair {} (Some "Hello")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" index c27191405d89..591b98a95ae6 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" @@ -8,14 +8,14 @@ big_map diff trace - location: 8 (remaining gas: 1039994.501 units remaining) - [ (Pair "abcd" None) ] + [ (Pair "abcd" None) ] - location: 8 (remaining gas: 1039994.491 units remaining) - [ "abcd" ] + [ "abcd" ] - location: 9 (remaining gas: 1039994.476 units remaining) - [ (Some "abcd") ] + [ (Some "abcd") ] - location: 10 (remaining gas: 1039994.461 units remaining) - [ {} - (Some "abcd") ] + [ {} + (Some "abcd") ] - location: 12 (remaining gas: 1039994.446 units remaining) - [ (Pair {} (Some "abcd")) ] + [ (Pair {} (Some "abcd")) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" index 153eeec13325..59843cd76048 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.553 units remaining) - [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ] + [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) - (Pair "1970-01-01T00:01:40Z" -100) ] + [ (Pair "1970-01-01T00:01:40Z" -100) + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 11 (remaining gas: 1039991.523 units remaining) - [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" -100) ] + [ "1970-01-01T00:01:40Z" + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 14 (remaining gas: 1039991.498 units remaining) - [ -100 ] + [ -100 ] - location: 12 (remaining gas: 1039991.468 units remaining) - [ "1970-01-01T00:01:40Z" - -100 ] + [ "1970-01-01T00:01:40Z" + -100 ] - location: 15 (remaining gas: 1039991.413 units remaining) - [ "1970-01-01T00:03:20Z" ] + [ "1970-01-01T00:03:20Z" ] - location: 16 (remaining gas: 1039991.398 units remaining) - [ {} - "1970-01-01T00:03:20Z" ] + [ {} + "1970-01-01T00:03:20Z" ] - location: 18 (remaining gas: 1039991.383 units remaining) - [ (Pair {} "1970-01-01T00:03:20Z") ] + [ (Pair {} "1970-01-01T00:03:20Z") ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" index 9452cd9c65fd..c8215f251d84 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.553 units remaining) - [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ] + [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) - (Pair "1970-01-01T00:01:40Z" 100) ] + [ (Pair "1970-01-01T00:01:40Z" 100) + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 11 (remaining gas: 1039991.523 units remaining) - [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 100) ] + [ "1970-01-01T00:01:40Z" + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 14 (remaining gas: 1039991.498 units remaining) - [ 100 ] + [ 100 ] - location: 12 (remaining gas: 1039991.468 units remaining) - [ "1970-01-01T00:01:40Z" - 100 ] + [ "1970-01-01T00:01:40Z" + 100 ] - location: 15 (remaining gas: 1039991.413 units remaining) - [ "1970-01-01T00:00:00Z" ] + [ "1970-01-01T00:00:00Z" ] - location: 16 (remaining gas: 1039991.398 units remaining) - [ {} - "1970-01-01T00:00:00Z" ] + [ {} + "1970-01-01T00:00:00Z" ] - location: 18 (remaining gas: 1039991.383 units remaining) - [ (Pair {} "1970-01-01T00:00:00Z") ] + [ (Pair {} "1970-01-01T00:00:00Z") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out index e01283a07a19..a2958aad9fa6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out @@ -8,27 +8,27 @@ big_map diff trace - location: 9 (remaining gas: 1039991.553 units remaining) - [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ] + [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039991.543 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 10 (remaining gas: 1039991.533 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) - (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) + (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 11 (remaining gas: 1039991.523 units remaining) - [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] + [ "1970-01-01T00:01:40Z" + (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 12 (remaining gas: 1039991.508 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 14 (remaining gas: 1039991.498 units remaining) - [ 2000000000000000000 ] + [ 2000000000000000000 ] - location: 12 (remaining gas: 1039991.468 units remaining) - [ "1970-01-01T00:01:40Z" - 2000000000000000000 ] + [ "1970-01-01T00:01:40Z" + 2000000000000000000 ] - location: 15 (remaining gas: 1039991.413 units remaining) - [ -1999999999999999900 ] + [ -1999999999999999900 ] - location: 16 (remaining gas: 1039991.398 units remaining) - [ {} - -1999999999999999900 ] + [ {} + -1999999999999999900 ] - location: 18 (remaining gas: 1039991.383 units remaining) - [ (Pair {} -1999999999999999900) ] + [ (Pair {} -1999999999999999900) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out index 0f816c4c8db8..c9b235f844cc 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out @@ -8,64 +8,64 @@ big_map diff trace - location: 12 (remaining gas: 1039980.750 units remaining) - [ (Pair (Pair 2000000 1000000) None) ] + [ (Pair (Pair 2000000 1000000) None) ] - location: 12 (remaining gas: 1039980.740 units remaining) - [ (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) ] - location: 13 (remaining gas: 1039980.730 units remaining) - [ (Pair 2000000 1000000) - (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 14 (remaining gas: 1039980.720 units remaining) - [ (Pair 2000000 1000000) - (Pair 2000000 1000000) - (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 15 (remaining gas: 1039980.710 units remaining) - [ 2000000 - (Pair 2000000 1000000) - (Pair 2000000 1000000) ] + [ 2000000 + (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 16 (remaining gas: 1039980.695 units remaining) - [ (Pair 2000000 1000000) - (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 18 (remaining gas: 1039980.685 units remaining) - [ 1000000 - (Pair 2000000 1000000) ] + [ 1000000 + (Pair 2000000 1000000) ] - location: 16 (remaining gas: 1039980.655 units remaining) - [ 2000000 - 1000000 - (Pair 2000000 1000000) ] + [ 2000000 + 1000000 + (Pair 2000000 1000000) ] - location: 19 (remaining gas: 1039980.635 units remaining) - [ 3000000 - (Pair 2000000 1000000) ] + [ 3000000 + (Pair 2000000 1000000) ] - location: 20 (remaining gas: 1039980.620 units remaining) - [ (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) ] - location: 22 (remaining gas: 1039980.610 units remaining) - [ (Pair 2000000 1000000) - (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 23 (remaining gas: 1039980.600 units remaining) - [ 2000000 - (Pair 2000000 1000000) ] + [ 2000000 + (Pair 2000000 1000000) ] - location: 24 (remaining gas: 1039980.585 units remaining) - [ (Pair 2000000 1000000) ] + [ (Pair 2000000 1000000) ] - location: 26 (remaining gas: 1039980.575 units remaining) - [ 1000000 ] + [ 1000000 ] - location: 24 (remaining gas: 1039980.545 units remaining) - [ 2000000 - 1000000 ] + [ 2000000 + 1000000 ] - location: 27 (remaining gas: 1039980.525 units remaining) - [ (Some 1000000) ] + [ (Some 1000000) ] - location: 29 (remaining gas: 1039980.515 units remaining) - [ 1000000 ] + [ 1000000 ] - location: 29 (remaining gas: 1039980.500 units remaining) - [ 1000000 ] + [ 1000000 ] - location: 20 (remaining gas: 1039980.470 units remaining) - [ 3000000 - 1000000 ] + [ 3000000 + 1000000 ] - location: 35 (remaining gas: 1039980.455 units remaining) - [ (Pair 3000000 1000000) ] + [ (Pair 3000000 1000000) ] - location: 36 (remaining gas: 1039980.440 units remaining) - [ (Some (Pair 3000000 1000000)) ] + [ (Some (Pair 3000000 1000000)) ] - location: 37 (remaining gas: 1039980.425 units remaining) - [ {} - (Some (Pair 3000000 1000000)) ] + [ {} + (Some (Pair 3000000 1000000)) ] - location: 39 (remaining gas: 1039980.410 units remaining) - [ (Pair {} (Some (Pair 3000000 1000000))) ] + [ (Pair {} (Some (Pair 3000000 1000000))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out index 8a4550d36299..d7f3fdda633c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out @@ -8,64 +8,64 @@ big_map diff trace - location: 12 (remaining gas: 1039980.750 units remaining) - [ (Pair (Pair 2310000 1010000) None) ] + [ (Pair (Pair 2310000 1010000) None) ] - location: 12 (remaining gas: 1039980.740 units remaining) - [ (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) ] - location: 13 (remaining gas: 1039980.730 units remaining) - [ (Pair 2310000 1010000) - (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 14 (remaining gas: 1039980.720 units remaining) - [ (Pair 2310000 1010000) - (Pair 2310000 1010000) - (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 15 (remaining gas: 1039980.710 units remaining) - [ 2310000 - (Pair 2310000 1010000) - (Pair 2310000 1010000) ] + [ 2310000 + (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 16 (remaining gas: 1039980.695 units remaining) - [ (Pair 2310000 1010000) - (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 18 (remaining gas: 1039980.685 units remaining) - [ 1010000 - (Pair 2310000 1010000) ] + [ 1010000 + (Pair 2310000 1010000) ] - location: 16 (remaining gas: 1039980.655 units remaining) - [ 2310000 - 1010000 - (Pair 2310000 1010000) ] + [ 2310000 + 1010000 + (Pair 2310000 1010000) ] - location: 19 (remaining gas: 1039980.635 units remaining) - [ 3320000 - (Pair 2310000 1010000) ] + [ 3320000 + (Pair 2310000 1010000) ] - location: 20 (remaining gas: 1039980.620 units remaining) - [ (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) ] - location: 22 (remaining gas: 1039980.610 units remaining) - [ (Pair 2310000 1010000) - (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 23 (remaining gas: 1039980.600 units remaining) - [ 2310000 - (Pair 2310000 1010000) ] + [ 2310000 + (Pair 2310000 1010000) ] - location: 24 (remaining gas: 1039980.585 units remaining) - [ (Pair 2310000 1010000) ] + [ (Pair 2310000 1010000) ] - location: 26 (remaining gas: 1039980.575 units remaining) - [ 1010000 ] + [ 1010000 ] - location: 24 (remaining gas: 1039980.545 units remaining) - [ 2310000 - 1010000 ] + [ 2310000 + 1010000 ] - location: 27 (remaining gas: 1039980.525 units remaining) - [ (Some 1300000) ] + [ (Some 1300000) ] - location: 29 (remaining gas: 1039980.515 units remaining) - [ 1300000 ] + [ 1300000 ] - location: 29 (remaining gas: 1039980.500 units remaining) - [ 1300000 ] + [ 1300000 ] - location: 20 (remaining gas: 1039980.470 units remaining) - [ 3320000 - 1300000 ] + [ 3320000 + 1300000 ] - location: 35 (remaining gas: 1039980.455 units remaining) - [ (Pair 3320000 1300000) ] + [ (Pair 3320000 1300000) ] - location: 36 (remaining gas: 1039980.440 units remaining) - [ (Some (Pair 3320000 1300000)) ] + [ (Some (Pair 3320000 1300000)) ] - location: 37 (remaining gas: 1039980.425 units remaining) - [ {} - (Some (Pair 3320000 1300000)) ] + [ {} + (Some (Pair 3320000 1300000)) ] - location: 39 (remaining gas: 1039980.410 units remaining) - [ (Pair {} (Some (Pair 3320000 1300000))) ] + [ (Pair {} (Some (Pair 3320000 1300000))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out index 5f5c1ccc7d7c..606e4002ada9 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out @@ -8,43 +8,43 @@ big_map diff trace - location: 10 (remaining gas: 1039988.846 units remaining) - [ (Pair (Pair 1 4 2) 0) ] + [ (Pair (Pair 1 4 2) 0) ] - location: 10 (remaining gas: 1039988.836 units remaining) - [ (Pair 1 4 2) ] + [ (Pair 1 4 2) ] - location: 11 (remaining gas: 1039988.799 units remaining) - [ 1 - 4 - 2 ] + [ 1 + 4 + 2 ] - location: 13 (remaining gas: 1039988.789 units remaining) - [ 100 - 1 - 4 - 2 ] + [ 100 + 1 + 4 + 2 ] - location: 16 (remaining gas: 1039988.685 units remaining) - [ 100 - 4 - 2 ] + [ 100 + 4 + 2 ] - location: 17 (remaining gas: 1039988.675 units remaining) - [ 4 - 100 - 2 ] + [ 4 + 100 + 2 ] - location: 18 (remaining gas: 1039988.665 units remaining) - [ 10 - 4 - 100 - 2 ] + [ 10 + 4 + 100 + 2 ] - location: 21 (remaining gas: 1039988.561 units remaining) - [ 40 - 100 - 2 ] + [ 40 + 100 + 2 ] - location: 22 (remaining gas: 1039988.506 units remaining) - [ 140 - 2 ] + [ 140 + 2 ] - location: 23 (remaining gas: 1039988.451 units remaining) - [ 142 ] + [ 142 ] - location: 24 (remaining gas: 1039988.436 units remaining) - [ {} - 142 ] + [ {} + 142 ] - location: 26 (remaining gas: 1039988.421 units remaining) - [ (Pair {} 142) ] + [ (Pair {} 142) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out index cb6725b9952f..d04559f22087 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out @@ -8,455 +8,455 @@ big_map diff trace - location: 7 (remaining gas: 1039873.089 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039873.079 units remaining) [ ] - location: 8 (remaining gas: 1039873.069 units remaining) - [ Unit ] + [ Unit ] - location: 9 (remaining gas: 1039873.059 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 10 (remaining gas: 1039873.044 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 11 (remaining gas: 1039873.034 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 12 (remaining gas: 1039872.969 units remaining) [ ] - location: 14 (remaining gas: 1039872.959 units remaining) - [ Unit ] + [ Unit ] - location: 15 (remaining gas: 1039872.949 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 16 (remaining gas: 1039872.934 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 17 (remaining gas: 1039872.924 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 18 (remaining gas: 1039872.859 units remaining) [ ] - location: 20 (remaining gas: 1039872.849 units remaining) - [ Unit ] + [ Unit ] - location: 21 (remaining gas: 1039872.839 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 22 (remaining gas: 1039872.824 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 23 (remaining gas: 1039872.814 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 24 (remaining gas: 1039872.804 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 25 (remaining gas: 1039872.739 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 27 (remaining gas: 1039872.729 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 28 (remaining gas: 1039872.719 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 29 (remaining gas: 1039872.654 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 31 (remaining gas: 1039872.644 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 32 (remaining gas: 1039872.634 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 33 (remaining gas: 1039872.569 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 35 (remaining gas: 1039872.559 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 36 (remaining gas: 1039872.549 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 37 (remaining gas: 1039872.484 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 39 (remaining gas: 1039872.474 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 40 (remaining gas: 1039872.464 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 41 (remaining gas: 1039872.399 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 43 (remaining gas: 1039872.389 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 44 (remaining gas: 1039872.379 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 45 (remaining gas: 1039872.314 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 47 (remaining gas: 1039872.304 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 48 (remaining gas: 1039872.294 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 49 (remaining gas: 1039872.229 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 51 (remaining gas: 1039872.219 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 52 (remaining gas: 1039872.209 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 53 (remaining gas: 1039872.144 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 55 (remaining gas: 1039872.134 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 56 (remaining gas: 1039872.124 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 57 (remaining gas: 1039872.059 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 59 (remaining gas: 1039872.049 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 60 (remaining gas: 1039872.039 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 61 (remaining gas: 1039871.974 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 63 (remaining gas: 1039871.964 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 64 (remaining gas: 1039871.954 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 65 (remaining gas: 1039871.889 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 67 (remaining gas: 1039871.879 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 68 (remaining gas: 1039871.869 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 69 (remaining gas: 1039871.804 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 71 (remaining gas: 1039871.794 units remaining) [ ] - location: 72 (remaining gas: 1039871.784 units remaining) - [ Unit ] + [ Unit ] - location: 73 (remaining gas: 1039871.774 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 74 (remaining gas: 1039871.759 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 75 (remaining gas: 1039871.749 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 76 (remaining gas: 1039871.739 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 77 (remaining gas: 1039871.674 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 79 (remaining gas: 1039871.664 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 80 (remaining gas: 1039871.654 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 81 (remaining gas: 1039871.589 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 83 (remaining gas: 1039871.579 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 84 (remaining gas: 1039871.569 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 85 (remaining gas: 1039871.504 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 87 (remaining gas: 1039871.494 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 88 (remaining gas: 1039871.484 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 89 (remaining gas: 1039871.419 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 91 (remaining gas: 1039871.409 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 92 (remaining gas: 1039871.399 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 93 (remaining gas: 1039871.334 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 95 (remaining gas: 1039871.324 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 96 (remaining gas: 1039871.314 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 97 (remaining gas: 1039871.249 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 99 (remaining gas: 1039871.239 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 100 (remaining gas: 1039871.229 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 101 (remaining gas: 1039871.164 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 103 (remaining gas: 1039871.154 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 104 (remaining gas: 1039871.144 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 105 (remaining gas: 1039871.079 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 107 (remaining gas: 1039871.069 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 108 (remaining gas: 1039871.059 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 109 (remaining gas: 1039870.994 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 111 (remaining gas: 1039870.984 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 112 (remaining gas: 1039870.974 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 113 (remaining gas: 1039870.909 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 115 (remaining gas: 1039870.899 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 116 (remaining gas: 1039870.889 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 117 (remaining gas: 1039870.824 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 119 (remaining gas: 1039870.814 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 120 (remaining gas: 1039870.804 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 121 (remaining gas: 1039870.739 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 123 (remaining gas: 1039870.729 units remaining) [ ] - location: 124 (remaining gas: 1039870.719 units remaining) - [ Unit ] + [ Unit ] - location: 125 (remaining gas: 1039870.709 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 126 (remaining gas: 1039870.694 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 127 (remaining gas: 1039870.684 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 128 (remaining gas: 1039870.674 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 129 (remaining gas: 1039870.609 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 131 (remaining gas: 1039870.599 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 132 (remaining gas: 1039870.589 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 133 (remaining gas: 1039870.524 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 135 (remaining gas: 1039870.514 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 136 (remaining gas: 1039870.504 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 137 (remaining gas: 1039870.439 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 139 (remaining gas: 1039870.429 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 140 (remaining gas: 1039870.419 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 141 (remaining gas: 1039870.354 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 143 (remaining gas: 1039870.344 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 144 (remaining gas: 1039870.334 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 145 (remaining gas: 1039870.269 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 147 (remaining gas: 1039870.259 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 148 (remaining gas: 1039870.249 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 149 (remaining gas: 1039870.184 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 151 (remaining gas: 1039870.174 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 152 (remaining gas: 1039870.164 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 153 (remaining gas: 1039870.099 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 155 (remaining gas: 1039870.089 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 156 (remaining gas: 1039870.079 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 157 (remaining gas: 1039870.014 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 159 (remaining gas: 1039870.004 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 160 (remaining gas: 1039869.994 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 161 (remaining gas: 1039869.929 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 163 (remaining gas: 1039869.919 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 164 (remaining gas: 1039869.909 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 165 (remaining gas: 1039869.844 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 167 (remaining gas: 1039869.834 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 168 (remaining gas: 1039869.824 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 169 (remaining gas: 1039869.759 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 171 (remaining gas: 1039869.749 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 172 (remaining gas: 1039869.739 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 173 (remaining gas: 1039869.674 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 175 (remaining gas: 1039869.664 units remaining) [ ] - location: 176 (remaining gas: 1039869.654 units remaining) - [ Unit ] + [ Unit ] - location: 177 (remaining gas: 1039869.644 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 178 (remaining gas: 1039869.629 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 179 (remaining gas: 1039869.619 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 180 (remaining gas: 1039869.609 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 181 (remaining gas: 1039869.544 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 183 (remaining gas: 1039869.534 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 184 (remaining gas: 1039869.524 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 185 (remaining gas: 1039869.459 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 187 (remaining gas: 1039869.449 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 188 (remaining gas: 1039869.439 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 189 (remaining gas: 1039869.374 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 191 (remaining gas: 1039869.364 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 192 (remaining gas: 1039869.354 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 193 (remaining gas: 1039869.289 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 195 (remaining gas: 1039869.279 units remaining) - [ (Pair Unit Unit) - (Pair Unit Unit) ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 196 (remaining gas: 1039869.269 units remaining) - [ Unit - Unit - (Pair Unit Unit) ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 197 (remaining gas: 1039869.204 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 199 (remaining gas: 1039869.194 units remaining) [ ] - location: 200 (remaining gas: 1039869.184 units remaining) - [ Unit ] + [ Unit ] - location: 201 (remaining gas: 1039869.174 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 202 (remaining gas: 1039869.159 units remaining) - [ (Pair Unit Unit) ] + [ (Pair Unit Unit) ] - location: 203 (remaining gas: 1039869.149 units remaining) - [ Unit - Unit ] + [ Unit + Unit ] - location: 204 (remaining gas: 1039869.084 units remaining) [ ] - location: 206 (remaining gas: 1039869.074 units remaining) - [ Unit ] + [ Unit ] - location: 207 (remaining gas: 1039869.059 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 209 (remaining gas: 1039869.044 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" index 24900d3ab54b..ddfbfad02764 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.bfa38be34d.out" @@ -8,25 +8,25 @@ big_map diff trace - location: 9 (remaining gas: 1039666.323 units remaining) - [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ] + [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ] - location: 9 (remaining gas: 1039666.313 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - location: 10 (remaining gas: 1039665.658 units remaining) - [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] + [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 11 (remaining gas: 1039445.120 units remaining) - [ 666 ] + [ 666 ] - location: 12 (remaining gas: 1039445.105 units remaining) [ ] - location: 14 (remaining gas: 1039234.727 units remaining) - [ 3330 ] + [ 3330 ] - location: 12 (remaining gas: 1039234.697 units remaining) - [ 666 - 3330 ] + [ 666 + 3330 ] - location: 15 (remaining gas: 1039234.682 units remaining) - [ (Pair 666 3330) ] + [ (Pair 666 3330) ] - location: 16 (remaining gas: 1039234.667 units remaining) - [ {} - (Pair 666 3330) ] + [ {} + (Pair 666 3330) ] - location: 18 (remaining gas: 1039234.652 units remaining) - [ (Pair {} 666 3330) ] + [ (Pair {} 666 3330) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out index cfefc05870c2..d3e24ab55358 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Left (Pair False False)) None) ] + [ (Pair (Left (Pair False False)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair False False)) ] + [ (Left (Pair False False)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair False False) ] + [ (Pair False False) ] - location: 19 (remaining gas: 1039986.729 units remaining) - [ False - False ] + [ False + False ] - location: 20 (remaining gas: 1039986.709 units remaining) - [ False ] + [ False ] - location: 21 (remaining gas: 1039986.694 units remaining) - [ (Left False) ] + [ (Left False) ] - location: 17 (remaining gas: 1039986.679 units remaining) - [ (Left False) ] + [ (Left False) ] - location: 28 (remaining gas: 1039986.664 units remaining) - [ (Some (Left False)) ] + [ (Some (Left False)) ] - location: 29 (remaining gas: 1039986.649 units remaining) - [ {} - (Some (Left False)) ] + [ {} + (Some (Left False)) ] - location: 31 (remaining gas: 1039986.634 units remaining) - [ (Pair {} (Some (Left False))) ] + [ (Pair {} (Some (Left False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out index 5b7a2be2c2a0..0802e45cfc60 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Left (Pair False True)) None) ] + [ (Pair (Left (Pair False True)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair False True)) ] + [ (Left (Pair False True)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair False True) ] + [ (Pair False True) ] - location: 19 (remaining gas: 1039986.729 units remaining) - [ False - True ] + [ False + True ] - location: 20 (remaining gas: 1039986.709 units remaining) - [ True ] + [ True ] - location: 21 (remaining gas: 1039986.694 units remaining) - [ (Left True) ] + [ (Left True) ] - location: 17 (remaining gas: 1039986.679 units remaining) - [ (Left True) ] + [ (Left True) ] - location: 28 (remaining gas: 1039986.664 units remaining) - [ (Some (Left True)) ] + [ (Some (Left True)) ] - location: 29 (remaining gas: 1039986.649 units remaining) - [ {} - (Some (Left True)) ] + [ {} + (Some (Left True)) ] - location: 31 (remaining gas: 1039986.634 units remaining) - [ (Pair {} (Some (Left True))) ] + [ (Pair {} (Some (Left True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out index 3ff40dde899d..7c48164a1f51 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Left (Pair True False)) None) ] + [ (Pair (Left (Pair True False)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair True False)) ] + [ (Left (Pair True False)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair True False) ] + [ (Pair True False) ] - location: 19 (remaining gas: 1039986.729 units remaining) - [ True - False ] + [ True + False ] - location: 20 (remaining gas: 1039986.709 units remaining) - [ True ] + [ True ] - location: 21 (remaining gas: 1039986.694 units remaining) - [ (Left True) ] + [ (Left True) ] - location: 17 (remaining gas: 1039986.679 units remaining) - [ (Left True) ] + [ (Left True) ] - location: 28 (remaining gas: 1039986.664 units remaining) - [ (Some (Left True)) ] + [ (Some (Left True)) ] - location: 29 (remaining gas: 1039986.649 units remaining) - [ {} - (Some (Left True)) ] + [ {} + (Some (Left True)) ] - location: 31 (remaining gas: 1039986.634 units remaining) - [ (Pair {} (Some (Left True))) ] + [ (Pair {} (Some (Left True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out index 486f94582820..546b89b49d49 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Left (Pair True True)) None) ] + [ (Pair (Left (Pair True True)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Left (Pair True True)) ] + [ (Left (Pair True True)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair True True) ] + [ (Pair True True) ] - location: 19 (remaining gas: 1039986.729 units remaining) - [ True - True ] + [ True + True ] - location: 20 (remaining gas: 1039986.709 units remaining) - [ False ] + [ False ] - location: 21 (remaining gas: 1039986.694 units remaining) - [ (Left False) ] + [ (Left False) ] - location: 17 (remaining gas: 1039986.679 units remaining) - [ (Left False) ] + [ (Left False) ] - location: 28 (remaining gas: 1039986.664 units remaining) - [ (Some (Left False)) ] + [ (Some (Left False)) ] - location: 29 (remaining gas: 1039986.649 units remaining) - [ {} - (Some (Left False)) ] + [ {} + (Some (Left False)) ] - location: 31 (remaining gas: 1039986.634 units remaining) - [ (Pair {} (Some (Left False))) ] + [ (Pair {} (Some (Left False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out index 8c0ba39db8e1..16cc94e4f484 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Right (Pair 0 0)) None) ] + [ (Pair (Right (Pair 0 0)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 0 0)) ] + [ (Right (Pair 0 0)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 0 0) ] + [ (Pair 0 0) ] - location: 24 (remaining gas: 1039986.729 units remaining) - [ 0 - 0 ] + [ 0 + 0 ] - location: 25 (remaining gas: 1039986.674 units remaining) - [ 0 ] + [ 0 ] - location: 26 (remaining gas: 1039986.659 units remaining) - [ (Right 0) ] + [ (Right 0) ] - location: 17 (remaining gas: 1039986.644 units remaining) - [ (Right 0) ] + [ (Right 0) ] - location: 28 (remaining gas: 1039986.629 units remaining) - [ (Some (Right 0)) ] + [ (Some (Right 0)) ] - location: 29 (remaining gas: 1039986.614 units remaining) - [ {} - (Some (Right 0)) ] + [ {} + (Some (Right 0)) ] - location: 31 (remaining gas: 1039986.599 units remaining) - [ (Pair {} (Some (Right 0))) ] + [ (Pair {} (Some (Right 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out index d806e493bcdf..10991242f41f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Right (Pair 0 1)) None) ] + [ (Pair (Right (Pair 0 1)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 0 1)) ] + [ (Right (Pair 0 1)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 0 1) ] + [ (Pair 0 1) ] - location: 24 (remaining gas: 1039986.729 units remaining) - [ 0 - 1 ] + [ 0 + 1 ] - location: 25 (remaining gas: 1039986.674 units remaining) - [ 1 ] + [ 1 ] - location: 26 (remaining gas: 1039986.659 units remaining) - [ (Right 1) ] + [ (Right 1) ] - location: 17 (remaining gas: 1039986.644 units remaining) - [ (Right 1) ] + [ (Right 1) ] - location: 28 (remaining gas: 1039986.629 units remaining) - [ (Some (Right 1)) ] + [ (Some (Right 1)) ] - location: 29 (remaining gas: 1039986.614 units remaining) - [ {} - (Some (Right 1)) ] + [ {} + (Some (Right 1)) ] - location: 31 (remaining gas: 1039986.599 units remaining) - [ (Pair {} (Some (Right 1))) ] + [ (Pair {} (Some (Right 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out index 98a4afea0807..6a631338ba70 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Right (Pair 1 0)) None) ] + [ (Pair (Right (Pair 1 0)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 1 0)) ] + [ (Right (Pair 1 0)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 1 0) ] + [ (Pair 1 0) ] - location: 24 (remaining gas: 1039986.729 units remaining) - [ 1 - 0 ] + [ 1 + 0 ] - location: 25 (remaining gas: 1039986.674 units remaining) - [ 1 ] + [ 1 ] - location: 26 (remaining gas: 1039986.659 units remaining) - [ (Right 1) ] + [ (Right 1) ] - location: 17 (remaining gas: 1039986.644 units remaining) - [ (Right 1) ] + [ (Right 1) ] - location: 28 (remaining gas: 1039986.629 units remaining) - [ (Some (Right 1)) ] + [ (Some (Right 1)) ] - location: 29 (remaining gas: 1039986.614 units remaining) - [ {} - (Some (Right 1)) ] + [ {} + (Some (Right 1)) ] - location: 31 (remaining gas: 1039986.599 units remaining) - [ (Pair {} (Some (Right 1))) ] + [ (Pair {} (Some (Right 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out index 6bd104337516..c9d444e45324 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Right (Pair 1 1)) None) ] + [ (Pair (Right (Pair 1 1)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 1 1)) ] + [ (Right (Pair 1 1)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 1 1) ] + [ (Pair 1 1) ] - location: 24 (remaining gas: 1039986.729 units remaining) - [ 1 - 1 ] + [ 1 + 1 ] - location: 25 (remaining gas: 1039986.674 units remaining) - [ 0 ] + [ 0 ] - location: 26 (remaining gas: 1039986.659 units remaining) - [ (Right 0) ] + [ (Right 0) ] - location: 17 (remaining gas: 1039986.644 units remaining) - [ (Right 0) ] + [ (Right 0) ] - location: 28 (remaining gas: 1039986.629 units remaining) - [ (Some (Right 0)) ] + [ (Some (Right 0)) ] - location: 29 (remaining gas: 1039986.614 units remaining) - [ {} - (Some (Right 0)) ] + [ {} + (Some (Right 0)) ] - location: 31 (remaining gas: 1039986.599 units remaining) - [ (Pair {} (Some (Right 0))) ] + [ (Pair {} (Some (Right 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out index 4e10d0de47f7..19344b796a9d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Right (Pair 42 21)) None) ] + [ (Pair (Right (Pair 42 21)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 42 21)) ] + [ (Right (Pair 42 21)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 42 21) ] + [ (Pair 42 21) ] - location: 24 (remaining gas: 1039986.729 units remaining) - [ 42 - 21 ] + [ 42 + 21 ] - location: 25 (remaining gas: 1039986.674 units remaining) - [ 63 ] + [ 63 ] - location: 26 (remaining gas: 1039986.659 units remaining) - [ (Right 63) ] + [ (Right 63) ] - location: 17 (remaining gas: 1039986.644 units remaining) - [ (Right 63) ] + [ (Right 63) ] - location: 28 (remaining gas: 1039986.629 units remaining) - [ (Some (Right 63)) ] + [ (Some (Right 63)) ] - location: 29 (remaining gas: 1039986.614 units remaining) - [ {} - (Some (Right 63)) ] + [ {} + (Some (Right 63)) ] - location: 31 (remaining gas: 1039986.599 units remaining) - [ (Pair {} (Some (Right 63))) ] + [ (Pair {} (Some (Right 63))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out index fd4ae34cd5f9..73b493498495 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out @@ -8,25 +8,25 @@ big_map diff trace - location: 16 (remaining gas: 1039986.759 units remaining) - [ (Pair (Right (Pair 42 63)) None) ] + [ (Pair (Right (Pair 42 63)) None) ] - location: 16 (remaining gas: 1039986.749 units remaining) - [ (Right (Pair 42 63)) ] + [ (Right (Pair 42 63)) ] - location: 17 (remaining gas: 1039986.739 units remaining) - [ (Pair 42 63) ] + [ (Pair 42 63) ] - location: 24 (remaining gas: 1039986.729 units remaining) - [ 42 - 63 ] + [ 42 + 63 ] - location: 25 (remaining gas: 1039986.674 units remaining) - [ 21 ] + [ 21 ] - location: 26 (remaining gas: 1039986.659 units remaining) - [ (Right 21) ] + [ (Right 21) ] - location: 17 (remaining gas: 1039986.644 units remaining) - [ (Right 21) ] + [ (Right 21) ] - location: 28 (remaining gas: 1039986.629 units remaining) - [ (Some (Right 21)) ] + [ (Some (Right 21)) ] - location: 29 (remaining gas: 1039986.614 units remaining) - [ {} - (Some (Right 21)) ] + [ {} + (Some (Right 21)) ] - location: 31 (remaining gas: 1039986.599 units remaining) - [ (Pair {} (Some (Right 21))) ] + [ (Pair {} (Some (Right 21))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out index df46a5c8bc6a..ef4cb7517e1d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.948 units remaining) - [ (Pair Unit 9999999) ] + [ (Pair Unit 9999999) ] - location: 7 (remaining gas: 1039994.938 units remaining) [ ] - location: 8 (remaining gas: 1039994.923 units remaining) - [ 10 ] + [ 10 ] - location: 9 (remaining gas: 1039994.908 units remaining) - [ {} - 10 ] + [ {} + 10 ] - location: 11 (remaining gas: 1039994.893 units remaining) - [ (Pair {} 10) ] + [ (Pair {} 10) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out index a6549cb09694..db0aa4080290 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out @@ -8,14 +8,14 @@ big_map diff trace - location: 7 (remaining gas: 1039994.848 units remaining) - [ (Pair Unit "2017-07-13T09:19:01Z") ] + [ (Pair Unit "2017-07-13T09:19:01Z") ] - location: 7 (remaining gas: 1039994.838 units remaining) [ ] - location: 8 (remaining gas: 1039994.823 units remaining) - [ "2021-10-13T10:16:52Z" ] + [ "2021-10-13T10:16:52Z" ] - location: 9 (remaining gas: 1039994.808 units remaining) - [ {} - "2021-10-13T10:16:52Z" ] + [ {} + "2021-10-13T10:16:52Z" ] - location: 11 (remaining gas: 1039994.793 units remaining) - [ (Pair {} "2021-10-13T10:16:52Z") ] + [ (Pair {} "2021-10-13T10:16:52Z") ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out index 69d30c9a1f3d..80e4ad43907f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out @@ -10,51 +10,51 @@ trace - location: 15 (remaining gas: 1039977.531 units remaining) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) - Unit) ] + Unit) ] - location: 15 (remaining gas: 1039977.521 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ] + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ] - location: 16 (remaining gas: 1039977.511 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 17 (remaining gas: 1039977.496 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 19 (remaining gas: 1039977.486 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 17 (remaining gas: 1039977.456 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 20 (remaining gas: 1039975.016 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 23 (remaining gas: 1039974.981 units remaining) - [ 0 - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ 0 + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 24 (remaining gas: 1039974.966 units remaining) - [ True - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ True + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 25 (remaining gas: 1039974.956 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 25 (remaining gas: 1039974.941 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 31 (remaining gas: 1039971.783 units remaining) - [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ] + [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ] - location: 40 (remaining gas: 1039971.773 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] - location: 40 (remaining gas: 1039971.758 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ] - location: 46 (remaining gas: 1039971.748 units remaining) [ ] - location: 47 (remaining gas: 1039971.738 units remaining) - [ Unit ] + [ Unit ] - location: 48 (remaining gas: 1039971.723 units remaining) - [ {} - Unit ] + [ {} + Unit ] - location: 50 (remaining gas: 1039971.708 units remaining) - [ (Pair {} Unit) ] + [ (Pair {} Unit) ] Runtime error in contract [CONTRACT_HASH]: 1: parameter (pair (pair (pair string (list int)) (set nat)) bytes) ; @@ -71,36 +71,36 @@ trace - location: 15 (remaining gas: 1039977.531 units remaining) [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) - Unit) ] + Unit) ] - location: 15 (remaining gas: 1039977.521 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ] + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ] - location: 16 (remaining gas: 1039977.511 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 17 (remaining gas: 1039977.496 units remaining) - [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 19 (remaining gas: 1039977.486 units remaining) - [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 17 (remaining gas: 1039977.456 units remaining) - [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 20 (remaining gas: 1039975.016 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 23 (remaining gas: 1039974.981 units remaining) - [ -1 - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ -1 + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 24 (remaining gas: 1039974.966 units remaining) - [ False - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ False + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 25 (remaining gas: 1039974.956 units remaining) - [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 29 (remaining gas: 1039974.946 units remaining) - [ Unit - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] + [ Unit + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] Fatal error: error running script -- GitLab From 1d7076e78ec1bc34d334302cf3ed47514e8154a6 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 7 Jan 2022 15:31:50 +0100 Subject: [PATCH 31/35] Proto/Michelson: simplify typechecking stack type encoding as well as type map encoding These encodings are used only for typechecking errors. But `type_map_enc` is also used in the plugin's `typecheck_code` rpc. It looks like no tests was using the output of this rpc. --- .../lib_protocol/script_interpreter.ml | 9 +------- .../script_tc_errors_registration.ml | 23 ++++--------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index d2cc95e3d73e..4486c4705b4f 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -119,18 +119,11 @@ type error += Michelson_too_many_recursive_calls let () = let open Data_encoding in let trace_encoding = - (* TODO: should this encoding be updated? *) list @@ obj3 (req "location" Script.location_encoding) (req "gas" Gas.encoding) - (req - "stack" - (list - (conv - (fun e -> (e, None)) - (fun (e, _annot) -> e) - (obj2 (req "item" Script.expr_encoding) (opt "annot" string))))) + (req "stack" (list Script.expr_encoding)) in (* Reject *) register_error_kind diff --git a/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml b/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml index 0d7f79e0fd36..fee39265d224 100644 --- a/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml +++ b/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml @@ -28,33 +28,18 @@ open Script open Script_tc_errors (* Helpers for encoding *) +let stack_ty_enc = Data_encoding.list Script.expr_encoding + let type_map_enc = let open Data_encoding in - (* TODO? simplify this encoding *) - let stack_enc = - list - (conv - (fun ty -> (ty, [])) - (fun (ty, _annots) -> ty) - (tup2 Script.expr_encoding (list string))) - in list (conv (fun (loc, (bef, aft)) -> (loc, bef, aft)) (fun (loc, bef, aft) -> (loc, (bef, aft))) (obj3 (req "location" Script.location_encoding) - (req "stack_before" stack_enc) - (req "stack_after" stack_enc))) - -let stack_ty_enc = - let open Data_encoding in - (* TODO? simplify this encoding *) - list - (conv - (fun ty -> (ty, [])) - (fun (ty, _annots) -> ty) - (obj2 (req "type" Script.expr_encoding) (dft "annots" (list string) []))) + (req "stack_before" stack_ty_enc) + (req "stack_after" stack_ty_enc))) (* main registration *) let () = -- GitLab From 3d82e53e8edda83834a70d4c634b7a71d04639be Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Fri, 7 Jan 2022 17:07:25 +0100 Subject: [PATCH 32/35] Proto/Plugin: simplify trace encoding This encoding seems to be used only in `trace_code` rpc, which doesn't seem to be used in tests. --- src/proto_alpha/lib_plugin/plugin.ml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 47f36c344616..32e8c94b316a 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -1245,20 +1245,11 @@ module RPC = struct let trace_code_input_encoding = run_code_input_encoding let trace_encoding = - (* TODO: should this encoding be updated? *) def "scripted.trace" @@ list @@ obj3 (req "location" Script.location_encoding) (req "gas" Gas.encoding) - (req - "stack" - (list - (conv - (fun e -> (e, None)) - (fun (e, _annot) -> e) - (obj2 - (req "item" Script.expr_encoding) - (opt "annot" string))))) + (req "stack" (list Script.expr_encoding)) let trace_code_output_encoding = conv -- GitLab From b6c50e365714869b9eb7f0da176676bdcd23e417 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 10 Jan 2022 15:42:34 +0100 Subject: [PATCH 33/35] Proto/Doc: add entry in changelog --- docs/protocols/alpha.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index b857f52af5dd..09a1d38a74cf 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -38,3 +38,14 @@ Michelson However, ``CREATE_CONTRACT``, ``SET_DELEGATE`` and ``TRANSFER_TOKENS`` remain available in lambdas defined inside a view. (MR :gl:`!3737`) + +- Stack variable annotations are ignored and not propagated. All contracts that + used to typecheck correctly before will still typecheck correctly afterwards. + Though more contracts are accepted as branches with different stack variable + annotations won't be rejected any more. + The special annotation ``%@`` of ``PAIR`` has no effect. + RPCs ``typecheck_code``, ``trace_code``, as well as typechecking errors + reporting stack types, won't report stack annotations any more. + In their output encodings, the objects containing the fields ``item`` and + ``annot`` are replaced with the contents of the field ``item``. + (MR :gl:`!4139`) -- GitLab From b0d0d752c775ac02f71d72701f0c0ca32e94f1b4 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Mon, 10 Jan 2022 16:15:47 +0100 Subject: [PATCH 34/35] Proto/Michelson: update stack_ty_size --- src/proto_alpha/lib_protocol/script_typed_ir_size.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 73da8322ac69..c9825ec644ba 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml @@ -109,7 +109,7 @@ let stack_ty_size s = fun accu s -> match s with | Bot_t -> ret_succ accu - | Item_t (ty, _) -> ret_succ_adding (accu ++ ty_size ty) h3w + | Item_t (ty, _) -> ret_succ_adding (accu ++ ty_size ty) h2w in stack_ty_traverse s zero {apply} -- GitLab From 3d3efe5c7c270a658302bfe35a0efe5a53de6d0b Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 11 Jan 2022 19:36:17 +0100 Subject: [PATCH 35/35] Proto/Tests: adapt script cache hard-coded values --- src/proto_alpha/lib_protocol/test/test_script_cache.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/test_script_cache.ml b/src/proto_alpha/lib_protocol/test/test_script_cache.ml index 6cee314763b3..4114da6b50d2 100644 --- a/src/proto_alpha/lib_protocol/test/test_script_cache.ml +++ b/src/proto_alpha/lib_protocol/test/test_script_cache.ml @@ -46,7 +46,7 @@ let err x = Exn (Script_cache_test_error x) model. It has been computed by a manual run of the test. *) -let liquidity_baking_contract_size = 291909 +let liquidity_baking_contract_size = 291537 let liquidity_baking_contract = Contract.of_b58check "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" |> function @@ -120,7 +120,7 @@ let add_some_contracts k src block baker = model. It has been computed by a manual run of the test. *) -let int_store_contract_size = 1482 +let int_store_contract_size = 1456 (* -- GitLab