diff --git a/src/proto_alpha/lib_client/michelson_v1_emacs.ml b/src/proto_alpha/lib_client/michelson_v1_emacs.ml index 07f493fc42a2887da6513c47a1597c4c5b3b60fa..76d2e0bf412f7593df1664b8f443e6a25742eef2 100644 --- a/src/proto_alpha/lib_client/michelson_v1_emacs.ml +++ b/src/proto_alpha/lib_client/michelson_v1_emacs.ml @@ -113,8 +113,7 @@ let first_error_location errs = let rec find = function | [] -> 0 - | ( Inconsistent_type_annotations (loc, _, _) - | Unexpected_annotation loc + | ( Unexpected_annotation loc | Ill_formed_type (_, _, loc) | Invalid_arity (loc, _, _, _) | Invalid_seq_arity (loc, _, _) 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 cf723f405df917c2c935e72cbe5fd52f11d42efc..96b1531c822e22d76e4fca2d753e7d657e952429 100644 --- a/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml +++ b/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml @@ -98,7 +98,6 @@ let collect_error_locations errs = | Environment.Ecoproto_error ( Invalid_arity (loc, _, _, _) | Invalid_seq_arity (loc, _, _) - | Inconsistent_type_annotations (loc, _, _) | Unexpected_annotation loc | Ungrouped_annotations loc | Type_too_large (loc, _, _) @@ -576,34 +575,6 @@ let report_errors ~details ~show_source ?parsed ppf errs = sta (fun ppf -> print_stack_ty ppf) stb - | Inconsistent_annotations (annot1, annot2) -> - Format.fprintf - ppf - "@[The two annotations do not match:@,\ - - @[%s@]@,\ - - @[%s@]@]" - annot1 - annot2 - | Inconsistent_field_annotations (annot1, annot2) -> - Format.fprintf - ppf - "@[The field access annotation does not match:@,\ - - @[%s@]@,\ - - @[%s@]@]" - annot1 - annot2 - | Inconsistent_type_annotations (loc, ty1, ty2) -> - Format.fprintf - ppf - "@[%athe two types contain incompatible annotations:@,\ - - @[%a@]@,\ - - @[%a@]@]" - print_loc - loc - print_ty - ty1 - print_ty - ty2 | Unexpected_annotation loc -> Format.fprintf ppf "@[%aunexpected annotation." print_loc loc | Ungrouped_annotations loc -> diff --git a/src/proto_alpha/lib_protocol/contract_services.ml b/src/proto_alpha/lib_protocol/contract_services.ml index ff47b435be859cc66584503a43ba2c2f57eb4109..d5ca3378aec71f11a815787e906bd0b4f67ffda7 100644 --- a/src/proto_alpha/lib_protocol/contract_services.ml +++ b/src/proto_alpha/lib_protocol/contract_services.ml @@ -297,12 +297,17 @@ let register () = ( Script.force_decode_in_context ctxt expr >>? fun (expr, _) -> parse_toplevel ~legacy expr - >>? (fun (arg_type, _, _, root_name) -> - parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> - Script_ir_translator.find_entrypoint + >>? (fun {arg_type; root_name; _} -> + parse_parameter_ty_and_entrypoints + ctxt + ~legacy + arg_type ~root_name + >>? fun ( Ex_parameter_ty_entrypoints (arg_type, entrypoints), + _ ) -> + Script_ir_translator.find_entrypoint arg_type + entrypoints entrypoint) |> function | Ok (_f, Ex_ty ty) -> @@ -324,13 +329,18 @@ let register () = ( Script.force_decode_in_context ctxt expr >>? fun (expr, _) -> parse_toplevel ~legacy expr - >>? (fun (arg_type, _, _, root_name) -> - parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> - Script_ir_translator.list_entrypoints + >>? (fun {arg_type; root_name; _} -> + parse_parameter_ty_and_entrypoints + ctxt + ~legacy + arg_type ~root_name + >>? fun ( Ex_parameter_ty_entrypoints (arg_type, entrypoints), + _ ) -> + Script_ir_translator.list_entrypoints + ctxt arg_type - ctxt) + entrypoints) >|? fun (unreachable_entrypoint, map) -> ( unreachable_entrypoint, Entrypoints_map.fold diff --git a/src/proto_alpha/lib_protocol/helpers_services.ml b/src/proto_alpha/lib_protocol/helpers_services.ml index ce2e41ce585778382f468e2602d5344509f52707..a0aa1661c8e7f4664ae8ee247f27b250605eb0d4 100644 --- a/src/proto_alpha/lib_protocol/helpers_services.ml +++ b/src/proto_alpha/lib_protocol/helpers_services.ml @@ -249,20 +249,12 @@ module Scripts = struct (Script.expr * string option) list tzresult Lwt.t = function | (Empty_t, ()) -> return_nil - | (Item_t (ty, rest_ty, annot), (v, rest)) -> + | (Item_t (ty, rest_ty), (v, rest)) -> Script_ir_translator.unparse_data ctxt Readable ty v >>=? fun (data, _ctxt) -> unparse_stack (rest_ty, rest) >|=? fun rest -> - let annot = - match Script_ir_annot.unparse_var_annot annot with - | [] -> - None - | [a] -> - Some a - | _ -> - assert false - in + let annot = None in let data = Micheline.strip_locations data in (data, annot) :: rest in @@ -638,12 +630,17 @@ module Scripts = struct let open Script_ir_translator in Lwt.return ( parse_toplevel ~legacy expr - >>? (fun (arg_type, _, _, root_name) -> - parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> - Script_ir_translator.find_entrypoint + >>? (fun {arg_type; root_name; _} -> + parse_parameter_ty_and_entrypoints + ctxt + ~legacy + arg_type ~root_name + >>? fun (Ex_parameter_ty_entrypoints (arg_type, entrypoints), _) + -> + Script_ir_translator.find_entrypoint arg_type + entrypoints entrypoint) >>? fun (_f, Ex_ty ty) -> unparse_ty ctxt ty @@ -654,10 +651,10 @@ module Scripts = struct let open Script_ir_translator in Lwt.return ( parse_toplevel ~legacy expr - >>? fun (arg_type, _, _, root_name) -> - parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> - Script_ir_translator.list_entrypoints ~root_name arg_type ctxt + >>? fun {arg_type; root_name; _} -> + parse_parameter_ty_and_entrypoints ctxt ~legacy arg_type ~root_name + >>? fun (Ex_parameter_ty_entrypoints (arg_type, entrypoints), _) -> + Script_ir_translator.list_entrypoints ctxt arg_type entrypoints >|? fun (unreachable_entrypoint, map) -> ( unreachable_entrypoint, Entrypoints_map.fold diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml index d3240e7401ccc4e9126c3720f4ef314827537eec..75650084ea63f06c263e8ada8e428fab778c0d99 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml @@ -56,43 +56,43 @@ module Cost_of = struct type a. a Script_typed_ir.comparable_ty -> a -> Z.t = fun wit v -> match (wit, v) with - | (Unit_key _, _) -> + | (Unit_key, _) -> Z.of_int 1 - | (Never_key _, _) -> + | (Never_key, _) -> . - | (Int_key _, _) -> + | (Int_key, _) -> Z.of_int (int_bytes v) - | (Nat_key _, _) -> + | (Nat_key, _) -> Z.of_int (int_bytes v) - | (Signature_key _, _) -> + | (Signature_key, _) -> Z.of_int Signature.size - | (String_key _, _) -> + | (String_key, _) -> Z.of_int (String.length v) - | (Bytes_key _, _) -> + | (Bytes_key, _) -> Z.of_int (Bytes.length v) - | (Bool_key _, _) -> + | (Bool_key, _) -> Z.of_int 8 - | (Key_hash_key _, _) -> + | (Key_hash_key, _) -> Z.of_int Signature.Public_key_hash.size - | (Key_key _, k) -> + | (Key_key, k) -> Z.of_int (Signature.Public_key.size k) - | (Timestamp_key _, _) -> + | (Timestamp_key, _) -> Z.of_int (timestamp_bytes v) - | (Address_key _, _) -> + | (Address_key, _) -> Z.of_int Signature.Public_key_hash.size - | (Mutez_key _, _) -> + | (Mutez_key, _) -> Z.of_int 8 - | (Chain_id_key _, _) -> + | (Chain_id_key, _) -> Z.of_int Chain_id.size - | (Pair_key ((l, _), (r, _), _), (lval, rval)) -> + | (Pair_key (l, r), (lval, rval)) -> Z.add (size_of_comparable l lval) (size_of_comparable r rval) - | (Union_key ((t, _), _, _), L x) -> + | (Union_key (t, _), L x) -> Z.add (Z.of_int 1) (size_of_comparable t x) - | (Union_key (_, (t, _), _), R x) -> + | (Union_key (_, t), R x) -> Z.add (Z.of_int 1) (size_of_comparable t x) | (Option_key _, None) -> Z.of_int 1 - | (Option_key (t, _), Some x) -> + | (Option_key t, Some x) -> Z.add (Z.of_int 1) (size_of_comparable t x) let manager_operation = step_cost @@ Z.of_int 1_000 @@ -1062,40 +1062,40 @@ module Cost_of = struct = fun ty x y -> match ty with - | Unit_key _ -> + | Unit_key -> compare_unit - | Never_key _ -> ( + | Never_key -> ( match x with _ -> . ) - | Bool_key _ -> + | Bool_key -> compare_bool - | String_key _ -> + | String_key -> compare_string x y - | Signature_key _ -> + | Signature_key -> compare_signature - | Bytes_key _ -> + | Bytes_key -> compare_bytes x y - | Mutez_key _ -> + | Mutez_key -> compare_mutez - | Int_key _ -> + | Int_key -> compare_int x y - | Nat_key _ -> + | Nat_key -> compare_nat x y - | Key_hash_key _ -> + | Key_hash_key -> compare_key_hash - | Key_key _ -> + | Key_key -> compare_key - | Timestamp_key _ -> + | Timestamp_key -> compare_timestamp x y - | Address_key _ -> + | Address_key -> compare_address - | Chain_id_key _ -> + | Chain_id_key -> compare_chain_id - | Pair_key ((tl, _), (tr, _), _) -> + | Pair_key (tl, tr) -> (* Reasonable over-approximation of the cost of lexicographic comparison. *) let (xl, xr) = x in let (yl, yr) = y in compare tl xl yl +@ compare tr xr yr - | Union_key ((tl, _), (tr, _), _) -> ( + | Union_key (tl, tr) -> ( compare_union_tag +@ match (x, y) with @@ -1107,7 +1107,7 @@ module Cost_of = struct free | (R x, R y) -> compare tr x y ) - | Option_key (t, _) -> ( + | Option_key t -> ( compare_option_tag +@ match (x, y) with diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index 95916b1367bd00cfba5bc2bdfc8c6584d0ea41f8..659c07178d3bdce945d132c9f249ad24ceb661cf 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -976,19 +976,19 @@ let rec step_bounded : >>=? fun ((res, ()), ctxt) -> logged_return ((res, rest), ctxt) | (Apply capture_ty, (capture, (lam, rest))) -> ( let (Lam (descr, expr)) = lam in - let (Item_t (full_arg_ty, _, _)) = descr.bef in + let (Item_t (full_arg_ty, _)) = descr.bef in unparse_data ctxt Optimized capture_ty capture >>=? fun (const_expr, ctxt) -> unparse_ty 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, Empty_t, None) in + | Pair_t (capture_ty, arg_ty) -> + let arg_stack_ty = Item_t (arg_ty, Empty_t) in let const_descr = ( { loc = descr.loc; bef = arg_stack_ty; - aft = Item_t (capture_ty, arg_stack_ty, None); + aft = Item_t (capture_ty, arg_stack_ty); instr = Const capture; } : (_, _) descr ) @@ -996,8 +996,8 @@ let rec step_bounded : let pair_descr = ( { loc = descr.loc; - bef = Item_t (capture_ty, arg_stack_ty, None); - aft = Item_t (full_arg_ty, Empty_t, None); + bef = Item_t (capture_ty, arg_stack_ty); + aft = Item_t (full_arg_ty, Empty_t); instr = Cons_pair; } : (_, _) descr ) @@ -1006,7 +1006,7 @@ let rec step_bounded : ( { loc = descr.loc; bef = arg_stack_ty; - aft = Item_t (full_arg_ty, Empty_t, None); + aft = Item_t (full_arg_ty, Empty_t); instr = Seq (const_descr, pair_descr); } : (_, _) descr ) @@ -1086,7 +1086,6 @@ let rec step_bounded : | ((contract, "default"), entrypoint) | ((contract, entrypoint), "default") -> Script_ir_translator.parse_contract_for_script - ~legacy:false ctxt loc t @@ -1133,15 +1132,12 @@ let rec step_bounded : ctxt ) | (Implicit_account, (key, rest)) -> let contract = Contract.implicit_contract key in - logged_return (((Unit_t None, (contract, "default")), rest), ctxt) - | ( Create_contract (storage_type, param_type, Lam (_, code), root_name), + logged_return (((Unit_t, (contract, "default")), rest), ctxt) + | ( Create_contract (storage_type, param_type, Lam (_, code), entrypoints), (* Removed the instruction's arguments manager, spendable and delegatable *) (delegate, (credit, (init, rest))) ) -> - unparse_ty ctxt param_type + unparse_parameter_ty ctxt param_type entrypoints >>?= fun (unparsed_param_type, ctxt) -> - let unparsed_param_type = - Script_ir_translator.add_field_annot root_name None unparsed_param_type - in unparse_ty ctxt storage_type >>?= fun (unparsed_storage_type, ctxt) -> let code = @@ -1483,10 +1479,11 @@ let execute logger ctxt mode step_constants ~entrypoint ~internal tzresult Lwt.t = parse_script ctxt unparsed_script ~legacy:true ~allow_forged_in_storage:true - >>=? fun (Ex_script {code; arg_type; storage; storage_type; root_name}, ctxt) -> + >>=? fun ( Ex_script {code; arg_type; storage; storage_type; entrypoints}, + ctxt ) -> record_trace (Bad_contract_parameter step_constants.self) - (find_entrypoint arg_type ~root_name entrypoint) + (find_entrypoint arg_type entrypoints entrypoint) >>?= fun (box, _) -> trace (Bad_contract_parameter step_constants.self) diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml index 0b1080ecad2c57b7e07458d5304ec95484559a45..b605a68cf9b10e1d12fea93ca34a47a7181089dc 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.ml +++ b/src/proto_alpha/lib_protocol/script_ir_annot.ml @@ -28,155 +28,12 @@ open Micheline open Script_tc_errors open Script_typed_ir -let default_now_annot = Some (Var_annot "now") - -let default_amount_annot = Some (Var_annot "amount") - -let default_balance_annot = Some (Var_annot "balance") - -let default_level_annot = Some (Var_annot "level") - -let default_steps_annot = Some (Var_annot "steps") - -let default_source_annot = Some (Var_annot "source") - -let default_sender_annot = Some (Var_annot "sender") - -let default_self_annot = Some (Var_annot "self") - -let default_arg_annot = Some (Var_annot "arg") - -let default_param_annot = Some (Var_annot "parameter") - -let default_storage_annot = Some (Var_annot "storage") - -let default_car_annot = Some (Field_annot "car") - -let default_cdr_annot = Some (Field_annot "cdr") - -let default_contract_annot = Some (Field_annot "contract") - -let default_addr_annot = Some (Field_annot "address") - -let default_manager_annot = Some (Field_annot "manager") - -let default_pack_annot = Some (Field_annot "packed") - -let default_unpack_annot = Some (Field_annot "unpacked") - -let default_slice_annot = Some (Field_annot "slice") - -let default_elt_annot = Some (Field_annot "elt") - -let default_key_annot = Some (Field_annot "key") - -let default_hd_annot = Some (Field_annot "hd") - -let default_tl_annot = Some (Field_annot "tl") - -let default_some_annot = Some (Field_annot "some") - -let default_left_annot = Some (Field_annot "left") - -let default_right_annot = Some (Field_annot "right") - -let default_binding_annot = Some (Field_annot "bnd") - -let default_sapling_state_annot = Some (Var_annot "sapling") - -let default_sapling_balance_annot = Some (Var_annot "sapling_balance") - -let unparse_type_annot : type_annot option -> string list = function - | None -> - [] - | Some (Type_annot a) -> - [":" ^ a] - -let unparse_var_annot : var_annot option -> string list = function - | None -> - [] - | Some (Var_annot a) -> - ["@" ^ a] - let unparse_field_annot : field_annot option -> string list = function | None -> [] | Some (Field_annot a) -> ["%" ^ a] -let field_to_var_annot : field_annot option -> var_annot option = function - | None -> - None - | Some (Field_annot s) -> - Some (Var_annot s) - -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 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, Some (Field_annot ""), _) - -> - None - | (None, Some (Field_annot f), _) -> - Some (Var_annot f) - | (Some (Var_annot v), (None | Some (Field_annot "")), Some (Field_annot f)) - -> - Some (Var_annot (String.concat "." [v; f])) - | (Some (Var_annot v), Some (Field_annot f), _) -> - Some (Var_annot (String.concat "." [v; f])) - -let merge_type_annot : - legacy:bool -> - type_annot option -> - type_annot option -> - type_annot option tzresult = - fun ~legacy annot1 annot2 -> - match (annot1, annot2) with - | (None, None) | (Some _, None) | (None, Some _) -> - ok_none - | (Some (Type_annot a1), Some (Type_annot a2)) -> - if legacy || String.equal a1 a2 then ok annot1 - else error (Inconsistent_annotations (":" ^ a1, ":" ^ a2)) - -let merge_field_annot : - legacy:bool -> - field_annot option -> - field_annot option -> - field_annot option tzresult = - fun ~legacy annot1 annot2 -> - match (annot1, annot2) with - | (None, None) | (Some _, None) | (None, Some _) -> - ok_none - | (Some (Field_annot a1), Some (Field_annot a2)) -> - if legacy || String.equal a1 a2 then ok annot1 - else error (Inconsistent_annotations ("%" ^ a1, "%" ^ a2)) - -let merge_var_annot : var_annot option -> var_annot option -> var_annot option - = - fun annot1 annot2 -> - match (annot1, annot2) with - | (None, None) | (Some _, None) | (None, Some _) -> - None - | (Some (Var_annot a1), Some (Var_annot a2)) -> - if String.equal a1 a2 then annot1 else None - let error_unexpected_annot loc annot = match annot with | [] -> @@ -208,63 +65,34 @@ type annot_opt = | Type_annot_opt of string option | Var_annot_opt of string option -let parse_annots loc ?(allow_special_var = false) - ?(allow_special_field = false) l = +let parse_one_annot loc s = (* allow empty annotations as wildcards but otherwise only accept annotations that start with [a-zA-Z_] *) - let sub_or_wildcard ~specials wrap s acc = - let mem_char c cs = List.exists (Char.equal c) cs in + let sub_or_wildcard wrap s = let len = String.length s in - ( if Compare.Int.(len > max_annot_length) then + if Compare.Int.(len > max_annot_length) then error (Unexpected_annotation loc) - else ok_unit ) - >>? fun () -> - if Compare.Int.(len = 1) then ok @@ (wrap None :: acc) + else if Compare.Int.(len = 1) then ok (wrap None) else match s.[1] with | 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' -> (* check that all characters are valid*) string_iter (check_char loc) s 2 - >>? fun () -> ok @@ (wrap (Some (String.sub s 1 (len - 1))) :: acc) - | '@' when Compare.Int.(len = 2) && mem_char '@' specials -> - ok @@ (wrap (Some "@") :: acc) - | '%' when mem_char '%' specials -> - if Compare.Int.(len = 2) then ok @@ (wrap (Some "%") :: acc) - else if Compare.Int.(len = 3) && Compare.Char.(s.[2] = '%') then - ok @@ (wrap (Some "%%") :: acc) - else error (Unexpected_annotation loc) + >>? fun () -> ok (wrap (Some (String.sub s 1 (len - 1)))) | _ -> error (Unexpected_annotation loc) in - List.fold_left - (fun acc s -> - acc - >>? fun acc -> - if Compare.Int.(String.length s = 0) then + if Compare.Int.(String.length s = 0) then error (Unexpected_annotation loc) + else + match s.[0] with + | ':' -> + sub_or_wildcard (fun a -> Type_annot_opt a) s + | '@' -> + sub_or_wildcard (fun a -> Var_annot_opt a) s + | '%' -> + sub_or_wildcard (fun a -> Field_annot_opt a) s + | _ -> error (Unexpected_annotation loc) - else - match s.[0] with - | ':' -> - sub_or_wildcard ~specials:[] (fun a -> Type_annot_opt a) s acc - | '@' -> - sub_or_wildcard - ~specials:(if allow_special_var then ['%'] else []) - (fun a -> Var_annot_opt a) - s - acc - | '%' -> - sub_or_wildcard - ~specials:(if allow_special_field then ['@'] else []) - (fun a -> Field_annot_opt a) - s - acc - | _ -> - error (Unexpected_annotation loc)) - ok_nil - l - >|? List.rev - -let opt_var_of_var_opt = function None -> None | Some a -> Some (Var_annot a) let opt_field_of_field_opt = function | None -> @@ -272,92 +100,14 @@ let opt_field_of_field_opt = function | Some a -> Some (Field_annot a) -let opt_type_of_type_opt = function - | None -> - None - | Some a -> - Some (Type_annot a) - -let classify_annot loc l : - (var_annot option list * type_annot option list * field_annot option list) - tzresult = - try - let (_, rv, _, rt, _, rf) = - List.fold_left - (fun (in_v, rv, in_t, rt, in_f, rf) a -> - match (a, in_v, rv, in_t, rt, in_f, rf) with - | (Var_annot_opt a, true, _, _, _, _, _) - | (Var_annot_opt a, false, [], _, _, _, _) -> - (true, opt_var_of_var_opt a :: rv, false, rt, false, rf) - | (Type_annot_opt a, _, _, true, _, _, _) - | (Type_annot_opt a, _, _, false, [], _, _) -> - (false, rv, true, opt_type_of_type_opt a :: rt, false, rf) - | (Field_annot_opt a, _, _, _, _, true, _) - | (Field_annot_opt a, _, _, _, _, false, []) -> - (false, rv, false, rt, true, opt_field_of_field_opt a :: rf) - | _ -> - raise Exit) - (false, [], false, [], false, []) - l - in - ok (List.rev rv, List.rev rt, List.rev rf) - with Exit -> error (Ungrouped_annotations loc) - -let get_one_annot loc = function - | [] -> - ok_none - | [a] -> - ok a - | _ -> - error (Unexpected_annotation loc) - -let get_two_annot loc = function - | [] -> - ok (None, None) - | [a] -> - ok (a, None) - | [a; b] -> - ok (a, b) - | _ -> - error (Unexpected_annotation loc) - -let parse_type_annot : int -> string list -> type_annot option tzresult = - fun loc annot -> - parse_annots loc annot >>? classify_annot loc - >>? fun (vars, types, fields) -> - error_unexpected_annot loc vars - >>? fun () -> - error_unexpected_annot loc fields >>? fun () -> get_one_annot loc types - -let parse_type_field_annot : - int -> string list -> (type_annot option * field_annot option) tzresult = +let parse_field_annot : int -> string -> field_annot option tzresult = fun loc annot -> - parse_annots loc annot >>? classify_annot loc - >>? fun (vars, types, fields) -> - error_unexpected_annot loc vars - >>? fun () -> - get_one_annot loc types - >>? fun t -> get_one_annot loc fields >|? fun f -> (t, f) - -let parse_composed_type_annot : - int -> - string list -> - (type_annot option * field_annot option * field_annot option) tzresult = - fun loc annot -> - parse_annots loc annot >>? classify_annot loc - >>? fun (vars, types, fields) -> - error_unexpected_annot loc vars - >>? fun () -> - get_one_annot loc types - >>? fun t -> get_two_annot loc fields >|? fun (f1, f2) -> (t, f1, f2) - -let parse_field_annot : int -> string list -> field_annot option tzresult = - fun loc annot -> - parse_annots loc annot >>? classify_annot loc - >>? fun (vars, types, fields) -> - error_unexpected_annot loc vars - >>? fun () -> - error_unexpected_annot loc types >>? fun () -> get_one_annot loc fields + parse_one_annot loc annot + >>? function + | Type_annot_opt _ | Var_annot_opt _ -> + error (Unexpected_annotation loc) + | Field_annot_opt a -> + ok (opt_field_of_field_opt a) let extract_field_annot : Script.node -> (Script.node * field_annot option) tzresult = function @@ -375,234 +125,29 @@ let extract_field_annot : | None -> ok_none | Some field_annot -> - parse_field_annot loc [field_annot] ) + parse_field_annot loc field_annot ) >|? fun field_annot -> (Prim (loc, prim, args, annot), field_annot) | expr -> ok (expr, None) -let check_correct_field : - field_annot option -> field_annot option -> unit tzresult = - fun f1 f2 -> - match (f1, f2) with - | (None, _) | (_, None) -> - ok_unit - | (Some (Field_annot s1), Some (Field_annot s2)) -> - if String.equal s1 s2 then ok_unit - else error (Inconsistent_field_annotations ("%" ^ s1, "%" ^ s2)) - -let parse_var_annot : - int -> - ?default:var_annot option -> - string list -> - var_annot option 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 ) - -let split_last_dot = function - | None -> - (None, None) - | Some (Field_annot s) -> ( - match String.rindex_opt s '.' with - | None -> - (None, Some (Field_annot s)) - | Some i -> - let s1 = String.sub s 0 i in - let s2 = String.sub s (i + 1) (String.length s - i - 1) in - let f = - if Compare.String.equal s2 "car" || Compare.String.equal s2 "cdr" - then None - else Some (Field_annot s2) - in - (Some (Var_annot s1), f) ) - -let common_prefix v1 v2 = - match (v1, v2) with - | (Some (Var_annot s1), Some (Var_annot s2)) when Compare.String.equal s1 s2 - -> - v1 - | (Some _, None) -> - v1 - | (None, Some _) -> - v2 - | (_, _) -> - None - -let parse_constr_annot : - int -> - ?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 -> - 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) -> - ( match (if_special_first, f1) with - | (Some special_var, Some (Field_annot "@")) -> - ok (split_last_dot special_var) - | (None, Some (Field_annot "@")) -> - error (Unexpected_annotation loc) - | (_, _) -> - ok (v, f1) ) - >>? fun (v1, f1) -> - ( match (if_special_second, f2) with - | (Some special_var, Some (Field_annot "@")) -> - ok (split_last_dot special_var) - | (None, Some (Field_annot "@")) -> - error (Unexpected_annotation loc) - | (_, _) -> - ok (v, f2) ) - >|? fun (v2, f2) -> - let v = match v with None -> common_prefix v1 v2 | Some _ -> v in - (v, t, f1, f2) - -let parse_two_var_annot : - int -> string list -> (var_annot option * var_annot option) 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 - -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 "%") -> - field_to_var_annot field_name - | Some (Var_annot "%%") -> - default - | Some _ -> - v - | None -> - value_annot - -let parse_destr_annot : - int -> - string list -> - default_accessor:field_annot option -> - 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 -> - 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) - -let parse_unpair_annot : - int -> - 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 -> - ( var_annot option - * 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 -> - 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) - -let parse_entrypoint_annot : - int -> - ?default:var_annot option -> - string list -> - (var_annot option * 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) ) - -let parse_var_type_annot : - int -> string list -> (var_annot option * type_annot option) tzresult = +let parse_entrypoint_annot : int -> string list -> field_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) + List.fold_left + (fun found a -> + found + >>? fun found -> + parse_one_annot loc a + >>? function + | Var_annot_opt _ -> + ok found + | Type_annot_opt _ -> + error (Unexpected_annotation loc) + | Field_annot_opt a -> ( + match found with + | Some _ -> + error (Unexpected_annotation loc) + | None -> + ok (opt_field_of_field_opt a) )) + ok_none + annot diff --git a/src/proto_alpha/lib_protocol/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli index 1fd5bf59693359ee9e1cfdc7b2877014d0070e75..4516a15c5dbc06fe5c9c5252ad45fed49c47192d 100644 --- a/src/proto_alpha/lib_protocol/script_ir_annot.mli +++ b/src/proto_alpha/lib_protocol/script_ir_annot.mli @@ -26,190 +26,20 @@ open Alpha_context open Script_typed_ir -(** 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_steps_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 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_manager_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 - -val default_binding_annot : field_annot option - (** Unparse annotations to their string representation *) -val unparse_type_annot : type_annot option -> string list - -val unparse_var_annot : var_annot option -> string list - val unparse_field_annot : field_annot option -> string list -(** Conversion functions between different annotation kinds *) - -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 - -(** 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 : - var_annot option -> - ?default:field_annot option -> - field_annot option -> - var_annot option - -(** Merge type annotations. - @return an error {!Inconsistent_type_annotations} if they are both present - and different, unless [legacy] *) -val merge_type_annot : - legacy:bool -> - type_annot option -> - type_annot option -> - type_annot option tzresult - -(** Merge field annotations. - @return an error {!Inconsistent_type_annotations} if they are both present - and different, unless [legacy] *) -val merge_field_annot : - legacy:bool -> - field_annot option -> - field_annot option -> - field_annot option tzresult - -(** Merge variable annotations, does not fail ([None] if different). *) -val merge_var_annot : var_annot option -> var_annot option -> var_annot option - (** @return an error {!Unexpected_annotation} in the monad the list is not empty. *) val error_unexpected_annot : int -> 'a list -> unit tzresult -(** Parse a type annotation only. *) -val parse_type_annot : int -> string list -> type_annot option tzresult - (** Parse a field annotation only. *) -val parse_field_annot : int -> string list -> field_annot option tzresult - -(** Parse an annotation for composed types, of the form - [:ty_name %field] in any order. *) -val parse_type_field_annot : - int -> string list -> (type_annot option * field_annot option) tzresult - -(** Parse an annotation for composed types, of the form - [:ty_name %field1 %field2] in any order. *) -val parse_composed_type_annot : - int -> - string list -> - (type_annot option * field_annot option * field_annot option) tzresult +val parse_field_annot : int -> string -> field_annot option tzresult (** Extract and remove a field annotation from a node *) val extract_field_annot : Script.node -> (Script.node * field_annot option) tzresult -(** Check that field annotations match, used for field accesses. *) -val check_correct_field : - field_annot option -> field_annot option -> unit tzresult - (** Instruction annotations parsing *) -(** Parse a variable annotation, replaced by a default value if [None]. *) -val parse_var_annot : - int -> ?default:var_annot option -> string list -> var_annot option tzresult - -val parse_constr_annot : - int -> - ?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 - -val parse_two_var_annot : - int -> string list -> (var_annot option * var_annot option) tzresult - -val parse_destr_annot : - int -> - string list -> - default_accessor:field_annot option -> - field_name:field_annot option -> - pair_annot:var_annot option -> - value_annot:var_annot option -> - (var_annot option * field_annot option) tzresult - -val parse_unpair_annot : - int -> - 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 -> - ( var_annot option - * var_annot option - * field_annot option - * field_annot option ) - tzresult - -val parse_entrypoint_annot : - int -> - ?default:var_annot option -> - string list -> - (var_annot option * field_annot option) tzresult - -val parse_var_type_annot : - int -> string list -> (var_annot option * type_annot option) tzresult +val parse_entrypoint_annot : int -> 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 6c239c645f33948305b4f241c31515100c690aa7..fa2c12aa0250aac56fd9d1720a48cc5bd7082166 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -38,6 +38,11 @@ type ex_comparable_ty = type ex_ty = Ex_ty : 'a ty -> ex_ty +type ex_parameter_ty_and_entrypoints = + | Ex_parameter_ty_entrypoints : + 'a ty * 'a entrypoints + -> ex_parameter_ty_and_entrypoints + type ex_stack_ty = Ex_stack_ty : 'a stack_ty -> ex_stack_ty type tc_context = @@ -46,8 +51,7 @@ type tc_context = | Toplevel : { storage_type : 'sto ty; param_type : 'param ty; - root_name : field_annot option; - legacy_create_contract_literal : bool; + entrypoints : 'param entrypoints; } -> tc_context @@ -59,12 +63,12 @@ type type_logger = (Script.expr * Script.annot) list -> unit -let add_dip ty annot prev = +let add_dip ty prev = match prev with | Lambda | Toplevel _ -> - Dip (Item_t (ty, Empty_t, annot), prev) + Dip (Item_t (ty, Empty_t), prev) | Dip (stack, _) -> - Dip (Item_t (ty, stack, annot), prev) + Dip (Item_t (ty, stack), prev) (* ---- Type size accounting ------------------------------------------------*) @@ -72,103 +76,103 @@ let rec comparable_type_size : type t. t comparable_ty -> int = fun ty -> (* No wildcard to force the update when comparable_ty changes. *) match ty with - | Unit_key _ -> + | Unit_key -> 1 - | Never_key _ -> + | Never_key -> 1 - | Int_key _ -> + | Int_key -> 1 - | Nat_key _ -> + | Nat_key -> 1 - | Signature_key _ -> + | Signature_key -> 1 - | String_key _ -> + | String_key -> 1 - | Bytes_key _ -> + | Bytes_key -> 1 - | Mutez_key _ -> + | Mutez_key -> 1 - | Bool_key _ -> + | Bool_key -> 1 - | Key_hash_key _ -> + | Key_hash_key -> 1 - | Key_key _ -> + | Key_key -> 1 - | Timestamp_key _ -> + | Timestamp_key -> 1 - | Chain_id_key _ -> + | Chain_id_key -> 1 - | Address_key _ -> + | Address_key -> 1 - | Pair_key ((t1, _), (t2, _), _) -> + | Pair_key (t1, t2) -> 1 + comparable_type_size t1 + comparable_type_size t2 - | Union_key ((t1, _), (t2, _), _) -> + | Union_key (t1, t2) -> 1 + comparable_type_size t1 + comparable_type_size t2 - | Option_key (t, _) -> + | Option_key t -> 1 + comparable_type_size t let rec type_size : type t. t ty -> int = fun ty -> match ty with - | Unit_t _ -> + | Unit_t -> 1 - | Int_t _ -> + | Int_t -> 1 - | Nat_t _ -> + | Nat_t -> 1 - | Signature_t _ -> + | Signature_t -> 1 - | Bytes_t _ -> + | Bytes_t -> 1 - | String_t _ -> + | String_t -> 1 - | Mutez_t _ -> + | Mutez_t -> 1 - | Key_hash_t _ -> + | Key_hash_t -> 1 - | Key_t _ -> + | Key_t -> 1 - | Timestamp_t _ -> + | Timestamp_t -> 1 - | Address_t _ -> + | Address_t -> 1 - | Bool_t _ -> + | Bool_t -> 1 - | Operation_t _ -> + | Operation_t -> 1 - | Chain_id_t _ -> + | Chain_id_t -> 1 - | Never_t _ -> + | Never_t -> 1 - | Bls12_381_g1_t _ -> + | Bls12_381_g1_t -> 1 - | Bls12_381_g2_t _ -> + | Bls12_381_g2_t -> 1 - | Bls12_381_fr_t _ -> + | Bls12_381_fr_t -> 1 | Sapling_transaction_t _ -> 1 | Sapling_state_t _ -> 1 - | Pair_t ((l, _, _), (r, _, _), _) -> + | Pair_t (l, r) -> 1 + type_size l + type_size r - | Union_t ((l, _), (r, _), _) -> + | Union_t (l, r) -> 1 + type_size l + type_size r - | Lambda_t (arg, ret, _) -> + | Lambda_t (arg, ret) -> 1 + type_size arg + type_size ret - | Option_t (t, _) -> + | Option_t t -> 1 + type_size t - | List_t (t, _) -> + | List_t t -> 1 + type_size t - | Ticket_t (t, _) -> + | Ticket_t t -> 1 + comparable_type_size t - | Set_t (k, _) -> + | Set_t k -> 1 + comparable_type_size k - | Map_t (k, v, _) -> + | Map_t (k, v) -> 1 + comparable_type_size k + type_size v - | Big_map_t (k, v, _) -> + | Big_map_t (k, v) -> 1 + comparable_type_size k + type_size v - | Contract_t (arg, _) -> + | Contract_t arg -> 1 + type_size arg let rec type_size_of_stack_head : type st. st stack_ty -> up_to:int -> int = @@ -176,7 +180,7 @@ let rec type_size_of_stack_head : type st. st stack_ty -> up_to:int -> int = match stack with | Empty_t -> 0 - | Item_t (head, tail, _annot) -> + | Item_t (head, tail) -> if Compare.Int.(up_to > 0) then Compare.Int.max (type_size head) @@ -607,39 +611,39 @@ let compare_address (x, ex) (y, ey) = let rec compare_comparable : type a. a comparable_ty -> a -> a -> int = fun kind -> match kind with - | Unit_key _ -> + | Unit_key -> fun () () -> 0 - | Never_key _ -> ( + | Never_key -> ( function _ -> . ) - | Signature_key _ -> + | Signature_key -> wrap_compare Signature.compare - | String_key _ -> + | String_key -> wrap_compare Compare.String.compare - | Bool_key _ -> + | Bool_key -> wrap_compare Compare.Bool.compare - | Mutez_key _ -> + | Mutez_key -> wrap_compare Tez.compare - | Key_hash_key _ -> + | Key_hash_key -> wrap_compare Signature.Public_key_hash.compare - | Key_key _ -> + | Key_key -> wrap_compare Signature.Public_key.compare - | Int_key _ -> + | Int_key -> wrap_compare Script_int.compare - | Nat_key _ -> + | Nat_key -> wrap_compare Script_int.compare - | Timestamp_key _ -> + | Timestamp_key -> wrap_compare Script_timestamp.compare - | Address_key _ -> + | Address_key -> wrap_compare compare_address - | Bytes_key _ -> + | Bytes_key -> wrap_compare Compare.Bytes.compare - | Chain_id_key _ -> + | Chain_id_key -> wrap_compare Chain_id.compare - | Pair_key ((tl, _), (tr, _), _) -> + | Pair_key (tl, tr) -> fun (lx, rx) (ly, ry) -> let lres = compare_comparable tl lx ly in if Compare.Int.(lres = 0) then compare_comparable tr rx ry else lres - | Union_key ((tl, _), (tr, _), _) -> ( + | Union_key (tl, tr) -> ( fun x y -> match (x, y) with | (L x, L y) -> @@ -650,7 +654,7 @@ let rec compare_comparable : type a. a comparable_ty -> a -> a -> int = 1 | (R x, R y) -> compare_comparable tr x y ) - | Option_key (t, _) -> ( + | Option_key t -> ( fun x y -> match (x, y) with | (None, None) -> @@ -786,101 +790,88 @@ let map_size : type key value. (key, value) map -> Script_int.n Script_int.num (* ---- Unparsing (Typed IR -> Untyped expressions) of types -----------------*) let rec ty_of_comparable_ty : type a. a comparable_ty -> a ty = function - | Unit_key tname -> - Unit_t tname - | Never_key tname -> - Never_t tname - | Int_key tname -> - Int_t tname - | Nat_key tname -> - Nat_t tname - | Signature_key tname -> - Signature_t tname - | String_key tname -> - String_t tname - | Bytes_key tname -> - Bytes_t tname - | Mutez_key tname -> - Mutez_t tname - | Bool_key tname -> - Bool_t tname - | Key_hash_key tname -> - Key_hash_t tname - | Key_key tname -> - Key_t tname - | Timestamp_key tname -> - Timestamp_t tname - | Address_key tname -> - Address_t tname - | Chain_id_key tname -> - Chain_id_t tname - | Pair_key ((l, al), (r, ar), tname) -> - Pair_t - ( (ty_of_comparable_ty l, al, None), - (ty_of_comparable_ty r, ar, None), - tname ) - | Union_key ((l, al), (r, ar), tname) -> - Union_t ((ty_of_comparable_ty l, al), (ty_of_comparable_ty r, ar), tname) - | Option_key (t, tname) -> - Option_t (ty_of_comparable_ty t, tname) - -let add_field_annot a var = function - | Prim (loc, prim, args, annots) -> - Prim - ( loc, - prim, - args, - annots @ unparse_field_annot a @ unparse_var_annot var ) - | expr -> - expr + | Unit_key -> + Unit_t + | Never_key -> + Never_t + | Int_key -> + Int_t + | Nat_key -> + Nat_t + | Signature_key -> + Signature_t + | String_key -> + String_t + | Bytes_key -> + Bytes_t + | Mutez_key -> + Mutez_t + | Bool_key -> + Bool_t + | Key_hash_key -> + Key_hash_t + | Key_key -> + Key_t + | Timestamp_key -> + Timestamp_t + | Address_key -> + Address_t + | Chain_id_key -> + Chain_id_t + | Pair_key (l, r) -> + Pair_t (ty_of_comparable_ty l, ty_of_comparable_ty r) + | Union_key (l, r) -> + Union_t (ty_of_comparable_ty l, ty_of_comparable_ty r) + | Option_key t -> + Option_t (ty_of_comparable_ty t) let rec unparse_comparable_ty : type a. a comparable_ty -> Script.node = function - | Unit_key tname -> - Prim (-1, T_unit, [], unparse_type_annot tname) - | Never_key tname -> - Prim (-1, T_never, [], unparse_type_annot tname) - | Int_key tname -> - Prim (-1, T_int, [], unparse_type_annot tname) - | Nat_key tname -> - Prim (-1, T_nat, [], unparse_type_annot tname) - | Signature_key tname -> - Prim (-1, T_signature, [], unparse_type_annot tname) - | String_key tname -> - Prim (-1, T_string, [], unparse_type_annot tname) - | Bytes_key tname -> - Prim (-1, T_bytes, [], unparse_type_annot tname) - | Mutez_key tname -> - Prim (-1, T_mutez, [], unparse_type_annot tname) - | Bool_key tname -> - Prim (-1, T_bool, [], unparse_type_annot tname) - | Key_hash_key tname -> - Prim (-1, T_key_hash, [], unparse_type_annot tname) - | Key_key tname -> - Prim (-1, T_key, [], unparse_type_annot tname) - | Timestamp_key tname -> - Prim (-1, T_timestamp, [], unparse_type_annot tname) - | Address_key tname -> - Prim (-1, T_address, [], unparse_type_annot tname) - | Chain_id_key tname -> - Prim (-1, T_chain_id, [], unparse_type_annot tname) - | Pair_key ((l, al), (r, ar), pname) -> ( - let tl = add_field_annot al None (unparse_comparable_ty l) in - let tr = add_field_annot ar None (unparse_comparable_ty r) in + | Unit_key -> + Prim (-1, T_unit, [], []) + | Never_key -> + Prim (-1, T_never, [], []) + | Int_key -> + Prim (-1, T_int, [], []) + | Nat_key -> + Prim (-1, T_nat, [], []) + | Signature_key -> + Prim (-1, T_signature, [], []) + | String_key -> + Prim (-1, T_string, [], []) + | Bytes_key -> + Prim (-1, T_bytes, [], []) + | Mutez_key -> + Prim (-1, T_mutez, [], []) + | Bool_key -> + Prim (-1, T_bool, [], []) + | Key_hash_key -> + Prim (-1, T_key_hash, [], []) + | Key_key -> + Prim (-1, T_key, [], []) + | Timestamp_key -> + Prim (-1, T_timestamp, [], []) + | Address_key -> + Prim (-1, T_address, [], []) + | Chain_id_key -> + Prim (-1, T_chain_id, [], []) + | Pair_key (l, r) -> ( + let tl = unparse_comparable_ty l in + let tr = unparse_comparable_ty r in (* Fold [pair a1 (pair ... (pair an-1 an))] into [pair a1 ... an] *) (* Note that the folding does not happen if the pair on the right has a field annotation because this annotation would be lost *) match tr with | Prim (_, T_pair, ts, []) -> - Prim (-1, T_pair, tl :: ts, unparse_type_annot pname) + Prim (-1, T_pair, tl :: ts, []) | _ -> - Prim (-1, T_pair, [tl; tr], unparse_type_annot pname) ) - | Union_key ((l, al), (r, ar), tname) -> - let tl = add_field_annot al None (unparse_comparable_ty l) in - let tr = add_field_annot ar None (unparse_comparable_ty r) in - Prim (-1, T_or, [tl; tr], unparse_type_annot tname) - | Option_key (t, tname) -> - Prim (-1, T_option, [unparse_comparable_ty t], unparse_type_annot tname) + Prim (-1, T_pair, [tl; tr], []) ) + | Union_key (l, r) -> + let tl = unparse_comparable_ty l in + let tr = unparse_comparable_ty r in + Prim (-1, T_or, [tl; tr], []) + | Option_key t -> + Prim (-1, T_option, [unparse_comparable_ty t], []) let unparse_memo_size memo_size = let z = Sapling.Memo_size.unparse_to_z memo_size in @@ -891,135 +882,117 @@ let rec unparse_ty : fun ctxt ty -> Gas.consume ctxt Unparse_costs.unparse_type_cycle >>? fun ctxt -> - let return ctxt (name, args, annot) = - let result = Prim (-1, name, args, annot) in - ok (result, ctxt) - in + let return ctxt (name, args) = ok (Prim (-1, name, args, []), ctxt) in match ty with - | Unit_t tname -> - return ctxt (T_unit, [], unparse_type_annot tname) - | Int_t tname -> - return ctxt (T_int, [], unparse_type_annot tname) - | Nat_t tname -> - return ctxt (T_nat, [], unparse_type_annot tname) - | Signature_t tname -> - return ctxt (T_signature, [], unparse_type_annot tname) - | String_t tname -> - return ctxt (T_string, [], unparse_type_annot tname) - | Bytes_t tname -> - return ctxt (T_bytes, [], unparse_type_annot tname) - | Mutez_t tname -> - return ctxt (T_mutez, [], unparse_type_annot tname) - | Bool_t tname -> - return ctxt (T_bool, [], unparse_type_annot tname) - | Key_hash_t tname -> - return ctxt (T_key_hash, [], unparse_type_annot tname) - | Key_t tname -> - return ctxt (T_key, [], unparse_type_annot tname) - | Timestamp_t tname -> - return ctxt (T_timestamp, [], unparse_type_annot tname) - | Address_t tname -> - return ctxt (T_address, [], unparse_type_annot tname) - | Operation_t tname -> - return ctxt (T_operation, [], unparse_type_annot tname) - | Chain_id_t tname -> - return ctxt (T_chain_id, [], unparse_type_annot tname) - | Never_t tname -> - return ctxt (T_never, [], unparse_type_annot tname) - | Bls12_381_g1_t tname -> - return ctxt (T_bls12_381_g1, [], unparse_type_annot tname) - | Bls12_381_g2_t tname -> - return ctxt (T_bls12_381_g2, [], unparse_type_annot tname) - | Bls12_381_fr_t tname -> - return ctxt (T_bls12_381_fr, [], unparse_type_annot tname) - | Contract_t (ut, tname) -> - unparse_ty ctxt ut - >>? fun (t, ctxt) -> - return ctxt (T_contract, [t], unparse_type_annot tname) - | Pair_t ((utl, l_field, l_var), (utr, r_field, r_var), tname) -> - let annot = unparse_type_annot tname in + | Unit_t -> + return ctxt (T_unit, []) + | Int_t -> + return ctxt (T_int, []) + | Nat_t -> + return ctxt (T_nat, []) + | Signature_t -> + return ctxt (T_signature, []) + | String_t -> + return ctxt (T_string, []) + | Bytes_t -> + return ctxt (T_bytes, []) + | Mutez_t -> + return ctxt (T_mutez, []) + | Bool_t -> + return ctxt (T_bool, []) + | Key_hash_t -> + return ctxt (T_key_hash, []) + | Key_t -> + return ctxt (T_key, []) + | Timestamp_t -> + return ctxt (T_timestamp, []) + | Address_t -> + return ctxt (T_address, []) + | Operation_t -> + return ctxt (T_operation, []) + | Chain_id_t -> + return ctxt (T_chain_id, []) + | Never_t -> + return ctxt (T_never, []) + | Bls12_381_g1_t -> + return ctxt (T_bls12_381_g1, []) + | Bls12_381_g2_t -> + return ctxt (T_bls12_381_g2, []) + | Bls12_381_fr_t -> + return ctxt (T_bls12_381_fr, []) + | Contract_t ut -> + unparse_ty ctxt ut >>? fun (t, ctxt) -> return ctxt (T_contract, [t]) + | Pair_t (utl, utr) -> unparse_ty ctxt utl - >>? fun (utl, ctxt) -> - let tl = add_field_annot l_field l_var utl in + >>? fun (tl, ctxt) -> unparse_ty ctxt utr - >>? fun (utr, ctxt) -> - let tr = add_field_annot r_field r_var utr in + >>? fun (tr, ctxt) -> (* Fold [pair a1 (pair ... (pair an-1 an))] into [pair a1 ... an] *) (* Note that the folding does not happen if the pair on the right has an annotation because this annotation would be lost *) return ctxt - ( match tr with - | Prim (_, T_pair, ts, []) -> - (T_pair, tl :: ts, annot) - | _ -> - (T_pair, [tl; tr], annot) ) - | Union_t ((utl, l_field), (utr, r_field), tname) -> - let annot = unparse_type_annot tname in + ( T_pair, + match tr with Prim (_, T_pair, ts, []) -> tl :: ts | _ -> [tl; tr] ) + | Union_t (utl, utr) -> unparse_ty ctxt utl - >>? fun (utl, ctxt) -> - let tl = add_field_annot l_field None utl in - unparse_ty ctxt utr - >>? fun (utr, ctxt) -> - let tr = add_field_annot r_field None utr in - return ctxt (T_or, [tl; tr], annot) - | Lambda_t (uta, utr, tname) -> + >>? fun (tl, ctxt) -> + unparse_ty ctxt utr >>? fun (tr, ctxt) -> return ctxt (T_or, [tl; tr]) + | Lambda_t (uta, utr) -> unparse_ty ctxt uta >>? fun (ta, ctxt) -> - unparse_ty ctxt utr - >>? fun (tr, ctxt) -> - return ctxt (T_lambda, [ta; tr], unparse_type_annot tname) - | Option_t (ut, tname) -> - let annot = unparse_type_annot tname in - unparse_ty ctxt ut - >>? fun (ut, ctxt) -> return ctxt (T_option, [ut], annot) - | List_t (ut, tname) -> - unparse_ty ctxt ut - >>? fun (t, ctxt) -> return ctxt (T_list, [t], unparse_type_annot tname) - | Ticket_t (ut, tname) -> + unparse_ty ctxt utr >>? fun (tr, ctxt) -> return ctxt (T_lambda, [ta; tr]) + | Option_t ut -> + unparse_ty ctxt ut >>? fun (ut, ctxt) -> return ctxt (T_option, [ut]) + | List_t ut -> + unparse_ty ctxt ut >>? fun (t, ctxt) -> return ctxt (T_list, [t]) + | Ticket_t ut -> let t = unparse_comparable_ty ut in - return ctxt (T_ticket, [t], unparse_type_annot tname) - | Set_t (ut, tname) -> + return ctxt (T_ticket, [t]) + | Set_t ut -> let t = unparse_comparable_ty ut in - return ctxt (T_set, [t], unparse_type_annot tname) - | Map_t (uta, utr, tname) -> + return ctxt (T_set, [t]) + | Map_t (uta, utr) -> let ta = unparse_comparable_ty uta in - unparse_ty ctxt utr - >>? fun (tr, ctxt) -> - return ctxt (T_map, [ta; tr], unparse_type_annot tname) - | Big_map_t (uta, utr, tname) -> + unparse_ty ctxt utr >>? fun (tr, ctxt) -> return ctxt (T_map, [ta; tr]) + | Big_map_t (uta, utr) -> let ta = unparse_comparable_ty uta in unparse_ty ctxt utr - >>? fun (tr, ctxt) -> - return ctxt (T_big_map, [ta; tr], unparse_type_annot tname) - | Sapling_transaction_t (memo_size, tname) -> - return - ctxt - ( T_sapling_transaction, - [unparse_memo_size memo_size], - unparse_type_annot tname ) - | Sapling_state_t (memo_size, tname) -> - return - ctxt - ( T_sapling_state, - [unparse_memo_size memo_size], - unparse_type_annot tname ) + >>? fun (tr, ctxt) -> return ctxt (T_big_map, [ta; tr]) + | Sapling_transaction_t memo_size -> + return ctxt (T_sapling_transaction, [unparse_memo_size memo_size]) + | Sapling_state_t memo_size -> + return ctxt (T_sapling_state, [unparse_memo_size memo_size]) -let rec strip_var_annots = function - | (Int _ | String _ | Bytes _) as atom -> - atom - | Seq (loc, args) -> - Seq (loc, List.map strip_var_annots args) - | Prim (loc, name, args, annots) -> - let not_var_annot s = Compare.Char.(s.[0] <> '@') in - let annots = List.filter not_var_annot annots in - Prim (loc, name, List.map strip_var_annots args, annots) +let rec add_entrypoints : type ty. ty entrypoints -> Script.node -> Script.node + = + fun entrypoints node -> + (* no gas accounting because this function is always called after + [unparse_ty] which generates [node]. *) + match (entrypoints, node) with + | ({nested = Entrypoints_None; name}, Prim (loc, prim, args, annots)) -> + Prim (loc, prim, args, annots @ unparse_field_annot name) + | ({nested = Entrypoints_None; _}, node) -> + node + | ( {nested = Entrypoints_Union {left; right}; name}, + Prim (loc, T_or, [utl; utr], annots) ) -> + let utl = add_entrypoints left utl in + let utr = add_entrypoints right utr in + Prim (loc, T_or, [utl; utr], annots @ unparse_field_annot name) + | ({nested = Entrypoints_Union _; _}, _) -> + (* this can only happen if [add_entrypoints] is not in sync with + [unparse_ty] *) + assert false + +let unparse_parameter_ty ctxt ty entrypoints = + unparse_ty ctxt ty + >|? fun (unparsed, ctxt) -> (add_entrypoints entrypoints unparsed, ctxt) let serialize_ty_for_error ctxt ty = unparse_ty ctxt ty >>? (fun (ty, ctxt) -> Gas.consume ctxt (Script.strip_locations_cost ty) - >|? fun ctxt -> (Micheline.strip_locations (strip_var_annots ty), ctxt)) + >|? fun ctxt -> (Micheline.strip_locations ty, ctxt)) |> record_trace Cannot_serialize_error let rec comparable_ty_of_ty : @@ -1030,47 +1003,47 @@ let rec comparable_ty_of_ty : Gas.consume ctxt Typecheck_costs.comparable_ty_of_ty_cycle >>? fun ctxt -> match ty with - | Unit_t tname -> - ok ((Unit_key tname : a comparable_ty), ctxt) - | Never_t tname -> - ok (Never_key tname, ctxt) - | Int_t tname -> - ok (Int_key tname, ctxt) - | Nat_t tname -> - ok (Nat_key tname, ctxt) - | Signature_t tname -> - ok (Signature_key tname, ctxt) - | String_t tname -> - ok (String_key tname, ctxt) - | Bytes_t tname -> - ok (Bytes_key tname, ctxt) - | Mutez_t tname -> - ok (Mutez_key tname, ctxt) - | Bool_t tname -> - ok (Bool_key tname, ctxt) - | Key_hash_t tname -> - ok (Key_hash_key tname, ctxt) - | Key_t tname -> - ok (Key_key tname, ctxt) - | Timestamp_t tname -> - ok (Timestamp_key tname, ctxt) - | Address_t tname -> - ok (Address_key tname, ctxt) - | Chain_id_t tname -> - ok (Chain_id_key tname, ctxt) - | Pair_t ((l, al, _), (r, ar, _), pname) -> + | Unit_t -> + ok ((Unit_key : a comparable_ty), ctxt) + | Never_t -> + ok (Never_key, ctxt) + | Int_t -> + ok (Int_key, ctxt) + | Nat_t -> + ok (Nat_key, ctxt) + | Signature_t -> + ok (Signature_key, ctxt) + | String_t -> + ok (String_key, ctxt) + | Bytes_t -> + ok (Bytes_key, ctxt) + | Mutez_t -> + ok (Mutez_key, ctxt) + | Bool_t -> + ok (Bool_key, ctxt) + | Key_hash_t -> + ok (Key_hash_key, ctxt) + | Key_t -> + ok (Key_key, ctxt) + | Timestamp_t -> + ok (Timestamp_key, ctxt) + | Address_t -> + ok (Address_key, ctxt) + | Chain_id_t -> + ok (Chain_id_key, ctxt) + | Pair_t (l, r) -> comparable_ty_of_ty ctxt loc l >>? fun (lty, ctxt) -> comparable_ty_of_ty ctxt loc r - >|? fun (rty, ctxt) -> (Pair_key ((lty, al), (rty, ar), pname), ctxt) - | Union_t ((l, al), (r, ar), tname) -> + >|? fun (rty, ctxt) -> (Pair_key (lty, rty), ctxt) + | Union_t (l, r) -> comparable_ty_of_ty ctxt loc l >>? fun (lty, ctxt) -> comparable_ty_of_ty ctxt loc r - >|? fun (rty, ctxt) -> (Union_key ((lty, al), (rty, ar), tname), ctxt) - | Option_t (tt, tname) -> + >|? fun (rty, ctxt) -> (Union_key (lty, rty), ctxt) + | Option_t tt -> comparable_ty_of_ty ctxt loc tt - >|? fun (ty, ctxt) -> (Option_key (ty, tname), ctxt) + >|? fun (ty, ctxt) -> (Option_key ty, ctxt) | Lambda_t _ | List_t _ | Ticket_t _ @@ -1078,10 +1051,10 @@ let rec comparable_ty_of_ty : | Map_t _ | Big_map_t _ | Contract_t _ - | Operation_t _ - | Bls12_381_fr_t _ - | Bls12_381_g1_t _ - | Bls12_381_g2_t _ + | Operation_t + | Bls12_381_fr_t + | Bls12_381_g1_t + | Bls12_381_g2_t | Sapling_state_t _ | Sapling_transaction_t _ -> serialize_ty_for_error ctxt ty @@ -1095,78 +1068,15 @@ let rec unparse_stack : fun ctxt -> function | Empty_t -> ok ([], ctxt) - | Item_t (ty, rest, annot) -> + | Item_t (ty, rest) -> unparse_ty ctxt ty >>? fun (uty, ctxt) -> unparse_stack ctxt rest - >|? fun (urest, ctxt) -> - ((strip_locations uty, unparse_var_annot annot) :: urest, ctxt) + >|? fun (urest, ctxt) -> ((strip_locations uty, []) :: urest, ctxt) let serialize_stack_for_error ctxt stack_ty = record_trace Cannot_serialize_error (unparse_stack ctxt stack_ty) -let name_of_ty : type a. a ty -> type_annot option = function - | Unit_t tname -> - tname - | Int_t tname -> - tname - | Nat_t tname -> - tname - | String_t tname -> - tname - | Bytes_t tname -> - tname - | Mutez_t tname -> - tname - | Bool_t tname -> - tname - | Key_hash_t tname -> - tname - | Key_t tname -> - tname - | Timestamp_t tname -> - tname - | Address_t tname -> - tname - | Signature_t tname -> - tname - | Operation_t tname -> - tname - | Chain_id_t tname -> - tname - | Never_t tname -> - tname - | Contract_t (_, tname) -> - tname - | Pair_t (_, _, tname) -> - tname - | Union_t (_, _, tname) -> - tname - | Lambda_t (_, _, tname) -> - tname - | Option_t (_, tname) -> - tname - | List_t (_, tname) -> - tname - | Ticket_t (_, tname) -> - tname - | Set_t (_, tname) -> - tname - | Map_t (_, _, tname) -> - tname - | Big_map_t (_, _, tname) -> - tname - | Bls12_381_g1_t tname -> - tname - | Bls12_381_g2_t tname -> - tname - | Bls12_381_fr_t tname -> - tname - | Sapling_state_t (_, tname) -> - tname - | Sapling_transaction_t (_, tname) -> - tname - (* ---- Tickets ------------------------------------------------------------ *) (* @@ -1174,20 +1084,20 @@ let name_of_ty : type a. a ty -> type_annot option = function checking this property when adding new types. *) let check_dupable_comparable_ty : type a. a comparable_ty -> unit = function - | Unit_key _ - | Never_key _ - | Int_key _ - | Nat_key _ - | Signature_key _ - | String_key _ - | Bytes_key _ - | Mutez_key _ - | Bool_key _ - | Key_hash_key _ - | Key_key _ - | Timestamp_key _ - | Chain_id_key _ - | Address_key _ + | Unit_key + | Never_key + | Int_key + | Nat_key + | Signature_key + | String_key + | Bytes_key + | Mutez_key + | Bool_key + | Key_hash_key + | Key_key + | Timestamp_key + | Chain_id_key + | Address_key | Pair_key _ | Union_key _ | Option_key _ -> @@ -1199,43 +1109,43 @@ let rec check_dupable_ty : Gas.consume ctxt Typecheck_costs.check_dupable_cycle >>? fun ctxt -> match ty with - | Unit_t _ -> + | Unit_t -> ok ctxt - | Int_t _ -> + | Int_t -> ok ctxt - | Nat_t _ -> + | Nat_t -> ok ctxt - | Signature_t _ -> + | Signature_t -> ok ctxt - | String_t _ -> + | String_t -> ok ctxt - | Bytes_t _ -> + | Bytes_t -> ok ctxt - | Mutez_t _ -> + | Mutez_t -> ok ctxt - | Key_hash_t _ -> + | Key_hash_t -> ok ctxt - | Key_t _ -> + | Key_t -> ok ctxt - | Timestamp_t _ -> + | Timestamp_t -> ok ctxt - | Address_t _ -> + | Address_t -> ok ctxt - | Bool_t _ -> + | Bool_t -> ok ctxt - | Contract_t (_, _) -> + | Contract_t _ -> ok ctxt - | Operation_t _ -> + | Operation_t -> ok ctxt - | Chain_id_t _ -> + | Chain_id_t -> ok ctxt - | Never_t _ -> + | Never_t -> ok ctxt - | Bls12_381_g1_t _ -> + | Bls12_381_g1_t -> ok ctxt - | Bls12_381_g2_t _ -> + | Bls12_381_g2_t -> ok ctxt - | Bls12_381_fr_t _ -> + | Bls12_381_fr_t -> ok ctxt | Sapling_state_t _ -> ok ctxt @@ -1243,13 +1153,13 @@ let rec check_dupable_ty : ok ctxt | Ticket_t _ -> error (Unexpected_ticket loc) - | Pair_t ((ty_a, _, _), (ty_b, _, _), _) -> + | Pair_t (ty_a, ty_b) -> check_dupable_ty ctxt loc ty_a >>? fun ctxt -> check_dupable_ty ctxt loc ty_b - | Union_t ((ty_a, _), (ty_b, _), _) -> + | Union_t (ty_a, ty_b) -> check_dupable_ty ctxt loc ty_a >>? fun ctxt -> check_dupable_ty ctxt loc ty_b - | Lambda_t (_, _, _) -> + | Lambda_t (_, _) -> (* Lambda are dupable as long as: - they don't contain non-dupable values, e.g. in `PUSH` @@ -1259,17 +1169,17 @@ let rec check_dupable_ty : Hence non-dupable should imply non-packable. *) ok ctxt - | Option_t (ty, _) -> + | Option_t ty -> check_dupable_ty ctxt loc ty - | List_t (ty, _) -> + | List_t ty -> check_dupable_ty ctxt loc ty - | Set_t (key_ty, _) -> + | Set_t key_ty -> let () = check_dupable_comparable_ty key_ty in ok ctxt - | Map_t (key_ty, val_ty, _) -> + | Map_t (key_ty, val_ty) -> let () = check_dupable_comparable_ty key_ty in check_dupable_ty ctxt loc val_ty - | Big_map_t (key_ty, val_ty, _) -> + | Big_map_t (key_ty, val_ty) -> let () = check_dupable_comparable_ty key_ty in check_dupable_ty ctxt loc val_ty @@ -1284,296 +1194,158 @@ let record_inconsistent ctxt ta tb = serialize_ty_for_error ctxt tb >|? fun (tb, _ctxt) -> Inconsistent_types (ta, tb)) -let record_inconsistent_type_annotations ctxt loc ta tb = - record_trace_eval (fun () -> - serialize_ty_for_error ctxt ta - >>? fun (ta, ctxt) -> - serialize_ty_for_error ctxt tb - >|? fun (tb, _ctxt) -> Inconsistent_type_annotations (loc, ta, tb)) - -let rec merge_comparable_types : +let rec comparable_ty_eq : type ta tb. - legacy:bool -> context -> ta comparable_ty -> tb comparable_ty -> - ((ta comparable_ty, tb comparable_ty) eq * ta comparable_ty * context) - tzresult = - fun ~legacy ctxt ta tb -> + ((ta comparable_ty, tb comparable_ty) eq * context) tzresult = + fun ctxt ta tb -> Gas.consume ctxt Typecheck_costs.merge_cycle >>? fun ctxt -> match (ta, tb) with - | (Unit_key annot_a, Unit_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> - ( (Eq : (ta comparable_ty, tb comparable_ty) eq), - (Unit_key annot : ta comparable_ty), - ctxt ) - | (Never_key annot_a, Never_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Never_key annot, ctxt) - | (Int_key annot_a, Int_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Int_key annot, ctxt) - | (Nat_key annot_a, Nat_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Nat_key annot, ctxt) - | (Signature_key annot_a, Signature_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Signature_key annot, ctxt) - | (String_key annot_a, String_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, String_key annot, ctxt) - | (Bytes_key annot_a, Bytes_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Bytes_key annot, ctxt) - | (Mutez_key annot_a, Mutez_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Mutez_key annot, ctxt) - | (Bool_key annot_a, Bool_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Bool_key annot, ctxt) - | (Key_hash_key annot_a, Key_hash_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Key_hash_key annot, ctxt) - | (Key_key annot_a, Key_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Key_key annot, ctxt) - | (Timestamp_key annot_a, Timestamp_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Timestamp_key annot, ctxt) - | (Chain_id_key annot_a, Chain_id_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Chain_id_key annot, ctxt) - | (Address_key annot_a, Address_key annot_b) -> - merge_type_annot ~legacy annot_a annot_b - >|? fun annot -> (Eq, Address_key annot, ctxt) - | ( Pair_key ((left_a, annot_left_a), (right_a, annot_right_a), annot_a), - Pair_key ((left_b, annot_left_b), (right_b, annot_right_b), annot_b) ) -> - merge_type_annot ~legacy annot_a annot_b - >>? fun annot -> - merge_field_annot ~legacy annot_left_a annot_left_b - >>? fun annot_left -> - merge_field_annot ~legacy annot_right_a annot_right_b - >>? fun annot_right -> - merge_comparable_types ~legacy ctxt left_a left_b - >>? fun (Eq, left, ctxt) -> - merge_comparable_types ~legacy ctxt right_a right_b - >|? fun (Eq, right, ctxt) -> - ( (Eq : (ta comparable_ty, tb comparable_ty) eq), - Pair_key ((left, annot_left), (right, annot_right), annot), - ctxt ) - | ( Union_key ((left_a, annot_left_a), (right_a, annot_right_a), annot_a), - Union_key ((left_b, annot_left_b), (right_b, annot_right_b), annot_b) ) - -> - merge_type_annot ~legacy annot_a annot_b - >>? fun annot -> - merge_field_annot ~legacy annot_left_a annot_left_b - >>? fun annot_left -> - merge_field_annot ~legacy annot_right_a annot_right_b - >>? fun annot_right -> - merge_comparable_types ~legacy ctxt left_a left_b - >>? fun (Eq, left, ctxt) -> - merge_comparable_types ~legacy ctxt right_a right_b - >|? fun (Eq, right, ctxt) -> - ( (Eq : (ta comparable_ty, tb comparable_ty) eq), - Union_key ((left, annot_left), (right, annot_right), annot), - ctxt ) - | (Option_key (ta, annot_a), Option_key (tb, annot_b)) -> - merge_type_annot ~legacy annot_a annot_b - >>? fun annot -> - merge_comparable_types ~legacy ctxt ta tb - >|? fun (Eq, t, ctxt) -> - ( (Eq : (ta comparable_ty, tb comparable_ty) eq), - Option_key (t, annot), - ctxt ) + | (Unit_key, Unit_key) -> + ok ((Eq : (ta comparable_ty, tb comparable_ty) eq), ctxt) + | (Never_key, Never_key) -> + ok (Eq, ctxt) + | (Int_key, Int_key) -> + ok (Eq, ctxt) + | (Nat_key, Nat_key) -> + ok (Eq, ctxt) + | (Signature_key, Signature_key) -> + ok (Eq, ctxt) + | (String_key, String_key) -> + ok (Eq, ctxt) + | (Bytes_key, Bytes_key) -> + ok (Eq, ctxt) + | (Mutez_key, Mutez_key) -> + ok (Eq, ctxt) + | (Bool_key, Bool_key) -> + ok (Eq, ctxt) + | (Key_hash_key, Key_hash_key) -> + ok (Eq, ctxt) + | (Key_key, Key_key) -> + ok (Eq, ctxt) + | (Timestamp_key, Timestamp_key) -> + ok (Eq, ctxt) + | (Chain_id_key, Chain_id_key) -> + ok (Eq, ctxt) + | (Address_key, Address_key) -> + ok (Eq, ctxt) + | (Pair_key (left_a, right_a), Pair_key (left_b, right_b)) -> + comparable_ty_eq ctxt left_a left_b + >>? fun (Eq, ctxt) -> + comparable_ty_eq ctxt right_a right_b + >|? fun (Eq, ctxt) -> + ((Eq : (ta comparable_ty, tb comparable_ty) eq), ctxt) + | (Union_key (left_a, right_a), Union_key (left_b, right_b)) -> + comparable_ty_eq ctxt left_a left_b + >>? fun (Eq, ctxt) -> + comparable_ty_eq ctxt right_a right_b + >|? fun (Eq, ctxt) -> + ((Eq : (ta comparable_ty, tb comparable_ty) eq), ctxt) + | (Option_key ta, Option_key tb) -> + comparable_ty_eq ctxt ta tb + >|? fun (Eq, ctxt) -> + ((Eq : (ta comparable_ty, tb comparable_ty) eq), ctxt) | (_, _) -> serialize_ty_for_error ctxt (ty_of_comparable_ty ta) >>? fun (ta, ctxt) -> serialize_ty_for_error ctxt (ty_of_comparable_ty tb) >>? fun (tb, _ctxt) -> error (Inconsistent_types (ta, tb)) -let comparable_ty_eq : - type ta tb. - context -> - ta comparable_ty -> - tb comparable_ty -> - ((ta comparable_ty, tb comparable_ty) eq * context) tzresult = - fun ctxt ta tb -> - merge_comparable_types ~legacy:true ctxt ta tb - >|? fun (eq, _ty, ctxt) -> (eq, ctxt) - -let merge_memo_sizes ms1 ms2 = - if Sapling.Memo_size.equal ms1 ms2 then ok ms1 +let memo_size_eq ms1 ms2 = + if Sapling.Memo_size.equal ms1 ms2 then ok_unit else error (Inconsistent_memo_sizes (ms1, ms2)) -let merge_types : - type a b. - legacy:bool -> - context -> - Script.location -> - a ty -> - b ty -> - ((a ty, b ty) eq * a ty * context) tzresult = - fun ~legacy ctxt loc ty1 ty2 -> - let merge_type_annot tn1 tn2 = - merge_type_annot ~legacy tn1 tn2 - |> record_inconsistent_type_annotations ctxt loc ty1 ty2 - in +let ty_eq : + type a b. context -> a ty -> b ty -> ((a ty, b ty) eq * context) tzresult = + fun ctxt ty1 ty2 -> let rec help : type ta tb. - context -> - ta ty -> - tb ty -> - ((ta ty, tb ty) eq * ta ty * context) tzresult = + context -> ta ty -> tb ty -> ((ta ty, tb ty) eq * context) tzresult = fun ctxt ty1 ty2 -> help0 ctxt ty1 ty2 |> record_inconsistent ctxt ty1 ty2 and help0 : type ta tb. - context -> - ta ty -> - tb ty -> - ((ta ty, tb ty) eq * ta ty * context) tzresult = + context -> ta ty -> tb ty -> ((ta ty, tb ty) eq * context) tzresult = fun ctxt ty1 ty2 -> Gas.consume ctxt Typecheck_costs.merge_cycle >>? fun ctxt -> match (ty1, ty2) with - | (Unit_t tn1, Unit_t tn2) -> - merge_type_annot tn1 tn2 - >|? fun tname -> - ((Eq : (ta ty, tb ty) eq), (Unit_t tname : ta ty), ctxt) - | (Int_t tn1, Int_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Int_t tname, ctxt) - | (Nat_t tn1, Nat_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Nat_t tname, ctxt) - | (Key_t tn1, Key_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Key_t tname, ctxt) - | (Key_hash_t tn1, Key_hash_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Key_hash_t tname, ctxt) - | (String_t tn1, String_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, String_t tname, ctxt) - | (Bytes_t tn1, Bytes_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Bytes_t tname, ctxt) - | (Signature_t tn1, Signature_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Signature_t tname, ctxt) - | (Mutez_t tn1, Mutez_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Mutez_t tname, ctxt) - | (Timestamp_t tn1, Timestamp_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Timestamp_t tname, ctxt) - | (Address_t tn1, Address_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Address_t tname, ctxt) - | (Bool_t tn1, Bool_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Bool_t tname, ctxt) - | (Chain_id_t tn1, Chain_id_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Chain_id_t tname, ctxt) - | (Never_t tn1, Never_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Never_t tname, ctxt) - | (Operation_t tn1, Operation_t tn2) -> - merge_type_annot tn1 tn2 >|? fun tname -> (Eq, Operation_t tname, ctxt) - | (Bls12_381_g1_t tn1, Bls12_381_g1_t tn2) -> - merge_type_annot tn1 tn2 - >|? fun tname -> (Eq, Bls12_381_g1_t tname, ctxt) - | (Bls12_381_g2_t tn1, Bls12_381_g2_t tn2) -> - merge_type_annot tn1 tn2 - >|? fun tname -> (Eq, Bls12_381_g2_t tname, ctxt) - | (Bls12_381_fr_t tn1, Bls12_381_fr_t tn2) -> - merge_type_annot tn1 tn2 - >|? fun tname -> (Eq, Bls12_381_fr_t tname, ctxt) - | (Map_t (tal, tar, tn1), Map_t (tbl, tbr, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> + | (Unit_t, Unit_t) -> + ok ((Eq : (ta ty, tb ty) eq), ctxt) + | (Int_t, Int_t) -> + ok (Eq, ctxt) + | (Nat_t, Nat_t) -> + ok (Eq, ctxt) + | (Key_t, Key_t) -> + ok (Eq, ctxt) + | (Key_hash_t, Key_hash_t) -> + ok (Eq, ctxt) + | (String_t, String_t) -> + ok (Eq, ctxt) + | (Bytes_t, Bytes_t) -> + ok (Eq, ctxt) + | (Signature_t, Signature_t) -> + ok (Eq, ctxt) + | (Mutez_t, Mutez_t) -> + ok (Eq, ctxt) + | (Timestamp_t, Timestamp_t) -> + ok (Eq, ctxt) + | (Address_t, Address_t) -> + ok (Eq, ctxt) + | (Bool_t, Bool_t) -> + ok (Eq, ctxt) + | (Chain_id_t, Chain_id_t) -> + ok (Eq, ctxt) + | (Never_t, Never_t) -> + ok (Eq, ctxt) + | (Operation_t, Operation_t) -> + ok (Eq, ctxt) + | (Bls12_381_g1_t, Bls12_381_g1_t) -> + ok (Eq, ctxt) + | (Bls12_381_g2_t, Bls12_381_g2_t) -> + ok (Eq, ctxt) + | (Bls12_381_fr_t, Bls12_381_fr_t) -> + ok (Eq, ctxt) + | (Map_t (tal, tar), Map_t (tbl, tbr)) -> help ctxt tar tbr - >>? fun (Eq, value, ctxt) -> - merge_comparable_types ~legacy ctxt tal tbl - >|? fun (Eq, tk, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Map_t (tk, value, tname), ctxt) - | (Big_map_t (tal, tar, tn1), Big_map_t (tbl, tbr, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> + >>? fun (Eq, ctxt) -> + comparable_ty_eq ctxt tal tbl + >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Big_map_t (tal, tar), Big_map_t (tbl, tbr)) -> help ctxt tar tbr - >>? fun (Eq, value, ctxt) -> - merge_comparable_types ~legacy ctxt tal tbl - >|? fun (Eq, tk, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Big_map_t (tk, value, tname), ctxt) - | (Set_t (ea, tn1), Set_t (eb, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - merge_comparable_types ~legacy ctxt ea eb - >|? fun (Eq, e, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Set_t (e, tname), ctxt) - | (Ticket_t (ea, tn1), Ticket_t (eb, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - merge_comparable_types ~legacy ctxt ea eb - >|? fun (Eq, e, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Ticket_t (e, tname), ctxt) - | ( Pair_t ((tal, l_field1, l_var1), (tar, r_field1, r_var1), tn1), - Pair_t ((tbl, l_field2, l_var2), (tbr, r_field2, r_var2), tn2) ) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - merge_field_annot ~legacy l_field1 l_field2 - >>? fun l_field -> - merge_field_annot ~legacy r_field1 r_field2 - >>? fun r_field -> - let l_var = merge_var_annot l_var1 l_var2 in - let r_var = merge_var_annot r_var1 r_var2 in + >>? fun (Eq, ctxt) -> + comparable_ty_eq ctxt tal tbl + >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Set_t ea, Set_t eb) -> + comparable_ty_eq ctxt ea eb + >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Ticket_t ea, Ticket_t eb) -> + comparable_ty_eq ctxt ea eb + >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Pair_t (tal, tar), Pair_t (tbl, tbr)) -> help ctxt tal tbl - >>? fun (Eq, left_ty, ctxt) -> - help ctxt tar tbr - >|? fun (Eq, right_ty, ctxt) -> - ( (Eq : (ta ty, tb ty) eq), - Pair_t ((left_ty, l_field, l_var), (right_ty, r_field, r_var), tname), - ctxt ) - | ( Union_t ((tal, tal_annot), (tar, tar_annot), tn1), - Union_t ((tbl, tbl_annot), (tbr, tbr_annot), tn2) ) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - merge_field_annot ~legacy tal_annot tbl_annot - >>? fun left_annot -> - merge_field_annot ~legacy tar_annot tbr_annot - >>? fun right_annot -> + >>? fun (Eq, ctxt) -> + help ctxt tar tbr >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Union_t (tal, tar), Union_t (tbl, tbr)) -> help ctxt tal tbl - >>? fun (Eq, left_ty, ctxt) -> - help ctxt tar tbr - >|? fun (Eq, right_ty, ctxt) -> - ( (Eq : (ta ty, tb ty) eq), - Union_t ((left_ty, left_annot), (right_ty, right_annot), tname), - ctxt ) - | (Lambda_t (tal, tar, tn1), Lambda_t (tbl, tbr, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> + >>? fun (Eq, ctxt) -> + help ctxt tar tbr >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Lambda_t (tal, tar), Lambda_t (tbl, tbr)) -> help ctxt tal tbl - >>? fun (Eq, left_ty, ctxt) -> - help ctxt tar tbr - >|? fun (Eq, right_ty, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Lambda_t (left_ty, right_ty, tname), ctxt) - | (Contract_t (tal, tn1), Contract_t (tbl, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - help ctxt tal tbl - >|? fun (Eq, arg_ty, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Contract_t (arg_ty, tname), ctxt) - | (Option_t (tva, tn1), Option_t (tvb, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - help ctxt tva tvb - >|? fun (Eq, ty, ctxt) -> - ((Eq : (ta ty, tb ty) eq), Option_t (ty, tname), ctxt) - | (List_t (tva, tn1), List_t (tvb, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - help ctxt tva tvb - >|? fun (Eq, ty, ctxt) -> - ((Eq : (ta ty, tb ty) eq), List_t (ty, tname), ctxt) - | (Sapling_state_t (ms1, tn1), Sapling_state_t (ms2, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - merge_memo_sizes ms1 ms2 - >|? fun ms -> (Eq, Sapling_state_t (ms, tname), ctxt) - | (Sapling_transaction_t (ms1, tn1), Sapling_transaction_t (ms2, tn2)) -> - merge_type_annot tn1 tn2 - >>? fun tname -> - merge_memo_sizes ms1 ms2 - >|? fun ms -> (Eq, Sapling_transaction_t (ms, tname), ctxt) + >>? fun (Eq, ctxt) -> + help ctxt tar tbr >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Contract_t tal, Contract_t tbl) -> + help ctxt tal tbl >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Option_t tva, Option_t tvb) -> + help ctxt tva tvb >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (List_t tva, List_t tvb) -> + help ctxt tva tvb >|? fun (Eq, ctxt) -> ((Eq : (ta ty, tb ty) eq), ctxt) + | (Sapling_state_t ms1, Sapling_state_t ms2) -> + memo_size_eq ms1 ms2 >|? fun () -> (Eq, ctxt) + | (Sapling_transaction_t ms1, Sapling_transaction_t ms2) -> + memo_size_eq ms1 ms2 >|? fun () -> (Eq, ctxt) | (_, _) -> serialize_ty_for_error ctxt ty1 >>? fun (ty1, ctxt) -> @@ -1583,49 +1355,24 @@ let merge_types : help ctxt ty1 ty2 [@@coq_axiom "non-top-level mutual recursion"] -let ty_eq : +let rec stacks_eq : type ta tb. context -> - Script.location -> - ta ty -> - tb ty -> - ((ta ty, tb ty) eq * context) tzresult = - fun ctxt loc ta tb -> - merge_types ~legacy:true ctxt loc ta tb >|? fun (eq, _ty, ctxt) -> (eq, ctxt) - -let merge_stacks : - type ta tb. - legacy:bool -> - Script.location -> - context -> int -> ta stack_ty -> tb stack_ty -> - ((ta stack_ty, tb stack_ty) eq * ta stack_ty * context) tzresult = - fun ~legacy loc -> - let rec help : - type a b. - context -> - int -> - a stack_ty -> - b stack_ty -> - ((a stack_ty, b stack_ty) eq * a stack_ty * context) tzresult = - fun ctxt lvl stack1 stack2 -> - match (stack1, stack2) with - | (Empty_t, Empty_t) -> - ok (Eq, Empty_t, ctxt) - | (Item_t (ty1, rest1, annot1), Item_t (ty2, rest2, annot2)) -> - merge_types ~legacy ctxt loc ty1 ty2 - |> record_trace (Bad_stack_item lvl) - >>? fun (Eq, ty, ctxt) -> - help ctxt (lvl + 1) rest1 rest2 - >|? fun (Eq, rest, ctxt) -> - let annot = merge_var_annot annot1 annot2 in - ((Eq : (a stack_ty, b stack_ty) eq), Item_t (ty, rest, annot), ctxt) - | (_, _) -> - error Bad_stack_length - in - help + ((ta stack_ty, tb stack_ty) eq * context) tzresult = + fun ctxt lvl stack1 stack2 -> + match (stack1, stack2) with + | (Empty_t, Empty_t) -> + ok (Eq, ctxt) + | (Item_t (ty1, rest1), Item_t (ty2, rest2)) -> + record_trace (Bad_stack_item lvl) (ty_eq ctxt ty1 ty2) + >>? fun (Eq, ctxt) -> + stacks_eq ctxt (lvl + 1) rest1 rest2 + >|? fun (Eq, ctxt) -> ((Eq : (ta stack_ty, tb stack_ty) eq), ctxt) + | (_, _) -> + error Bad_stack_length (* ---- Type checker results -------------------------------------------------*) @@ -1645,14 +1392,13 @@ type ('t, 'f, 'b) branch = { let merge_branches : type bef a b. - legacy:bool -> context -> int -> a judgement -> b judgement -> (a, b, bef) branch -> (bef judgement * context) tzresult = - fun ~legacy ctxt loc btr bfr {branch} -> + fun ctxt loc btr bfr {branch} -> match (btr, bfr) with | (Typed ({aft = aftbt; _} as dbt), Typed ({aft = aftbf; _} as dbf)) -> let unmatched_branches () = @@ -1663,11 +1409,8 @@ let merge_branches : in record_trace_eval unmatched_branches - ( merge_stacks ~legacy loc ctxt 1 aftbt aftbf - >|? fun (Eq, merged_stack, ctxt) -> - ( Typed - (branch {dbt with aft = merged_stack} {dbf with aft = merged_stack}), - ctxt ) ) + ( stacks_eq ctxt 1 aftbt aftbf + >|? fun (Eq, ctxt) -> (Typed (branch dbt dbf), ctxt) ) | (Failed {descr = descrt}, Failed {descr = descrf}) -> let descr ret = branch (descrt ret) (descrf ret) in ok (Failed {descr}, ctxt) @@ -1695,48 +1438,34 @@ let rec parse_comparable_ty : Gas.consume ctxt Typecheck_costs.parse_type_cycle >>? fun ctxt -> match ty with - | Prim (loc, T_unit, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Unit_key tname), ctxt) - | Prim (loc, T_never, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Never_key tname), ctxt) - | Prim (loc, T_int, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Int_key tname), ctxt) - | Prim (loc, T_nat, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Nat_key tname), ctxt) - | Prim (loc, T_signature, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Signature_key tname), ctxt) - | Prim (loc, T_string, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (String_key tname), ctxt) - | Prim (loc, T_bytes, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Bytes_key tname), ctxt) - | Prim (loc, T_mutez, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Mutez_key tname), ctxt) - | Prim (loc, T_bool, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Bool_key tname), ctxt) - | Prim (loc, T_key_hash, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Key_hash_key tname), ctxt) - | Prim (loc, T_key, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Key_key tname), ctxt) - | Prim (loc, T_timestamp, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Timestamp_key tname), ctxt) - | Prim (loc, T_chain_id, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Chain_id_key tname), ctxt) - | Prim (loc, T_address, [], annot) -> - parse_type_annot loc annot - >|? fun tname -> (Ex_comparable_ty (Address_key tname), ctxt) + | Prim (_loc, T_unit, [], _annot) -> + ok (Ex_comparable_ty Unit_key, ctxt) + | Prim (_loc, T_never, [], _annot) -> + ok (Ex_comparable_ty Never_key, ctxt) + | Prim (_loc, T_int, [], _annot) -> + ok (Ex_comparable_ty Int_key, ctxt) + | Prim (_loc, T_nat, [], _annot) -> + ok (Ex_comparable_ty Nat_key, ctxt) + | Prim (_loc, T_signature, [], _annot) -> + ok (Ex_comparable_ty Signature_key, ctxt) + | Prim (_loc, T_string, [], _annot) -> + ok (Ex_comparable_ty String_key, ctxt) + | Prim (_loc, T_bytes, [], _annot) -> + ok (Ex_comparable_ty Bytes_key, ctxt) + | Prim (_loc, T_mutez, [], _annot) -> + ok (Ex_comparable_ty Mutez_key, ctxt) + | Prim (_loc, T_bool, [], _annot) -> + ok (Ex_comparable_ty Bool_key, ctxt) + | Prim (_loc, T_key_hash, [], _annot) -> + ok (Ex_comparable_ty Key_hash_key, ctxt) + | Prim (_loc, T_key, [], _annot) -> + ok (Ex_comparable_ty Key_key, ctxt) + | Prim (_loc, T_timestamp, [], _annot) -> + ok (Ex_comparable_ty Timestamp_key, ctxt) + | Prim (_loc, T_chain_id, [], _annot) -> + ok (Ex_comparable_ty Chain_id_key, ctxt) + | Prim (_loc, T_address, [], _annot) -> + ok (Ex_comparable_ty Address_key, ctxt) | Prim ( loc, ( ( T_unit @@ -1756,47 +1485,32 @@ let rec parse_comparable_ty : l, _ ) -> error (Invalid_arity (loc, prim, 0, List.length l)) - | Prim (loc, T_pair, left :: right, annot) -> - parse_type_annot loc annot - >>? fun pname -> - extract_field_annot left - >>? fun (left, left_annot) -> - ( match right with - | [right] -> - extract_field_annot right - | right -> - (* Unfold [pair t1 ... tn] as [pair t1 (... (pair tn-1 tn))] *) - ok (Prim (loc, T_pair, right, []), None) ) - >>? fun (right, right_annot) -> + | Prim (loc, T_pair, left :: right, _annot) -> + let right = + match right with + | [right] -> + right + | right -> + (* Unfold [pair t1 ... tn] as [pair t1 (... (pair tn-1 tn))] *) + Prim (loc, T_pair, right, []) + in parse_comparable_ty ctxt right >>? fun (Ex_comparable_ty right, ctxt) -> parse_comparable_ty ctxt left >|? fun (Ex_comparable_ty left, ctxt) -> - ( Ex_comparable_ty - (Pair_key ((left, left_annot), (right, right_annot), pname)), - ctxt ) - | Prim (loc, T_or, [left; right], annot) -> - parse_type_annot loc annot - >>? fun pname -> - extract_field_annot left - >>? fun (left, left_annot) -> - extract_field_annot right - >>? fun (right, right_annot) -> + (Ex_comparable_ty (Pair_key (left, right)), ctxt) + | Prim (_loc, T_or, [left; right], _annot) -> parse_comparable_ty ctxt right >>? fun (Ex_comparable_ty right, ctxt) -> parse_comparable_ty ctxt left >|? fun (Ex_comparable_ty left, ctxt) -> - ( Ex_comparable_ty - (Union_key ((left, left_annot), (right, right_annot), pname)), - ctxt ) + (Ex_comparable_ty (Union_key (left, right)), ctxt) | Prim (loc, ((T_pair | T_or) as prim), l, _) -> error (Invalid_arity (loc, prim, 2, List.length l)) - | Prim (loc, T_option, [t], annot) -> - parse_type_annot loc annot - >>? fun tname -> + | Prim (_loc, T_option, [t], _annot) -> parse_comparable_ty ctxt t >|? fun (Ex_comparable_ty t, ctxt) -> - (Ex_comparable_ty (Option_key (t, tname)), ctxt) + (Ex_comparable_ty (Option_key t), ctxt) | Prim (loc, T_option, l, _) -> error (Invalid_arity (loc, T_option, 1, List.length l)) | Prim @@ -1829,51 +1543,7 @@ let rec parse_comparable_ty : T_signature; T_key ] -and parse_packable_ty : - context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = - fun ctxt ~legacy -> - parse_ty - ctxt - ~legacy - ~allow_lazy_storage:false - ~allow_operation:false - ~allow_contract:legacy - ~allow_ticket:false - -and parse_parameter_ty : - context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = - fun ctxt ~legacy -> - parse_ty - ctxt - ~legacy - ~allow_lazy_storage:true - ~allow_operation:false - ~allow_contract:true - ~allow_ticket:true - -and parse_normal_storage_ty : - context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = - fun ctxt ~legacy -> - parse_ty - ctxt - ~legacy - ~allow_lazy_storage:true - ~allow_operation:false - ~allow_contract:legacy - ~allow_ticket:true - -and parse_any_ty : - context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = - fun ctxt ~legacy -> - parse_ty - ctxt - ~legacy - ~allow_lazy_storage:true - ~allow_operation:true - ~allow_contract:true - ~allow_ticket:true - -and parse_ty : +let rec parse_ty : context -> legacy:bool -> allow_lazy_storage:bool -> @@ -1892,72 +1562,49 @@ and parse_ty : Gas.consume ctxt Typecheck_costs.parse_type_cycle >>? fun ctxt -> match node with - | Prim (loc, T_unit, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Unit_t ty_name), ctxt) - | Prim (loc, T_int, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Int_t ty_name), ctxt) - | Prim (loc, T_nat, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Nat_t ty_name), ctxt) - | Prim (loc, T_string, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (String_t ty_name), ctxt) - | Prim (loc, T_bytes, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Bytes_t ty_name), ctxt) - | Prim (loc, T_mutez, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Mutez_t ty_name), ctxt) - | Prim (loc, T_bool, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Bool_t ty_name), ctxt) - | Prim (loc, T_key, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Key_t ty_name), ctxt) - | Prim (loc, T_key_hash, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Key_hash_t ty_name), ctxt) - | Prim (loc, T_timestamp, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Timestamp_t ty_name), ctxt) - | Prim (loc, T_address, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Address_t ty_name), ctxt) - | Prim (loc, T_signature, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Signature_t ty_name), ctxt) - | Prim (loc, T_operation, [], annot) -> - if allow_operation then - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Operation_t ty_name), ctxt) + | Prim (_loc, T_unit, [], _annot) -> + ok (Ex_ty Unit_t, ctxt) + | Prim (_loc, T_int, [], _annot) -> + ok (Ex_ty Int_t, ctxt) + | Prim (_loc, T_nat, [], _annot) -> + ok (Ex_ty Nat_t, ctxt) + | Prim (_loc, T_string, [], _annot) -> + ok (Ex_ty String_t, ctxt) + | Prim (_loc, T_bytes, [], _annot) -> + ok (Ex_ty Bytes_t, ctxt) + | Prim (_loc, T_mutez, [], _annot) -> + ok (Ex_ty Mutez_t, ctxt) + | Prim (_loc, T_bool, [], _annot) -> + ok (Ex_ty Bool_t, ctxt) + | Prim (_loc, T_key, [], _annot) -> + ok (Ex_ty Key_t, ctxt) + | Prim (_loc, T_key_hash, [], _annot) -> + ok (Ex_ty Key_hash_t, ctxt) + | Prim (_loc, T_timestamp, [], _annot) -> + ok (Ex_ty Timestamp_t, ctxt) + | Prim (_loc, T_address, [], _annot) -> + ok (Ex_ty Address_t, ctxt) + | Prim (_loc, T_signature, [], _annot) -> + ok (Ex_ty Signature_t, ctxt) + | Prim (loc, T_operation, [], _annot) -> + if allow_operation then ok (Ex_ty Operation_t, ctxt) else error (Unexpected_operation loc) - | Prim (loc, T_chain_id, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Chain_id_t ty_name), ctxt) - | Prim (loc, T_never, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Never_t ty_name), ctxt) - | Prim (loc, T_bls12_381_g1, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Bls12_381_g1_t ty_name), ctxt) - | Prim (loc, T_bls12_381_g2, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Bls12_381_g2_t ty_name), ctxt) - | Prim (loc, T_bls12_381_fr, [], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Bls12_381_fr_t ty_name), ctxt) - | Prim (loc, T_contract, [utl], annot) -> + | Prim (_loc, T_chain_id, [], _annot) -> + ok (Ex_ty Chain_id_t, ctxt) + | Prim (_loc, T_never, [], _annot) -> + ok (Ex_ty Never_t, ctxt) + | Prim (_loc, T_bls12_381_g1, [], _annot) -> + ok (Ex_ty Bls12_381_g1_t, ctxt) + | Prim (_loc, T_bls12_381_g2, [], _annot) -> + ok (Ex_ty Bls12_381_g2_t, ctxt) + | Prim (_loc, T_bls12_381_fr, [], _annot) -> + ok (Ex_ty Bls12_381_fr_t, ctxt) + | Prim (loc, T_contract, [utl], _annot) -> if allow_contract then parse_parameter_ty ctxt ~legacy utl - >>? fun (Ex_ty tl, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Contract_t (tl, ty_name)), ctxt) + >>? fun (Ex_ty tl, ctxt) -> ok (Ex_ty (Contract_t tl), ctxt) else error (Unexpected_contract loc) - | Prim (loc, T_pair, utl :: utr, annot) -> - extract_field_annot utl - >>? fun (utl, left_field) -> + | Prim (loc, T_pair, utl :: utr, _annot) -> parse_ty ctxt ~legacy @@ -1967,13 +1614,14 @@ and parse_ty : ~allow_ticket utl >>? fun (Ex_ty tl, ctxt) -> - ( match utr with - | [utr] -> - extract_field_annot utr - | utr -> - (* Unfold [pair t1 ... tn] as [pair t1 (... (pair tn-1 tn))] *) - ok (Prim (loc, T_pair, utr, []), None) ) - >>? fun (utr, right_field) -> + let utr = + match utr with + | [utr] -> + utr + | utr -> + (* Unfold [pair t1 ... tn] as [pair t1 (... (pair tn-1 tn))] *) + Prim (loc, T_pair, utr, []) + in parse_ty ctxt ~legacy @@ -1982,18 +1630,8 @@ and parse_ty : ~allow_contract ~allow_ticket utr - >>? fun (Ex_ty tr, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> - ok - ( Ex_ty - (Pair_t ((tl, left_field, None), (tr, right_field, None), ty_name)), - ctxt ) - | Prim (loc, T_or, [utl; utr], annot) -> - extract_field_annot utl - >>? fun (utl, left_constr) -> - extract_field_annot utr - >>? fun (utr, right_constr) -> + >>? fun (Ex_ty tr, ctxt) -> ok (Ex_ty (Pair_t (tl, tr)), ctxt) + | Prim (_loc, T_or, [utl; utr], _annot) -> parse_ty ctxt ~legacy @@ -2011,27 +1649,13 @@ and parse_ty : ~allow_contract ~allow_ticket utr - >>? fun (Ex_ty tr, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> - ok - (Ex_ty (Union_t ((tl, left_constr), (tr, right_constr), ty_name)), ctxt) - | Prim (loc, T_lambda, [uta; utr], annot) -> + >>? fun (Ex_ty tr, ctxt) -> ok (Ex_ty (Union_t (tl, tr)), ctxt) + | Prim (_loc, T_lambda, [uta; utr], _annot) -> parse_any_ty ctxt ~legacy uta >>? fun (Ex_ty ta, ctxt) -> parse_any_ty ctxt ~legacy utr - >>? fun (Ex_ty tr, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Lambda_t (ta, tr, ty_name)), ctxt) - | Prim (loc, T_option, [ut], annot) -> - ( if legacy then - (* legacy semantics with (broken) field annotations *) - extract_field_annot ut - >>? fun (ut, _some_constr) -> - parse_composed_type_annot loc annot - >>? fun (ty_name, _none_constr, _) -> ok (ut, ty_name) - else parse_type_annot loc annot >>? fun ty_name -> ok (ut, ty_name) ) - >>? fun (ut, ty_name) -> + >>? fun (Ex_ty tr, ctxt) -> ok (Ex_ty (Lambda_t (ta, tr)), ctxt) + | Prim (_loc, T_option, [ut], _annot) -> parse_ty ctxt ~legacy @@ -2040,8 +1664,8 @@ and parse_ty : ~allow_contract ~allow_ticket ut - >>? fun (Ex_ty t, ctxt) -> ok (Ex_ty (Option_t (t, ty_name)), ctxt) - | Prim (loc, T_list, [ut], annot) -> + >>? fun (Ex_ty t, ctxt) -> ok (Ex_ty (Option_t t), ctxt) + | Prim (_loc, T_list, [ut], _annot) -> parse_ty ctxt ~legacy @@ -2050,22 +1674,16 @@ and parse_ty : ~allow_contract ~allow_ticket ut - >>? fun (Ex_ty t, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (List_t (t, ty_name)), ctxt) - | Prim (loc, T_ticket, [ut], annot) -> + >>? fun (Ex_ty t, ctxt) -> ok (Ex_ty (List_t t), ctxt) + | Prim (loc, T_ticket, [ut], _annot) -> if allow_ticket then parse_comparable_ty ctxt ut - >>? fun (Ex_comparable_ty t, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Ticket_t (t, ty_name)), ctxt) + >>? fun (Ex_comparable_ty t, ctxt) -> ok (Ex_ty (Ticket_t t), ctxt) else error (Unexpected_ticket loc) - | Prim (loc, T_set, [ut], annot) -> + | Prim (_loc, T_set, [ut], _annot) -> parse_comparable_ty ctxt ut - >>? fun (Ex_comparable_ty t, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Set_t (t, ty_name)), ctxt) - | Prim (loc, T_map, [uta; utr], annot) -> + >>? fun (Ex_comparable_ty t, ctxt) -> ok (Ex_ty (Set_t t), ctxt) + | Prim (_loc, T_map, [uta; utr], _annot) -> parse_comparable_ty ctxt uta >>? fun (Ex_comparable_ty ta, ctxt) -> parse_ty @@ -2076,29 +1694,22 @@ and parse_ty : ~allow_contract ~allow_ticket utr - >>? fun (Ex_ty tr, ctxt) -> - parse_type_annot loc annot - >>? fun ty_name -> ok (Ex_ty (Map_t (ta, tr, ty_name)), ctxt) - | Prim (loc, T_sapling_transaction, [memo_size], annot) -> - parse_type_annot loc annot - >>? fun ty_name -> + >>? fun (Ex_ty tr, ctxt) -> ok (Ex_ty (Map_t (ta, tr)), ctxt) + | Prim (_loc, T_sapling_transaction, [memo_size], _annot) -> parse_memo_size memo_size - >|? fun memo_size -> - (Ex_ty (Sapling_transaction_t (memo_size, ty_name)), ctxt) + >|? fun memo_size -> (Ex_ty (Sapling_transaction_t memo_size), ctxt) (* /!\ When adding new lazy storage kinds, be careful to use [when allow_lazy_storage] /!\ Lazy storage should not be packable to avoid stealing a lazy storage from another contract with `PUSH t id` or `UNPACK`. *) - | Prim (loc, T_big_map, args, annot) when allow_lazy_storage -> - parse_big_map_ty ctxt ~legacy loc args annot - >>? fun (big_map_ty, ctxt) -> ok (big_map_ty, ctxt) - | Prim (loc, T_sapling_state, [memo_size], annot) when allow_lazy_storage -> - parse_type_annot loc annot - >>? fun ty_name -> + | Prim (loc, T_big_map, args, _annot) when allow_lazy_storage -> + parse_big_map_ty ctxt ~legacy loc args + | Prim (_loc, T_sapling_state, [memo_size], _annot) when allow_lazy_storage + -> parse_memo_size memo_size - >|? fun memo_size -> (Ex_ty (Sapling_state_t (memo_size, ty_name)), ctxt) + >|? fun memo_size -> (Ex_ty (Sapling_state_t memo_size), ctxt) | Prim (loc, (T_big_map | T_sapling_state), _, _) -> error (Unexpected_lazy_storage loc) | Prim @@ -2160,7 +1771,29 @@ and parse_ty : T_bls12_381_fr; T_ticket ] -and parse_big_map_ty ctxt ~legacy big_map_loc args map_annot = +and parse_parameter_ty : + context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = + fun ctxt ~legacy -> + parse_ty + ctxt + ~legacy + ~allow_lazy_storage:true + ~allow_operation:false + ~allow_contract:true + ~allow_ticket:true + +and parse_any_ty : + context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = + fun ctxt ~legacy -> + parse_ty + ctxt + ~legacy + ~allow_lazy_storage:true + ~allow_operation:true + ~allow_contract:true + ~allow_ticket:true + +and parse_big_map_ty ctxt ~legacy big_map_loc args = Gas.consume ctxt Typecheck_costs.parse_type_cycle >>? fun ctxt -> match args with @@ -2168,10 +1801,8 @@ and parse_big_map_ty ctxt ~legacy big_map_loc args map_annot = parse_comparable_ty ctxt key_ty >>? fun (Ex_comparable_ty key_ty, ctxt) -> parse_big_map_value_ty ctxt ~legacy value_ty - >>? fun (Ex_ty value_ty, ctxt) -> - parse_type_annot big_map_loc map_annot - >|? fun map_name -> - let big_map_ty = Big_map_t (key_ty, value_ty, map_name) in + >|? fun (Ex_ty value_ty, ctxt) -> + let big_map_ty = Big_map_t (key_ty, value_ty) in (Ex_ty big_map_ty, ctxt) | args -> error @@ Invalid_arity (big_map_loc, T_big_map, 2, List.length args) @@ -2186,14 +1817,25 @@ and parse_big_map_value_ty ctxt ~legacy value_ty = ~allow_ticket:true value_ty -and parse_storage_ty : +let parse_normal_storage_ty : + context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = + fun ctxt ~legacy -> + parse_ty + ctxt + ~legacy + ~allow_lazy_storage:true + ~allow_operation:false + ~allow_contract:legacy + ~allow_ticket:true + +let parse_storage_ty : context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = fun ctxt ~legacy node -> match node with | Prim - ( loc, + ( _loc, T_pair, - [Prim (big_map_loc, T_big_map, args, map_annot); remaining_storage], + [Prim (big_map_loc, T_big_map, args, _map_annot); remaining_storage], storage_annot ) when legacy -> ( match storage_annot with @@ -2207,22 +1849,51 @@ and parse_storage_ty : (* legacy semantics of big maps used the wrong annotation parser *) Gas.consume ctxt Typecheck_costs.parse_type_cycle >>? fun ctxt -> - parse_big_map_ty ctxt ~legacy big_map_loc args map_annot + parse_big_map_ty ctxt ~legacy big_map_loc args >>? fun (Ex_ty big_map_ty, ctxt) -> parse_normal_storage_ty ctxt ~legacy remaining_storage >>? fun (Ex_ty remaining_storage, ctxt) -> - parse_composed_type_annot loc storage_annot - >>? fun (ty_name, map_field, storage_field) -> - ok - ( Ex_ty - (Pair_t - ( (big_map_ty, map_field, None), - (remaining_storage, storage_field, None), - ty_name )), - ctxt ) ) + ok (Ex_ty (Pair_t (big_map_ty, remaining_storage)), ctxt) ) | _ -> parse_normal_storage_ty ctxt ~legacy node +let parse_packable_ty : + context -> legacy:bool -> Script.node -> (ex_ty * context) tzresult = + fun ctxt ~legacy -> + parse_ty + ctxt + ~legacy + ~allow_lazy_storage:false + ~allow_operation:false + ~allow_contract:legacy + ~allow_ticket:false + +let rec parse_entrypoints : + type t. + ?root_name:field_annot -> Script.node -> t ty -> t entrypoints tzresult = + fun ?root_name node arg_ty -> + (* no gas accounting, [parse_entrypoints] is only called after a successful + [parse_parameter_ty] which traverses the same node already *) + ( match root_name with + | Some _ -> + ok (node, root_name) + | None -> + extract_field_annot node ) + >>? fun (node, name) -> + ( match (arg_ty, node) with + | (Union_t (tl, tr), Prim (_loc, T_or, [utl; utr], _annot)) -> + parse_entrypoints utl tl + >>? fun left -> + parse_entrypoints utr tr + >|? fun right -> (Entrypoints_Union {left; right} : t nested_entrypoints) + | (Union_t _, _) -> + (* this can only happen if [parse_entrypoints] is not in sync with + [parse_ty] *) + assert false + | (_, _) -> + ok Entrypoints_None ) + >|? fun nested -> {name; nested} + let check_packable ~legacy loc root = let rec check : type t. t ty -> unit tzresult = function (* /!\ When adding new lazy storage kinds, be sure to return an error. /!\ @@ -2231,72 +1902,79 @@ let check_packable ~legacy loc root = error (Unexpected_lazy_storage loc) | Sapling_state_t _ -> error (Unexpected_lazy_storage loc) - | Operation_t _ -> + | Operation_t -> error (Unexpected_operation loc) - | Unit_t _ -> + | Unit_t -> ok_unit - | Int_t _ -> + | Int_t -> ok_unit - | Nat_t _ -> + | Nat_t -> ok_unit - | Signature_t _ -> + | Signature_t -> ok_unit - | String_t _ -> + | String_t -> ok_unit - | Bytes_t _ -> + | Bytes_t -> ok_unit - | Mutez_t _ -> + | Mutez_t -> ok_unit - | Key_hash_t _ -> + | Key_hash_t -> ok_unit - | Key_t _ -> + | Key_t -> ok_unit - | Timestamp_t _ -> + | Timestamp_t -> ok_unit - | Address_t _ -> + | Address_t -> ok_unit - | Bool_t _ -> + | Bool_t -> ok_unit - | Chain_id_t _ -> + | Chain_id_t -> ok_unit - | Never_t _ -> + | Never_t -> ok_unit - | Set_t (_, _) -> + | Set_t _ -> ok_unit | Ticket_t _ -> error (Unexpected_ticket loc) - | Lambda_t (_, _, _) -> + | Lambda_t (_, _) -> ok_unit - | Bls12_381_g1_t _ -> + | Bls12_381_g1_t -> ok_unit - | Bls12_381_g2_t _ -> + | Bls12_381_g2_t -> ok_unit - | Bls12_381_fr_t _ -> + | Bls12_381_fr_t -> ok_unit - | Pair_t ((l_ty, _, _), (r_ty, _, _), _) -> + | Pair_t (l_ty, r_ty) -> check l_ty >>? fun () -> check r_ty - | Union_t ((l_ty, _), (r_ty, _), _) -> + | Union_t (l_ty, r_ty) -> check l_ty >>? fun () -> check r_ty - | Option_t (v_ty, _) -> + | Option_t v_ty -> check v_ty - | List_t (elt_ty, _) -> + | List_t elt_ty -> check elt_ty - | Map_t (_, elt_ty, _) -> + | Map_t (_, elt_ty) -> check elt_ty - | Contract_t (_, _) when legacy -> + | Contract_t _ when legacy -> ok_unit - | Contract_t (_, _) -> + | Contract_t _ -> error (Unexpected_contract loc) | Sapling_transaction_t _ -> ok () in check root +type toplevel = { + code_field : Script.node; + arg_type : Script.node; + storage_type : Script.node; + root_name : field_annot option; +} + type ('arg, 'storage) code = { code : (('arg, 'storage) pair, (operation boxed_list, 'storage) pair) lambda; arg_type : 'arg ty; storage_type : 'storage ty; - root_name : field_annot option; + entrypoints : 'arg entrypoints; } type ex_script = Ex_script : ('a, 'c) script -> ex_script @@ -2306,7 +1984,7 @@ type ex_code = Ex_code : ('a, 'c) code -> ex_code type _ dig_proof_argument = | Dig_proof_argument : ( ('x * 'rest, 'rest, 'bef, 'aft) stack_prefix_preservation_witness - * ('x ty * var_annot option) + * 'x ty * 'aft stack_ty ) -> 'bef dig_proof_argument @@ -2356,35 +2034,28 @@ type 'before dup_n_proof_argument = ('before, 'a) dup_n_gadt_witness * 'a ty -> 'before dup_n_proof_argument -let find_entrypoint (type full) (full : full ty) ~root_name entrypoint = +let find_entrypoint (type full) (full : full ty) + (entrypoints : full entrypoints) entrypoint = let rec find_entrypoint : - type t. t ty -> string -> (Script.node -> Script.node) * ex_ty = - fun t entrypoint -> - match t with - | Union_t ((tl, al), (tr, ar), _) -> ( - if - match al with - | None -> - false - | Some (Field_annot l) -> - Compare.String.(l = entrypoint) - then ((fun e -> Prim (0, D_Left, [e], [])), Ex_ty tl) - else if - match ar with - | None -> - false - | Some (Field_annot r) -> - Compare.String.(r = entrypoint) - then ((fun e -> Prim (0, D_Right, [e], [])), Ex_ty tr) - else - try - let (f, t) = find_entrypoint tl entrypoint in - ((fun e -> Prim (0, D_Left, [f e], [])), t) - with Not_found -> - let (f, t) = find_entrypoint tr entrypoint in - ((fun e -> Prim (0, D_Right, [f e], [])), t) ) - | _ -> + type t. + t ty -> t entrypoints -> string -> (Script.node -> Script.node) * ex_ty = + fun ty entrypoints entrypoint -> + match (ty, entrypoints) with + | (_, {name = Some (Field_annot name); _}) + when Compare.String.(entrypoint = name) -> + ((fun e -> e), Ex_ty ty) + | (Union_t (tl, tr), {nested = Entrypoints_Union {left; right}; _}) -> ( + match find_entrypoint tl left entrypoint with + | (f, t) -> + ((fun e -> Prim (0, D_Left, [f e], [])), t) + | exception Not_found -> + let (f, t) = find_entrypoint tr right entrypoint in + ((fun e -> Prim (0, D_Right, [f e], [])), t) ) + | (_, {nested = Entrypoints_None; _}) -> raise Not_found + | (_, {nested = Entrypoints_Union _; _}) -> + assert false + (* TODO: fix injectivity of types *) in let entrypoint = if Compare.String.(entrypoint = "") then "default" else entrypoint @@ -2392,116 +2063,113 @@ let find_entrypoint (type full) (full : full ty) ~root_name entrypoint = if Compare.Int.(String.length entrypoint > 31) then error (Entrypoint_name_too_long entrypoint) else - match root_name with - | Some (Field_annot root_name) when Compare.String.(entrypoint = root_name) - -> - ok ((fun e -> e), Ex_ty full) - | _ -> ( - try ok (find_entrypoint full entrypoint) - with Not_found -> ( - match entrypoint with - | "default" -> - ok ((fun e -> e), Ex_ty full) - | _ -> - error (No_such_entrypoint entrypoint) ) ) + match find_entrypoint full entrypoints entrypoint with + | f_t -> + ok f_t + | exception Not_found -> ( + match entrypoint with + | "default" -> + ok ((fun e -> e), Ex_ty full) + | _ -> + error (No_such_entrypoint entrypoint) ) -let find_entrypoint_for_type (type full exp) ~legacy ~(full : full ty) - ~(expected : exp ty) ~root_name entrypoint ctxt loc : +let find_entrypoint_for_type (type full exp) ~(full : full ty) + ~(expected : exp ty) entrypoints entrypoint ctxt : (context * string * exp ty) tzresult = - match (entrypoint, root_name) with - | ("default", Some (Field_annot "root")) -> ( - match find_entrypoint full ~root_name entrypoint with - | Error _ as err -> - err - | Ok (_, Ex_ty ty) -> ( - match merge_types ~legacy ctxt loc ty expected with - | Ok (Eq, ty, ctxt) -> - ok (ctxt, "default", ty) - | Error _ -> - merge_types ~legacy ctxt loc full expected - >>? fun (Eq, full, ctxt) -> ok (ctxt, "root", (full : exp ty)) ) ) - | _ -> - find_entrypoint full ~root_name entrypoint - >>? fun (_, Ex_ty ty) -> - merge_types ~legacy ctxt loc ty expected - >>? fun (Eq, ty, ctxt) -> ok (ctxt, entrypoint, (ty : exp ty)) + find_entrypoint full entrypoints entrypoint + >>? fun (_, Ex_ty ty) -> + match (ty_eq ctxt ty expected, entrypoint, entrypoints) with + | (Ok (Eq, ctxt), _, _) -> + ok (ctxt, entrypoint, (ty : exp ty)) + | (Error _, "default", {name = Some (Field_annot "root"); _}) -> + ty_eq ctxt full expected + >|? fun (Eq, ctxt) -> (ctxt, "root", (full : exp ty)) + | ((Error _ as err), _, _) -> + err module Entrypoints = Set.Make (String) -exception Duplicate of string - -exception Too_long of string - -let well_formed_entrypoints (type full) (full : full ty) ~root_name = - let merge path annot (type t) (ty : t ty) reachable +let well_formed_entrypoints (type full) (full : full ty) entrypoints = + let exception Duplicate of string in + let exception Too_long of string in + let merge path (type t) (ty : t ty) (entrypoints : t entrypoints) reachable ((first_unreachable, all) as acc) = - match annot with - | None | Some (Field_annot "") -> ( - if reachable then acc - else - match ty with - | Union_t _ -> - acc - | _ -> ( - match first_unreachable with - | None -> - (Some (List.rev path), all) - | Some _ -> - acc ) ) - | Some (Field_annot name) -> + match entrypoints with + | {name = None | Some (Field_annot ""); _} -> + ( ( if reachable then acc + else + match ty with + | Union_t _ -> + acc + | _ -> ( + match first_unreachable with + | None -> + (Some (List.rev path), all) + | Some _ -> + acc ) ), + reachable ) + | {name = Some (Field_annot name); _} -> if Compare.Int.(String.length name > 31) then raise (Too_long name) else if Entrypoints.mem name all then raise (Duplicate name) - else (first_unreachable, Entrypoints.add name all) + else ((first_unreachable, Entrypoints.add name all), true) in let rec check : type t. t ty -> + t entrypoints -> prim list -> bool -> prim list option * Entrypoints.t -> prim list option * Entrypoints.t = - fun t path reachable acc -> - match t with - | Union_t ((tl, al), (tr, ar), _) -> - let acc = merge (D_Left :: path) al tl reachable acc in - let acc = merge (D_Right :: path) ar tr reachable acc in - let acc = - check - tl - (D_Left :: path) - (match al with Some _ -> true | None -> reachable) - acc + fun t entrypoints path reachable acc -> + match (t, entrypoints) with + | (Union_t (tl, tr), {nested = Entrypoints_Union {left; right}; _}) -> + let (acc, l_reachable) = + merge (D_Left :: path) tl left reachable acc in - check - tr - (D_Right :: path) - (match ar with Some _ -> true | None -> reachable) - acc + let (acc, r_reachable) = + merge (D_Right :: path) tr right reachable acc + in + let acc = check tl left (D_Left :: path) l_reachable acc in + check tr right (D_Right :: path) r_reachable acc | _ -> acc in - try - let (init, reachable) = - match root_name with - | None | Some (Field_annot "") -> - (Entrypoints.empty, false) - | Some (Field_annot name) -> - (Entrypoints.singleton name, true) - in - let (first_unreachable, all) = check full [] reachable (None, init) in - if not (Entrypoints.mem "default" all) then ok_unit - else - match first_unreachable with - | None -> - ok_unit - | Some path -> - error (Unreachable_entrypoint path) - with - | Duplicate name -> + let (init, reachable) = + match entrypoints with + | {name = None | Some (Field_annot ""); _} -> + (Entrypoints.empty, false) + | {name = Some (Field_annot name); _} -> + (Entrypoints.singleton name, true) + in + match check full entrypoints [] reachable (None, init) with + | (first_unreachable, all) -> ( + if not (Entrypoints.mem "default" all) then ok_unit + else + match first_unreachable with + | None -> + ok_unit + | Some path -> + error (Unreachable_entrypoint path) ) + | exception Duplicate name -> error (Duplicate_entrypoint name) - | Too_long name -> + | exception Too_long name -> error (Entrypoint_name_too_long name) +let parse_parameter_ty_and_entrypoints : + context -> + legacy:bool -> + root_name:field_annot option -> + Script.node -> + (ex_parameter_ty_and_entrypoints * context) tzresult = + fun ctxt ~legacy ~root_name node -> + parse_parameter_ty ctxt ~legacy node + >>? fun (Ex_ty arg_ty, ctxt) -> + parse_entrypoints ?root_name node arg_ty + >>? fun entrypoints -> + (if legacy then ok_unit else well_formed_entrypoints arg_ty entrypoints) + >|? fun () -> (Ex_parameter_ty_entrypoints (arg_ty, entrypoints), ctxt) + let parse_uint ~nb_bits = assert (Compare.Int.(nb_bits >= 0 && nb_bits <= 30)) ; let max_int = (1 lsl nb_bits) - 1 in @@ -2525,11 +2193,7 @@ let parse_uint11 = parse_uint ~nb_bits:11 (* This type is used to: - serialize and deserialize tickets when they are stored or transferred, - type the READ_TICKET instruction. *) -let opened_ticket_type ty = - Pair_key - ( (Address_key None, None), - (Pair_key ((ty, None), (Nat_key None, None), None), None), - None ) +let opened_ticket_type ty = Pair_key (Address_key, Pair_key (ty, Nat_key)) (* -- parse data of primitive types -- *) @@ -2892,46 +2556,46 @@ let rec parse_comparable_data : >>?= fun ctxt -> let legacy = false in match (ty, script_data) with - | (Unit_key _, expr) -> + | (Unit_key, expr) -> Lwt.return @@ traced_no_lwt @@ (parse_unit ctxt ~legacy expr : (a * context) tzresult) - | (Bool_key _, expr) -> + | (Bool_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_bool ctxt ~legacy expr - | (String_key _, expr) -> + | (String_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_string ctxt expr - | (Bytes_key _, expr) -> + | (Bytes_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_bytes ctxt expr - | (Int_key _, expr) -> + | (Int_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_int ctxt expr - | (Nat_key _, expr) -> + | (Nat_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_nat ctxt expr - | (Mutez_key _, expr) -> + | (Mutez_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_mutez ctxt expr - | (Timestamp_key _, expr) -> + | (Timestamp_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_timestamp ctxt expr - | (Key_key _, expr) -> + | (Key_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_key ctxt expr - | (Key_hash_key _, expr) -> + | (Key_hash_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_key_hash ctxt expr - | (Signature_key _, expr) -> + | (Signature_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_signature ctxt expr - | (Chain_id_key _, expr) -> + | (Chain_id_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_chain_id ctxt expr - | (Address_key _, expr) -> + | (Address_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_address ctxt expr - | (Pair_key ((tl, _), (tr, _), _), expr) -> + | (Pair_key (tl, tr), expr) -> let r_witness = comparable_comb_witness1 tr in let parse_l ctxt v = parse_comparable_data ?type_logger ctxt tl v in let parse_r ctxt v = parse_comparable_data ?type_logger ctxt tr v in traced @@ parse_pair parse_l parse_r ctxt ~legacy r_witness expr - | (Union_key ((tl, _), (tr, _), _), expr) -> + | (Union_key (tl, tr), expr) -> let parse_l ctxt v = parse_comparable_data ?type_logger ctxt tl v in let parse_r ctxt v = parse_comparable_data ?type_logger ctxt tr v in traced @@ parse_union parse_l parse_r ctxt ~legacy expr - | (Option_key (t, _), expr) -> + | (Option_key t, expr) -> let parse_v ctxt v = parse_comparable_data ?type_logger ctxt t v in traced @@ parse_option parse_v ctxt ~legacy expr - | (Never_key _, expr) -> + | (Never_key, expr) -> Lwt.return @@ traced_no_lwt @@ parse_never expr (* -- parse data of any type -- *) @@ -3041,46 +2705,46 @@ let rec parse_data : >|=? fun (_, items, ctxt) -> (items, ctxt) in match (ty, script_data) with - | (Unit_t _, expr) -> + | (Unit_t, expr) -> Lwt.return @@ traced_no_lwt @@ (parse_unit ctxt ~legacy expr : (a * context) tzresult) - | (Bool_t _, expr) -> + | (Bool_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_bool ctxt ~legacy expr - | (String_t _, expr) -> + | (String_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_string ctxt expr - | (Bytes_t _, expr) -> + | (Bytes_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_bytes ctxt expr - | (Int_t _, expr) -> + | (Int_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_int ctxt expr - | (Nat_t _, expr) -> + | (Nat_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_nat ctxt expr - | (Mutez_t _, expr) -> + | (Mutez_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_mutez ctxt expr - | (Timestamp_t _, expr) -> + | (Timestamp_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_timestamp ctxt expr - | (Key_t _, expr) -> + | (Key_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_key ctxt expr - | (Key_hash_t _, expr) -> + | (Key_hash_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_key_hash ctxt expr - | (Signature_t _, expr) -> + | (Signature_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_signature ctxt expr - | (Operation_t _, _) -> + | (Operation_t, _) -> (* operations cannot appear in parameters or storage, the protocol should never parse the bytes of an operation *) assert false - | (Chain_id_t _, expr) -> + | (Chain_id_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_chain_id ctxt expr - | (Address_t _, expr) -> + | (Address_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_address ctxt expr - | (Contract_t (ty, _), expr) -> + | (Contract_t ty, expr) -> traced ( parse_address ctxt expr >>?= fun ((c, entrypoint), ctxt) -> let loc = location expr in - parse_contract ~legacy ctxt loc ty c ~entrypoint + parse_contract ctxt loc ty c ~entrypoint >|=? fun (ctxt, _) -> ((ty, (c, entrypoint)), ctxt) ) (* Pairs *) - | (Pair_t ((tl, _, _), (tr, _, _), _), expr) -> + | (Pair_t (tl, tr), expr) -> let r_witness = comb_witness1 tr in let parse_l ctxt v = non_terminal_recursion ?type_logger ctxt ~legacy tl v @@ -3090,7 +2754,7 @@ let rec parse_data : in traced @@ parse_pair parse_l parse_r ctxt ~legacy r_witness expr (* Unions *) - | (Union_t ((tl, _), (tr, _), _), expr) -> + | (Union_t (tl, tr), expr) -> let parse_l ctxt v = non_terminal_recursion ?type_logger ctxt ~legacy tl v in @@ -3099,7 +2763,7 @@ let rec parse_data : in traced @@ parse_union parse_l parse_r ctxt ~legacy expr (* Lambdas *) - | (Lambda_t (ta, tr, _ty_name), (Seq (_loc, _) as script_instr)) -> + | (Lambda_t (ta, tr), (Seq (_loc, _) as script_instr)) -> traced @@ parse_returning Lambda @@ -3107,19 +2771,19 @@ let rec parse_data : ~stack_depth ctxt ~legacy - (ta, Some (Var_annot "@arg")) + ta tr script_instr | (Lambda_t _, expr) -> traced_fail (Invalid_kind (location expr, [Seq_kind], kind expr)) (* Options *) - | (Option_t (t, _), expr) -> + | (Option_t t, expr) -> let parse_v ctxt v = non_terminal_recursion ?type_logger ctxt ~legacy t v in traced @@ parse_option parse_v ctxt ~legacy expr (* Lists *) - | (List_t (t, _ty_name), Seq (_loc, items)) -> + | (List_t t, Seq (_loc, items)) -> traced @@ fold_right_s (fun v (rest, ctxt) -> @@ -3130,14 +2794,14 @@ let rec parse_data : | (List_t _, expr) -> traced_fail (Invalid_kind (location expr, [Seq_kind], kind expr)) (* Tickets *) - | (Ticket_t (t, _ty_name), expr) -> + | (Ticket_t t, expr) -> if allow_forged then parse_comparable_data ?type_logger ctxt (opened_ticket_type t) expr >|=? fun ((ticketer, (contents, amount)), ctxt) -> ({ticketer; contents; amount}, ctxt) else traced_fail (Unexpected_forged_value (location expr)) (* Sets *) - | (Set_t (t, _ty_name), (Seq (loc, vs) as expr)) -> + | (Set_t t, (Seq (loc, vs) as expr)) -> traced @@ fold_left_s (fun (last_value, set, ctxt) v -> @@ -3172,11 +2836,11 @@ let rec parse_data : | (Set_t _, expr) -> traced_fail (Invalid_kind (location expr, [Seq_kind], kind expr)) (* Maps *) - | (Map_t (tk, tv, _ty_name), (Seq (_, vs) as expr)) -> + | (Map_t (tk, tv), (Seq (_, vs) as expr)) -> parse_items ?type_logger ctxt expr tk tv vs (fun x -> x) | (Map_t _, expr) -> traced_fail (Invalid_kind (location expr, [Seq_kind], kind expr)) - | (Big_map_t (tk, tv, _ty_name), expr) -> + | (Big_map_t (tk, tv), expr) -> ( match expr with | Int (loc, id) -> return (Some (id, loc), empty_map tk, ctxt) @@ -3186,7 +2850,7 @@ let rec parse_data : | Prim (loc, D_Pair, [Int (loc_id, id); Seq (_, vs)], annot) -> error_unexpected_annot loc annot >>?= fun () -> - let tv_opt = Option_t (tv, None) in + let tv_opt = Option_t tv in parse_items ?type_logger ctxt expr tk tv_opt vs (fun x -> x) >|=? fun (diff, ctxt) -> (Some (id, loc_id), diff, ctxt) | Prim (_, D_Pair, [Int _; expr], _) -> @@ -3218,14 +2882,13 @@ let rec parse_data : >>? fun (Ex_ty btv, ctxt) -> comparable_ty_eq ctxt tk btk >>? fun (Eq, ctxt) -> - ty_eq ctxt loc tv btv >>? fun (Eq, ctxt) -> ok (Some id, ctxt) - ) + ty_eq ctxt tv btv >>? fun (Eq, ctxt) -> ok (Some id, ctxt) ) else traced_fail (Unexpected_forged_value loc) ) >|=? fun (id, ctxt) -> ({id; diff; key_type = tk; value_type = tv}, ctxt) - | (Never_t _, expr) -> + | (Never_t, expr) -> Lwt.return @@ traced_no_lwt @@ parse_never expr (* Bls12_381 types *) - | (Bls12_381_g1_t _, Bytes (_, bs)) -> ( + | (Bls12_381_g1_t, Bytes (_, bs)) -> ( Gas.consume ctxt Typecheck_costs.bls12_381_g1 >>?= fun ctxt -> match Bls12_381.G1.of_bytes_opt bs with @@ -3233,9 +2896,9 @@ let rec parse_data : return (pt, ctxt) | None -> fail_parse_data () ) - | (Bls12_381_g1_t _, expr) -> + | (Bls12_381_g1_t, expr) -> traced_fail (Invalid_kind (location expr, [Bytes_kind], kind expr)) - | (Bls12_381_g2_t _, Bytes (_, bs)) -> ( + | (Bls12_381_g2_t, Bytes (_, bs)) -> ( Gas.consume ctxt Typecheck_costs.bls12_381_g2 >>?= fun ctxt -> match Bls12_381.G2.of_bytes_opt bs with @@ -3243,9 +2906,9 @@ let rec parse_data : return (pt, ctxt) | None -> fail_parse_data () ) - | (Bls12_381_g2_t _, expr) -> + | (Bls12_381_g2_t, expr) -> traced_fail (Invalid_kind (location expr, [Bytes_kind], kind expr)) - | (Bls12_381_fr_t _, Bytes (_, bs)) -> ( + | (Bls12_381_fr_t, Bytes (_, bs)) -> ( Gas.consume ctxt Typecheck_costs.bls12_381_fr >>?= fun ctxt -> match Bls12_381.Fr.of_bytes_opt bs with @@ -3253,17 +2916,17 @@ let rec parse_data : return (pt, ctxt) | None -> fail_parse_data () ) - | (Bls12_381_fr_t _, Int (_, v)) -> + | (Bls12_381_fr_t, Int (_, v)) -> Gas.consume ctxt Typecheck_costs.bls12_381_fr >>?= fun ctxt -> return (Bls12_381.Fr.of_z v, ctxt) - | (Bls12_381_fr_t _, expr) -> + | (Bls12_381_fr_t, expr) -> traced_fail (Invalid_kind (location expr, [Bytes_kind], kind expr)) (* /!\ When adding new lazy storage kinds, you may want to guard the parsing of identifiers with [allow_forged]. *) (* Sapling *) - | (Sapling_transaction_t (memo_size, _), Bytes (_, bytes)) -> ( + | (Sapling_transaction_t memo_size, Bytes (_, bytes)) -> ( match Data_encoding.Binary.of_bytes Sapling.transaction_encoding bytes with | Some transaction -> ( match Sapling.transaction_get_memo_size transaction with @@ -3271,22 +2934,22 @@ let rec parse_data : return (transaction, ctxt) | Some transac_memo_size -> Lwt.return - ( merge_memo_sizes memo_size transac_memo_size - >|? fun _ms -> (transaction, ctxt) ) ) + ( memo_size_eq memo_size transac_memo_size + >|? fun () -> (transaction, ctxt) ) ) | None -> fail_parse_data () ) | (Sapling_transaction_t _, expr) -> traced_fail (Invalid_kind (location expr, [Bytes_kind], kind expr)) - | (Sapling_state_t (memo_size, _), Int (loc, id)) -> + | (Sapling_state_t memo_size, Int (loc, id)) -> if allow_forged then let id = Sapling.Id.parse_z id in Sapling.state_from_id ctxt id >>=? fun (state, ctxt) -> Lwt.return - ( traced_no_lwt @@ merge_memo_sizes memo_size state.Sapling.memo_size - >|? fun _memo_size -> (state, ctxt) ) + ( traced_no_lwt @@ memo_size_eq memo_size state.Sapling.memo_size + >|? fun () -> (state, ctxt) ) else traced_fail (Unexpected_forged_value loc) - | (Sapling_state_t (memo_size, _), Seq (_, [])) -> + | (Sapling_state_t memo_size, Seq (_, [])) -> return (Sapling.empty_state ~memo_size (), ctxt) | (Sapling_state_t _, expr) -> (* Do not allow to input diffs as they are untrusted and may not be the @@ -3301,18 +2964,11 @@ and 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 @@ -3320,9 +2976,9 @@ and parse_returning : ~legacy ~stack_depth:(stack_depth + 1) script_instr - (Item_t (arg, Empty_t, arg_annot)) + (Item_t (arg, Empty_t)) >>=? function - | (Typed ({loc; aft = Item_t (ty, Empty_t, _) as stack_ty; _} as descr), ctxt) + | (Typed ({loc; aft = Item_t (ty, Empty_t) as stack_ty; _} as descr), ctxt) -> Lwt.return @@ record_trace_eval @@ -3331,8 +2987,8 @@ and parse_returning : >>? fun (ret, ctxt) -> serialize_stack_for_error ctxt stack_ty >|? fun (stack_ty, _ctxt) -> Bad_return (loc, stack_ty, ret)) - ( merge_types ~legacy ctxt loc ty ret - >|? fun (Eq, _ret, ctxt) -> + ( ty_eq ctxt ty ret + >|? fun (Eq, ctxt) -> ((Lam (descr, script_instr) : (arg, ret) lambda), ctxt) ) | (Typed {loc; aft = stack_ty; _}, ctxt) -> Lwt.return @@ -3342,7 +2998,7 @@ and parse_returning : >>? fun (stack_ty, _ctxt) -> error (Bad_return (loc, stack_ty, ret)) ) | (Failed {descr}, ctxt) -> return - ( ( Lam (descr (Item_t (ret, Empty_t, None)), script_instr) + ( ( Lam (descr (Item_t (ret, Empty_t)), script_instr) : (arg, ret) lambda ), ctxt ) @@ -3358,14 +3014,11 @@ and parse_instr : (bef judgement * context) tzresult Lwt.t = fun ?type_logger ~stack_depth tc_context ctxt ~legacy script_instr stack_ty -> let check_item_ty (type a b) ctxt (exp : a ty) (got : b ty) loc name n m : - ((a, b) eq * a ty * context) tzresult = + ((a ty, b ty) eq * context) tzresult = record_trace_eval (fun () -> serialize_stack_for_error ctxt stack_ty >|? fun (stack_ty, _ctxt) -> Bad_stack (loc, name, m, stack_ty)) - @@ record_trace - (Bad_stack_item n) - ( merge_types ~legacy ctxt loc exp got - >>? fun (Eq, ty, ctxt) -> ok ((Eq : (a, b) eq), (ty : a ty), ctxt) ) + @@ record_trace (Bad_stack_item n) (ty_eq ctxt exp got) in let log_stack ctxt loc stack_ty aft = match (type_logger, script_instr) with @@ -3427,7 +3080,7 @@ and 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 Drop rest : (bef judgement * context) tzresult Lwt.t ) | (Prim (loc, I_DROP, [n], result_annot), whole_stack) -> @@ -3442,11 +3095,11 @@ and parse_instr : match (Compare.Int.(n = 0), stk) with | (true, rest) -> ok @@ Dropn_proof_argument (Rest, rest, rest) - | (false, Item_t (v, rest, annot)) -> + | (false, Item_t (v, rest)) -> make_proof_argument (n - 1) rest >|? fun (Dropn_proof_argument (n', stack_after_drops, aft')) -> Dropn_proof_argument - (Prefix n', stack_after_drops, Item_t (v, aft', annot)) + (Prefix n', stack_after_drops, Item_t (v, aft')) | (_, _) -> serialize_stack_for_error ctxt whole_stack >>? fun (whole_stack, _ctxt) -> @@ -3461,27 +3114,22 @@ and 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)) -> record_trace_eval (fun () -> serialize_ty_for_error ctxt v >|? fun (t, _ctxt) -> Non_dupable_type (loc, t)) (check_dupable_ty ctxt loc v) - >>?= fun ctxt -> - typed ctxt loc Dup (Item_t (v, Item_t (v, rest, stack_annot), annot)) - | (Prim (loc, I_DUP, [n], v_annot), stack_ty) -> - parse_var_annot loc v_annot - >>?= fun annot -> + >>?= fun ctxt -> typed ctxt loc Dup (Item_t (v, Item_t (v, rest))) + | (Prim (loc, I_DUP, [n], _v_annot), stack_ty) -> let rec make_proof_argument : type before. int -> before stack_ty -> before dup_n_proof_argument tzresult = fun n (stack_ty : before 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) @@ -3504,18 +3152,18 @@ and parse_instr : >|? fun (t, _ctxt) -> Non_dupable_type (loc, t)) (check_dupable_ty ctxt loc after_ty) >>?= fun ctxt -> - typed ctxt loc (Dup_n (n, witness)) (Item_t (after_ty, stack_ty, annot)) + typed ctxt loc (Dup_n (n, witness)) (Item_t (after_ty, stack_ty)) | (Prim (loc, I_DIG, [n], result_annot), stack) -> let rec make_proof_argument : type tstk. int -> tstk stack_ty -> tstk dig_proof_argument tzresult = fun n stk -> match (Compare.Int.(n = 0), stk) with - | (true, Item_t (v, rest, annot)) -> - ok @@ Dig_proof_argument (Rest, (v, annot), rest) - | (false, Item_t (v, rest, annot)) -> + | (true, Item_t (v, rest)) -> + ok @@ Dig_proof_argument (Rest, v, rest) + | (false, Item_t (v, rest)) -> make_proof_argument (n - 1) rest - >|? fun (Dig_proof_argument (n', (x, xv), aft')) -> - Dig_proof_argument (Prefix n', (x, xv), Item_t (v, aft', annot)) + >|? fun (Dig_proof_argument (n', x, aft')) -> + Dig_proof_argument (Prefix n', x, Item_t (v, aft')) | (_, _) -> serialize_stack_for_error ctxt stack >>? fun (whole_stack, _ctxt) -> @@ -3528,31 +3176,27 @@ and parse_instr : error_unexpected_annot loc result_annot >>?= fun () -> make_proof_argument n stack - >>?= fun (Dig_proof_argument (n', (x, stack_annot), aft)) -> - typed ctxt loc (Dig (n, n')) (Item_t (x, aft, stack_annot)) + >>?= fun (Dig_proof_argument (n', x, aft)) -> + typed ctxt loc (Dig (n, n')) (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 tstk x. - int -> - x ty -> - var_annot option -> - tstk stack_ty -> - (tstk, x) dug_proof_argument tzresult = - fun n x stack_annot stk -> + int -> x ty -> tstk stack_ty -> (tstk, x) dug_proof_argument tzresult + = + fun n x stk -> match (Compare.Int.(n = 0), stk) with | (true, rest) -> - ok @@ Dug_proof_argument (Rest, (), Item_t (x, rest, stack_annot)) - | (false, Item_t (v, rest, annot)) -> - make_proof_argument (n - 1) x stack_annot rest + ok @@ Dug_proof_argument (Rest, (), Item_t (x, rest)) + | (false, Item_t (v, rest)) -> + make_proof_argument (n - 1) x rest >|? fun (Dug_proof_argument (n', (), aft')) -> - Dug_proof_argument (Prefix n', (), Item_t (v, aft', annot)) + Dug_proof_argument (Prefix n', (), Item_t (v, aft')) | (_, _) -> serialize_stack_for_error ctxt whole_stack >>? fun (whole_stack, _ctxt) -> @@ -3560,7 +3204,7 @@ and parse_instr : 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)) -> typed ctxt loc (Dug (whole_n, n')) aft | (Prim (loc, I_DUG, [_], result_annot), (Empty_t as stack)) -> @@ -3571,18 +3215,10 @@ and parse_instr : >>? fun (stack, _ctxt) -> 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 () -> - typed - ctxt - loc - Swap - (Item_t (w, Item_t (v, rest, cur_top_annot), stack_annot)) - | (Prim (loc, I_PUSH, [t; d], annot), stack) -> - parse_var_annot loc annot - >>?= fun annot -> + >>?= fun () -> typed ctxt loc Swap (Item_t (w, Item_t (v, rest))) + | (Prim (loc, I_PUSH, [t; d], _annot), stack) -> parse_packable_ty ctxt ~legacy t >>?= fun (Ex_ty t, ctxt) -> parse_data @@ -3593,35 +3229,24 @@ and parse_instr : ~allow_forged:false t d - >>=? fun (v, ctxt) -> typed ctxt loc (Const v) (Item_t (t, stack, annot)) - | (Prim (loc, I_UNIT, [], annot), stack) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> - typed ctxt loc (Const ()) (Item_t (Unit_t ty_name, stack, annot)) + >>=? fun (v, ctxt) -> typed ctxt loc (Const v) (Item_t (t, stack)) + | (Prim (loc, I_UNIT, [], _annot), stack) -> + typed ctxt loc (Const ()) (Item_t (Unit_t, stack)) (* options *) - | (Prim (loc, I_SOME, [], annot), Item_t (t, rest, _)) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> - typed ctxt loc Cons_some (Item_t (Option_t (t, ty_name), rest, annot)) - | (Prim (loc, I_NONE, [t], annot), stack) -> + | (Prim (loc, I_SOME, [], _annot), Item_t (t, rest)) -> + typed ctxt loc Cons_some (Item_t (Option_t t, rest)) + | (Prim (loc, I_NONE, [t], _annot), stack) -> parse_any_ty ctxt ~legacy t >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> - typed - ctxt - loc - (Cons_none t) - (Item_t (Option_t (t, ty_name), stack, annot)) - | ( Prim (loc, I_IF_NONE, [bt; bf], annot), - (Item_t (Option_t (t, _), rest, option_annot) as bef) ) -> + typed ctxt loc (Cons_none t) (Item_t (Option_t t, stack)) + | (Prim (loc, I_IF_NONE, [bt; bf], annot), (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 non_terminal_recursion ?type_logger tc_context ctxt ~legacy bt rest >>=? fun (btr, ctxt) -> non_terminal_recursion @@ -3630,60 +3255,30 @@ and parse_instr : ctxt ~legacy bf - (Item_t (t, rest, annot)) + (Item_t (t, rest)) >>=? fun (bfr, ctxt) -> let branch ibt ibf = {loc; instr = If_none (ibt, ibf); bef; aft = ibt.aft} in - merge_branches ~legacy ctxt loc btr bfr {branch} + merge_branches ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement (* pairs *) - | ( Prim (loc, I_PAIR, [], annot), - Item_t (a, Item_t (b, rest, snd_annot), fst_annot) ) -> - 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) -> - typed - ctxt - loc - Cons_pair - (Item_t - ( Pair_t ((a, l_field, fst_annot), (b, r_field, snd_annot), ty_name), - rest, - annot )) - | (Prim (loc, I_PAIR, [n], annot), stack_ty) -> - parse_var_annot loc annot - >>?= fun annot -> + | (Prim (loc, I_PAIR, [], _annot), Item_t (a, Item_t (b, rest))) -> + typed ctxt loc Cons_pair (Item_t (Pair_t (a, b), rest)) + | (Prim (loc, I_PAIR, [n], _annot), stack_ty) -> let rec make_proof_argument : type before. - int -> - before stack_ty -> - (before comb_proof_argument * var_annot option) tzresult = + int -> before stack_ty -> before 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)), - a_annot_opt ) - | (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)), - b_annot_opt ) -> - let prop_annot_opt' = var_to_field_annot prop_annot_opt in - let b_prop_annot_opt = var_to_field_annot b_annot_opt in - let pair_t = - Pair_t - ( (a_ty, prop_annot_opt', None), - (b_ty, b_prop_annot_opt, None), - None ) - in - ( Comb_proof_argument - (Comb_succ comb_witness, Item_t (pair_t, tl_ty', annot)), - None ) + >|? fun (Comb_proof_argument (comb_witness, Item_t (b_ty, tl_ty'))) -> + let pair_t = Pair_t (a_ty, b_ty) in + Comb_proof_argument + (Comb_succ comb_witness, Item_t (pair_t, tl_ty')) | _ -> serialize_stack_for_error ctxt stack_ty >>? fun (whole_stack, _ctxt) -> @@ -3696,7 +3291,7 @@ and parse_instr : error_unless (Compare.Int.( > ) n 1) (Pair_bad_argument loc) >>?= fun () -> make_proof_argument n stack_ty - >>?= fun (Comb_proof_argument (witness, after_ty), _none) -> + >>?= fun (Comb_proof_argument (witness, after_ty)) -> typed ctxt loc (Comb (n, witness)) after_ty | (Prim (loc, I_UNPAIR, [n], annot), stack_ty) -> error_unexpected_annot loc annot @@ -3706,22 +3301,13 @@ and parse_instr : int -> before stack_ty -> before 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)) | _ -> serialize_stack_for_error ctxt stack_ty >>? fun (whole_stack, _ctxt) -> @@ -3736,9 +3322,7 @@ and parse_instr : make_proof_argument n stack_ty >>?= fun (Uncomb_proof_argument (witness, after_ty)) -> typed ctxt loc (Uncomb (n, witness)) 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)) -> let rec make_proof_argument : type before. int -> before ty -> before comb_get_proof_argument tzresult = @@ -3746,9 +3330,9 @@ and parse_instr : match (n, ty) with | (0, value_ty) -> ok @@ Comb_get_proof_argument (Comb_get_zero, value_ty) - | (1, Pair_t ((hd_ty, _at1, _at2), _, _annot)) -> + | (1, Pair_t (hd_ty, _)) -> ok @@ Comb_get_proof_argument (Comb_get_one, hd_ty) - | (n, Pair_t (_, (tl_ty, _bt1, _bt2), _annot)) -> + | (n, Pair_t (_, tl_ty)) -> make_proof_argument (n - 2) tl_ty >|? fun (Comb_get_proof_argument (comb_get_left_witness, ty')) -> Comb_get_proof_argument @@ -3764,12 +3348,10 @@ and parse_instr : >>?= 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 typed ctxt loc (Comb_get (n, witness)) 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 -> + | ( Prim (loc, I_UPDATE, [n], _annot), + Item_t (value_ty, Item_t (comb_ty, rest_ty)) ) -> let rec make_proof_argument : type value before. int -> @@ -3780,17 +3362,13 @@ and parse_instr : match (n, ty) with | (0, _) -> ok @@ Comb_set_proof_argument (Comb_set_zero, value_ty) - | (1, Pair_t ((_hd_ty, at1, at2), (tl_ty, bt1, bt2), annot)) -> - let after_ty = - Pair_t ((value_ty, at1, at2), (tl_ty, bt1, bt2), annot) - in + | (1, Pair_t (_hd_ty, tl_ty)) -> + let after_ty = Pair_t (value_ty, tl_ty) in ok @@ Comb_set_proof_argument (Comb_set_one, after_ty) - | (n, Pair_t ((hd_ty, at1, at2), (tl_ty, bt1, bt2), annot)) -> + | (n, Pair_t (hd_ty, tl_ty)) -> make_proof_argument (n - 2) value_ty tl_ty >|? fun (Comb_set_proof_argument (comb_set_left_witness, tl_ty')) -> - let after_ty = - Pair_t ((hd_ty, at1, at2), (tl_ty', bt1, bt2), annot) - in + let after_ty = Pair_t (hd_ty, tl_ty') in Comb_set_proof_argument (Comb_set_plus_two comb_set_left_witness, after_ty) | _ -> @@ -3804,107 +3382,38 @@ and parse_instr : >>?= 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 typed ctxt loc (Comb_set (n, witness)) after_stack_ty - | ( Prim (loc, I_UNPAIR, [], annot), - Item_t - ( Pair_t - ( (a, expected_field_annot_a, a_annot), - (b, expected_field_annot_b, b_annot), - _ ), - rest, - pair_annot ) ) -> - parse_unpair_annot - loc - annot - ~pair_annot - ~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) -> - check_correct_field field_a expected_field_annot_a - >>?= fun () -> - check_correct_field field_b expected_field_annot_b - >>?= fun () -> - typed ctxt loc Unpair (Item_t (a, Item_t (b, rest, annot_b), annot_a)) - | ( Prim (loc, I_CAR, [], annot), - Item_t - (Pair_t ((a, expected_field_annot, a_annot), _, _), rest, pair_annot) - ) -> - parse_destr_annot - loc - annot - ~pair_annot - ~value_annot:a_annot - ~field_name:expected_field_annot - ~default_accessor:default_car_annot - >>?= fun (annot, field_annot) -> - check_correct_field field_annot expected_field_annot - >>?= fun () -> typed ctxt loc Car (Item_t (a, rest, annot)) - | ( Prim (loc, I_CDR, [], annot), - Item_t - (Pair_t (_, (b, expected_field_annot, b_annot), _), rest, pair_annot) - ) -> - parse_destr_annot - loc - annot - ~pair_annot - ~value_annot:b_annot - ~field_name:expected_field_annot - ~default_accessor:default_cdr_annot - >>?= fun (annot, field_annot) -> - check_correct_field field_annot expected_field_annot - >>?= fun () -> typed ctxt loc Cdr (Item_t (b, rest, annot)) + | (Prim (loc, I_UNPAIR, [], _annot), Item_t (Pair_t (a, b), rest)) -> + typed ctxt loc Unpair (Item_t (a, Item_t (b, rest))) + | (Prim (loc, I_CAR, [], _annot), Item_t (Pair_t (a, _), rest)) -> + typed ctxt loc Car (Item_t (a, rest)) + | (Prim (loc, I_CDR, [], _annot), Item_t (Pair_t (_, b), rest)) -> + 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 ~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) -> - typed - ctxt - loc - Cons_left - (Item_t (Union_t ((tl, l_field), (tr, r_field), tname), rest, annot)) - | (Prim (loc, I_RIGHT, [tl], annot), Item_t (tr, rest, stack_annot)) -> + typed ctxt loc Cons_left (Item_t (Union_t (tl, tr), rest)) + | (Prim (loc, I_RIGHT, [tl], _annot), Item_t (tr, rest)) -> parse_any_ty ctxt ~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) -> - typed - ctxt - loc - Cons_right - (Item_t (Union_t ((tl, l_field), (tr, r_field), tname), rest, annot)) + typed ctxt loc Cons_right (Item_t (Union_t (tl, tr), rest)) | ( 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, tr), 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 - in - let right_annot = - gen_access_annot union_annot r_field ~default:default_right_annot - in non_terminal_recursion ?type_logger tc_context ctxt ~legacy bt - (Item_t (tl, rest, left_annot)) + (Item_t (tl, rest)) >>=? fun (btr, ctxt) -> non_terminal_recursion ?type_logger @@ -3912,73 +3421,59 @@ and parse_instr : ctxt ~legacy bf - (Item_t (tr, rest, right_annot)) + (Item_t (tr, rest)) >>=? fun (bfr, ctxt) -> let branch ibt ibf = {loc; instr = If_left (ibt, ibf); bef; aft = ibt.aft} in - merge_branches ~legacy ctxt loc btr bfr {branch} + merge_branches ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement (* lists *) - | (Prim (loc, I_NIL, [t], annot), stack) -> + | (Prim (loc, I_NIL, [t], _annot), stack) -> parse_any_ty ctxt ~legacy t - >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> - typed ctxt loc Nil (Item_t (List_t (t, ty_name), stack, annot)) - | ( Prim (loc, I_CONS, [], annot), - Item_t (tv, Item_t (List_t (t, ty_name), rest, _), _) ) -> + >>?= fun (Ex_ty t, ctxt) -> typed ctxt loc Nil (Item_t (List_t t, stack)) + | (Prim (loc, I_CONS, [], _annot), Item_t (tv, Item_t (List_t t, rest))) -> check_item_ty ctxt tv t loc I_CONS 1 2 - >>?= fun (Eq, t, ctxt) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Cons_list (Item_t (List_t (t, ty_name), rest, annot)) - | ( Prim (loc, I_IF_CONS, [bt; bf], annot), - (Item_t (List_t (t, ty_name), rest, list_annot) as bef) ) -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Cons_list (Item_t (List_t t, rest)) + | (Prim (loc, I_IF_CONS, [bt; bf], annot), (Item_t (List_t t, 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 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, rest))) >>=? fun (btr, ctxt) -> non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf rest >>=? fun (bfr, ctxt) -> let branch ibt ibf = {loc; instr = If_cons (ibt, ibf); bef; aft = ibt.aft} in - merge_branches ~legacy ctxt loc btr bfr {branch} + merge_branches ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement - | (Prim (loc, I_SIZE, [], annot), Item_t (List_t _, rest, _)) -> - parse_var_type_annot loc annot - >>?= fun (annot, tname) -> - typed ctxt loc List_size (Item_t (Nat_t tname, rest, annot)) - | ( Prim (loc, I_MAP, [body], annot), - Item_t (List_t (elt, _), starting_rest, list_annot) ) -> ( + | (Prim (loc, I_SIZE, [], _annot), Item_t (List_t _, rest)) -> + typed ctxt loc List_size (Item_t (Nat_t, 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 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) -> match judgement with - | Typed ({aft = Item_t (ret, rest, _); _} as ibody) -> + | Typed ({aft = Item_t (ret, rest); _} as ibody) -> let invalid_map_body () = serialize_stack_for_error ctxt ibody.aft >|? fun (aft, _ctxt) -> Invalid_map_body (loc, aft) @@ -3986,33 +3481,31 @@ and parse_instr : Lwt.return @@ record_trace_eval invalid_map_body - ( merge_stacks ~legacy loc ctxt 1 rest starting_rest - >>? fun (Eq, rest, ctxt) -> + ( stacks_eq ctxt 1 rest starting_rest + >>? fun (Eq, ctxt) -> typed_no_lwt ctxt loc (List_map ibody) - (Item_t (List_t (ret, list_ty_name), rest, ret_annot)) ) + (Item_t (List_t ret, rest)) ) | Typed {aft; _} -> Lwt.return ( serialize_stack_for_error ctxt aft >>? fun (aft, _ctxt) -> error (Invalid_map_body (loc, aft)) ) | Failed _ -> fail (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 non_terminal_recursion ?type_logger tc_context ctxt ~legacy body - (Item_t (elt, rest, elt_annot)) + (Item_t (elt, rest)) >>=? fun (judgement, ctxt) -> match judgement with | Typed ({aft; _} as ibody) -> @@ -4025,25 +3518,21 @@ and parse_instr : Lwt.return @@ record_trace_eval invalid_iter_body - ( merge_stacks ~legacy loc ctxt 1 aft rest - >>? fun (Eq, rest, ctxt) -> + ( stacks_eq ctxt 1 aft rest + >>? fun (Eq, ctxt) -> typed_no_lwt ctxt loc (List_iter ibody) rest ) | Failed {descr} -> typed ctxt loc (List_iter (descr rest)) rest ) (* sets *) - | (Prim (loc, I_EMPTY_SET, [t], annot), rest) -> + | (Prim (loc, I_EMPTY_SET, [t], _annot), rest) -> parse_comparable_ty ctxt t >>?= fun (Ex_comparable_ty t, ctxt) -> - parse_var_type_annot loc annot - >>?= fun (annot, tname) -> - typed ctxt loc (Empty_set t) (Item_t (Set_t (t, tname), rest, annot)) - | ( Prim (loc, I_ITER, [body], annot), - Item_t (Set_t (comp_elt, _), rest, set_annot) ) -> ( + typed ctxt loc (Empty_set t) (Item_t (Set_t t, 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 = ty_of_comparable_ty comp_elt in non_terminal_recursion ?type_logger @@ -4051,7 +3540,7 @@ and parse_instr : ctxt ~legacy body - (Item_t (elt, rest, elt_annot)) + (Item_t (elt, rest)) >>=? fun (judgement, ctxt) -> match judgement with | Typed ({aft; _} as ibody) -> @@ -4064,68 +3553,44 @@ and parse_instr : Lwt.return @@ record_trace_eval invalid_iter_body - ( merge_stacks ~legacy loc ctxt 1 aft rest - >>? fun (Eq, rest, ctxt) -> + ( stacks_eq ctxt 1 aft rest + >>? fun (Eq, ctxt) -> typed_no_lwt ctxt loc (Set_iter ibody) rest ) | Failed {descr} -> typed ctxt loc (Set_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) -> check_item_ty ctxt elt v loc I_MEM 1 2 - >>?= fun (Eq, _, ctxt) -> - typed ctxt loc Set_mem (Item_t (Bool_t tname, rest, annot)) - | ( Prim (loc, I_UPDATE, [], annot), - Item_t - ( v, - Item_t (Bool_t _, Item_t (Set_t (elt, tname), rest, set_annot), _), - _ ) ) -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Set_mem (Item_t (Bool_t, rest)) + | ( Prim (loc, I_UPDATE, [], _annot), + Item_t (v, Item_t (Bool_t, Item_t (Set_t elt, 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 -> - typed ctxt loc Set_update (Item_t (Set_t (elt, tname), rest, annot)) - | (Prim (loc, I_SIZE, [], annot), Item_t (Set_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Set_size (Item_t (Nat_t None, rest, annot)) + >>?= fun (Eq, ctxt) -> + typed ctxt loc Set_update (Item_t (Set_t elt, rest)) + | (Prim (loc, I_SIZE, [], _annot), Item_t (Set_t _, rest)) -> + typed ctxt loc Set_size (Item_t (Nat_t, rest)) (* maps *) - | (Prim (loc, I_EMPTY_MAP, [tk; tv], annot), stack) -> + | (Prim (loc, I_EMPTY_MAP, [tk; tv], _annot), stack) -> parse_comparable_ty ctxt tk >>?= fun (Ex_comparable_ty tk, ctxt) -> parse_any_ty ctxt ~legacy tv >>?= fun (Ex_ty tv, ctxt) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> - typed - ctxt - loc - (Empty_map (tk, tv)) - (Item_t (Map_t (tk, tv, ty_name), stack, annot)) - | ( Prim (loc, I_MAP, [body], annot), - Item_t (Map_t (ck, elt, _), starting_rest, _map_annot) ) -> ( + typed ctxt loc (Empty_map (tk, tv)) (Item_t (Map_t (tk, tv), stack)) + | (Prim (loc, I_MAP, [body], _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) -> - let k_name = field_to_var_annot default_key_annot in - let e_name = field_to_var_annot default_elt_annot in non_terminal_recursion ?type_logger tc_context ctxt ~legacy body - (Item_t - ( Pair_t ((k, None, k_name), (elt, None, e_name), None), - starting_rest, - None )) + (Item_t (Pair_t (k, elt), starting_rest)) >>=? fun (judgement, ctxt) -> match judgement with - | Typed ({aft = Item_t (ret, rest, _); _} as ibody) -> + | Typed ({aft = Item_t (ret, rest); _} as ibody) -> let invalid_map_body () = serialize_stack_for_error ctxt ibody.aft >|? fun (aft, _ctxt) -> Invalid_map_body (loc, aft) @@ -4133,13 +3598,13 @@ and parse_instr : Lwt.return @@ record_trace_eval invalid_map_body - ( merge_stacks ~legacy loc ctxt 1 rest starting_rest - >>? fun (Eq, rest, ctxt) -> + ( stacks_eq ctxt 1 rest starting_rest + >>? fun (Eq, ctxt) -> typed_no_lwt ctxt loc (Map_map ibody) - (Item_t (Map_t (ck, ret, ty_name), rest, ret_annot)) ) + (Item_t (Map_t (ck, ret), rest)) ) | Typed {aft; _} -> Lwt.return ( serialize_stack_for_error ctxt aft @@ -4147,13 +3612,11 @@ and parse_instr : | Failed _ -> fail (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 - let e_name = field_to_var_annot default_elt_annot in let key = ty_of_comparable_ty comp_elt in non_terminal_recursion ?type_logger @@ -4161,10 +3624,7 @@ and parse_instr : ctxt ~legacy body - (Item_t - ( Pair_t ((key, None, k_name), (element_ty, None, e_name), None), - rest, - None )) + (Item_t (Pair_t (key, element_ty), rest)) >>=? fun (judgement, ctxt) -> match judgement with | Typed ({aft; _} as ibody) -> @@ -4177,176 +3637,114 @@ and parse_instr : Lwt.return @@ record_trace_eval invalid_iter_body - ( merge_stacks ~legacy loc ctxt 1 aft rest - >>? fun (Eq, rest, ctxt) -> + ( stacks_eq ctxt 1 aft rest + >>? fun (Eq, ctxt) -> typed_no_lwt ctxt loc (Map_iter ibody) rest ) | Failed {descr} -> typed ctxt loc (Map_iter (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 -> - typed ctxt loc Map_mem (Item_t (Bool_t None, rest, annot)) - | ( Prim (loc, I_GET, [], annot), - Item_t (vk, Item_t (Map_t (ck, elt, _), rest, _), _) ) -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Map_mem (Item_t (Bool_t, rest)) + | (Prim (loc, I_GET, [], _annot), 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 -> - typed ctxt loc Map_get (Item_t (Option_t (elt, None), rest, annot)) - | ( Prim (loc, I_UPDATE, [], annot), - Item_t - ( vk, - Item_t - ( Option_t (vv, _), - Item_t (Map_t (ck, v, map_name), rest, map_annot), - _ ), - _ ) ) -> + >>?= fun (Eq, ctxt) -> + typed ctxt loc Map_get (Item_t (Option_t elt, rest)) + | ( Prim (loc, I_UPDATE, [], _annot), + Item_t (vk, Item_t (Option_t vv, Item_t (Map_t (ck, v), rest))) ) -> let k = ty_of_comparable_ty ck in check_item_ty ctxt vk k loc I_UPDATE 1 3 - >>?= fun (Eq, _, ctxt) -> + >>?= 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 -> - typed ctxt loc Map_update (Item_t (Map_t (ck, v, map_name), rest, annot)) - | ( 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 ), - _ ) ) -> + >>?= fun (Eq, ctxt) -> + typed ctxt loc Map_update (Item_t (Map_t (ck, v), rest)) + | ( Prim (loc, I_GET_AND_UPDATE, [], _annot), + Item_t (vk, Item_t (Option_t vv, Item_t (Map_t (ck, v), 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) -> + >>?= 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 -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Map_get_and_update - (Item_t - ( Option_t (vv, vname), - Item_t (Map_t (ck, v, map_name), rest, annot), - v_annot )) - | (Prim (loc, I_SIZE, [], annot), Item_t (Map_t (_, _, _), rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Map_size (Item_t (Nat_t None, rest, annot)) + (Item_t (Option_t vv, Item_t (Map_t (ck, v), rest))) + | (Prim (loc, I_SIZE, [], _annot), Item_t (Map_t (_, _), rest)) -> + typed ctxt loc Map_size (Item_t (Nat_t, rest)) (* big_map *) - | (Prim (loc, I_EMPTY_BIG_MAP, [tk; tv], annot), stack) -> + | (Prim (loc, I_EMPTY_BIG_MAP, [tk; tv], _annot), stack) -> parse_comparable_ty ctxt tk >>?= fun (Ex_comparable_ty tk, ctxt) -> parse_big_map_value_ty ctxt ~legacy tv >>?= fun (Ex_ty tv, ctxt) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> typed ctxt loc (Empty_big_map (tk, tv)) - (Item_t (Big_map_t (tk, tv, ty_name), stack, annot)) - | ( Prim (loc, I_MEM, [], annot), - Item_t (set_key, Item_t (Big_map_t (map_key, _, _), rest, _), _) ) -> + (Item_t (Big_map_t (tk, tv), stack)) + | ( Prim (loc, I_MEM, [], _annot), + 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 -> - typed ctxt loc Big_map_mem (Item_t (Bool_t None, rest, annot)) - | ( Prim (loc, I_GET, [], annot), - Item_t (vk, Item_t (Big_map_t (ck, elt, _), rest, _), _) ) -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Big_map_mem (Item_t (Bool_t, rest)) + | ( Prim (loc, I_GET, [], _annot), + 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 -> - typed ctxt loc Big_map_get (Item_t (Option_t (elt, None), rest, annot)) - | ( Prim (loc, I_UPDATE, [], annot), + >>?= fun (Eq, ctxt) -> + typed ctxt loc Big_map_get (Item_t (Option_t elt, rest)) + | ( 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), - _ ), - _ ) ) -> + (Option_t set_value, Item_t (Big_map_t (map_key, map_value), 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) -> + >>?= 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 -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Big_map_update - (Item_t (Big_map_t (map_key, map_value, map_name), rest, annot)) - | ( 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 ), - _ ) ) -> + (Item_t (Big_map_t (map_key, map_value), rest)) + | ( Prim (loc, I_GET_AND_UPDATE, [], _annot), + Item_t (vk, Item_t (Option_t vv, Item_t (Big_map_t (ck, v), 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) -> + >>?= 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 -> + >>?= fun (Eq, ctxt) -> typed ctxt loc Big_map_get_and_update - (Item_t - ( Option_t (vv, vname), - Item_t (Big_map_t (ck, v, map_name), rest, annot), - v_annot )) + (Item_t (Option_t vv, Item_t (Big_map_t (ck, v), rest))) (* Sapling *) - | (Prim (loc, I_SAPLING_EMPTY_STATE, [memo_size], annot), rest) -> + | (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 -> typed ctxt loc (Sapling_empty_state {memo_size}) - (Item_t (Sapling_state_t (memo_size, None), rest, annot)) + (Item_t (Sapling_state_t memo_size, rest)) | ( 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 ), - _ ) ) -> - merge_memo_sizes state_memo_size transaction_memo_size - >>?= fun _memo_size -> + ( Sapling_transaction_t transaction_memo_size, + Item_t ((Sapling_state_t state_memo_size as state_ty), rest) ) ) -> + memo_size_eq state_memo_size transaction_memo_size + >>?= fun () -> typed ctxt loc Sapling_verify_update - (Item_t - ( Option_t - ( Pair_t - ( (Int_t None, None, default_sapling_balance_annot), - (state_ty, None, None), - None ), - None ), - rest, - stack_annot )) + (Item_t (Option_t (Pair_t (Int_t, state_ty)), rest)) (* control *) | (Seq (loc, []), stack) -> typed ctxt loc Nop stack @@ -4387,7 +3785,7 @@ and parse_instr : return ctxt (Failed {descr}) | Typed itl -> typed ctxt loc (Seq (ihd, itl)) itl.aft ) ) - | (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 @@ -4399,10 +3797,9 @@ and parse_instr : non_terminal_recursion ?type_logger tc_context ctxt ~legacy bf rest >>=? fun (bfr, ctxt) -> let branch ibt ibf = {loc; instr = If (ibt, ibf); bef; aft = ibt.aft} in - merge_branches ~legacy ctxt loc btr bfr {branch} + merge_branches ctxt loc btr bfr {branch} >>?= fun (judgement, ctxt) -> return ctxt judgement - | ( 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 @@ -4420,29 +3817,22 @@ and parse_instr : Lwt.return @@ record_trace_eval unmatched_branches - ( merge_stacks ~legacy loc ctxt 1 ibody.aft stack - >>? fun (Eq, _stack, ctxt) -> - typed_no_lwt ctxt loc (Loop ibody) rest ) + ( stacks_eq ctxt 1 ibody.aft stack + >>? fun (Eq, ctxt) -> typed_no_lwt ctxt loc (Loop ibody) rest ) | Failed {descr} -> let ibody = descr stack in typed ctxt loc (Loop ibody) rest ) - | ( Prim (loc, I_LOOP_LEFT, [body], annot), - (Item_t (Union_t ((tl, l_field), (tr, _), _), rest, union_annot) as stack) - ) -> ( + | ( Prim (loc, I_LOOP_LEFT, [body], _annot), + (Item_t (Union_t (tl, 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 - in non_terminal_recursion ?type_logger tc_context ctxt ~legacy body - (Item_t (tl, rest, l_annot)) + (Item_t (tl, rest)) >>=? fun (judgement, ctxt) -> match judgement with | Typed ibody -> @@ -4455,74 +3845,51 @@ and parse_instr : Lwt.return @@ record_trace_eval unmatched_branches - ( merge_stacks ~legacy loc ctxt 1 ibody.aft stack - >>? fun (Eq, _stack, ctxt) -> - typed_no_lwt - ctxt - loc - (Loop_left ibody) - (Item_t (tr, rest, annot)) ) + ( stacks_eq ctxt 1 ibody.aft stack + >>? fun (Eq, ctxt) -> + typed_no_lwt ctxt loc (Loop_left ibody) (Item_t (tr, rest)) ) | Failed {descr} -> let ibody = descr stack in - typed ctxt loc (Loop_left ibody) (Item_t (tr, rest, annot)) ) - | (Prim (loc, I_LAMBDA, [arg; ret; code], annot), stack) -> + typed ctxt loc (Loop_left ibody) (Item_t (tr, rest)) ) + | (Prim (loc, I_LAMBDA, [arg; ret; code], _annot), stack) -> parse_any_ty ctxt ~legacy arg >>?= fun (Ex_ty arg, ctxt) -> parse_any_ty ctxt ~legacy ret >>?= fun (Ex_ty ret, ctxt) -> check_kind [Seq_kind] code >>?= fun () -> - parse_var_annot loc annot - >>?= fun annot -> parse_returning Lambda ?type_logger ~stack_depth ctxt ~legacy - (arg, default_arg_annot) + arg ret code >>=? fun (lambda, ctxt) -> - typed - ctxt - loc - (Lambda lambda) - (Item_t (Lambda_t (arg, ret, None), stack, annot)) - | ( Prim (loc, I_EXEC, [], annot), - Item_t (arg, Item_t (Lambda_t (param, ret, _), rest, _), _) ) -> + typed ctxt loc (Lambda lambda) (Item_t (Lambda_t (arg, ret), stack)) + | ( 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 -> typed ctxt loc Exec (Item_t (ret, rest, annot)) - | ( Prim (loc, I_APPLY, [], annot), + >>?= fun (Eq, ctxt) -> typed ctxt loc Exec (Item_t (ret, rest)) + | ( Prim (loc, I_APPLY, [], _annot), Item_t - ( capture, - Item_t - ( Lambda_t - (Pair_t ((capture_ty, _, _), (arg_ty, _, _), lam_annot), ret, _), - rest, - _ ), - _ ) ) -> + (capture, Item_t (Lambda_t (Pair_t (capture_ty, arg_ty), ret), 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 -> - typed - ctxt - loc - (Apply capture_ty) - (Item_t (Lambda_t (arg_ty, ret, lam_annot), rest, annot)) - | (Prim (loc, I_DIP, [code], annot), Item_t (v, rest, stack_annot)) -> ( + >>?= fun (Eq, ctxt) -> + typed ctxt loc (Apply capture_ty) (Item_t (Lambda_t (arg_ty, ret), rest)) + | (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 - (add_dip v stack_annot tc_context) + (add_dip v tc_context) ctxt ~legacy code @@ -4530,7 +3897,7 @@ and parse_instr : >>=? fun (judgement, ctxt) -> match judgement with | Typed descr -> - typed ctxt loc (Dip descr) (Item_t (v, descr.aft, stack_annot)) + typed ctxt loc (Dip descr) (Item_t (v, descr.aft)) | Failed _ -> fail (Fail_not_in_tail_position loc) ) | (Prim (loc, I_DIP, [n; code], result_annot), stack) -> @@ -4563,10 +3930,10 @@ and parse_instr : ok @@ Dipn_proof_argument (Rest, (ctxt, descr), descr.aft) | Failed _ -> error (Fail_not_in_tail_position loc) ) - | (false, Item_t (v, rest, annot)) -> - make_proof_argument (n - 1) (add_dip v annot tc_context) rest + | (false, Item_t (v, rest)) -> + make_proof_argument (n - 1) (add_dip v tc_context) rest >|=? fun (Dipn_proof_argument (n', descr, aft')) -> - Dipn_proof_argument (Prefix n', descr, Item_t (v, aft', annot)) + Dipn_proof_argument (Prefix n', descr, Item_t (v, aft')) | (_, _) -> Lwt.return ( serialize_stack_for_error ctxt stack @@ -4583,7 +3950,7 @@ and 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)) -> error_unexpected_annot loc annot >>?= fun () -> (if legacy then ok_unit else check_packable ~legacy:false loc v) @@ -4591,484 +3958,205 @@ and parse_instr : let descr aft = {loc; instr = Failwith v; bef = stack_ty; aft} in log_stack ctxt loc stack_ty Empty_t >>?= fun () -> return ctxt (Failed {descr}) - | (Prim (loc, I_NEVER, [], annot), Item_t (Never_t _, _rest, _)) -> + | (Prim (loc, I_NEVER, [], annot), Item_t (Never_t, _rest)) -> error_unexpected_annot loc annot >>?= fun () -> let descr aft = {loc; instr = Never; bef = stack_ty; aft} in log_stack ctxt loc stack_ty Empty_t >>?= fun () -> return ctxt (Failed {descr}) (* timestamp operations *) - | ( Prim (loc, I_ADD, [], annot), - Item_t (Timestamp_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Add_timestamp_to_seconds - (Item_t (Timestamp_t tname, rest, annot)) - | ( Prim (loc, I_ADD, [], annot), - Item_t (Int_t _, Item_t (Timestamp_t tname, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Add_seconds_to_timestamp - (Item_t (Timestamp_t tname, rest, annot)) - | ( Prim (loc, I_SUB, [], annot), - Item_t (Timestamp_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Sub_timestamp_seconds - (Item_t (Timestamp_t tname, rest, annot)) - | ( Prim (loc, I_SUB, [], annot), - Item_t (Timestamp_t tn1, Item_t (Timestamp_t tn2, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Diff_timestamps (Item_t (Int_t tname, rest, annot)) + | (Prim (loc, I_ADD, [], _annot), Item_t (Timestamp_t, Item_t (Int_t, rest))) + -> + typed ctxt loc Add_timestamp_to_seconds (Item_t (Timestamp_t, rest)) + | (Prim (loc, I_ADD, [], _annot), Item_t (Int_t, Item_t (Timestamp_t, rest))) + -> + typed ctxt loc Add_seconds_to_timestamp (Item_t (Timestamp_t, rest)) + | (Prim (loc, I_SUB, [], _annot), Item_t (Timestamp_t, Item_t (Int_t, rest))) + -> + typed ctxt loc Sub_timestamp_seconds (Item_t (Timestamp_t, rest)) + | ( Prim (loc, I_SUB, [], _annot), + Item_t (Timestamp_t, Item_t (Timestamp_t, rest)) ) -> + typed ctxt loc Diff_timestamps (Item_t (Int_t, rest)) (* 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Concat_string_pair (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 Concat_string (Item_t (String_t tname, rest, annot)) - | ( Prim (loc, I_SLICE, [], annot), - Item_t - ( Nat_t _, - Item_t (Nat_t _, Item_t (String_t tname, rest, string_annot), _), - _ ) ) -> - parse_var_annot - ~default:(gen_access_annot string_annot default_slice_annot) - loc - annot - >>?= fun annot -> - typed - ctxt - loc - Slice_string - (Item_t (Option_t (String_t tname, None), rest, annot)) - | (Prim (loc, I_SIZE, [], annot), Item_t (String_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc String_size (Item_t (Nat_t None, rest, annot)) + | ( Prim (loc, I_CONCAT, [], _annot), + Item_t (String_t, Item_t (String_t, rest)) ) -> + typed ctxt loc Concat_string_pair (Item_t (String_t, rest)) + | (Prim (loc, I_CONCAT, [], _annot), Item_t (List_t String_t, rest)) -> + typed ctxt loc Concat_string (Item_t (String_t, rest)) + | ( Prim (loc, I_SLICE, [], _annot), + Item_t (Nat_t, Item_t (Nat_t, Item_t (String_t, rest))) ) -> + typed ctxt loc Slice_string (Item_t (Option_t String_t, rest)) + | (Prim (loc, I_SIZE, [], _annot), Item_t (String_t, rest)) -> + typed ctxt loc String_size (Item_t (Nat_t, rest)) (* 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Concat_bytes_pair (Item_t (Bytes_t tname, rest, annot)) - | ( 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 -> - typed ctxt loc Concat_bytes (Item_t (Bytes_t tname, rest, annot)) - | ( Prim (loc, I_SLICE, [], annot), - Item_t - ( Nat_t _, - Item_t (Nat_t _, Item_t (Bytes_t tname, rest, bytes_annot), _), - _ ) ) -> - parse_var_annot - ~default:(gen_access_annot bytes_annot default_slice_annot) - loc - annot - >>?= fun annot -> - typed - ctxt - loc - Slice_bytes - (Item_t (Option_t (Bytes_t tname, None), rest, annot)) - | (Prim (loc, I_SIZE, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Bytes_size (Item_t (Nat_t None, rest, annot)) + | (Prim (loc, I_CONCAT, [], _annot), Item_t (Bytes_t, Item_t (Bytes_t, rest))) + -> + typed ctxt loc Concat_bytes_pair (Item_t (Bytes_t, rest)) + | (Prim (loc, I_CONCAT, [], _annot), Item_t (List_t Bytes_t, rest)) -> + typed ctxt loc Concat_bytes (Item_t (Bytes_t, rest)) + | ( Prim (loc, I_SLICE, [], _annot), + Item_t (Nat_t, Item_t (Nat_t, Item_t (Bytes_t, rest))) ) -> + typed ctxt loc Slice_bytes (Item_t (Option_t Bytes_t, rest)) + | (Prim (loc, I_SIZE, [], _annot), Item_t (Bytes_t, rest)) -> + typed ctxt loc Bytes_size (Item_t (Nat_t, rest)) (* 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Add_tez (Item_t (Mutez_t tname, rest, annot)) - | ( Prim (loc, I_SUB, [], annot), - Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Sub_tez (Item_t (Mutez_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Mutez_t tname, Item_t (Nat_t _, rest, _), _) ) -> + | (Prim (loc, I_ADD, [], _annot), Item_t (Mutez_t, Item_t (Mutez_t, rest))) + -> + typed ctxt loc Add_tez (Item_t (Mutez_t, rest)) + | (Prim (loc, I_SUB, [], _annot), Item_t (Mutez_t, Item_t (Mutez_t, rest))) + -> + typed ctxt loc Sub_tez (Item_t (Mutez_t, rest)) + | (Prim (loc, I_MUL, [], _annot), Item_t (Mutez_t, Item_t (Nat_t, rest))) -> (* no type name check *) - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Mul_teznat (Item_t (Mutez_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t _, Item_t (Mutez_t tname, rest, _), _) ) -> + typed ctxt loc Mul_teznat (Item_t (Mutez_t, rest)) + | (Prim (loc, I_MUL, [], _annot), Item_t (Nat_t, Item_t (Mutez_t, rest))) -> (* no type name check *) - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Mul_nattez (Item_t (Mutez_t tname, rest, annot)) + typed ctxt loc Mul_nattez (Item_t (Mutez_t, rest)) (* 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> typed ctxt loc Or (Item_t (Bool_t tname, rest, annot)) - | ( Prim (loc, I_AND, [], annot), - Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> typed ctxt loc And (Item_t (Bool_t tname, rest, annot)) - | ( Prim (loc, I_XOR, [], annot), - Item_t (Bool_t tn1, Item_t (Bool_t tn2, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> typed ctxt loc Xor (Item_t (Bool_t tname, rest, annot)) - | (Prim (loc, I_NOT, [], annot), Item_t (Bool_t tname, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Not (Item_t (Bool_t tname, rest, annot)) + | (Prim (loc, I_OR, [], _annot), Item_t (Bool_t, Item_t (Bool_t, rest))) -> + typed ctxt loc Or (Item_t (Bool_t, rest)) + | (Prim (loc, I_AND, [], _annot), Item_t (Bool_t, Item_t (Bool_t, rest))) -> + typed ctxt loc And (Item_t (Bool_t, rest)) + | (Prim (loc, I_XOR, [], _annot), Item_t (Bool_t, Item_t (Bool_t, rest))) -> + typed ctxt loc Xor (Item_t (Bool_t, rest)) + | (Prim (loc, I_NOT, [], _annot), Item_t (Bool_t, rest)) -> + typed ctxt loc Not (Item_t (Bool_t, rest)) (* integer operations *) - | (Prim (loc, I_ABS, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Abs_int (Item_t (Nat_t None, rest, annot)) - | (Prim (loc, I_ISNAT, [], annot), Item_t (Int_t _, rest, int_annot)) -> - parse_var_annot loc annot ~default:int_annot - >>?= fun annot -> - typed ctxt loc Is_nat (Item_t (Option_t (Nat_t None, None), rest, annot)) - | (Prim (loc, I_INT, [], annot), Item_t (Nat_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Int_nat (Item_t (Int_t None, rest, annot)) - | (Prim (loc, I_NEG, [], annot), Item_t (Int_t tname, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Neg_int (Item_t (Int_t tname, rest, annot)) - | (Prim (loc, I_NEG, [], annot), Item_t (Nat_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Neg_nat (Item_t (Int_t None, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Add_intint (Item_t (Int_t tname, rest, annot)) - | ( Prim (loc, I_ADD, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Add_intnat (Item_t (Int_t tname, rest, annot)) - | ( Prim (loc, I_ADD, [], annot), - Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Add_natint (Item_t (Int_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Add_natnat (Item_t (Nat_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Sub_int (Item_t (Int_t tname, rest, annot)) - | ( Prim (loc, I_SUB, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Sub_int (Item_t (Int_t tname, rest, annot)) - | ( Prim (loc, I_SUB, [], annot), - Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Sub_int (Item_t (Int_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun _tname -> - typed ctxt loc Sub_int (Item_t (Int_t None, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Mul_intint (Item_t (Int_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Mul_intnat (Item_t (Int_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t _, Item_t (Int_t tname, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Mul_natint (Item_t (Int_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Mul_natnat (Item_t (Nat_t tname, rest, annot)) - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Mutez_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> + | (Prim (loc, I_ABS, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Abs_int (Item_t (Nat_t, rest)) + | (Prim (loc, I_ISNAT, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Is_nat (Item_t (Option_t Nat_t, rest)) + | (Prim (loc, I_INT, [], _annot), Item_t (Nat_t, rest)) -> + typed ctxt loc Int_nat (Item_t (Int_t, rest)) + | (Prim (loc, I_NEG, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Neg_int (Item_t (Int_t, rest)) + | (Prim (loc, I_NEG, [], _annot), Item_t (Nat_t, rest)) -> + typed ctxt loc Neg_nat (Item_t (Int_t, rest)) + | (Prim (loc, I_ADD, [], _annot), Item_t (Int_t, Item_t (Int_t, rest))) -> + typed ctxt loc Add_intint (Item_t (Int_t, rest)) + | (Prim (loc, I_ADD, [], _annot), Item_t (Int_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Add_intnat (Item_t (Int_t, rest)) + | (Prim (loc, I_ADD, [], _annot), Item_t (Nat_t, Item_t (Int_t, rest))) -> + typed ctxt loc Add_natint (Item_t (Int_t, rest)) + | (Prim (loc, I_ADD, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Add_natnat (Item_t (Nat_t, rest)) + | (Prim (loc, I_SUB, [], _annot), Item_t (Int_t, Item_t (Int_t, rest))) -> + typed ctxt loc Sub_int (Item_t (Int_t, rest)) + | (Prim (loc, I_SUB, [], _annot), Item_t (Int_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Sub_int (Item_t (Int_t, rest)) + | (Prim (loc, I_SUB, [], _annot), Item_t (Nat_t, Item_t (Int_t, rest))) -> + typed ctxt loc Sub_int (Item_t (Int_t, rest)) + | (Prim (loc, I_SUB, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Sub_int (Item_t (Int_t, rest)) + | (Prim (loc, I_MUL, [], _annot), Item_t (Int_t, Item_t (Int_t, rest))) -> + typed ctxt loc Mul_intint (Item_t (Int_t, rest)) + | (Prim (loc, I_MUL, [], _annot), Item_t (Int_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Mul_intnat (Item_t (Int_t, rest)) + | (Prim (loc, I_MUL, [], _annot), Item_t (Nat_t, Item_t (Int_t, rest))) -> + typed ctxt loc Mul_natint (Item_t (Int_t, rest)) + | (Prim (loc, I_MUL, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Mul_natnat (Item_t (Nat_t, rest)) + | (Prim (loc, I_EDIV, [], _annot), Item_t (Mutez_t, Item_t (Nat_t, rest))) -> typed ctxt loc Ediv_teznat - (Item_t - ( Option_t - ( Pair_t - ( (Mutez_t tname, None, None), - (Mutez_t tname, None, None), - None ), - None ), - rest, - annot )) - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Mutez_t tn1, Item_t (Mutez_t tn2, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> + (Item_t (Option_t (Pair_t (Mutez_t, Mutez_t)), rest)) + | (Prim (loc, I_EDIV, [], _annot), Item_t (Mutez_t, Item_t (Mutez_t, rest))) + -> typed ctxt loc Ediv_tez - (Item_t - ( Option_t - ( Pair_t - ((Nat_t None, None, None), (Mutez_t tname, None, None), None), - None ), - rest, - 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_annot ~legacy tn1 tn2 - >>?= fun tname -> + (Item_t (Option_t (Pair_t (Nat_t, Mutez_t)), rest)) + | (Prim (loc, I_EDIV, [], _annot), Item_t (Int_t, Item_t (Int_t, rest))) -> typed ctxt loc Ediv_intint - (Item_t - ( Option_t - ( Pair_t - ((Int_t tname, None, None), (Nat_t None, None, None), None), - None ), - rest, - annot )) - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Int_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> + (Item_t (Option_t (Pair_t (Int_t, Nat_t)), rest)) + | (Prim (loc, I_EDIV, [], _annot), Item_t (Int_t, Item_t (Nat_t, rest))) -> typed ctxt loc Ediv_intnat - (Item_t - ( Option_t - ( Pair_t - ((Int_t tname, None, None), (Nat_t None, None, None), None), - None ), - rest, - annot )) - | ( Prim (loc, I_EDIV, [], annot), - Item_t (Nat_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> + (Item_t (Option_t (Pair_t (Int_t, Nat_t)), rest)) + | (Prim (loc, I_EDIV, [], _annot), Item_t (Nat_t, Item_t (Int_t, rest))) -> typed ctxt loc Ediv_natint - (Item_t - ( Option_t - ( Pair_t - ((Int_t None, None, None), (Nat_t tname, None, None), None), - None ), - rest, - 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_annot ~legacy tn1 tn2 - >>?= fun tname -> + (Item_t (Option_t (Pair_t (Int_t, Nat_t)), rest)) + | (Prim (loc, I_EDIV, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> typed ctxt loc Ediv_natnat - (Item_t - ( Option_t - ( Pair_t - ((Nat_t tname, None, None), (Nat_t tname, None, None), None), - None ), - rest, - 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Lsl_nat (Item_t (Nat_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Lsr_nat (Item_t (Nat_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Or_nat (Item_t (Nat_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc And_nat (Item_t (Nat_t tname, rest, annot)) - | ( Prim (loc, I_AND, [], annot), - Item_t (Int_t _, Item_t (Nat_t tname, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc And_int_nat (Item_t (Nat_t tname, rest, 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_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed ctxt loc Xor_nat (Item_t (Nat_t tname, rest, annot)) - | (Prim (loc, I_NOT, [], annot), Item_t (Int_t tname, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Not_int (Item_t (Int_t tname, rest, annot)) - | (Prim (loc, I_NOT, [], annot), Item_t (Nat_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Not_nat (Item_t (Int_t None, rest, annot)) + (Item_t (Option_t (Pair_t (Nat_t, Nat_t)), rest)) + | (Prim (loc, I_LSL, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Lsl_nat (Item_t (Nat_t, rest)) + | (Prim (loc, I_LSR, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Lsr_nat (Item_t (Nat_t, rest)) + | (Prim (loc, I_OR, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Or_nat (Item_t (Nat_t, rest)) + | (Prim (loc, I_AND, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc And_nat (Item_t (Nat_t, rest)) + | (Prim (loc, I_AND, [], _annot), Item_t (Int_t, Item_t (Nat_t, rest))) -> + typed ctxt loc And_int_nat (Item_t (Nat_t, rest)) + | (Prim (loc, I_XOR, [], _annot), Item_t (Nat_t, Item_t (Nat_t, rest))) -> + typed ctxt loc Xor_nat (Item_t (Nat_t, rest)) + | (Prim (loc, I_NOT, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Not_int (Item_t (Int_t, rest)) + | (Prim (loc, I_NOT, [], _annot), Item_t (Nat_t, rest)) -> + typed ctxt loc Not_nat (Item_t (Int_t, rest)) (* 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))) -> check_item_ty ctxt t1 t2 loc I_COMPARE 1 2 - >>?= fun (Eq, t, ctxt) -> - comparable_ty_of_ty ctxt loc t + >>?= fun (Eq, ctxt) -> + comparable_ty_of_ty ctxt loc t1 >>?= fun (key, ctxt) -> - typed ctxt loc (Compare key) (Item_t (Int_t None, rest, annot)) + typed ctxt loc (Compare key) (Item_t (Int_t, rest)) (* comparators *) - | (Prim (loc, I_EQ, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Eq (Item_t (Bool_t None, rest, annot)) - | (Prim (loc, I_NEQ, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Neq (Item_t (Bool_t None, rest, annot)) - | (Prim (loc, I_LT, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Lt (Item_t (Bool_t None, rest, annot)) - | (Prim (loc, I_GT, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Gt (Item_t (Bool_t None, rest, annot)) - | (Prim (loc, I_LE, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Le (Item_t (Bool_t None, rest, annot)) - | (Prim (loc, I_GE, [], annot), Item_t (Int_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> typed ctxt loc Ge (Item_t (Bool_t None, rest, annot)) + | (Prim (loc, I_EQ, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Eq (Item_t (Bool_t, rest)) + | (Prim (loc, I_NEQ, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Neq (Item_t (Bool_t, rest)) + | (Prim (loc, I_LT, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Lt (Item_t (Bool_t, rest)) + | (Prim (loc, I_GT, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Gt (Item_t (Bool_t, rest)) + | (Prim (loc, I_LE, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Le (Item_t (Bool_t, rest)) + | (Prim (loc, I_GE, [], _annot), Item_t (Int_t, rest)) -> + typed ctxt loc Ge (Item_t (Bool_t, rest)) (* 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_any_ty ctxt ~legacy cast_t >>?= fun (Ex_ty cast_t, ctxt) -> - merge_types ~legacy ctxt loc cast_t t - >>?= fun (Eq, _, ctxt) -> - typed ctxt loc Nop (Item_t (cast_t, stack, annot)) - | (Prim (loc, I_RENAME, [], annot), Item_t (t, stack, _)) -> - parse_var_annot loc annot - >>?= fun annot -> + ty_eq ctxt cast_t t + >>?= fun (Eq, ctxt) -> typed ctxt loc Nop (Item_t (cast_t, stack)) + | (Prim (loc, I_RENAME, [], _annot), Item_t (t, stack)) -> (* can erase annot *) - typed ctxt loc Nop (Item_t (t, stack, annot)) + typed ctxt loc Nop (Item_t (t, 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 t - >>?= fun () -> - parse_var_annot - loc - annot - ~default:(gen_access_annot unpacked_annot default_pack_annot) - >>?= fun annot -> - typed ctxt loc (Pack t) (Item_t (Bytes_t None, rest, annot)) - | (Prim (loc, I_UNPACK, [ty], annot), Item_t (Bytes_t _, rest, packed_annot)) - -> + >>?= fun () -> typed ctxt loc (Pack t) (Item_t (Bytes_t, rest)) + | (Prim (loc, I_UNPACK, [ty], _annot), Item_t (Bytes_t, rest)) -> parse_packable_ty ctxt ~legacy ty >>?= fun (Ex_ty t, ctxt) -> - parse_var_type_annot loc annot - >>?= fun (annot, ty_name) -> - let annot = - default_annot - annot - ~default:(gen_access_annot packed_annot default_unpack_annot) - in - typed ctxt loc (Unpack t) (Item_t (Option_t (t, ty_name), rest, annot)) + typed ctxt loc (Unpack t) (Item_t (Option_t t, rest)) (* protocol *) - | ( Prim (loc, I_ADDRESS, [], annot), - Item_t (Contract_t _, rest, contract_annot) ) -> - parse_var_annot - loc - annot - ~default:(gen_access_annot contract_annot default_addr_annot) - >>?= fun annot -> - typed ctxt loc Address (Item_t (Address_t None, rest, annot)) - | ( Prim (loc, I_CONTRACT, [ty], annot), - Item_t (Address_t _, rest, addr_annot) ) -> + | (Prim (loc, I_ADDRESS, [], _annot), Item_t (Contract_t _, rest)) -> + typed ctxt loc Address (Item_t (Address_t, rest)) + | (Prim (loc, I_CONTRACT, [ty], annot), Item_t (Address_t, rest)) -> parse_parameter_ty ctxt ~legacy ty >>?= fun (Ex_ty t, ctxt) -> - parse_entrypoint_annot - loc - annot - ~default:(gen_access_annot addr_annot default_contract_annot) - >>?= fun (annot, entrypoint) -> + parse_entrypoint_annot loc annot + >>?= fun entrypoint -> ( match entrypoint with | None -> Ok "default" @@ -5083,152 +4171,86 @@ and parse_instr : ctxt loc (Contract (t, entrypoint)) - (Item_t (Option_t (Contract_t (t, None), None), rest, annot)) - | ( Prim (loc, I_TRANSFER_TOKENS, [], annot), - Item_t (p, Item_t (Mutez_t _, Item_t (Contract_t (cp, _), rest, _), _), _) - ) -> + (Item_t (Option_t (Contract_t t), rest)) + | ( Prim (loc, I_TRANSFER_TOKENS, [], _annot), + Item_t (p, Item_t (Mutez_t, Item_t (Contract_t cp, rest))) ) -> check_item_ty ctxt p cp loc I_TRANSFER_TOKENS 1 4 - >>?= fun (Eq, _, ctxt) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Transfer_tokens (Item_t (Operation_t None, rest, annot)) - | ( Prim (loc, I_SET_DELEGATE, [], annot), - Item_t (Option_t (Key_hash_t _, _), rest, _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Set_delegate (Item_t (Operation_t None, rest, annot)) + >>?= fun (Eq, ctxt) -> + typed ctxt loc Transfer_tokens (Item_t (Operation_t, rest)) + | (Prim (loc, I_SET_DELEGATE, [], _annot), Item_t (Option_t Key_hash_t, rest)) + -> + typed ctxt loc Set_delegate (Item_t (Operation_t, rest)) | (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 -> - typed - ctxt - loc - Implicit_account - (Item_t (Contract_t (Unit_t None, None), rest, annot)) - | ( Prim (loc, I_CREATE_CONTRACT, [(Seq _ as code)], annot), - Item_t - ( Option_t (Key_hash_t _, _), - Item_t (Mutez_t _, Item_t (ginit, rest, _), _), - _ ) ) -> - parse_two_var_annot loc annot - >>?= fun (op_annot, addr_annot) -> + | (Prim (loc, I_IMPLICIT_ACCOUNT, [], _annot), Item_t (Key_hash_t, rest)) -> + typed ctxt loc Implicit_account (Item_t (Contract_t Unit_t, rest)) + | ( Prim (loc, I_CREATE_CONTRACT, [(Seq _ as code)], _annot), + Item_t (Option_t Key_hash_t, Item_t (Mutez_t, Item_t (ginit, rest))) ) -> let canonical_code = fst @@ Micheline.extract_locations code in parse_toplevel ~legacy canonical_code - >>?= fun (arg_type, storage_type, code_field, root_name) -> + >>?= fun {arg_type; storage_type; code_field; root_name} -> record_trace (Ill_formed_type (Some "parameter", canonical_code, location arg_type)) - (parse_parameter_ty ctxt ~legacy arg_type) - >>?= fun (Ex_ty arg_type, ctxt) -> - (if legacy then ok_unit else well_formed_entrypoints ~root_name arg_type) - >>?= fun () -> + (parse_parameter_ty_and_entrypoints ctxt ~legacy ~root_name arg_type) + >>?= fun (Ex_parameter_ty_entrypoints (arg_type, entrypoints), ctxt) -> record_trace (Ill_formed_type (Some "storage", canonical_code, location storage_type)) (parse_storage_ty ctxt ~legacy storage_type) >>?= fun (Ex_ty storage_type, ctxt) -> - let arg_annot = - default_annot - (type_to_var_annot (name_of_ty arg_type)) - ~default:default_param_annot - in - let storage_annot = - default_annot - (type_to_var_annot (name_of_ty storage_type)) - ~default:default_storage_annot - in - let arg_type_full = - Pair_t - ( (arg_type, None, arg_annot), - (storage_type, None, storage_annot), - None ) - in - let ret_type_full = - Pair_t - ( (List_t (Operation_t None, None), None, None), - (storage_type, None, None), - None ) - in + let arg_type_full = Pair_t (arg_type, storage_type) in + let ret_type_full = Pair_t (List_t Operation_t, storage_type) in trace (Ill_typed_contract (canonical_code, [])) (parse_returning - (Toplevel - { - storage_type; - param_type = arg_type; - root_name; - legacy_create_contract_literal = false; - }) + (Toplevel {storage_type; param_type = arg_type; entrypoints}) ctxt ~legacy ?type_logger ~stack_depth - (arg_type_full, None) + arg_type_full ret_type_full code_field) >>=? fun ( ( Lam - ( { bef = Item_t (arg, Empty_t, _); - aft = Item_t (ret, Empty_t, _); + ( { bef = Item_t (arg, Empty_t); + aft = Item_t (ret, Empty_t); _ }, _ ) as lambda ), ctxt ) -> - merge_types ~legacy ctxt loc arg arg_type_full - >>?= fun (Eq, _, ctxt) -> - merge_types ~legacy ctxt loc ret ret_type_full - >>?= fun (Eq, _, ctxt) -> - merge_types ~legacy ctxt loc storage_type ginit - >>?= fun (Eq, _, ctxt) -> + ty_eq ctxt arg arg_type_full + >>?= fun (Eq, ctxt) -> + ty_eq ctxt ret ret_type_full + >>?= fun (Eq, ctxt) -> + ty_eq ctxt storage_type ginit + >>?= fun (Eq, ctxt) -> typed ctxt loc - (Create_contract (storage_type, arg_type, lambda, root_name)) - (Item_t - ( Operation_t None, - Item_t (Address_t None, rest, addr_annot), - op_annot )) - | (Prim (loc, I_NOW, [], annot), stack) -> - parse_var_annot loc annot ~default:default_now_annot - >>?= fun annot -> - typed ctxt loc Now (Item_t (Timestamp_t None, stack, annot)) - | (Prim (loc, I_AMOUNT, [], annot), stack) -> - parse_var_annot loc annot ~default:default_amount_annot - >>?= fun annot -> - typed ctxt loc Amount (Item_t (Mutez_t None, stack, annot)) - | (Prim (loc, I_CHAIN_ID, [], annot), stack) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc ChainId (Item_t (Chain_id_t None, stack, annot)) - | (Prim (loc, I_BALANCE, [], annot), stack) -> - parse_var_annot loc annot ~default:default_balance_annot - >>?= fun annot -> - typed ctxt loc Balance (Item_t (Mutez_t None, stack, annot)) - | (Prim (loc, I_LEVEL, [], annot), stack) -> - parse_var_annot loc annot ~default:default_level_annot - >>?= fun annot -> - typed ctxt loc Level (Item_t (Nat_t None, stack, annot)) - | (Prim (loc, I_VOTING_POWER, [], annot), Item_t (Key_hash_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Voting_power (Item_t (Nat_t None, rest, annot)) - | (Prim (loc, I_TOTAL_VOTING_POWER, [], annot), stack) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Total_voting_power (Item_t (Nat_t None, stack, annot)) + (Create_contract (storage_type, arg_type, lambda, entrypoints)) + (Item_t (Operation_t, Item_t (Address_t, rest))) + | (Prim (loc, I_NOW, [], _annot), stack) -> + typed ctxt loc Now (Item_t (Timestamp_t, stack)) + | (Prim (loc, I_AMOUNT, [], _annot), stack) -> + typed ctxt loc Amount (Item_t (Mutez_t, stack)) + | (Prim (loc, I_CHAIN_ID, [], _annot), stack) -> + typed ctxt loc ChainId (Item_t (Chain_id_t, stack)) + | (Prim (loc, I_BALANCE, [], _annot), stack) -> + typed ctxt loc Balance (Item_t (Mutez_t, stack)) + | (Prim (loc, I_LEVEL, [], _annot), stack) -> + typed ctxt loc Level (Item_t (Nat_t, stack)) + | (Prim (loc, I_VOTING_POWER, [], _annot), Item_t (Key_hash_t, rest)) -> + typed ctxt loc Voting_power (Item_t (Nat_t, rest)) + | (Prim (loc, I_TOTAL_VOTING_POWER, [], _annot), stack) -> + typed ctxt loc Total_voting_power (Item_t (Nat_t, 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 -> - typed ctxt loc Source (Item_t (Address_t None, stack, annot)) - | (Prim (loc, I_SENDER, [], annot), stack) -> - parse_var_annot loc annot ~default:default_sender_annot - >>?= fun annot -> - typed ctxt loc Sender (Item_t (Address_t None, stack, annot)) + | (Prim (loc, I_SOURCE, [], _annot), stack) -> + typed ctxt loc Source (Item_t (Address_t, stack)) + | (Prim (loc, I_SENDER, [], _annot), stack) -> + typed ctxt loc Sender (Item_t (Address_t, stack)) | (Prim (loc, I_SELF, [], annot), stack) -> Lwt.return - ( parse_entrypoint_annot loc annot ~default:default_self_annot - >>? fun (annot, entrypoint) -> + ( parse_entrypoint_annot loc annot + >>? fun entrypoint -> let entrypoint = Option.fold ~some:(fun (Field_annot annot) -> annot) @@ -5241,246 +4263,97 @@ and parse_instr : error (Self_in_lambda loc) | Dip (_, prev) -> get_toplevel_type prev - | Toplevel - {param_type; root_name; legacy_create_contract_literal = false} - -> - find_entrypoint param_type ~root_name entrypoint + | Toplevel {param_type; entrypoints} -> + find_entrypoint param_type entrypoints entrypoint >>? fun (_, Ex_ty param_type) -> typed_no_lwt ctxt loc (Self (param_type, entrypoint)) - (Item_t (Contract_t (param_type, None), stack, annot)) - | Toplevel - {param_type; root_name = _; legacy_create_contract_literal = true} - -> - typed_no_lwt - ctxt - loc - (Self (param_type, "default")) - (Item_t (Contract_t (param_type, None), stack, annot)) + (Item_t (Contract_t param_type, stack)) in get_toplevel_type tc_context ) - | (Prim (loc, I_SELF_ADDRESS, [], annot), stack) -> - parse_var_annot loc annot ~default:default_self_annot - >>?= fun annot -> - typed ctxt loc Self_address (Item_t (Address_t None, stack, annot)) + | (Prim (loc, I_SELF_ADDRESS, [], _annot), stack) -> + typed ctxt loc Self_address (Item_t (Address_t, stack)) (* cryptography *) - | (Prim (loc, I_HASH_KEY, [], annot), Item_t (Key_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Hash_key (Item_t (Key_hash_t None, rest, annot)) - | ( 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 -> - typed ctxt loc Check_signature (Item_t (Bool_t None, rest, annot)) - | (Prim (loc, I_BLAKE2B, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Blake2b (Item_t (Bytes_t None, rest, annot)) - | (Prim (loc, I_SHA256, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Sha256 (Item_t (Bytes_t None, rest, annot)) - | (Prim (loc, I_SHA512, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Sha512 (Item_t (Bytes_t None, rest, annot)) - | (Prim (loc, I_KECCAK, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Keccak (Item_t (Bytes_t None, rest, annot)) - | (Prim (loc, I_SHA3, [], annot), Item_t (Bytes_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Sha3 (Item_t (Bytes_t None, rest, annot)) - | ( 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed - ctxt - loc - Add_bls12_381_g1 - (Item_t (Bls12_381_g1_t tname, rest, annot)) - | ( 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed - ctxt - loc - Add_bls12_381_g2 - (Item_t (Bls12_381_g2_t tname, rest, annot)) - | ( 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 -> - merge_type_annot ~legacy tn1 tn2 - >>?= fun tname -> - typed - ctxt - loc - Add_bls12_381_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | ( 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 -> - typed - ctxt - loc - Mul_bls12_381_g1 - (Item_t (Bls12_381_g1_t tname, rest, annot)) - | ( 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 -> - typed - ctxt - loc - Mul_bls12_381_g2 - (Item_t (Bls12_381_g2_t tname, rest, annot)) - | ( 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 -> - typed - ctxt - loc - Mul_bls12_381_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Nat_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_fr_z - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Int_t tname, Item_t (Bls12_381_fr_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_fr_z - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_fr_t tname, Item_t (Int_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_z_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | ( Prim (loc, I_MUL, [], annot), - Item_t (Bls12_381_fr_t tname, Item_t (Nat_t _, rest, _), _) ) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Mul_bls12_381_z_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | (Prim (loc, I_INT, [], annot), Item_t (Bls12_381_fr_t _, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed ctxt loc Int_bls12_381_fr (Item_t (Int_t None, rest, annot)) - | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g1_t tname, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Neg_bls12_381_g1 - (Item_t (Bls12_381_g1_t tname, rest, annot)) - | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_g2_t tname, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Neg_bls12_381_g2 - (Item_t (Bls12_381_g2_t tname, rest, annot)) - | (Prim (loc, I_NEG, [], annot), Item_t (Bls12_381_fr_t tname, rest, _)) -> - parse_var_annot loc annot - >>?= fun annot -> - typed - ctxt - loc - Neg_bls12_381_fr - (Item_t (Bls12_381_fr_t tname, rest, annot)) - | ( 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 -> - typed - ctxt - loc - Pairing_check_bls12_381 - (Item_t (Bool_t None, rest, annot)) + | (Prim (loc, I_HASH_KEY, [], _annot), Item_t (Key_t, rest)) -> + typed ctxt loc Hash_key (Item_t (Key_hash_t, rest)) + | ( Prim (loc, I_CHECK_SIGNATURE, [], _annot), + Item_t (Key_t, Item_t (Signature_t, Item_t (Bytes_t, rest))) ) -> + typed ctxt loc Check_signature (Item_t (Bool_t, rest)) + | (Prim (loc, I_BLAKE2B, [], _annot), Item_t (Bytes_t, rest)) -> + typed ctxt loc Blake2b (Item_t (Bytes_t, rest)) + | (Prim (loc, I_SHA256, [], _annot), Item_t (Bytes_t, rest)) -> + typed ctxt loc Sha256 (Item_t (Bytes_t, rest)) + | (Prim (loc, I_SHA512, [], _annot), Item_t (Bytes_t, rest)) -> + typed ctxt loc Sha512 (Item_t (Bytes_t, rest)) + | (Prim (loc, I_KECCAK, [], _annot), Item_t (Bytes_t, rest)) -> + typed ctxt loc Keccak (Item_t (Bytes_t, rest)) + | (Prim (loc, I_SHA3, [], _annot), Item_t (Bytes_t, rest)) -> + typed ctxt loc Sha3 (Item_t (Bytes_t, rest)) + | ( Prim (loc, I_ADD, [], _annot), + Item_t (Bls12_381_g1_t, Item_t (Bls12_381_g1_t, rest)) ) -> + typed ctxt loc Add_bls12_381_g1 (Item_t (Bls12_381_g1_t, rest)) + | ( Prim (loc, I_ADD, [], _annot), + Item_t (Bls12_381_g2_t, Item_t (Bls12_381_g2_t, rest)) ) -> + typed ctxt loc Add_bls12_381_g2 (Item_t (Bls12_381_g2_t, rest)) + | ( Prim (loc, I_ADD, [], _annot), + Item_t (Bls12_381_fr_t, Item_t (Bls12_381_fr_t, rest)) ) -> + typed ctxt loc Add_bls12_381_fr (Item_t (Bls12_381_fr_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Bls12_381_g1_t, Item_t (Bls12_381_fr_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_g1 (Item_t (Bls12_381_g1_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Bls12_381_g2_t, Item_t (Bls12_381_fr_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_g2 (Item_t (Bls12_381_g2_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Bls12_381_fr_t, Item_t (Bls12_381_fr_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_fr (Item_t (Bls12_381_fr_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Nat_t, Item_t (Bls12_381_fr_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_fr_z (Item_t (Bls12_381_fr_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Int_t, Item_t (Bls12_381_fr_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_fr_z (Item_t (Bls12_381_fr_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Bls12_381_fr_t, Item_t (Int_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_z_fr (Item_t (Bls12_381_fr_t, rest)) + | ( Prim (loc, I_MUL, [], _annot), + Item_t (Bls12_381_fr_t, Item_t (Nat_t, rest)) ) -> + typed ctxt loc Mul_bls12_381_z_fr (Item_t (Bls12_381_fr_t, rest)) + | (Prim (loc, I_INT, [], _annot), Item_t (Bls12_381_fr_t, rest)) -> + typed ctxt loc Int_bls12_381_fr (Item_t (Int_t, rest)) + | (Prim (loc, I_NEG, [], _annot), Item_t (Bls12_381_g1_t, rest)) -> + typed ctxt loc Neg_bls12_381_g1 (Item_t (Bls12_381_g1_t, rest)) + | (Prim (loc, I_NEG, [], _annot), Item_t (Bls12_381_g2_t, rest)) -> + typed ctxt loc Neg_bls12_381_g2 (Item_t (Bls12_381_g2_t, rest)) + | (Prim (loc, I_NEG, [], _annot), Item_t (Bls12_381_fr_t, rest)) -> + typed ctxt loc Neg_bls12_381_fr (Item_t (Bls12_381_fr_t, rest)) + | ( Prim (loc, I_PAIRING_CHECK, [], _annot), + Item_t (List_t (Pair_t (Bls12_381_g1_t, Bls12_381_g2_t)), rest) ) -> + typed ctxt loc Pairing_check_bls12_381 (Item_t (Bool_t, rest)) (* 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))) -> comparable_ty_of_ty ctxt loc t - >>?= fun (ty, ctxt) -> - typed ctxt loc Ticket (Item_t (Ticket_t (ty, None), rest, annot)) - | ( Prim (loc, I_READ_TICKET, [], annot), - (Item_t (Ticket_t (t, _), _, _) as full_stack) ) -> - parse_var_annot loc annot - >>?= fun annot -> + >>?= fun (ty, ctxt) -> typed ctxt loc Ticket (Item_t (Ticket_t ty, rest)) + | ( Prim (loc, I_READ_TICKET, [], _annot), + (Item_t (Ticket_t t, _) as full_stack) ) -> let () = check_dupable_comparable_ty t in let result = ty_of_comparable_ty @@ opened_ticket_type t in - typed ctxt loc Read_ticket (Item_t (result, full_stack, annot)) - | ( 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 -> + typed ctxt loc Read_ticket (Item_t (result, full_stack)) + | ( Prim (loc, I_SPLIT_TICKET, [], _annot), + Item_t ((Ticket_t t as ticket_t), Item_t (Pair_t (Nat_t, Nat_t), rest)) + ) -> let () = check_dupable_comparable_ty t in - let result = - Option_t - (Pair_t ((ticket_t, fa_a, a_a), (ticket_t, fa_b, a_b), None), None) - in - typed ctxt loc Split_ticket (Item_t (result, rest, annot)) - | ( Prim (loc, I_JOIN_TICKETS, [], annot), + let result = Option_t (Pair_t (ticket_t, ticket_t)) in + typed ctxt loc Split_ticket (Item_t (result, rest)) + | ( 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 -> - merge_types ~legacy ctxt loc ty_a ty_b - >>?= fun (Eq, ty, ctxt) -> - match ty with - | Ticket_t (contents_ty, _) -> - typed - ctxt - loc - (Join_tickets contents_ty) - (Item_t (Option_t (ty, None), rest, annot)) - | _ -> - (* TODO: fix injectivity of types *) assert false ) + (Pair_t ((Ticket_t contents_ty as ty_a), (Ticket_t _ as ty_b)), rest) + ) -> + ty_eq ctxt ty_a ty_b + >>?= fun (Eq, ctxt) -> + typed ctxt loc (Join_tickets contents_ty) (Item_t (Option_t ty_a, rest)) (* Primitive parsing errors *) | ( Prim ( loc, @@ -5607,7 +4480,7 @@ and parse_instr : | I_PAIRING_CHECK ) as name ), [], _ ), - Item_t (ta, Item_t (tb, _, _), _) ) -> + Item_t (ta, Item_t (tb, _)) ) -> serialize_ty_for_error ctxt ta >>?= fun (ta, ctxt) -> serialize_ty_for_error ctxt tb @@ -5629,7 +4502,7 @@ and parse_instr : | I_CONCAT ) as name ), [], _ ), - Item_t (t, _, _) ) -> + Item_t (t, _) ) -> serialize_ty_for_error ctxt t >>?= fun (t, _ctxt) -> fail (Undefined_unop (loc, name, t)) | (Prim (loc, ((I_UPDATE | I_SLICE) as name), [], _), stack) -> @@ -5823,14 +4696,13 @@ and parse_instr : and parse_contract : type arg. - legacy:bool -> context -> Script.location -> arg ty -> Contract.t -> entrypoint:string -> (context * arg typed_contract) tzresult Lwt.t = - fun ~legacy ctxt loc arg contract ~entrypoint -> + fun ctxt loc arg contract ~entrypoint -> Gas.consume ctxt Typecheck_costs.contract_exists >>?= fun ctxt -> Contract.exists ctxt contract @@ -5845,7 +4717,7 @@ and parse_contract : @@ match code with | None -> ( - ty_eq ctxt loc arg (Unit_t None) + ty_eq ctxt arg Unit_t >>? fun (Eq, ctxt) -> match entrypoint with | "default" -> @@ -5859,17 +4731,19 @@ and parse_contract : Script.force_decode_in_context ctxt code >>? fun (code, ctxt) -> parse_toplevel ~legacy:true code - >>? fun (arg_type, _, _, root_name) -> - parse_parameter_ty ctxt ~legacy:true arg_type - >>? fun (Ex_ty targ, ctxt) -> + >>? fun {arg_type; root_name; _} -> + parse_parameter_ty_and_entrypoints + ctxt + ~legacy:true + ~root_name + arg_type + >>? fun (Ex_parameter_ty_entrypoints (targ, entrypoints), ctxt) -> find_entrypoint_for_type - ~legacy ~full:targ ~expected:arg - ~root_name + entrypoints entrypoint ctxt - loc >|? fun (ctxt, entrypoint, arg) -> let contract : arg typed_contract = (arg, (contract, entrypoint)) in (ctxt, contract) ) @@ -5880,21 +4754,20 @@ and parse_contract : This can still fail on gas exhaustion. *) and parse_contract_for_script : type arg. - legacy:bool -> context -> Script.location -> arg ty -> Contract.t -> entrypoint:string -> (context * arg typed_contract option) tzresult Lwt.t = - fun ~legacy ctxt loc arg contract ~entrypoint -> + fun ctxt loc arg contract ~entrypoint -> Gas.consume ctxt Typecheck_costs.contract_exists >>?= fun ctxt -> match (Contract.is_implicit contract, entrypoint) with | (Some _, "default") -> (* An implicit account on the "default" entrypoint always exists and has type unit. *) Lwt.return - ( match ty_eq ctxt loc arg (Unit_t None) with + ( match ty_eq ctxt arg Unit_t with | Ok (Eq, ctxt) -> let contract : arg typed_contract = (arg, (contract, entrypoint)) @@ -5931,20 +4804,25 @@ and parse_contract_for_script : match parse_toplevel ~legacy:true code with | Error _ -> error (Invalid_contract (loc, contract)) - | Ok (arg_type, _, _, root_name) -> ( - match parse_parameter_ty ctxt ~legacy:true arg_type with + | Ok {arg_type; root_name; _} -> ( + match + parse_parameter_ty_and_entrypoints + ctxt + ~legacy:true + ~root_name + arg_type + with | Error _ -> error (Invalid_contract (loc, contract)) - | Ok (Ex_ty targ, ctxt) -> ( + | Ok (Ex_parameter_ty_entrypoints (targ, entrypoints), ctxt) + -> ( match find_entrypoint_for_type - ~legacy ~full:targ ~expected:arg - ~root_name + entrypoints entrypoint ctxt - loc >|? fun (ctxt, entrypoint, arg) -> let contract : arg typed_contract = (arg, (contract, entrypoint)) @@ -5956,13 +4834,10 @@ and parse_contract_for_script : | Error _ -> (* overapproximation by checking if targ = targ, can only fail because of gas *) - merge_types ~legacy ctxt loc targ targ - >|? fun (Eq, _, ctxt) -> (ctxt, None) ) ) ) ) ) + ty_eq ctxt targ targ >|? fun (Eq, ctxt) -> (ctxt, None) + ) ) ) ) ) -and parse_toplevel : - legacy:bool -> - Script.expr -> - (Script.node * Script.node * Script.node * field_annot option) tzresult = +and parse_toplevel : legacy:bool -> Script.expr -> toplevel tzresult = fun ~legacy toplevel -> record_trace (Ill_typed_contract (toplevel, [])) @@ @@ -6036,21 +4911,18 @@ and parse_toplevel : | [single] when Compare.Int.(String.length single > 0) && Compare.Char.(single.[0] = '%') -> - parse_field_annot ploc [single] + parse_field_annot ploc single >>? fun pannot -> ok (p, [], pannot) | _ -> ok (p, pannot, None) ) in - if legacy then + ( if legacy then (* legacy semantics ignores spurious annotations *) - let (p, root_name) = - match maybe_root_name with - | Ok (p, _, root_name) -> - (p, root_name) - | Error _ -> - (p, None) - in - ok (p, s, c, root_name) + match maybe_root_name with + | Ok (p, _, root_name) -> + ok (p, root_name) + | Error _ -> + ok (p, None) else (* only one field annot is allowed to set the root entrypoint name *) maybe_root_name @@ -6060,7 +4932,9 @@ and parse_toplevel : Script_ir_annot.error_unexpected_annot cloc carrot >>? fun () -> Script_ir_annot.error_unexpected_annot sloc sannot - >>? fun () -> ok (p, s, c, root_name) ) + >|? fun () -> (p, root_name) ) + >|? fun (arg_type, root_name) -> + {code_field = c; arg_type; root_name; storage_type = s} ) let parse_code : ?type_logger:type_logger -> @@ -6072,56 +4946,30 @@ let parse_code : Script.force_decode_in_context ctxt code >>?= fun (code, ctxt) -> parse_toplevel ~legacy code - >>?= fun (arg_type, storage_type, code_field, root_name) -> + >>?= fun {arg_type; storage_type; code_field; root_name} -> record_trace (Ill_formed_type (Some "parameter", code, location arg_type)) - (parse_parameter_ty ctxt ~legacy arg_type) - >>?= fun (Ex_ty arg_type, ctxt) -> - (if legacy then ok_unit else well_formed_entrypoints ~root_name arg_type) - >>?= fun () -> + (parse_parameter_ty_and_entrypoints ctxt ~legacy ~root_name arg_type) + >>?= fun (Ex_parameter_ty_entrypoints (arg_type, entrypoints), ctxt) -> record_trace (Ill_formed_type (Some "storage", code, location storage_type)) (parse_storage_ty ctxt ~legacy storage_type) >>?= fun (Ex_ty storage_type, ctxt) -> - let arg_annot = - default_annot - (type_to_var_annot (name_of_ty arg_type)) - ~default:default_param_annot - in - let storage_annot = - default_annot - (type_to_var_annot (name_of_ty storage_type)) - ~default:default_storage_annot - in - let arg_type_full = - Pair_t - ((arg_type, None, arg_annot), (storage_type, None, storage_annot), None) - in - let ret_type_full = - Pair_t - ( (List_t (Operation_t None, None), None, None), - (storage_type, None, None), - None ) - in + let arg_type_full = Pair_t (arg_type, storage_type) in + let ret_type_full = Pair_t (List_t Operation_t, storage_type) in trace (Ill_typed_contract (code, [])) (parse_returning - (Toplevel - { - storage_type; - param_type = arg_type; - root_name; - legacy_create_contract_literal = false; - }) + (Toplevel {storage_type; param_type = arg_type; entrypoints}) ctxt ~legacy ~stack_depth:0 ?type_logger - (arg_type_full, None) + arg_type_full ret_type_full code_field) >|=? fun (code, ctxt) -> - (Ex_code {code; arg_type; storage_type; root_name}, ctxt) + (Ex_code {code; arg_type; storage_type; entrypoints}, ctxt) let parse_storage : ?type_logger:type_logger -> @@ -6158,7 +5006,7 @@ let parse_script : (ex_script * context) tzresult Lwt.t = fun ?type_logger ctxt ~legacy ~allow_forged_in_storage {code; storage} -> parse_code ~legacy ctxt ?type_logger ~code - >>=? fun (Ex_code {code; arg_type; storage_type; root_name}, ctxt) -> + >>=? fun (Ex_code {code; arg_type; storage_type; entrypoints}, ctxt) -> parse_storage ?type_logger ctxt @@ -6167,7 +5015,7 @@ let parse_script : storage_type ~storage >|=? fun (storage, ctxt) -> - (Ex_script {code; arg_type; storage; storage_type; root_name}, ctxt) + (Ex_script {code; arg_type; storage; storage_type; entrypoints}, ctxt) let typecheck_code : legacy:bool -> @@ -6176,53 +5024,27 @@ let typecheck_code : (type_map * context) tzresult Lwt.t = fun ~legacy ctxt code -> parse_toplevel ~legacy code - >>?= fun (arg_type, storage_type, code_field, root_name) -> + >>?= fun {arg_type; storage_type; code_field; root_name} -> let type_map = ref [] in record_trace (Ill_formed_type (Some "parameter", code, location arg_type)) - (parse_parameter_ty ctxt ~legacy arg_type) - >>?= fun (Ex_ty arg_type, ctxt) -> - (if legacy then ok_unit else well_formed_entrypoints ~root_name arg_type) - >>?= fun () -> + (parse_parameter_ty_and_entrypoints ctxt ~legacy ~root_name arg_type) + >>?= fun (Ex_parameter_ty_entrypoints (arg_type, entrypoints), ctxt) -> record_trace (Ill_formed_type (Some "storage", code, location storage_type)) (parse_storage_ty ctxt ~legacy storage_type) >>?= fun (Ex_ty storage_type, ctxt) -> - let arg_annot = - default_annot - (type_to_var_annot (name_of_ty arg_type)) - ~default:default_param_annot - in - let storage_annot = - default_annot - (type_to_var_annot (name_of_ty storage_type)) - ~default:default_storage_annot - in - let arg_type_full = - Pair_t - ((arg_type, None, arg_annot), (storage_type, None, storage_annot), None) - in - let ret_type_full = - Pair_t - ( (List_t (Operation_t None, None), None, None), - (storage_type, None, None), - None ) - in + let arg_type_full = Pair_t (arg_type, storage_type) in + let ret_type_full = Pair_t (List_t Operation_t, storage_type) in let result = parse_returning - (Toplevel - { - storage_type; - param_type = arg_type; - root_name; - legacy_create_contract_literal = false; - }) + (Toplevel {storage_type; param_type = arg_type; entrypoints}) ctxt ~legacy ~stack_depth:0 ~type_logger:(fun loc bef aft -> type_map := (loc, (bef, aft)) :: !type_map) - (arg_type_full, None) + arg_type_full ret_type_full code_field in @@ -6231,70 +5053,64 @@ let typecheck_code : module Entrypoints_map = Map.Make (String) -let list_entrypoints (type full) (full : full ty) ctxt ~root_name = - let merge path annot (type t) (ty : t ty) reachable +let list_entrypoints ctxt (type full) (full : full ty) + (entrypoints : full entrypoints) = + let merge path (type t) (ty : t ty) (entrypoints : t entrypoints) reachable ((unreachables, all) as acc) = - match annot with - | None | Some (Field_annot "") -> ( + match entrypoints with + | {name = None | Some (Field_annot ""); _} -> ok - @@ - if reachable then acc - else - match ty with - | Union_t _ -> - acc - | _ -> - (List.rev path :: unreachables, all) ) - | Some (Field_annot name) -> + ( ( if reachable then acc + else + match ty with + | Union_t _ -> + acc + | _ -> + (List.rev path :: unreachables, all) ), + reachable ) + | {name = Some (Field_annot name); _} -> if Compare.Int.(String.length name > 31) then - ok (List.rev path :: unreachables, all) + ok ((List.rev path :: unreachables, all), true) else if Entrypoints_map.mem name all then - ok (List.rev path :: unreachables, all) + ok ((List.rev path :: unreachables, all), true) else unparse_ty ctxt ty >>? fun (unparsed_ty, _) -> ok - ( unreachables, - Entrypoints_map.add name (List.rev path, unparsed_ty) all ) + ( ( unreachables, + Entrypoints_map.add name (List.rev path, unparsed_ty) all ), + true ) in let rec fold_tree : type t. t ty -> + t entrypoints -> prim list -> bool -> prim list list * (prim list * Script.node) Entrypoints_map.t -> (prim list list * (prim list * Script.node) Entrypoints_map.t) tzresult = - fun t path reachable acc -> - match t with - | Union_t ((tl, al), (tr, ar), _) -> - merge (D_Left :: path) al tl reachable acc - >>? fun acc -> - merge (D_Right :: path) ar tr reachable acc - >>? fun acc -> - fold_tree - tl - (D_Left :: path) - (match al with Some _ -> true | None -> reachable) - acc - >>? fun acc -> - fold_tree - tr - (D_Right :: path) - (match ar with Some _ -> true | None -> reachable) - acc + fun t entrypoints path reachable acc -> + match (t, entrypoints) with + | (Union_t (tl, tr), {nested = Entrypoints_Union {left; right}; _}) -> + merge (D_Left :: path) tl left reachable acc + >>? fun (acc, l_reachable) -> + merge (D_Right :: path) tr right reachable acc + >>? fun (acc, r_reachable) -> + fold_tree tl left (D_Left :: path) l_reachable acc + >>? fun acc -> fold_tree tr right (D_Right :: path) r_reachable acc | _ -> ok acc in unparse_ty ctxt full >>? fun (unparsed_full, _) -> let (init, reachable) = - match root_name with - | None | Some (Field_annot "") -> + match entrypoints with + | {name = None | Some (Field_annot ""); _} -> (Entrypoints_map.empty, false) - | Some (Field_annot name) -> + | {name = Some (Field_annot name); _} -> (Entrypoints_map.singleton name ([], unparsed_full), true) in - fold_tree full [] reachable ([], init) + fold_tree full entrypoints [] reachable ([], init) (* ---- Unparsing (Typed IR -> Untyped expressions) --------------------------*) @@ -6489,7 +5305,7 @@ let unparse_option unparse_v ctxt = function let comparable_comb_witness2 : type t. t comparable_ty -> (t, unit -> unit -> unit) comb_witness = function - | Pair_key (_, (Pair_key _, _), _) -> + | Pair_key (_, Pair_key _) -> Comb_Pair (Comb_Pair Comb_Any) | Pair_key _ -> Comb_Pair Comb_Any @@ -6513,52 +5329,52 @@ let rec unparse_comparable_data : [unparse_data] for now. *) >>?= fun ctxt -> match (ty, a) with - | (Unit_key _, v) -> + | (Unit_key, v) -> Lwt.return @@ unparse_unit ctxt v - | (Int_key _, v) -> + | (Int_key, v) -> Lwt.return @@ unparse_int ctxt v - | (Nat_key _, v) -> + | (Nat_key, v) -> Lwt.return @@ unparse_nat ctxt v - | (String_key _, s) -> + | (String_key, s) -> Lwt.return @@ unparse_string ctxt s - | (Bytes_key _, s) -> + | (Bytes_key, s) -> Lwt.return @@ unparse_bytes ctxt s - | (Bool_key _, b) -> + | (Bool_key, b) -> Lwt.return @@ unparse_bool ctxt b - | (Timestamp_key _, t) -> + | (Timestamp_key, t) -> Lwt.return @@ unparse_timestamp ctxt mode t - | (Address_key _, address) -> + | (Address_key, address) -> Lwt.return @@ unparse_address ctxt mode address - | (Signature_key _, s) -> + | (Signature_key, s) -> Lwt.return @@ unparse_signature ctxt mode s - | (Mutez_key _, v) -> + | (Mutez_key, v) -> Lwt.return @@ unparse_mutez ctxt v - | (Key_key _, k) -> + | (Key_key, k) -> Lwt.return @@ unparse_key ctxt mode k - | (Key_hash_key _, k) -> + | (Key_hash_key, k) -> Lwt.return @@ unparse_key_hash ctxt mode k - | (Chain_id_key _, chain_id) -> + | (Chain_id_key, chain_id) -> Lwt.return @@ unparse_chain_id ctxt mode chain_id - | (Pair_key ((tl, _), (tr, _), _), pair) -> + | (Pair_key (tl, tr), pair) -> let r_witness = comparable_comb_witness2 tr in let unparse_l ctxt v = unparse_comparable_data ctxt mode tl v in let unparse_r ctxt v = unparse_comparable_data ctxt mode tr v in unparse_pair unparse_l unparse_r ctxt mode r_witness pair - | (Union_key ((tl, _), (tr, _), _), v) -> + | (Union_key (tl, tr), v) -> let unparse_l ctxt v = unparse_comparable_data ctxt mode tl v in let unparse_r ctxt v = unparse_comparable_data ctxt mode tr v in unparse_union unparse_l unparse_r ctxt v - | (Option_key (t, _), v) -> + | (Option_key t, v) -> let unparse_v ctxt v = unparse_comparable_data ctxt mode t v in unparse_option unparse_v ctxt v - | (Never_key _, _) -> + | (Never_key, _) -> . (* -- Unparsing data of any type -- *) let comb_witness2 : type t. t ty -> (t, unit -> unit -> unit) comb_witness = function - | Pair_t (_, (Pair_t _, _, _), _) -> + | Pair_t (_, Pair_t _) -> Comb_Pair (Comb_Pair Comb_Any) | Pair_t _ -> Comb_Pair Comb_Any @@ -6582,55 +5398,55 @@ let rec unparse_data : else unparse_data ctxt ~stack_depth:(stack_depth + 1) mode ty a in match (ty, a) with - | (Unit_t _, v) -> + | (Unit_t, v) -> Lwt.return @@ unparse_unit ctxt v - | (Int_t _, v) -> + | (Int_t, v) -> Lwt.return @@ unparse_int ctxt v - | (Nat_t _, v) -> + | (Nat_t, v) -> Lwt.return @@ unparse_nat ctxt v - | (String_t _, s) -> + | (String_t, s) -> Lwt.return @@ unparse_string ctxt s - | (Bytes_t _, s) -> + | (Bytes_t, s) -> Lwt.return @@ unparse_bytes ctxt s - | (Bool_t _, b) -> + | (Bool_t, b) -> Lwt.return @@ unparse_bool ctxt b - | (Timestamp_t _, t) -> + | (Timestamp_t, t) -> Lwt.return @@ unparse_timestamp ctxt mode t - | (Address_t _, address) -> + | (Address_t, address) -> Lwt.return @@ unparse_address ctxt mode address | (Contract_t _, contract) -> Lwt.return @@ unparse_contract ctxt mode contract - | (Signature_t _, s) -> + | (Signature_t, s) -> Lwt.return @@ unparse_signature ctxt mode s - | (Mutez_t _, v) -> + | (Mutez_t, v) -> Lwt.return @@ unparse_mutez ctxt v - | (Key_t _, k) -> + | (Key_t, k) -> Lwt.return @@ unparse_key ctxt mode k - | (Key_hash_t _, k) -> + | (Key_hash_t, k) -> Lwt.return @@ unparse_key_hash ctxt mode k - | (Operation_t _, operation) -> + | (Operation_t, operation) -> Lwt.return @@ unparse_operation ctxt operation - | (Chain_id_t _, chain_id) -> + | (Chain_id_t, chain_id) -> Lwt.return @@ unparse_chain_id ctxt mode chain_id - | (Bls12_381_g1_t _, x) -> + | (Bls12_381_g1_t, x) -> Lwt.return @@ unparse_bls12_381_g1 ctxt x - | (Bls12_381_g2_t _, x) -> + | (Bls12_381_g2_t, x) -> Lwt.return @@ unparse_bls12_381_g2 ctxt x - | (Bls12_381_fr_t _, x) -> + | (Bls12_381_fr_t, x) -> Lwt.return @@ unparse_bls12_381_fr ctxt x - | (Pair_t ((tl, _, _), (tr, _, _), _), pair) -> + | (Pair_t (tl, tr), pair) -> let r_witness = comb_witness2 tr in let unparse_l ctxt v = non_terminal_recursion ctxt mode tl v in let unparse_r ctxt v = non_terminal_recursion ctxt mode tr v in unparse_pair unparse_l unparse_r ctxt mode r_witness pair - | (Union_t ((tl, _), (tr, _), _), v) -> + | (Union_t (tl, tr), v) -> let unparse_l ctxt v = non_terminal_recursion ctxt mode tl v in let unparse_r ctxt v = non_terminal_recursion ctxt mode tr v in unparse_union unparse_l unparse_r ctxt v - | (Option_t (t, _), v) -> + | (Option_t t, v) -> let unparse_v ctxt v = non_terminal_recursion ctxt mode t v in unparse_option unparse_v ctxt v - | (List_t (t, _), items) -> + | (List_t t, items) -> fold_left_s (fun (l, ctxt) element -> non_terminal_recursion ctxt mode t element @@ -6638,10 +5454,10 @@ let rec unparse_data : ([], ctxt) items.elements >|=? fun (items, ctxt) -> (Micheline.Seq (-1, List.rev items), ctxt) - | (Ticket_t (t, _), {ticketer; contents; amount}) -> + | (Ticket_t t, {ticketer; contents; amount}) -> let t = ty_of_comparable_ty @@ opened_ticket_type t in unparse_data ctxt ~stack_depth mode t (ticketer, (contents, amount)) - | (Set_t (t, _), set) -> + | (Set_t t, set) -> fold_left_s (fun (l, ctxt) item -> unparse_comparable_data ctxt mode t item @@ -6649,18 +5465,18 @@ let rec unparse_data : ([], ctxt) (set_fold (fun e acc -> e :: acc) set []) >|=? fun (items, ctxt) -> (Micheline.Seq (-1, items), ctxt) - | (Map_t (kt, vt, _), map) -> + | (Map_t (kt, vt), map) -> let items = map_fold (fun k v acc -> (k, v) :: acc) map [] in unparse_items ctxt ~stack_depth:(stack_depth + 1) mode kt vt items >|=? fun (items, ctxt) -> (Micheline.Seq (-1, items), ctxt) - | (Big_map_t (_kt, _vt, _), {id = Some id; diff = (module Diff); _}) + | (Big_map_t (_kt, _vt), {id = Some id; diff = (module Diff); _}) when Diff.OPS.is_empty (fst Diff.boxed) -> return (Micheline.Int (-1, Big_map.Id.unparse_to_z id), ctxt) - | (Big_map_t (kt, vt, _), {id = Some id; diff = (module Diff); _}) -> + | (Big_map_t (kt, vt), {id = Some id; diff = (module Diff); _}) -> let items = Diff.OPS.fold (fun k v acc -> (k, v) :: acc) (fst Diff.boxed) [] in - let vt = Option_t (vt, None) in + let vt = Option_t vt in unparse_items ctxt ~stack_depth:(stack_depth + 1) mode kt vt items >|=? fun (items, ctxt) -> ( Micheline.Prim @@ -6669,7 +5485,7 @@ let rec unparse_data : [Int (-1, Big_map.Id.unparse_to_z id); Seq (-1, items)], [] ), ctxt ) - | (Big_map_t (kt, vt, _), {id = None; diff = (module Diff); _}) -> + | (Big_map_t (kt, vt), {id = None; diff = (module Diff); _}) -> let items = Diff.OPS.fold (fun k v acc -> match v with None -> acc | Some v -> (k, v) :: acc) @@ -6680,7 +5496,7 @@ let rec unparse_data : >|=? fun (items, ctxt) -> (Micheline.Seq (-1, items), ctxt) | (Lambda_t _, Lam (_, original_code)) -> unparse_code ctxt ~stack_depth:(stack_depth + 1) mode original_code - | (Never_t _, _) -> + | (Never_t, _) -> . | (Sapling_transaction_t _, s) -> Lwt.return @@ -6788,19 +5604,18 @@ and unparse_code ctxt ~stack_depth mode code = return (atom, ctxt) (* Gas accounting may not be perfect in this function, as it is only called by RPCs. *) -let unparse_script ctxt mode {code; arg_type; storage; storage_type; root_name} - = +let unparse_script ctxt mode + {code; arg_type; storage; storage_type; entrypoints} = let (Lam (_, original_code)) = code in unparse_code ctxt ~stack_depth:0 mode original_code >>=? fun (code, ctxt) -> unparse_data ctxt ~stack_depth:0 mode storage_type storage >>=? fun (storage, ctxt) -> Lwt.return - ( unparse_ty ctxt arg_type + ( unparse_parameter_ty ctxt arg_type entrypoints >>? fun (arg_type, ctxt) -> unparse_ty ctxt storage_type >>? fun (storage_type, ctxt) -> - let arg_type = add_field_annot root_name None arg_type in let open Micheline in let code = Seq @@ -7036,65 +5851,65 @@ let rec has_lazy_storage : type t. t ty -> t has_lazy_storage = cons h1 h2 in function - | Big_map_t (_, _, _) -> + | Big_map_t (_, _) -> True_f | Sapling_state_t _ -> True_f - | Unit_t _ -> + | Unit_t -> False_f - | Int_t _ -> + | Int_t -> False_f - | Nat_t _ -> + | Nat_t -> False_f - | Signature_t _ -> + | Signature_t -> False_f - | String_t _ -> + | String_t -> False_f - | Bytes_t _ -> + | Bytes_t -> False_f - | Mutez_t _ -> + | Mutez_t -> False_f - | Key_hash_t _ -> + | Key_hash_t -> False_f - | Key_t _ -> + | Key_t -> False_f - | Timestamp_t _ -> + | Timestamp_t -> False_f - | Address_t _ -> + | Address_t -> False_f - | Bool_t _ -> + | Bool_t -> False_f - | Lambda_t (_, _, _) -> + | Lambda_t (_, _) -> False_f - | Set_t (_, _) -> + | Set_t _ -> False_f - | Contract_t (_, _) -> + | Contract_t _ -> False_f - | Operation_t _ -> + | Operation_t -> False_f - | Chain_id_t _ -> + | Chain_id_t -> False_f - | Never_t _ -> + | Never_t -> False_f - | Bls12_381_g1_t _ -> + | Bls12_381_g1_t -> False_f - | Bls12_381_g2_t _ -> + | Bls12_381_g2_t -> False_f - | Bls12_381_fr_t _ -> + | Bls12_381_fr_t -> False_f | Sapling_transaction_t _ -> False_f | Ticket_t _ -> False_f - | Pair_t ((l, _, _), (r, _, _), _) -> + | Pair_t (l, r) -> aux2 (fun l r -> Pair_f (l, r)) l r - | Union_t ((l, _), (r, _), _) -> + | Union_t (l, r) -> aux2 (fun l r -> Union_f (l, r)) l r - | Option_t (t, _) -> + | Option_t t -> aux1 (fun h -> Option_f h) t - | List_t (t, _) -> + | List_t t -> aux1 (fun h -> List_f h) t - | Map_t (_, t, _) -> + | Map_t (_, t) -> aux1 (fun h -> Map_f h) t (** @@ -7123,7 +5938,7 @@ let extract_lazy_storage_updates ctxt mode ~temporary ids_to_copy acc ty x = match (has_lazy_storage, ty, x) with | (False_f, _, _) -> return (ctxt, x, ids_to_copy, acc) - | (_, Big_map_t (_, _, _), map) -> + | (_, Big_map_t (_, _), map) -> diff_of_big_map ctxt mode ~temporary ~ids_to_copy map >|=? fun (diff, id, ctxt) -> let (module Map) = map.diff in @@ -7142,22 +5957,22 @@ let extract_lazy_storage_updates ctxt mode ~temporary ids_to_copy acc ty x = Lazy_storage.IdSet.add Sapling_state id ids_to_copy in (ctxt, sapling_state, ids_to_copy, diff :: acc) - | (Pair_f (hl, hr), Pair_t ((tyl, _, _), (tyr, _, _), _), (xl, xr)) -> + | (Pair_f (hl, hr), Pair_t (tyl, tyr), (xl, xr)) -> aux ctxt mode ~temporary ids_to_copy acc tyl xl ~has_lazy_storage:hl >>=? fun (ctxt, xl, ids_to_copy, acc) -> aux ctxt mode ~temporary ids_to_copy acc tyr xr ~has_lazy_storage:hr >|=? fun (ctxt, xr, ids_to_copy, acc) -> (ctxt, (xl, xr), ids_to_copy, acc) - | (Union_f (has_lazy_storage, _), Union_t ((ty, _), (_, _), _), L x) -> + | (Union_f (has_lazy_storage, _), Union_t (ty, _), L x) -> aux ctxt mode ~temporary ids_to_copy acc ty x ~has_lazy_storage >|=? fun (ctxt, x, ids_to_copy, acc) -> (ctxt, L x, ids_to_copy, acc) - | (Union_f (_, has_lazy_storage), Union_t ((_, _), (ty, _), _), R x) -> + | (Union_f (_, has_lazy_storage), Union_t (_, ty), R x) -> aux ctxt mode ~temporary ids_to_copy acc ty x ~has_lazy_storage >|=? fun (ctxt, x, ids_to_copy, acc) -> (ctxt, R x, ids_to_copy, acc) - | (Option_f has_lazy_storage, Option_t (ty, _), Some x) -> + | (Option_f has_lazy_storage, Option_t ty, Some x) -> aux ctxt mode ~temporary ids_to_copy acc ty x ~has_lazy_storage >|=? fun (ctxt, x, ids_to_copy, acc) -> (ctxt, Some x, ids_to_copy, acc) - | (List_f has_lazy_storage, List_t (ty, _), l) -> + | (List_f has_lazy_storage, List_t ty, l) -> fold_left_s (fun (ctxt, l, ids_to_copy, acc) x -> aux ctxt mode ~temporary ids_to_copy acc ty x ~has_lazy_storage @@ -7168,7 +5983,7 @@ let extract_lazy_storage_updates ctxt mode ~temporary ids_to_copy acc ty x = >|=? fun (ctxt, l, ids_to_copy, acc) -> let reversed = {length = l.length; elements = List.rev l.elements} in (ctxt, reversed, ids_to_copy, acc) - | (Map_f has_lazy_storage, Map_t (_, ty, _), (module M)) -> + | (Map_f has_lazy_storage, Map_t (_, ty), (module M)) -> fold_left_s (fun (ctxt, m, ids_to_copy, acc) (k, x) -> aux ctxt mode ~temporary ids_to_copy acc ty x ~has_lazy_storage @@ -7192,7 +6007,7 @@ let extract_lazy_storage_updates ctxt mode ~temporary ids_to_copy acc ty x = (module M : Boxed_map with type key = M.key and type value = M.value), ids_to_copy, acc ) - | (_, Option_t (_, _), None) -> + | (_, Option_t _, None) -> return (ctxt, None, ids_to_copy, acc) | _ -> assert false @@ -7214,7 +6029,7 @@ let rec fold_lazy_storage : Gas.consume ctxt Typecheck_costs.parse_instr_cycle >>? fun ctxt -> match (has_lazy_storage, ty, x) with - | (_, Big_map_t (_, _, _), {id = Some id}) -> + | (_, Big_map_t (_, _), {id = Some id}) -> Gas.consume ctxt Typecheck_costs.parse_instr_cycle >>? fun ctxt -> ok (f.f Big_map id init, ctxt) | (_, Sapling_state_t _, {id = Some id}) -> @@ -7222,23 +6037,23 @@ let rec fold_lazy_storage : >>? fun ctxt -> ok (f.f Sapling_state id init, ctxt) | (False_f, _, _) -> ok (init, ctxt) - | (_, Big_map_t (_, _, _), {id = None}) -> + | (_, Big_map_t (_, _), {id = None}) -> ok (init, ctxt) | (_, Sapling_state_t _, {id = None}) -> ok (init, ctxt) - | (Pair_f (hl, hr), Pair_t ((tyl, _, _), (tyr, _, _), _), (xl, xr)) -> + | (Pair_f (hl, hr), Pair_t (tyl, tyr), (xl, xr)) -> fold_lazy_storage ~f ~init ctxt tyl xl ~has_lazy_storage:hl >>? fun (init, ctxt) -> fold_lazy_storage ~f ~init ctxt tyr xr ~has_lazy_storage:hr - | (Union_f (has_lazy_storage, _), Union_t ((ty, _), (_, _), _), L x) -> + | (Union_f (has_lazy_storage, _), Union_t (ty, _), L x) -> fold_lazy_storage ~f ~init ctxt ty x ~has_lazy_storage - | (Union_f (_, has_lazy_storage), Union_t ((_, _), (ty, _), _), R x) -> + | (Union_f (_, has_lazy_storage), Union_t (_, ty), R x) -> fold_lazy_storage ~f ~init ctxt ty x ~has_lazy_storage - | (_, Option_t (_, _), None) -> + | (_, Option_t _, None) -> ok (init, ctxt) - | (Option_f has_lazy_storage, Option_t (ty, _), Some x) -> + | (Option_f has_lazy_storage, Option_t ty, Some x) -> fold_lazy_storage ~f ~init ctxt ty x ~has_lazy_storage - | (List_f has_lazy_storage, List_t (ty, _), l) -> + | (List_f has_lazy_storage, List_t ty, l) -> List.fold_left (fun acc x -> acc @@ -7246,7 +6061,7 @@ let rec fold_lazy_storage : fold_lazy_storage ~f ~init ctxt ty x ~has_lazy_storage) (ok (init, ctxt)) l.elements - | (Map_f has_lazy_storage, Map_t (_, ty, _), m) -> + | (Map_f has_lazy_storage, Map_t (_, ty), m) -> map_fold (fun _ v acc -> acc diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 09aa2b3403aaa8d4c1c382bffc9584c1a1cbbbf9..686ba2c03986ad56c7a846164b99f4e2664bb769 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -33,10 +33,22 @@ type ex_comparable_ty = type ex_ty = Ex_ty : 'a Script_typed_ir.ty -> ex_ty +type ex_parameter_ty_and_entrypoints = + | Ex_parameter_ty_entrypoints : + 'a Script_typed_ir.ty * 'a Script_typed_ir.entrypoints + -> ex_parameter_ty_and_entrypoints + type ex_stack_ty = Ex_stack_ty : 'a Script_typed_ir.stack_ty -> ex_stack_ty type ex_script = Ex_script : ('a, 'b) Script_typed_ir.script -> ex_script +type toplevel = { + code_field : Script.node; + arg_type : Script.node; + storage_type : Script.node; + root_name : Script_typed_ir.field_annot option; +} + type ('arg, 'storage) code = { code : ( ('arg, 'storage) Script_typed_ir.pair, @@ -46,7 +58,7 @@ type ('arg, 'storage) code = { Script_typed_ir.lambda; arg_type : 'arg Script_typed_ir.ty; storage_type : 'storage Script_typed_ir.ty; - root_name : Script_typed_ir.field_annot option; + entrypoints : 'arg Script_typed_ir.entrypoints; } type ex_code = Ex_code : ('a, 'c) code -> ex_code @@ -57,8 +69,7 @@ type tc_context = | Toplevel : { storage_type : 'sto Script_typed_ir.ty; param_type : 'param Script_typed_ir.ty; - root_name : Script_typed_ir.field_annot option; - legacy_create_contract_literal : bool; + entrypoints : 'param Script_typed_ir.entrypoints; } -> tc_context @@ -146,7 +157,6 @@ val big_map_update : val ty_eq : context -> - Script.location -> 'ta Script_typed_ir.ty -> 'tb Script_typed_ir.ty -> (('ta Script_typed_ir.ty, 'tb Script_typed_ir.ty) eq * context) tzresult @@ -209,6 +219,13 @@ val parse_parameter_ty : val parse_comparable_ty : context -> Script.node -> (ex_comparable_ty * context) tzresult +val parse_parameter_ty_and_entrypoints : + context -> + legacy:bool -> + root_name:Script_typed_ir.field_annot option -> + Script.node -> + (ex_parameter_ty_and_entrypoints * context) tzresult + (** We expose [parse_ty] for convenience to external tools. Please use specialized versions such as [parse_packable_ty], [parse_parameter_ty], [parse_comparable_ty], or [parse_big_map_value_ty] if possible. *) @@ -225,17 +242,13 @@ val parse_ty : val unparse_ty : context -> 'a Script_typed_ir.ty -> (Script.node * context) tzresult -val parse_toplevel : - legacy:bool -> - Script.expr -> - (Script.node * Script.node * Script.node * Script_typed_ir.field_annot option) - tzresult +val unparse_parameter_ty : + context -> + 'a Script_typed_ir.ty -> + 'a Script_typed_ir.entrypoints -> + (Script.node * context) tzresult -val add_field_annot : - Script_typed_ir.field_annot option -> - Script_typed_ir.var_annot option -> - Script.node -> - Script.node +val parse_toplevel : legacy:bool -> Script.expr -> toplevel tzresult val typecheck_code : legacy:bool -> context -> Script.expr -> (type_map * context) tzresult Lwt.t @@ -276,7 +289,6 @@ val unparse_script : (Script.t * context) tzresult Lwt.t val parse_contract : - legacy:bool -> context -> Script.location -> 'a Script_typed_ir.ty -> @@ -285,7 +297,6 @@ val parse_contract : (context * 'a Script_typed_ir.typed_contract) tzresult Lwt.t val parse_contract_for_script : - legacy:bool -> context -> Script.location -> 'a Script_typed_ir.ty -> @@ -295,16 +306,16 @@ val parse_contract_for_script : val find_entrypoint : 't Script_typed_ir.ty -> - root_name:Script_typed_ir.field_annot option -> + 't Script_typed_ir.entrypoints -> string -> ((Script.node -> Script.node) * ex_ty) tzresult module Entrypoints_map : S.MAP with type key = string val list_entrypoints : - 't Script_typed_ir.ty -> context -> - root_name:Script_typed_ir.field_annot option -> + 't Script_typed_ir.ty -> + 't Script_typed_ir.entrypoints -> ( Michelson_v1_primitives.prim list list * (Michelson_v1_primitives.prim list * Script.node) Entrypoints_map.t ) tzresult diff --git a/src/proto_alpha/lib_protocol/script_tc_errors.ml b/src/proto_alpha/lib_protocol/script_tc_errors.ml index bdfc99cf07a3bdf965453add81965ed64a226840..b076f9b5899d576a7230701c1187dc86a9e6d0c7 100644 --- a/src/proto_alpha/lib_protocol/script_tc_errors.ml +++ b/src/proto_alpha/lib_protocol/script_tc_errors.ml @@ -97,15 +97,6 @@ type error += Bad_stack_length type error += Bad_stack_item of int -type error += Inconsistent_annotations of string * string - -type error += - | Inconsistent_type_annotations : - Script.location * Script.expr * Script.expr - -> error - -type error += Inconsistent_field_annotations of string * string - type error += Unexpected_annotation of Script.location type error += Ungrouped_annotations of Script.location 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 cb62174f77affc1a47eb239ff5f4b92b9d9e7946..25073a7bb41263d43515f633666626023be62777 100644 --- a/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml +++ b/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml @@ -375,49 +375,6 @@ let () = (function | Bad_stack (loc, name, s, sty) -> Some (loc, (name, s, sty)) | _ -> None) (fun (loc, (name, s, sty)) -> Bad_stack (loc, name, s, sty)) ; - (* Inconsistent annotations *) - register_error_kind - `Permanent - ~id:"michelson_v1.inconsistent_annotations" - ~title:"Annotations inconsistent between branches" - ~description:"The annotations on two types could not be merged" - (obj2 (req "annot1" string) (req "annot2" string)) - (function - | Inconsistent_annotations (annot1, annot2) -> - Some (annot1, annot2) - | _ -> - None) - (fun (annot1, annot2) -> Inconsistent_annotations (annot1, annot2)) ; - (* Inconsistent field annotations *) - register_error_kind - `Permanent - ~id:"michelson_v1.inconsistent_field_annotations" - ~title:"Annotations for field accesses is inconsistent" - ~description: - "The specified field does not match the field annotation in the type" - (obj2 (req "annot1" string) (req "annot2" string)) - (function - | Inconsistent_field_annotations (annot1, annot2) -> - Some (annot1, annot2) - | _ -> - None) - (fun (annot1, annot2) -> Inconsistent_field_annotations (annot1, annot2)) ; - (* Inconsistent type annotations *) - register_error_kind - `Permanent - ~id:"michelson_v1.inconsistent_type_annotations" - ~title:"Types contain inconsistent annotations" - ~description:"The two types contain annotations that do not match" - (located - (obj2 - (req "type1" Script.expr_encoding) - (req "type2" Script.expr_encoding))) - (function - | Inconsistent_type_annotations (loc, ty1, ty2) -> - Some (loc, (ty1, ty2)) - | _ -> - None) - (fun (loc, (ty1, ty2)) -> Inconsistent_type_annotations (loc, ty1, ty2)) ; (* Unexpected annotation *) register_error_kind `Permanent diff --git a/src/proto_alpha/lib_protocol/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml index cb1019c9588f7c185a37b785379d41d4ac91a5e2..5cf61c5fe241490906b08b479fb4d7e1d7fcd0e4 100644 --- a/src/proto_alpha/lib_protocol/script_typed_ir.ml +++ b/src/proto_alpha/lib_protocol/script_typed_ir.ml @@ -29,10 +29,6 @@ open Script_int (* ---- Auxiliary types -----------------------------------------------------*) -type var_annot = Var_annot of string - -type type_annot = Type_annot of string - type field_annot = Field_annot of string type address = Contract.t * string @@ -44,33 +40,27 @@ type ('a, 'b) union = L of 'a | R of 'b type never = | type _ comparable_ty = - | Unit_key : type_annot option -> unit comparable_ty - | Never_key : type_annot option -> never comparable_ty - | Int_key : type_annot option -> z num comparable_ty - | Nat_key : type_annot option -> n num comparable_ty - | Signature_key : type_annot option -> signature comparable_ty - | String_key : type_annot option -> string comparable_ty - | Bytes_key : type_annot option -> Bytes.t comparable_ty - | Mutez_key : type_annot option -> Tez.t comparable_ty - | Bool_key : type_annot option -> bool comparable_ty - | Key_hash_key : type_annot option -> public_key_hash comparable_ty - | Key_key : type_annot option -> public_key comparable_ty - | Timestamp_key : type_annot option -> Script_timestamp.t comparable_ty - | Chain_id_key : type_annot option -> Chain_id.t comparable_ty - | Address_key : type_annot option -> address comparable_ty + | Unit_key : unit comparable_ty + | Never_key : never comparable_ty + | Int_key : z num comparable_ty + | Nat_key : n num comparable_ty + | Signature_key : signature comparable_ty + | String_key : string comparable_ty + | Bytes_key : Bytes.t comparable_ty + | Mutez_key : Tez.t comparable_ty + | Bool_key : bool comparable_ty + | Key_hash_key : public_key_hash comparable_ty + | Key_key : public_key comparable_ty + | Timestamp_key : Script_timestamp.t comparable_ty + | Chain_id_key : Chain_id.t comparable_ty + | Address_key : address comparable_ty | Pair_key : - ('a comparable_ty * field_annot option) - * ('b comparable_ty * field_annot option) - * type_annot option + 'a comparable_ty * 'b comparable_ty -> ('a, 'b) pair comparable_ty | Union_key : - ('a comparable_ty * field_annot option) - * ('b comparable_ty * field_annot option) - * type_annot option + 'a comparable_ty * 'b comparable_ty -> ('a, 'b) union comparable_ty - | Option_key : - 'v comparable_ty * type_annot option - -> 'v option comparable_ty + | Option_key : 'v comparable_ty -> 'v option comparable_ty module type Boxed_set = sig type elt @@ -105,12 +95,25 @@ type operation = packed_internal_operation * Lazy_storage.diffs option type 'a ticket = {ticketer : address; contents : 'a; amount : n num} +type 'arg entrypoints = { + name : field_annot option; + nested : 'arg nested_entrypoints; +} + +and 'arg nested_entrypoints = + | Entrypoints_Union : { + left : 'l entrypoints; + right : 'r entrypoints; + } + -> ('l, 'r) union nested_entrypoints + | Entrypoints_None : _ nested_entrypoints + type ('arg, 'storage) script = { code : (('arg, 'storage) pair, (operation boxed_list, 'storage) pair) lambda; arg_type : 'arg ty; storage : 'storage; storage_type : 'storage ty; - root_name : field_annot option; + entrypoints : 'arg entrypoints; } and end_of_stack = unit @@ -123,55 +126,39 @@ and ('arg, 'ret) lambda = and 'arg typed_contract = 'arg ty * address and 'ty ty = - | Unit_t : type_annot option -> unit ty - | Int_t : type_annot option -> z num ty - | Nat_t : type_annot option -> n num ty - | Signature_t : type_annot option -> signature ty - | String_t : type_annot option -> string ty - | Bytes_t : type_annot option -> bytes ty - | Mutez_t : type_annot option -> Tez.t ty - | Key_hash_t : type_annot option -> public_key_hash ty - | Key_t : type_annot option -> public_key ty - | Timestamp_t : type_annot option -> Script_timestamp.t ty - | Address_t : type_annot option -> address ty - | Bool_t : type_annot option -> bool ty - | Pair_t : - ('a ty * field_annot option * var_annot option) - * ('b ty * field_annot option * var_annot option) - * type_annot option - -> ('a, 'b) pair ty - | Union_t : - ('a ty * field_annot option) - * ('b ty * field_annot option) - * type_annot option - -> ('a, 'b) union ty - | Lambda_t : 'arg ty * 'ret ty * type_annot option -> ('arg, 'ret) lambda ty - | Option_t : 'v ty * type_annot option -> 'v option ty - | List_t : 'v ty * type_annot option -> 'v boxed_list ty - | Set_t : 'v comparable_ty * type_annot option -> 'v set ty - | Map_t : 'k comparable_ty * 'v ty * type_annot option -> ('k, 'v) map ty - | Big_map_t : - 'k comparable_ty * 'v ty * type_annot option - -> ('k, 'v) big_map ty - | Contract_t : 'arg ty * type_annot option -> 'arg typed_contract ty - | Sapling_transaction_t : - Sapling.Memo_size.t * type_annot option - -> Sapling.transaction ty - | Sapling_state_t : - Sapling.Memo_size.t * type_annot option - -> Sapling.state ty - | Operation_t : type_annot option -> operation ty - | Chain_id_t : type_annot option -> Chain_id.t ty - | Never_t : type_annot option -> never ty - | Bls12_381_g1_t : type_annot option -> Bls12_381.G1.t ty - | Bls12_381_g2_t : type_annot option -> Bls12_381.G2.t ty - | Bls12_381_fr_t : type_annot option -> Bls12_381.Fr.t ty - | Ticket_t : 'a comparable_ty * type_annot option -> 'a ticket ty + | Unit_t : unit ty + | Int_t : z num ty + | Nat_t : n num ty + | Signature_t : signature ty + | String_t : string ty + | Bytes_t : bytes ty + | Mutez_t : Tez.t ty + | Key_hash_t : public_key_hash ty + | Key_t : public_key ty + | Timestamp_t : Script_timestamp.t ty + | Address_t : address ty + | Bool_t : bool ty + | Pair_t : 'a ty * 'b ty -> ('a, 'b) pair ty + | Union_t : 'a ty * 'b ty -> ('a, 'b) union ty + | Lambda_t : 'arg ty * 'ret ty -> ('arg, 'ret) lambda ty + | Option_t : 'v ty -> 'v option ty + | List_t : 'v ty -> 'v boxed_list ty + | Set_t : 'v comparable_ty -> 'v set ty + | Map_t : 'k comparable_ty * 'v ty -> ('k, 'v) map ty + | Big_map_t : 'k comparable_ty * 'v ty -> ('k, 'v) big_map ty + | Contract_t : 'arg ty -> 'arg typed_contract ty + | Sapling_transaction_t : Sapling.Memo_size.t -> Sapling.transaction ty + | Sapling_state_t : Sapling.Memo_size.t -> Sapling.state ty + | Operation_t : operation ty + | Chain_id_t : Chain_id.t ty + | Never_t : never ty + | Bls12_381_g1_t : Bls12_381.G1.t ty + | Bls12_381_g2_t : Bls12_381.G2.t ty + | Bls12_381_fr_t : Bls12_381.Fr.t ty + | Ticket_t : 'a comparable_ty -> 'a ticket ty and 'ty stack_ty = - | Item_t : - 'ty ty * 'rest stack_ty * var_annot option - -> ('ty * 'rest) stack_ty + | Item_t : 'ty ty * 'rest stack_ty -> ('ty * 'rest) stack_ty | Empty_t : end_of_stack stack_ty and ('key, 'value) big_map = { @@ -388,7 +375,7 @@ and ('bef, 'aft) instr = 'g ty * 'p ty * ('p * 'g, operation boxed_list * 'g) lambda - * field_annot option + * 'p entrypoints -> ( public_key_hash option * (Tez.t * ('g * 'rest)), operation * (address * 'rest) ) instr diff --git a/src/proto_alpha/lib_protocol/test/test_gas_costs.ml b/src/proto_alpha/lib_protocol/test/test_gas_costs.ml index a61923572d7832794ec10fbdced9819f90586356..cad32184533a20bc0b3b429e97ca0130d02bccb8 100644 --- a/src/proto_alpha/lib_protocol/test/test_gas_costs.ml +++ b/src/proto_alpha/lib_protocol/test/test_gas_costs.ml @@ -39,14 +39,10 @@ let dummy_list = list_cons 42 list_empty let forty_two = Alpha_context.Script_int.of_int 42 -let dummy_set = - set_update forty_two true (empty_set Script_typed_ir.(Int_key None)) +let dummy_set = set_update forty_two true (empty_set Script_typed_ir.(Int_key)) let dummy_map = - map_update - forty_two - (Some forty_two) - (empty_map Script_typed_ir.(Int_key None)) + map_update forty_two (Some forty_two) (empty_map Script_typed_ir.(Int_key)) let dummy_timestamp = Alpha_context.Script_timestamp.of_zint (Z.of_int 42) @@ -142,7 +138,7 @@ let all_interpreter_costs = ("dropn", dropn 42); ("neq", neq); ("nop", nop); - ("compare", compare Script_typed_ir.(Int_key None) forty_two forty_two); + ("compare", compare Script_typed_ir.(Int_key) forty_two forty_two); ( "concat_string_precheck", concat_string_precheck (list_cons "42" list_empty) ); ("concat_string", concat_string (Z.of_int 42)); diff --git a/src/proto_alpha/lib_protocol/test/test_sapling.ml b/src/proto_alpha/lib_protocol/test/test_sapling.ml index 727c532737e67e0d0fb7702bf9db099e13d2d473..b53abc9e2651f9c700288d06965104f2372be330 100644 --- a/src/proto_alpha/lib_protocol/test/test_sapling.ml +++ b/src/proto_alpha/lib_protocol/test/test_sapling.ml @@ -1135,8 +1135,8 @@ module Interpreter_tests = struct let tytype = let memo_size = memo_size_of_int memo_size in let open Script_typed_ir in - let state_ty = Sapling_state_t (memo_size, None) in - Pair_t ((state_ty, None, None), (state_ty, None, None), None) + let state_ty = Sapling_state_t memo_size in + Pair_t (state_ty, state_ty) in Script_ir_translator.parse_storage ctx_without_gas diff --git a/src/proto_alpha/lib_protocol/test/test_typechecking.ml b/src/proto_alpha/lib_protocol/test/test_typechecking.ml index 6a8d461044ad96a666a498f6a7e839ebc2639579..de32b91104d5fb0603363614be3e3a8d4a4f3490 100644 --- a/src/proto_alpha/lib_protocol/test/test_typechecking.ml +++ b/src/proto_alpha/lib_protocol/test/test_typechecking.ml @@ -52,7 +52,7 @@ let test_context_with_nat_nat_big_map () = let ctxt = Incremental.alpha_ctxt v in wrap_error_lwt @@ Big_map.fresh ~temporary:false ctxt >>=? fun (ctxt, id) -> - let nat_ty = Script_typed_ir.Nat_t None in + let nat_ty = Script_typed_ir.Nat_t in wrap_error_lwt @@ Lwt.return @@ Script_ir_translator.unparse_ty ctxt nat_ty >>=? fun (nat_ty_node, ctxt) -> let nat_ty_expr = Micheline.strip_locations nat_ty_node in @@ -171,8 +171,8 @@ let test_parse_ty ctxt node expected = ~allow_ticket node >>? fun (Script_ir_translator.Ex_ty actual, ctxt) -> - Script_ir_translator.ty_eq ctxt (location node) actual expected - >|? fun (_, ctxt) -> ctxt ) + Script_ir_translator.ty_eq ctxt actual expected >|? fun (_, ctxt) -> ctxt + ) let test_parse_comb_type () = let open Script in @@ -181,9 +181,9 @@ let test_parse_comb_type () = let nat_prim_a = Prim (-1, T_nat, [], ["%a"]) in let nat_prim_b = Prim (-1, T_nat, [], ["%b"]) in let nat_prim_c = Prim (-1, T_nat, [], ["%c"]) in - let nat_ty = Nat_t None in + let nat_ty = Nat_t in let pair_prim l = Prim (-1, T_pair, l, []) in - let pair_ty ty1 ty2 = Pair_t ((ty1, None, None), (ty2, None, None), None) in + let pair_ty ty1 ty2 = Pair_t (ty1, ty2) in let pair_prim2 a b = pair_prim [a; b] in let pair_nat_nat_prim = pair_prim2 nat_prim nat_prim in let pair_nat_nat_ty = pair_ty nat_ty nat_ty in @@ -211,50 +211,28 @@ let test_parse_comb_type () = (pair_ty nat_ty pair_nat_nat_ty) >>?= fun ctxt -> (* pair (nat %a) nat *) - test_parse_ty - ctxt - (pair_prim2 nat_prim_a nat_prim) - (Pair_t ((nat_ty, Some (Field_annot "a"), None), (nat_ty, None, None), None)) + test_parse_ty ctxt (pair_prim2 nat_prim_a nat_prim) (Pair_t (nat_ty, nat_ty)) >>?= fun ctxt -> (* pair nat (nat %b) *) - test_parse_ty - ctxt - (pair_prim2 nat_prim nat_prim_b) - (Pair_t ((nat_ty, None, None), (nat_ty, Some (Field_annot "b"), None), None)) + test_parse_ty ctxt (pair_prim2 nat_prim nat_prim_b) (Pair_t (nat_ty, nat_ty)) >>?= fun ctxt -> (* pair (nat %a) (nat %b) *) test_parse_ty ctxt (pair_prim2 nat_prim_a nat_prim_b) - (Pair_t - ( (nat_ty, Some (Field_annot "a"), None), - (nat_ty, Some (Field_annot "b"), None), - None )) + (Pair_t (nat_ty, nat_ty)) >>?= fun ctxt -> (* pair (nat %a) (nat %b) (nat %c) *) test_parse_ty ctxt (pair_prim [nat_prim_a; nat_prim_b; nat_prim_c]) - (Pair_t - ( (nat_ty, Some (Field_annot "a"), None), - ( Pair_t - ( (nat_ty, Some (Field_annot "b"), None), - (nat_ty, Some (Field_annot "c"), None), - None ), - None, - None ), - None )) + (Pair_t (nat_ty, Pair_t (nat_ty, nat_ty))) >>?= fun ctxt -> (* pair (nat %a) (pair %b nat nat) *) test_parse_ty ctxt (pair_prim2 nat_prim_a (Prim (-1, T_pair, [nat_prim; nat_prim], ["%b"]))) - (Pair_t - ( (nat_ty, Some (Field_annot "a"), None), - ( Pair_t ((nat_ty, None, None), (nat_ty, None, None), None), - Some (Field_annot "b"), - None ), - None )) + (Pair_t (nat_ty, Pair_t (nat_ty, nat_ty))) >>?= fun _ -> return_unit let test_unparse_ty loc ctxt expected ty = @@ -268,12 +246,9 @@ let test_unparse_comb_type () = let open Script in let open Script_typed_ir in let nat_prim = Prim (-1, T_nat, [], []) in - let nat_prim_a = Prim (-1, T_nat, [], ["%a"]) in - let nat_prim_b = Prim (-1, T_nat, [], ["%b"]) in - let nat_prim_c = Prim (-1, T_nat, [], ["%c"]) in - let nat_ty = Nat_t None in + let nat_ty = Nat_t in let pair_prim l = Prim (-1, T_pair, l, []) in - let pair_ty ty1 ty2 = Pair_t ((ty1, None, None), (ty2, None, None), None) in + let pair_ty ty1 ty2 = Pair_t (ty1, ty2) in let pair_prim2 a b = pair_prim [a; b] in let pair_nat_nat_prim = pair_prim2 nat_prim nat_prim in let pair_nat_nat_ty = pair_ty nat_ty nat_ty in @@ -295,89 +270,13 @@ let test_unparse_comb_type () = ctxt (pair_prim [nat_prim; nat_prim; nat_prim]) (pair_ty nat_ty pair_nat_nat_ty) - >>?= fun ctxt -> - (* pair (nat %a) nat *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim2 nat_prim_a nat_prim) - (Pair_t ((nat_ty, Some (Field_annot "a"), None), (nat_ty, None, None), None)) - >>?= fun ctxt -> - (* pair nat (nat %b) *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim2 nat_prim nat_prim_b) - (Pair_t ((nat_ty, None, None), (nat_ty, Some (Field_annot "b"), None), None)) - >>?= fun ctxt -> - (* pair (nat %a) (nat %b) *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim2 nat_prim_a nat_prim_b) - (Pair_t - ( (nat_ty, Some (Field_annot "a"), None), - (nat_ty, Some (Field_annot "b"), None), - None )) - >>?= fun ctxt -> - (* pair (nat %a) (nat %b) (nat %c) *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim [nat_prim_a; nat_prim_b; nat_prim_c]) - (Pair_t - ( (nat_ty, Some (Field_annot "a"), None), - ( Pair_t - ( (nat_ty, Some (Field_annot "b"), None), - (nat_ty, Some (Field_annot "c"), None), - None ), - None, - None ), - None )) - >>?= fun ctxt -> - (* pair (nat %a) (pair %b nat nat) *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim2 nat_prim_a (Prim (-1, T_pair, [nat_prim; nat_prim], ["%b"]))) - (Pair_t - ( (nat_ty, Some (Field_annot "a"), None), - ( Pair_t ((nat_ty, None, None), (nat_ty, None, None), None), - Some (Field_annot "b"), - None ), - None )) - >>?= fun ctxt -> - (* pair nat (pair @b nat nat) *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim2 nat_prim (Prim (-1, T_pair, [nat_prim; nat_prim], ["@b"]))) - (Pair_t - ( (nat_ty, None, None), - ( Pair_t ((nat_ty, None, None), (nat_ty, None, None), None), - None, - Some (Var_annot "b") ), - None )) - >>?= fun ctxt -> - (* pair nat (pair :b nat nat) *) - test_unparse_ty - __LOC__ - ctxt - (pair_prim2 nat_prim (Prim (-1, T_pair, [nat_prim; nat_prim], [":b"]))) - (Pair_t - ( (nat_ty, None, None), - ( Pair_t - ((nat_ty, None, None), (nat_ty, None, None), Some (Type_annot "b")), - None, - None ), - None )) >>?= fun _ -> return_unit let test_unparse_comparable_ty loc ctxt expected ty = (* unparse_comparable_ty is not exported, the simplest way to call it is to call parse_ty on a set type *) Environment.wrap_error - ( Script_ir_translator.unparse_ty ctxt (Set_t (ty, None)) + ( Script_ir_translator.unparse_ty ctxt (Set_t ty) >>? fun (actual, ctxt) -> if actual = Prim (-1, T_set, [expected], []) then ok ctxt else Alcotest.failf "Unexpected error: %s" loc ) @@ -386,12 +285,9 @@ let test_unparse_comb_comparable_type () = let open Script in let open Script_typed_ir in let nat_prim = Prim (-1, T_nat, [], []) in - let nat_prim_a = Prim (-1, T_nat, [], ["%a"]) in - let nat_prim_b = Prim (-1, T_nat, [], ["%b"]) in - let nat_prim_c = Prim (-1, T_nat, [], ["%c"]) in - let nat_ty = Nat_key None in + let nat_ty = Nat_key in let pair_prim l = Prim (-1, T_pair, l, []) in - let pair_ty ty1 ty2 = Pair_key ((ty1, None), (ty2, None), None) in + let pair_ty ty1 ty2 = Pair_key (ty1, ty2) in let pair_prim2 a b = pair_prim [a; b] in let pair_nat_nat_prim = pair_prim2 nat_prim nat_prim in let pair_nat_nat_ty = pair_ty nat_ty nat_ty in @@ -413,66 +309,6 @@ let test_unparse_comb_comparable_type () = ctxt (pair_prim [nat_prim; nat_prim; nat_prim]) (pair_ty nat_ty pair_nat_nat_ty) - >>?= fun ctxt -> - (* pair (nat %a) nat *) - test_unparse_comparable_ty - __LOC__ - ctxt - (pair_prim2 nat_prim_a nat_prim) - (Pair_key ((nat_ty, Some (Field_annot "a")), (nat_ty, None), None)) - >>?= fun ctxt -> - (* pair nat (nat %b) *) - test_unparse_comparable_ty - __LOC__ - ctxt - (pair_prim2 nat_prim nat_prim_b) - (Pair_key ((nat_ty, None), (nat_ty, Some (Field_annot "b")), None)) - >>?= fun ctxt -> - (* pair (nat %a) (nat %b) *) - test_unparse_comparable_ty - __LOC__ - ctxt - (pair_prim2 nat_prim_a nat_prim_b) - (Pair_key - ( (nat_ty, Some (Field_annot "a")), - (nat_ty, Some (Field_annot "b")), - None )) - >>?= fun ctxt -> - (* pair (nat %a) (nat %b) (nat %c) *) - test_unparse_comparable_ty - __LOC__ - ctxt - (pair_prim [nat_prim_a; nat_prim_b; nat_prim_c]) - (Pair_key - ( (nat_ty, Some (Field_annot "a")), - ( Pair_key - ( (nat_ty, Some (Field_annot "b")), - (nat_ty, Some (Field_annot "c")), - None ), - None ), - None )) - >>?= fun ctxt -> - (* pair (nat %a) (pair %b nat nat) *) - test_unparse_comparable_ty - __LOC__ - ctxt - (pair_prim2 nat_prim_a (Prim (-1, T_pair, [nat_prim; nat_prim], ["%b"]))) - (Pair_key - ( (nat_ty, Some (Field_annot "a")), - ( Pair_key ((nat_ty, None), (nat_ty, None), None), - Some (Field_annot "b") ), - None )) - >>?= fun ctxt -> - (* pair nat (pair :b nat nat) *) - test_unparse_comparable_ty - __LOC__ - ctxt - (pair_prim2 nat_prim (Prim (-1, T_pair, [nat_prim; nat_prim], [":b"]))) - (Pair_key - ( (nat_ty, None), - ( Pair_key ((nat_ty, None), (nat_ty, None), Some (Type_annot "b")), - None ), - None )) >>?= fun _ -> return_unit let test_parse_data ?(equal = Stdlib.( = )) loc ctxt ty node expected = @@ -503,14 +339,14 @@ let test_parse_comb_data () = let open Script_typed_ir in let z = Script_int.zero_n in let z_prim = Micheline.Int (-1, Z.zero) in - let nat_ty = Nat_t None in + let nat_ty = Nat_t in let pair_prim l = Prim (-1, D_Pair, l, []) in - let pair_ty ty1 ty2 = Pair_t ((ty1, None, None), (ty2, None, None), None) in + let pair_ty ty1 ty2 = Pair_t (ty1, ty2) in let pair_nat_nat_ty = pair_ty nat_ty nat_ty in let pair_prim2 a b = pair_prim [a; b] in let pair_z_z_prim = pair_prim2 z_prim z_prim in - let list_nat_ty = List_t (nat_ty, None) in - let big_map_nat_nat_ty = Big_map_t (Nat_key None, nat_ty, None) in + let list_nat_ty = List_t nat_ty in + let big_map_nat_nat_ty = Big_map_t (Nat_key, nat_ty) in test_context_with_nat_nat_big_map () >>=? fun (ctxt, big_map_id) -> (* Pair 0 0 *) @@ -583,7 +419,7 @@ let test_parse_comb_data () = type value = n num option - let key_ty = Nat_key None + let key_ty = Nat_key module OPS = Environment.Map.Make (struct type t = key @@ -599,7 +435,7 @@ let test_parse_comb_data () = let expected_big_map = let open Script_typed_ir in let diff = (module M : M.S) in - let nat_key_ty = Nat_key None in + let nat_key_ty = Nat_key in {id = Some big_map_id; diff; key_type = nat_key_ty; value_type = nat_ty} in let equal (nat1, big_map1) (nat2, big_map2) = @@ -646,9 +482,9 @@ let test_unparse_comb_data () = let open Script_typed_ir in let z = Script_int.zero_n in let z_prim = Micheline.Int (-1, Z.zero) in - let nat_ty = Nat_t None in + let nat_ty = Nat_t in let pair_prim l = Prim (-1, D_Pair, l, []) in - let pair_ty ty1 ty2 = Pair_t ((ty1, None, None), (ty2, None, None), None) in + let pair_ty ty1 ty2 = Pair_t (ty1, ty2) in let pair_nat_nat_ty = pair_ty nat_ty nat_ty in let pair_prim2 a b = pair_prim [a; b] in let pair_z_z_prim = pair_prim2 z_prim z_prim in @@ -715,7 +551,7 @@ let rec gen_combs leaf arity = (* Checks the optimality of the Optimized Micheline representation for combs *) let test_optimal_comb () = let open Script_typed_ir in - let leaf_ty = Nat_t None in + let leaf_ty = Nat_t in let leaf_mich = Int (-1, Z.zero) in let leaf_v = Script_int.zero_n in let size_of_micheline mich = @@ -754,7 +590,7 @@ let test_optimal_comb () = @@ gen_combs leaf_mich arity >>=? fun () -> return ctxt ) in - let pair_ty ty1 ty2 = Pair_t ((ty1, None, None), (ty2, None, None), None) in + let pair_ty ty1 ty2 = Pair_t (ty1, ty2) in test_context () >>=? fun ctxt -> let comb2_ty = pair_ty leaf_ty leaf_ty in 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_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.ed8a8c90dc.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.ed8a8c90dc.out" index cc735b855129abb95c86bef43d63d68bf10f3384..9c3c741c1aba869637d6d68b436f056a8ee31580 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.ed8a8c90dc.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.ed8a8c90dc.out" @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039988.651 units remaining) [ (Pair "hello" (Some 4) {}) ] - location: 13 (remaining gas: 1039988.451 units remaining) - [ "hello" @parameter - (Pair (Some 4) {}) @storage ] + [ "hello" + (Pair (Some 4) {}) ] - location: 16 (remaining gas: 1039988.151 units remaining) [ (Some 4) {} ] @@ -20,11 +20,11 @@ trace [ (Some 4) {} ] - location: 14 (remaining gas: 1039988.081 units remaining) - [ "hello" @parameter + [ "hello" (Some 4) {} ] - location: -1 (remaining gas: 1039988.011 units remaining) - [ "hello" @parameter + [ "hello" (Some 4) {} ] - location: 17 (remaining gas: 1039987.791 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.4ba77dda56.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.4ba77dda56.out" index 13b8f03d3d0cef028d3bafbc4768276232a30ed4..400174b10df8a313ca5f062d00bd47c7bd0562fc 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.4ba77dda56.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.4ba77dda56.out" @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039988.057 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039987.857 units remaining) - [ "hi" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hi" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.557 units remaining) [ (Some 5) { Elt "hello" 4 } ] @@ -21,11 +21,11 @@ trace [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.487 units remaining) - [ "hi" @parameter + [ "hi" (Some 5) { Elt "hello" 4 } ] - location: -1 (remaining gas: 1039987.417 units remaining) - [ "hi" @parameter + [ "hi" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039987.197 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.662e6b84f7.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.662e6b84f7.out" index e7514617ee193a1130faaeeda2e3e231f7e7e78f..5d52f6e752f6927303fee97146fb749c508156bd 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.662e6b84f7.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.662e6b84f7.out" @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039988.027 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039987.827 units remaining) - [ "hello" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.527 units remaining) [ (Some 5) { Elt "hello" 4 } ] @@ -20,11 +20,11 @@ trace [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.457 units remaining) - [ "hello" @parameter + [ "hello" (Some 5) { Elt "hello" 4 } ] - location: -1 (remaining gas: 1039987.387 units remaining) - [ "hello" @parameter + [ "hello" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039987.167 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 ; .7806be875b.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 ; .7806be875b.out" index 038d7695c568dbad0a8f39f2cdb705c63c7bf3d5..e29323f5329fd142f6cce6923a896f8d9872a22e 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 ; .7806be875b.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 ; .7806be875b.out" @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039987.643 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039987.443 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039987.143 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] @@ -21,11 +21,11 @@ trace [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039987.073 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: -1 (remaining gas: 1039987.003 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039986.783 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 ; .7beec6cc30.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 ; .7beec6cc30.out" index d2186acbb7482ba067c28456639f6818a905aef4..5a008cdaea9386e3aa3310f14cd39821f3f55c4d 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 ; .7beec6cc30.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 ; .7beec6cc30.out" @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039987.643 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039987.443 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039987.143 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] @@ -21,11 +21,11 @@ trace [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039987.073 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: -1 (remaining gas: 1039987.003 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039986.783 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 })-.2e17580138.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 })-.2e17580138.out" index 1643aec70fb66bee6ad76a8fb47ce2931d315a97..3240bada6a775ba3f334b5169229af4d48d06e9e 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 })-.2e17580138.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 })-.2e17580138.out" @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039988.267 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039988.067 units remaining) - [ "hello" @parameter - (Pair None { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair None { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039987.767 units remaining) [ None { Elt "hello" 4 } ] @@ -20,11 +20,11 @@ trace [ None { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039987.697 units remaining) - [ "hello" @parameter + [ "hello" None { Elt "hello" 4 } ] - location: -1 (remaining gas: 1039987.627 units remaining) - [ "hello" @parameter + [ "hello" None { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039987.407 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.ae2570aa95.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.ae2570aa95.out" index b18f28c849bc62730e7e5250b9b17fc18bf8dded..58e78115d0bd8779ca34c0058205042c1c73fafa 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.ae2570aa95.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.ae2570aa95.out" @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039988.891 units remaining) [ (Pair "hello" None {}) ] - location: 13 (remaining gas: 1039988.691 units remaining) - [ "hello" @parameter - (Pair None {}) @storage ] + [ "hello" + (Pair None {}) ] - location: 16 (remaining gas: 1039988.391 units remaining) [ None {} ] @@ -20,11 +20,11 @@ trace [ None {} ] - location: 14 (remaining gas: 1039988.321 units remaining) - [ "hello" @parameter + [ "hello" None {} ] - location: -1 (remaining gas: 1039988.251 units remaining) - [ "hello" @parameter + [ "hello" None {} ] - location: 17 (remaining gas: 1039988.031 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.7085ccc339.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.7085ccc339.out" index 244eca17f903ad9268b54558224b2fa3db845a54..17c069a151143b1cfd5130af4a282b70603ccea4 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.7085ccc339.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.7085ccc339.out" @@ -15,10 +15,10 @@ trace [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 13 (remaining gas: 1039982.245 units remaining) - [ "1" @parameter + [ "1" (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 17 (remaining gas: 1039981.885 units remaining) - [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) @storage ] + [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ] - location: 18 (remaining gas: 1039981.745 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - location: -1 (remaining gas: 1039981.675 units remaining) @@ -30,7 +30,7 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 14 (remaining gas: 1039981.465 units remaining) - [ "1" @parameter + [ "1" { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 20 (remaining gas: 1039981.325 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)-\"\".75aa05c5ef.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)-\"\".75aa05c5ef.out" index b234724e1ace316633ea85703560bbdafb1ea8ac..5c6f01c7cf57610d3690dc1360b67e627c064d80 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)-\"\".75aa05c5ef.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)-\"\".75aa05c5ef.out" @@ -14,10 +14,10 @@ trace [ (Pair "" { Elt "hello" "hi" } None) (Pair "" { Elt "hello" "hi" } None) ] - location: 13 (remaining gas: 1039982.973 units remaining) - [ "" @parameter + [ "" (Pair "" { Elt "hello" "hi" } None) ] - location: 17 (remaining gas: 1039982.613 units remaining) - [ (Pair { Elt "hello" "hi" } None) @storage ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 18 (remaining gas: 1039982.473 units remaining) [ { Elt "hello" "hi" } ] - location: -1 (remaining gas: 1039982.403 units remaining) @@ -29,7 +29,7 @@ trace [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039982.193 units remaining) - [ "" @parameter + [ "" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039982.053 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.ce376412b0.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.ce376412b0.out" index ced903564247588311ef64f0b562083ebbc180b1..55a7a0876d53332b18ab498ddb9113f002f08597 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.ce376412b0.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.ce376412b0.out" @@ -14,10 +14,10 @@ trace [ (Pair "hello" { Elt "hello" "hi" } None) (Pair "hello" { Elt "hello" "hi" } None) ] - location: 13 (remaining gas: 1039982.923 units remaining) - [ "hello" @parameter + [ "hello" (Pair "hello" { Elt "hello" "hi" } None) ] - location: 17 (remaining gas: 1039982.563 units remaining) - [ (Pair { Elt "hello" "hi" } None) @storage ] + [ (Pair { Elt "hello" "hi" } None) ] - location: 18 (remaining gas: 1039982.423 units remaining) [ { Elt "hello" "hi" } ] - location: -1 (remaining gas: 1039982.353 units remaining) @@ -29,7 +29,7 @@ trace [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039982.143 units remaining) - [ "hello" @parameter + [ "hello" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039982.003 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\" .0689a9f5c7.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\" .0689a9f5c7.out" index cbf36dd206254947076361be6310769b94b78ca6..54fa9300c6a34e6fe3fbdf3d1bb8f06a103c3017 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\" .0689a9f5c7.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\" .0689a9f5c7.out" @@ -12,8 +12,8 @@ trace - location: 13 (remaining gas: 1039984.765 units remaining) [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.565 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: 18 (remaining gas: 1039984.265 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] @@ -21,16 +21,16 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.195 units remaining) - [ { Elt "2" None } @parameter + [ { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: -1 (remaining gas: 1039984.125 units remaining) - [ { Elt "2" None } @parameter + [ { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039983.805 units remaining) - [ "2" @key - None @elt + [ "2" + None { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.665 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\" .28027e7c51.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\" .28027e7c51.out" index aa6fd21b9a886f042620f8cb544221975bad5fbc..daf9910c07c7143340da304b58213076b84265f1 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\" .28027e7c51.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\" .28027e7c51.out" @@ -12,8 +12,8 @@ trace - location: 13 (remaining gas: 1039985.349 units remaining) [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039985.149 units remaining) - [ {} @parameter - (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) @storage ] + [ {} + (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 18 (remaining gas: 1039984.849 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] @@ -21,11 +21,11 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.779 units remaining) - [ {} @parameter + [ {} { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: -1 (remaining gas: 1039984.709 units remaining) - [ {} @parameter + [ {} { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 19 (remaining gas: 1039984.569 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\" .5b9b4f4add.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\" .5b9b4f4add.out" index 3f91418ad4bec3161f0a711be44b5b90a2d8bb18..b705b06b017803ee8b0de40400b68fa53f648e3b 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\" .5b9b4f4add.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\" .5b9b4f4add.out" @@ -12,8 +12,8 @@ trace - location: 13 (remaining gas: 1039984.481 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.281 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: 18 (remaining gas: 1039983.981 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] @@ -21,16 +21,16 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039983.911 units remaining) - [ { Elt "1" (Some "two") } @parameter + [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: -1 (remaining gas: 1039983.841 units remaining) - [ { Elt "1" (Some "two") } @parameter + [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039983.521 units remaining) - [ "1" @key - (Some "two") @elt + [ "1" + (Some "two") { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.381 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\" .923a9b1a0c.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\" .923a9b1a0c.out" index 03a7e8fa90ebc7d9f286c716b6107d27a6a5b6b3..afc6b38f4488e3910538749b92fe17ff7f039620 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\" .923a9b1a0c.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\" .923a9b1a0c.out" @@ -12,8 +12,8 @@ trace - location: 13 (remaining gas: 1039984.481 units remaining) [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.281 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: 18 (remaining gas: 1039983.981 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] @@ -21,16 +21,16 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039983.911 units remaining) - [ { Elt "1" (Some "two") } @parameter + [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: -1 (remaining gas: 1039983.841 units remaining) - [ { Elt "1" (Some "two") } @parameter + [ { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039983.521 units remaining) - [ "1" @key - (Some "two") @elt + [ "1" + (Some "two") { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.381 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\" .e075542e26.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\" .e075542e26.out" index caf39e8096fa6ac5191f8cd161a5878fb50a9e98..9a4f01d74998e5ef7a8edafc0d9952ea95384389 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\" .e075542e26.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\" .e075542e26.out" @@ -13,8 +13,8 @@ trace - location: 13 (remaining gas: 1039984.461 units remaining) [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.261 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: 18 (remaining gas: 1039983.961 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] @@ -22,16 +22,16 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039983.891 units remaining) - [ { Elt "3" (Some "three") } @parameter + [ { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: -1 (remaining gas: 1039983.821 units remaining) - [ { Elt "3" (Some "three") } @parameter + [ { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039983.501 units remaining) - [ "3" @key - (Some "three") @elt + [ "3" + (Some "three") { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.361 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\" .f2ff59db97.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\" .f2ff59db97.out" index c2f150a379d2b4472f7b903d7c2e9b2bb11706ef..5dbac213f8bea5bee54f0490e24a64d10ba86244 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\" .f2ff59db97.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\" .f2ff59db97.out" @@ -13,8 +13,8 @@ trace - location: 13 (remaining gas: 1039984.765 units remaining) [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ] - location: 15 (remaining gas: 1039984.565 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: 18 (remaining gas: 1039984.265 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } Unit ] @@ -22,16 +22,16 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 16 (remaining gas: 1039984.195 units remaining) - [ { Elt "3" None } @parameter + [ { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: -1 (remaining gas: 1039984.125 units remaining) - [ { Elt "3" None } @parameter + [ { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 21 (remaining gas: 1039983.805 units remaining) - [ "3" @key - None @elt + [ "3" + None { Elt "1" "one" ; Elt "2" "two" } Unit ] - location: 22 (remaining gas: 1039983.665 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 44b41e708e68bfa445d368b74afdc30fb59582c7..571743ac6719571bf0c55bfb67ee4c6e9464bc77 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 500000 @balance ] + [ 500000 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 500000 @balance ] + 500000 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 500000) ] - location: -1 (remaining gas: 1039779.174 units remaining) 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 b1201f24905c5fdb74042b42935df6ef87fc475f..b096a44b5df8c7f2d877f4a2f879c5de7ca01d20 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 0 @balance ] + [ 0 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 0 @balance ] + 0 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 0) ] - location: -1 (remaining gas: 1039779.174 units remaining) 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 a11df17172e93e40e4644436a58cc50735917624..5d973b7f581bfeaf83ff30fddbe079e067c101a5 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 1000000000 @balance ] + [ 1000000000 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 1000000000 @balance ] + 1000000000 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 1000000000) ] - location: -1 (remaining gas: 1039779.174 units remaining) 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 b47d865640ebb65eff96881ea3161b87f1bad061..9ef3bada6289f5697ee688d2c00a988de0b5e2f1 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 1000000 @balance ] + [ 1000000 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 1000000 @balance ] + 1000000 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 1000000) ] - location: -1 (remaining gas: 1039779.174 units remaining) 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 3b29d757f6408a59f88b3cde2c97b3320d251d8c..9c50f47555a1396801dbdb721a754640ac5bc33a 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 1 @balance ] + [ 1 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 1 @balance ] + 1 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 1) ] - location: -1 (remaining gas: 1039779.174 units remaining) 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 3a58f08a7fda14aab64465dc1d34d674802fe441..6280512c73dbface6523b65c07d2dbdf59c16e36 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 5000000 @balance ] + [ 5000000 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 5000000 @balance ] + 5000000 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 5000000) ] - location: -1 (remaining gas: 1039779.174 units remaining) 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 ef052fe6a6dbc10de83ca97dba0fc0b8caafff6d..0d901e305805d4f58d4441e56912df5229467b1f 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 8000000000000000000 @balance ] + [ 8000000000000000000 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 8000000000000000000 @balance ] + 8000000000000000000 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 8000000000000000000) ] - location: -1 (remaining gas: 1039779.174 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 (Righ.4c10105111.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.4c10105111.out" index 0fd60fff89a167a49db54148b89bdd88dda174e4..4f881c5bda8135d6f203ef8a7bcf7f5016493973 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.4c10105111.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.4c10105111.out" @@ -15,12 +15,12 @@ trace [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039921.141 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: 114 (remaining gas: 1039920.101 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 112 (remaining gas: 1039920.031 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 119 (remaining gas: 1039919.891 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] @@ -28,7 +28,7 @@ trace [ { Elt "1" "one" } { Elt "2" "two" } ] - location: 110 (remaining gas: 1039919.821 units remaining) - [ { Pair "3" "three" } @parameter.right.right.right.add + [ { Pair "3" "three" } { Elt "1" "one" } { Elt "2" "two" } ] - location: 122 (remaining gas: 1039919.114 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)-(.00a32294a4.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)-(.00a32294a4.out" index 4067f13e09fcb46723e42f755f8c577cd16141c7..0daf746c41b8c1fe3cb8f92a3812b96c2faa26d8 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)-(.00a32294a4.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)-(.00a32294a4.out" @@ -13,14 +13,14 @@ trace - location: 42 (remaining gas: 1039923.184 units remaining) [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039923.044 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: 46 (remaining gas: 1039922.754 units remaining) - [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) @storage ] + [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - location: 49 (remaining gas: 1039922.474 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 47 (remaining gas: 1039922.404 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 54 (remaining gas: 1039922.264 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 .47f32b8f4c.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 .47f32b8f4c.out" index 7108e1a50838d65c1c538eb919d06c3febe534c6..2c0db19301cd67b50e56bbcc16a30437a468c72a 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 .47f32b8f4c.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 .47f32b8f4c.out" @@ -14,15 +14,15 @@ trace [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039919.298 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: 62 (remaining gas: 1039918.868 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: 1039918.728 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: -1 (remaining gas: 1039918.658 units remaining) - [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) @parameter.right.reset ] + [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 59 (remaining gas: 1039918.588 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - location: 151 (remaining gas: 1039918.448 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 8bdfe34037274aa09008873cb3ef52b919f2fa23..65189f2ecb925d443693874155500a9fac8acd1e 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,15 +10,15 @@ trace - location: 42 (remaining gas: 1039921.954 units remaining) [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039921.814 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: 62 (remaining gas: 1039921.384 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: 1039921.244 units remaining) - [ (Right Unit) @parameter.right.reset ] + [ (Right Unit) ] - location: -1 (remaining gas: 1039921.174 units remaining) - [ (Right Unit) @parameter.right.reset ] + [ (Right Unit) ] - location: 59 (remaining gas: 1039921.104 units remaining) [ (Right Unit) ] - location: 151 (remaining gas: 1039920.964 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.db0e6941b3.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.db0e6941b3.out" index 6a10960c117f0d7b44f5f650a47924be2ca99961..2b57b183d9a9dcba2a43decab334e9a4981138a7 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.db0e6941b3.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.db0e6941b3.out" @@ -14,12 +14,12 @@ trace [ (Pair (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - location: 43 (remaining gas: 1039921.685 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: 135 (remaining gas: 1039920.645 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 133 (remaining gas: 1039920.575 units remaining) - [ (Pair { Elt "1" "one" } { Elt "2" "two" }) @storage.left ] + [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - location: 140 (remaining gas: 1039920.435 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] @@ -27,7 +27,7 @@ trace [ { Elt "1" "one" } { Elt "2" "two" } ] - location: 131 (remaining gas: 1039920.365 units remaining) - [ { "1" } @parameter.right.right.right.rem + [ { "1" } { Elt "1" "one" } { Elt "2" "two" } ] - location: 145 (remaining gas: 1039919.498 units remaining) @@ -39,7 +39,7 @@ trace { Elt "1" "one" } { Elt "2" "two" } ] - location: 143 (remaining gas: 1039919.428 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.79a01c2ffd.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.79a01c2ffd.out" index 47bdfac695bb6a191cb688f3acb6d8150dcb55a5..25a992b1c6f5c4c03460d1b94f9712dfaee412a2 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.79a01c2ffd.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.79a01c2ffd.out" @@ -13,18 +13,18 @@ trace - location: 42 (remaining gas: 1039922.719 units remaining) [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - location: 43 (remaining gas: 1039922.579 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: 75 (remaining gas: 1039921.689 units remaining) - [ Unit @storage.right ] + [ Unit ] - location: 69 (remaining gas: 1039921.619 units remaining) - [ Unit @storage.right ] + [ Unit ] - location: 76 (remaining gas: 1039921.479 units remaining) [ ] - location: -1 (remaining gas: 1039921.409 units remaining) [ ] - location: 67 (remaining gas: 1039921.409 units remaining) - [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) @parameter.right.right.import ] + [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ] - location: 77 (remaining gas: 1039921.269 units remaining) [ { Pair "foo" "bar" } { Pair "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 225cf14f973dd1ea4f6ab8ebabd1a0cfcef140f1..62843abd990a1073e891d42080cdd5caa6341115 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 @@ -31,22 +31,22 @@ trace "hello") ] - location: 13 (remaining gas: 1039943.796 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 14 (remaining gas: 1039943.656 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 15 (remaining gas: 1039943.516 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage + "hello") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -56,24 +56,24 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 19 (remaining gas: 1039930.916 units remaining) - [ 0x05010000000568656c6c6f @packed + [ 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: -1 (remaining gas: 1039930.846 units remaining) - [ 0x05010000000568656c6c6f @packed + [ 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 16 (remaining gas: 1039930.846 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: -1 (remaining gas: 1039930.776 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -82,14 +82,14 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] - location: 20 (remaining gas: 1039930.636 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000568656c6c6f @packed + 0x05010000000568656c6c6f (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "hello") ] @@ -104,11 +104,11 @@ trace "hello") ] - location: 28 (remaining gas: 1039660.233 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage ] + "hello") ] - location: 29 (remaining gas: 1039660.093 units remaining) [ {} (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "hello") @storage ] + "hello") ] - location: 31 (remaining gas: 1039659.953 units remaining) [ (Pair {} "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" @@ -157,22 +157,22 @@ trace "abcd") ] - location: 13 (remaining gas: 1039943.806 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 14 (remaining gas: 1039943.666 units remaining) [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 15 (remaining gas: 1039943.526 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - "abcd") @storage + "abcd") (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] @@ -182,24 +182,24 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 19 (remaining gas: 1039930.926 units remaining) - [ 0x05010000000461626364 @packed + [ 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: -1 (remaining gas: 1039930.856 units remaining) - [ 0x05010000000461626364 @packed + [ 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 16 (remaining gas: 1039930.856 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: -1 (remaining gas: 1039930.786 units remaining) [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] @@ -208,14 +208,14 @@ trace "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" - 0x05010000000461626364 @packed + 0x05010000000461626364 (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF" "abcd") ] - location: 20 (remaining gas: 1039930.646 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 9db1391fc6dfd81ff48cf8b0e40b3f3591a224de..89a2baad5e85dbb63715ffedf0dffe1482960623 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: 6 (remaining gas: 1039987.125 units remaining) [ (Pair 0 Unit) ] - location: 7 (remaining gas: 1039986.985 units remaining) - [ 0 @parameter ] + [ 0 ] - location: 8 (remaining gas: 1039986.845 units remaining) - [ 0 @parameter - 0 @parameter ] + [ 0 + 0 ] - location: 9 (remaining gas: 1039986.705 units remaining) [ 0 - 0 @parameter ] + 0 ] - location: 10 (remaining gas: 1039986.565 units remaining) [ 0 - 0 @parameter ] + 0 ] - location: 11 (remaining gas: 1039986.355 units remaining) [ 0 ] - location: 13 (remaining gas: 1039986.155 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 2c9ac54b36fe68d0e6c1a9cc4401a86ef9927a6a..0643b91398f5fe878217add8f03bd01b54d586f8 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: 6 (remaining gas: 1039987.125 units remaining) [ (Pair 12039123919239192312931 Unit) ] - location: 7 (remaining gas: 1039986.985 units remaining) - [ 12039123919239192312931 @parameter ] + [ 12039123919239192312931 ] - location: 8 (remaining gas: 1039986.845 units remaining) - [ 12039123919239192312931 @parameter - 12039123919239192312931 @parameter ] + [ 12039123919239192312931 + 12039123919239192312931 ] - location: 9 (remaining gas: 1039986.705 units remaining) [ -12039123919239192312931 - 12039123919239192312931 @parameter ] + 12039123919239192312931 ] - location: 10 (remaining gas: 1039986.565 units remaining) [ 12039123919239192312931 - 12039123919239192312931 @parameter ] + 12039123919239192312931 ] - location: 11 (remaining gas: 1039986.355 units remaining) [ 0 ] - location: 13 (remaining gas: 1039986.155 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 bcaa38d0a40affc23f66dc7717ab47e97bba28c5..1788408ac801ce91ca00fda0ddc3c9acc0551ff5 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: 6 (remaining gas: 1039987.125 units remaining) [ (Pair 948 Unit) ] - location: 7 (remaining gas: 1039986.985 units remaining) - [ 948 @parameter ] + [ 948 ] - location: 8 (remaining gas: 1039986.845 units remaining) - [ 948 @parameter - 948 @parameter ] + [ 948 + 948 ] - location: 9 (remaining gas: 1039986.705 units remaining) [ -948 - 948 @parameter ] + 948 ] - location: 10 (remaining gas: 1039986.565 units remaining) [ 948 - 948 @parameter ] + 948 ] - location: 11 (remaining gas: 1039986.355 units remaining) [ 0 ] - location: 13 (remaining gas: 1039986.155 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 9000cd940b8fa968560e57a9652b82f47f047ee6..6fd3e98c101efbcb36609c8515b18ccd4da5e5ce 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,226 +10,226 @@ trace - location: 6 (remaining gas: 1039917.130 units remaining) [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039916.990 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 8 (remaining gas: 1039916.850 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 11 (remaining gas: 1039916.710 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 14 (remaining gas: 1039916.570 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 15 (remaining gas: 1039916.430 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 20 (remaining gas: 1039916.100 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 21 (remaining gas: 1039915.960 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039915.890 units remaining) [ True - Unit @parameter ] + Unit ] - location: 23 (remaining gas: 1039915.700 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039915.630 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 28 (remaining gas: 1039915.490 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 31 (remaining gas: 1039915.350 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 34 (remaining gas: 1039915.210 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 35 (remaining gas: 1039915.070 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 40 (remaining gas: 1039914.740 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 41 (remaining gas: 1039914.600 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039914.530 units remaining) [ True - Unit @parameter ] + Unit ] - location: 43 (remaining gas: 1039914.340 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039914.270 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 48 (remaining gas: 1039914.130 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 51 (remaining gas: 1039913.990 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 54 (remaining gas: 1039913.850 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 55 (remaining gas: 1039913.710 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 60 (remaining gas: 1039913.380 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 61 (remaining gas: 1039913.240 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039913.170 units remaining) [ True - Unit @parameter ] + Unit ] - location: 63 (remaining gas: 1039912.980 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039912.910 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 68 (remaining gas: 1039912.770 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 71 (remaining gas: 1039912.630 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 74 (remaining gas: 1039912.490 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 75 (remaining gas: 1039912.350 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 80 (remaining gas: 1039912.020 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 81 (remaining gas: 1039911.880 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039911.810 units remaining) [ True - Unit @parameter ] + Unit ] - location: 83 (remaining gas: 1039911.620 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039911.550 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 88 (remaining gas: 1039911.410 units remaining) [ 2 - Unit @parameter ] + Unit ] - location: 91 (remaining gas: 1039911.270 units remaining) [ 2 2 - Unit @parameter ] + Unit ] - location: 94 (remaining gas: 1039911.130 units remaining) [ 4 - Unit @parameter ] + Unit ] - location: 95 (remaining gas: 1039910.990 units remaining) [ 4 4 - Unit @parameter ] + Unit ] - location: 100 (remaining gas: 1039910.660 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 101 (remaining gas: 1039910.520 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039910.450 units remaining) [ True - Unit @parameter ] + Unit ] - location: 103 (remaining gas: 1039910.260 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039910.190 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 108 (remaining gas: 1039910.050 units remaining) [ 60 - Unit @parameter ] + Unit ] - location: 111 (remaining gas: 1039909.910 units remaining) [ "2019-09-09T12:08:37Z" 60 - Unit @parameter ] + Unit ] - location: 114 (remaining gas: 1039909.770 units remaining) [ "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 115 (remaining gas: 1039909.630 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 120 (remaining gas: 1039909.310 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 121 (remaining gas: 1039909.170 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039909.100 units remaining) [ True - Unit @parameter ] + Unit ] - location: 123 (remaining gas: 1039908.910 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039908.840 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 128 (remaining gas: 1039908.700 units remaining) [ "2019-09-09T12:08:37Z" - Unit @parameter ] + Unit ] - location: 131 (remaining gas: 1039908.560 units remaining) [ 60 "2019-09-09T12:08:37Z" - Unit @parameter ] + Unit ] - location: 134 (remaining gas: 1039908.420 units remaining) [ "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 135 (remaining gas: 1039908.280 units remaining) [ "2019-09-09T12:09:37Z" "2019-09-09T12:09:37Z" - Unit @parameter ] + Unit ] - location: 140 (remaining gas: 1039907.960 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 141 (remaining gas: 1039907.820 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039907.750 units remaining) [ True - Unit @parameter ] + Unit ] - location: 143 (remaining gas: 1039907.560 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039907.490 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 148 (remaining gas: 1039907.350 units remaining) [ 1000 - Unit @parameter ] + Unit ] - location: 151 (remaining gas: 1039907.210 units remaining) [ 1000 1000 - Unit @parameter ] + Unit ] - location: 154 (remaining gas: 1039907.050 units remaining) [ 2000 - Unit @parameter ] + Unit ] - location: 155 (remaining gas: 1039906.910 units remaining) [ 2000 2000 - Unit @parameter ] + Unit ] - location: 160 (remaining gas: 1039906.626 units remaining) [ 0 - Unit @parameter ] + Unit ] - location: 161 (remaining gas: 1039906.486 units remaining) [ True - Unit @parameter ] + Unit ] - location: -1 (remaining gas: 1039906.416 units remaining) [ True - Unit @parameter ] + Unit ] - location: 163 (remaining gas: 1039906.226 units remaining) - [ Unit @parameter ] + [ Unit ] - location: -1 (remaining gas: 1039906.156 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 168 (remaining gas: 1039906.016 units remaining) [ {} - Unit @parameter ] + Unit ] - location: 170 (remaining gas: 1039905.876 units remaining) [ (Pair {} Unit) ] - location: -1 (remaining gas: 1039905.806 units remaining) 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 e16553e90fc0c0ca08a9673c0cdd92b860958423..87d50b57c1901d0258b2d26e0d47e0806221c221 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: 1039991.880 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039991.740 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 cbbe7b1efa6d94b968a47826f788e8b8fc8ce3ac..0c64212bfc7ac76012a933aa92fe4c96cfef5fda 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: 1039991.880 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039991.740 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 20aa8d97f9a9bec541cf5ecb79e3fe102628c129..f83db85d31f7fd198da93a2f663e653bfc002d98 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: 1039991.880 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0000000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039991.740 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 0310556975936019405025bf75633a15441cc87a..d64091d76d8fbb36f9a7d03db3c8e9490f92a276 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: 1039991.880 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 - 0x0100000000000000000000000000000000000000000000000000000000000000) @parameter ] + 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 11 (remaining gas: 1039991.740 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 84420a52d2bc204712688ad4feda2eaaebf9e606..39be7eb3ea456ef6b055d595fca398ae878665dd 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,13 +10,13 @@ trace - location: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair -100 "1970-01-01T00:01:40Z") ] - location: 11 (remaining gas: 1039988.870 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: 1039988.730 units remaining) [ -100 - (Pair -100 "1970-01-01T00:01:40Z") @parameter ] + (Pair -100 "1970-01-01T00:01:40Z") ] - location: 15 (remaining gas: 1039988.430 units remaining) [ "1970-01-01T00:01:40Z" ] - location: 14 (remaining gas: 1039988.360 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 0e5aa0f7ffe8145f490fa8b4b4c192e1183da732..dc3cb8f64ee44dc078ff62b2f510152ad1a96612 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,13 +10,13 @@ trace - location: 9 (remaining gas: 1039989.020 units remaining) [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ] - location: 10 (remaining gas: 1039988.880 units remaining) - [ (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + [ (Pair 0 "1970-01-01T00:00:00Z") ] - location: 11 (remaining gas: 1039988.740 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: 1039988.600 units remaining) [ 0 - (Pair 0 "1970-01-01T00:00:00Z") @parameter ] + (Pair 0 "1970-01-01T00:00:00Z") ] - location: 15 (remaining gas: 1039988.300 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 14 (remaining gas: 1039988.230 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 4b25b4cddfe8b6737e0892a678d1d35fdb3b029a..4678b43af3a2453692a450e214d838f6dcb1ed07 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,13 +10,13 @@ trace - location: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + [ (Pair 100 "1970-01-01T00:01:40Z") ] - location: 11 (remaining gas: 1039988.870 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: 1039988.730 units remaining) [ 100 - (Pair 100 "1970-01-01T00:01:40Z") @parameter ] + (Pair 100 "1970-01-01T00:01:40Z") ] - location: 15 (remaining gas: 1039988.430 units remaining) [ "1970-01-01T00:01:40Z" ] - location: 14 (remaining gas: 1039988.360 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 d06320bd9e6892ca7828974c51892749ecb73cf9..13d29f855f54a3de80e340893269b99b4a996160 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,13 +10,13 @@ trace - location: 9 (remaining gas: 1039989.020 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ] - location: 10 (remaining gas: 1039988.880 units remaining) - [ (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + [ (Pair "1970-01-01T00:00:00Z" 0) ] - location: 11 (remaining gas: 1039988.740 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: 1039988.600 units remaining) [ "1970-01-01T00:00:00Z" - (Pair "1970-01-01T00:00:00Z" 0) @parameter ] + (Pair "1970-01-01T00:00:00Z" 0) ] - location: 15 (remaining gas: 1039988.300 units remaining) [ 0 ] - location: 14 (remaining gas: 1039988.230 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 72d25b3e996e2595f98e92c561e4c0e446f82d21..899f2ea9117c8b98835f621e63ac2b947b2bdff5 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,13 +10,13 @@ trace - location: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 11 (remaining gas: 1039988.870 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: 1039988.730 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 15 (remaining gas: 1039988.430 units remaining) [ -100 ] - location: 14 (remaining gas: 1039988.360 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 d8abf6dc9c6f1f3ffe72b935c75a7d9e8d941236..1f6f48171ad059a9f465917e0de890098bc91cc7 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,13 +10,13 @@ trace - location: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 11 (remaining gas: 1039988.870 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: 1039988.730 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 15 (remaining gas: 1039988.430 units remaining) [ 100 ] - location: 14 (remaining gas: 1039988.360 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 257551a41d86a2f5ef63f95fbf91b39656dd68a9..64fb223ad0e3aaf5c907795d12357b2fd5c313c3 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: 8 (remaining gas: 1039480.374 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ] - location: 9 (remaining gas: 1039480.234 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 10 (remaining gas: 1039480.094 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.address ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 11 (remaining gas: 1039479.954 units remaining) [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 12 (remaining gas: 1039479.814 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 d544ed225c0ad932eafc9dbba6420453c16eb91a..59d1a026be4e8710c955e19ee154d3cd6a434442 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: 9 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair False False) None) ] - location: 10 (remaining gas: 1039990.480 units remaining) - [ (Pair False False) @param ] + [ (Pair False False) ] - location: 11 (remaining gas: 1039990.340 units remaining) [ False False ] - location: 12 (remaining gas: 1039990.180 units remaining) - [ False @and ] + [ False ] - location: 13 (remaining gas: 1039990.040 units remaining) - [ (Some False) @res ] + [ (Some False) ] - location: 14 (remaining gas: 1039989.900 units remaining) - [ {} @noop - (Some False) @res ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039989.760 units remaining) [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039989.620 units remaining) - [ {} @x - (Some False) @y ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039989.480 units remaining) [ (Pair {} (Some False)) ] - location: -1 (remaining gas: 1039989.410 units remaining) 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 9c191fe79d40913a46703564aa4d7aee701a76c9..69ec65062263df9b8b1fa4b51191c75b2c69be22 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: 9 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair False True) None) ] - location: 10 (remaining gas: 1039990.480 units remaining) - [ (Pair False True) @param ] + [ (Pair False True) ] - location: 11 (remaining gas: 1039990.340 units remaining) [ False True ] - location: 12 (remaining gas: 1039990.180 units remaining) - [ False @and ] + [ False ] - location: 13 (remaining gas: 1039990.040 units remaining) - [ (Some False) @res ] + [ (Some False) ] - location: 14 (remaining gas: 1039989.900 units remaining) - [ {} @noop - (Some False) @res ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039989.760 units remaining) [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039989.620 units remaining) - [ {} @x - (Some False) @y ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039989.480 units remaining) [ (Pair {} (Some False)) ] - location: -1 (remaining gas: 1039989.410 units remaining) 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 8721c98c898651f9f25683daa34935ae763e1397..f226a24fb34b694cce25333ad5ab197e5f429e75 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: 9 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair True False) None) ] - location: 10 (remaining gas: 1039990.480 units remaining) - [ (Pair True False) @param ] + [ (Pair True False) ] - location: 11 (remaining gas: 1039990.340 units remaining) [ True False ] - location: 12 (remaining gas: 1039990.180 units remaining) - [ False @and ] + [ False ] - location: 13 (remaining gas: 1039990.040 units remaining) - [ (Some False) @res ] + [ (Some False) ] - location: 14 (remaining gas: 1039989.900 units remaining) - [ {} @noop - (Some False) @res ] + [ {} + (Some False) ] - location: 16 (remaining gas: 1039989.760 units remaining) [ (Pair {} (Some False)) ] - location: 17 (remaining gas: 1039989.620 units remaining) - [ {} @x - (Some False) @y ] + [ {} + (Some False) ] - location: 18 (remaining gas: 1039989.480 units remaining) [ (Pair {} (Some False)) ] - location: -1 (remaining gas: 1039989.410 units remaining) 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 36559c2fa360c3986c31ad3629f012610b666392..f5f201d34b5893df4349b29aefa63d0023a1663e 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: 9 (remaining gas: 1039990.620 units remaining) [ (Pair (Pair True True) None) ] - location: 10 (remaining gas: 1039990.480 units remaining) - [ (Pair True True) @param ] + [ (Pair True True) ] - location: 11 (remaining gas: 1039990.340 units remaining) [ True True ] - location: 12 (remaining gas: 1039990.180 units remaining) - [ True @and ] + [ True ] - location: 13 (remaining gas: 1039990.040 units remaining) - [ (Some True) @res ] + [ (Some True) ] - location: 14 (remaining gas: 1039989.900 units remaining) - [ {} @noop - (Some True) @res ] + [ {} + (Some True) ] - location: 16 (remaining gas: 1039989.760 units remaining) [ (Pair {} (Some True)) ] - location: 17 (remaining gas: 1039989.620 units remaining) - [ {} @x - (Some True) @y ] + [ {} + (Some True) ] - location: 18 (remaining gas: 1039989.480 units remaining) [ (Pair {} (Some True)) ] - location: -1 (remaining gas: 1039989.410 units remaining) 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 f365a7b92f4f38a0c7406a46cce49a5fd2d3e9dd..00d3aaa256aecc9e15d43be2a03df5dc9e0e235f 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 @@ -94,7 +94,7 @@ trace - location: 88 (remaining gas: 1039950.100 units remaining) [ Unit ] - location: 89 (remaining gas: 1039949.960 units remaining) - [ {} @noop + [ {} Unit ] - location: 91 (remaining gas: 1039949.820 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 3b8fa653806c96be4adba8611ad305caa2e3dc12..447ef64b41f98c971f1703712c1bb0993201ea68 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: 8 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair False False) False) ] - location: 9 (remaining gas: 1039993.030 units remaining) - [ (Pair False False) @parameter ] + [ (Pair False False) ] - location: 10 (remaining gas: 1039992.890 units remaining) [ False False ] - location: 11 (remaining gas: 1039992.730 units remaining) - [ False @and ] + [ False ] - location: 12 (remaining gas: 1039992.590 units remaining) - [ {} @noop - False @and ] + [ {} + False ] - location: 14 (remaining gas: 1039992.450 units remaining) [ (Pair {} False) ] - location: -1 (remaining gas: 1039992.380 units remaining) 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 73a28df403b89b2dcf68119337ac8f2fa9167ffa..8a2fa949d4127d4ae5a782980dd63779cca6dae4 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: 8 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair False True) False) ] - location: 9 (remaining gas: 1039993.030 units remaining) - [ (Pair False True) @parameter ] + [ (Pair False True) ] - location: 10 (remaining gas: 1039992.890 units remaining) [ False True ] - location: 11 (remaining gas: 1039992.730 units remaining) - [ False @and ] + [ False ] - location: 12 (remaining gas: 1039992.590 units remaining) - [ {} @noop - False @and ] + [ {} + False ] - location: 14 (remaining gas: 1039992.450 units remaining) [ (Pair {} False) ] - location: -1 (remaining gas: 1039992.380 units remaining) 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 1ace40329ac98654803870dae9d94b2198fe006d..f71f8f38a13d0087feb83f9b39e3d9b407a5bbdf 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: 8 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair True False) False) ] - location: 9 (remaining gas: 1039993.030 units remaining) - [ (Pair True False) @parameter ] + [ (Pair True False) ] - location: 10 (remaining gas: 1039992.890 units remaining) [ True False ] - location: 11 (remaining gas: 1039992.730 units remaining) - [ False @and ] + [ False ] - location: 12 (remaining gas: 1039992.590 units remaining) - [ {} @noop - False @and ] + [ {} + False ] - location: 14 (remaining gas: 1039992.450 units remaining) [ (Pair {} False) ] - location: -1 (remaining gas: 1039992.380 units remaining) 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 fe8c552df9480f5c888ac4f8f5f8d0af9280737d..3e5de68c3fe925884119ff3eba1ecd9efd1b8303 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: 8 (remaining gas: 1039993.170 units remaining) [ (Pair (Pair True True) False) ] - location: 9 (remaining gas: 1039993.030 units remaining) - [ (Pair True True) @parameter ] + [ (Pair True True) ] - location: 10 (remaining gas: 1039992.890 units remaining) [ True True ] - location: 11 (remaining gas: 1039992.730 units remaining) - [ True @and ] + [ True ] - location: 12 (remaining gas: 1039992.590 units remaining) - [ {} @noop - True @and ] + [ {} + True ] - location: 14 (remaining gas: 1039992.450 units remaining) [ (Pair {} True) ] - location: -1 (remaining gas: 1039992.380 units remaining) 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 813d5404ed6a2f3cb46b9822fa0ae2e5ee86edf8..c624203fd4775d667b2771a9f3a489f2b2834007 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039779.524 units remaining) - [ 4000000000000 @balance ] + [ 4000000000000 ] - location: 9 (remaining gas: 1039779.384 units remaining) [ {} - 4000000000000 @balance ] + 4000000000000 ] - location: 11 (remaining gas: 1039779.244 units remaining) [ (Pair {} 4000000000000) ] - location: -1 (remaining gas: 1039779.174 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 0 (S.4c96f27113.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 0 (S.4c96f27113.out index 676ae34a280a86685c18f1f6e68234e0114e735f..0d4a3e241033def95be910ee51591250f405fda8 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 0 (S.4c96f27113.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 0 (S.4c96f27113.out @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039986.030 units remaining) - [ 1 @parameter - (Pair { Elt 0 1 } None) @storage ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039985.730 units remaining) [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039985.590 units remaining) @@ -22,7 +22,7 @@ trace [ { Elt 0 1 } { Elt 0 1 } ] - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter + [ 1 { Elt 0 1 } { Elt 0 1 } ] - location: 17 (remaining gas: 1039985.380 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 0 (S.7a576099dd.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 0 (S.7a576099dd.out index 4430689d9574267761fa08fd3b7ea4a06108400f..8aec8198ade23d36644f94d0fb764c097df71388 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 0 (S.7a576099dd.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 0 (S.7a576099dd.out @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039986.030 units remaining) - [ 1 @parameter - (Pair { Elt 0 1 } None) @storage ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039985.730 units remaining) [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039985.590 units remaining) @@ -22,7 +22,7 @@ trace [ { Elt 0 1 } { Elt 0 1 } ] - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter + [ 1 { Elt 0 1 } { Elt 0 1 } ] - location: 17 (remaining gas: 1039985.380 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 0 (S.a78f9cbe43.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 0 (S.a78f9cbe43.out index 5e8203e8b096d14a0cd9afd1de1598ddeb5668ee..9a241cefc93735f3ab3caeacda6456a57b2abf6e 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 0 (S.a78f9cbe43.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 0 (S.a78f9cbe43.out @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039986.030 units remaining) - [ 1 @parameter - (Pair { Elt 1 0 } None) @storage ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039985.730 units remaining) [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039985.590 units remaining) @@ -22,7 +22,7 @@ trace [ { Elt 1 0 } { Elt 1 0 } ] - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter + [ 1 { Elt 1 0 } { Elt 1 0 } ] - location: 17 (remaining gas: 1039985.380 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 0 (S.eb161b3e7b.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 0 (S.eb161b3e7b.out index 3736ed1a670f78d8f061901bc03b149e1eb14e5d..11f89770e1b47031151521d2969b1e273d7047b3 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 0 (S.eb161b3e7b.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 0 (S.eb161b3e7b.out @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039986.170 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039986.030 units remaining) - [ 1 @parameter - (Pair { Elt 1 0 } None) @storage ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039985.730 units remaining) [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039985.590 units remaining) @@ -22,7 +22,7 @@ trace [ { Elt 1 0 } { Elt 1 0 } ] - location: 13 (remaining gas: 1039985.520 units remaining) - [ 1 @parameter + [ 1 { Elt 1 0 } { Elt 1 0 } ] - location: 17 (remaining gas: 1039985.380 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.09d8aca862.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.09d8aca862.out index e0f2bd6ed2229a9516e7520f792c81edcc0ec18a..e87b2d94596022d32f16cd10d2b4e00527f7a57b 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.09d8aca862.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.09d8aca862.out @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.460 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.320 units remaining) - [ 1 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.020 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039984.880 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039984.810 units remaining) - [ 1 @parameter + [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039984.670 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.8c67185afa.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.8c67185afa.out index a6216b12435a000f23b2a3aa812c2c0889596a5f..62b9baa871281ef2c1d15efdf8d45bacb60f038f 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.8c67185afa.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.8c67185afa.out @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.460 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.320 units remaining) - [ 1 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.020 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039984.880 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039984.810 units remaining) - [ 1 @parameter + [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039984.670 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.288a17ed5b.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.288a17ed5b.out index 4b167d07a9e668c3bd3c76940552e013171caf9c..5323fc344c4536f170eda53e0510da28d73775f9 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.288a17ed5b.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.288a17ed5b.out @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.460 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.320 units remaining) - [ 2 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.020 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039984.880 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039984.810 units remaining) - [ 2 @parameter + [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039984.670 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.359cf3d084.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.359cf3d084.out index 9d6e27f7038af1d8182c3956c29c38774d56305f..cf31233b8c0338b3e28d141e5819280dcab6e978 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.359cf3d084.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.359cf3d084.out @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.460 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.320 units remaining) - [ 2 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.020 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039984.880 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039984.810 units remaining) - [ 2 @parameter + [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039984.670 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.1c70ed3ee1.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.1c70ed3ee1.out index b46dd2aeae83e0e9fcebb0a321a9b3d3fdd6bcf9..a451148252fa5182a7ba0a42d333994266e2ea35 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.1c70ed3ee1.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.1c70ed3ee1.out @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.460 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.320 units remaining) - [ 3 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.020 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039984.880 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039984.810 units remaining) - [ 3 @parameter + [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039984.670 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.4df68c50c9.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.4df68c50c9.out index 04efc1e1841b820a4be2dbca7653d41b7a6eabf1..4f0389216891c71b456c6897d67ad180f7dfdfa2 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.4df68c50c9.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.4df68c50c9.out @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.460 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039985.320 units remaining) - [ 3 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.020 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039984.880 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039984.810 units remaining) - [ 3 @parameter + [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039984.670 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 0 (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 0 (Some False))0].out index f2acaa713ddcd54e333cd49fceed987d47427be4..b621280d5f1906e743adc712491f9016fd5107db 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 0 (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 0 (Some False))0].out @@ -10,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.730 units remaining) [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039986.590 units remaining) - [ 1 @parameter - (Pair {} None) @storage ] + [ 1 + (Pair {} None) ] - location: 15 (remaining gas: 1039986.290 units remaining) [ {} ] - location: 16 (remaining gas: 1039986.150 units remaining) @@ -21,7 +21,7 @@ trace [ {} {} ] - location: 13 (remaining gas: 1039986.080 units remaining) - [ 1 @parameter + [ 1 {} {} ] - location: 17 (remaining gas: 1039985.940 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 0 (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 0 (Some False))1].out index 3bfbf9673694d1262268edea1bbae6fb624e1790..16bc40d1fb7eba9bb72efba1ddc77a8ed0223492 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 0 (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 0 (Some False))1].out @@ -10,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.730 units remaining) [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039986.590 units remaining) - [ 1 @parameter - (Pair {} None) @storage ] + [ 1 + (Pair {} None) ] - location: 15 (remaining gas: 1039986.290 units remaining) [ {} ] - location: 16 (remaining gas: 1039986.150 units remaining) @@ -21,7 +21,7 @@ trace [ {} {} ] - location: 13 (remaining gas: 1039986.080 units remaining) - [ 1 @parameter + [ 1 {} {} ] - location: 17 (remaining gas: 1039985.940 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.712049bd7b.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.712049bd7b.out" index a78495ddd87636b020d163357215c4bf33e0ac75..cc7f18b73af13b6cbff282a02c645a6b4b91f37b 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.712049bd7b.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.712049bd7b.out" @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.358 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.218 units remaining) - [ "baz" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "baz" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039984.918 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039984.778 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039984.708 units remaining) - [ "baz" @parameter + [ "baz" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.568 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.b18ef3a371.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.b18ef3a371.out" index b6430898be15999d192b2642ec4b810efa7e158d..c76ab24bd0923c24475d512da38c25d9df9bfd81 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.b18ef3a371.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.b18ef3a371.out" @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.358 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.218 units remaining) - [ "foo" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "foo" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039984.918 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039984.778 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039984.708 units remaining) - [ "foo" @parameter + [ "foo" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.568 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.d04a6af348.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.d04a6af348.out" index 4b4234dbb4e8856f583123809fff9f340255f544..9834c51dd3cbaa108756084199f922d2bda33d18 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.d04a6af348.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.d04a6af348.out" @@ -12,8 +12,8 @@ trace - location: 11 (remaining gas: 1039985.358 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039985.218 units remaining) - [ "bar" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "bar" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039984.918 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039984.778 units remaining) @@ -23,7 +23,7 @@ trace [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039984.708 units remaining) - [ "bar" @parameter + [ "bar" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039984.568 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\".1ae65b36c3.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\".1ae65b36c3.out" index 71261ace75bf80253b3c782a998d7008adced621..fa48fa1e6f3cf1623622833fbc36e080f86f5f22 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\".1ae65b36c3.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\".1ae65b36c3.out" @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039986.082 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - location: 12 (remaining gas: 1039985.942 units remaining) - [ "foo" @parameter - (Pair { Elt "foo" 0 } None) @storage ] + [ "foo" + (Pair { Elt "foo" 0 } None) ] - location: 15 (remaining gas: 1039985.642 units remaining) [ { Elt "foo" 0 } ] - location: 16 (remaining gas: 1039985.502 units remaining) @@ -22,7 +22,7 @@ trace [ { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 13 (remaining gas: 1039985.432 units remaining) - [ "foo" @parameter + [ "foo" { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 17 (remaining gas: 1039985.292 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\".59ffcc6af5.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\".59ffcc6af5.out" index f62cfd898bafc2584668e2d77cc4c437e01576e5..9037edf62bc860a50c868a0eb8ef072db7ab071e 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\".59ffcc6af5.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\".59ffcc6af5.out" @@ -11,8 +11,8 @@ trace - location: 11 (remaining gas: 1039986.082 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - location: 12 (remaining gas: 1039985.942 units remaining) - [ "bar" @parameter - (Pair { Elt "foo" 1 } None) @storage ] + [ "bar" + (Pair { Elt "foo" 1 } None) ] - location: 15 (remaining gas: 1039985.642 units remaining) [ { Elt "foo" 1 } ] - location: 16 (remaining gas: 1039985.502 units remaining) @@ -22,7 +22,7 @@ trace [ { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 13 (remaining gas: 1039985.432 units remaining) - [ "bar" @parameter + [ "bar" { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 17 (remaining gas: 1039985.292 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 0 (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 0 (Some False))].out" index e22e5eb8081ef34f06f8f547409396fc4ef9f653..18af2f4599c9fbbb0fff0d58f0086232f1ff6f68 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 0 (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 0 (Some False))].out" @@ -10,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.686 units remaining) [ (Pair "bar" {} None) ] - location: 12 (remaining gas: 1039986.546 units remaining) - [ "bar" @parameter - (Pair {} None) @storage ] + [ "bar" + (Pair {} None) ] - location: 15 (remaining gas: 1039986.246 units remaining) [ {} ] - location: 16 (remaining gas: 1039986.106 units remaining) @@ -21,7 +21,7 @@ trace [ {} {} ] - location: 13 (remaining gas: 1039986.036 units remaining) - [ "bar" @parameter + [ "bar" {} {} ] - location: 17 (remaining gas: 1039985.896 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 148d8da9c6a2eb3589dda1028e922d401e6b08e2..14095e67e31b031be25349109e884410a447b88d 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 0x0000000000000000000000000000000000000000000000000000000000000000 @parameter ] + [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.460 units remaining) [ 0 ] - location: 9 (remaining gas: 1039994.320 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 f11add396420955a64cafd88abe73ee008ee2f1f..b0e70d7b6b825d39dc5e0eb017d9ccf2ce7dbd4a 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.460 units remaining) [ 1 ] - location: 9 (remaining gas: 1039994.320 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 d6bfbc1e812ea04d01c4edec84d8df2d90b8e614..b339bbe158dc1e872972fb4f4728cd7148c35b69 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 @parameter ] + [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 ] - location: 8 (remaining gas: 1039994.460 units remaining) [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ] - location: 9 (remaining gas: 1039994.320 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 81c59ecbb86c055c4764066dc2ffc4e02f4f09da..c0eb52013ac190b1dfd0b2ccc3105af7128c098f 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 @parameter ] + [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 ] - location: 8 (remaining gas: 1039994.460 units remaining) [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ] - location: 9 (remaining gas: 1039994.320 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 32e039284900e35098186f5963b34d0a7adbe15d..783428f92cbbc2c1ef01412092bd40cc8977912e 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: 6 (remaining gas: 1039988.655 units remaining) [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ] - location: 7 (remaining gas: 1039988.515 units remaining) - [ 0x1000000000000000000000000000000000000000000000000000000000000000 @parameter ] + [ 0x1000000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039988.425 units remaining) [ 16 ] - location: 9 (remaining gas: 1039988.285 units remaining) [ (Some 16) ] - location: 16 (remaining gas: 1039988.015 units remaining) - [ 16 @some ] + [ 16 ] - location: 10 (remaining gas: 1039987.945 units remaining) - [ 16 @some ] + [ 16 ] - location: 17 (remaining gas: 1039987.805 units remaining) [ 1 - 16 @some ] + 16 ] - location: 20 (remaining gas: 1039987.412 units remaining) [ 16 ] - location: 21 (remaining gas: 1039987.272 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 89f091226a6d7f54eb4e66fd36b6b9a0b4f8fb7c..b5d81b297ee65c43149b1f173b82ccbfa84cd4ef 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ -42 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -42 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 9 (remaining gas: 1039993.960 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 4ed39fd2143ce09fa89ac90fb642fcf9166c0db2..0e4a20334d2964602fb02ed9992b2ef08326d939 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 3fee2b75acf6777d48639f7bfe20c835b793d531..749657cfa4928a9039adc087e8248c7352c8641d 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ -1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 9 (remaining gas: 1039993.960 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 6593af7599fee84b83473c76e10662bcf01066c8..ab4223905def154f4bec08a64b87986215b7fc1d 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 fd904dcbd52f2d17781e1593a3375da44572748c..44d30472cc3cdccf1d313ed5ab27dda242631686 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.550 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 d5f199914242cf0a26e31a3548586abf833b6993..16cae18ff3234b361e7f22f7c9d83b751613bcb8 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 e3bf07375293c17765375fb43b673993afdc5847..f49f0ccac430d6e8c498d16cf4f4aea62e879751 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.550 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 9 (remaining gas: 1039993.960 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 eb76460e9d8a9e78cf7363eae8d4c6e1f023eb6a..ba8103881ad7e38d56a4dd7a8facd88b1fccb20e 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.550 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 9 (remaining gas: 1039993.960 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 2e090ceb7bd3323273af917927deed52f9a1fcdc..7fdf8a073285ffb4ad1ebdb63d5346f80981b570 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.550 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039993.960 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 b4b5cf5b432c8f219d937355e9520de5a3dfbc93..7251ee15debc7d6b8d23f36699309a75db11925b 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.550 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039993.960 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 b7a018b326eb1e87a24d89fd6ec92cfd3fa5d4bc..27c58ab36b557ce4b25ea989362bea34ea77ce14 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 5a2432ead968a658cf89d6cd2ee134e65e684c15..526140ad7412c2f9ee11953bf59e39c2ca8e3d1a 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 412a2f30e7d643c28e98a2ef17a7cd4e72b6302f..848321dd6931536ea1652938774d07129854ba24 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.550 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 7f0a929bfaca3a4a03b597f721ad66b1e690e561..1cbbdd33e3162bc0888d6376fe0592c3b53fd66d 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: 6 (remaining gas: 1039994.690 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039994.550 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 9 (remaining gas: 1039993.960 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 7d5d9fd1a545f9238d9236f303deb93fb3604551..18c5fcd9212bdb707685d8e941523f74fa5a9eb0 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.550 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 9 (remaining gas: 1039993.960 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 bba323c3036640c22aa2c39ae3ae4940f4c3de17..40cfa64aacbdb8d33ed963dc3abb9b565192e8cc 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.550 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 9 (remaining gas: 1039993.960 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 09cb2c002a787ee60bb663c4a495b67cf79d4a40..736ba603085dc73ef5296edf7ee5a379b7abfa2c 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.550 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039993.960 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 5d0250c0241f54b16f26074e917c2b6123ab1395..58c4bc03fad50a9e6ccdf6478a98a2c2dc47029c 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.550 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039994.100 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 9 (remaining gas: 1039993.960 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 4347e6726a862301d06a1e0ca724db07093f5444..6e8a9dd400a2dec785cb6e1737bba46c2119f7d0 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 2 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 2 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 26feee3ba38cf6940d3e3d9e6d23401557d8e79e..f77558957246fa300f677798065e378273659f49 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ -1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - -1 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + -1 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 10 (remaining gas: 1039993.080 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 9fceef0ae3e41b7402367d42c87c3330f8fcfca0..6f0812d75445211be46a05bf1443d08eeec606a5 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 0 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 be5155b66dcb6297472f8bc2bcffe54d9956546b..79d2930b8da0af6e02163afa2e066d5c66bcdc4d 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ -42 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ -42 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - -42 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + -42 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ] - location: 10 (remaining gas: 1039993.080 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 7d4d3ac50a75fd78a9ae4f215a3a16f987c2f22f..038227b46e1d9601f80c92dd895554427adbe935 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 1 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 1 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 45f07ccd565b04ceeb6337a50b602cc2ef61566a..9b3c73ea12aa9c01d50989a8c75cac14f0b70b3b 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: 1039993.800 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 1bef36cdf080b9c3a40080c229017ffb9e9f8fc1..78ce1ca1eb9e1834976538562214b28264c0614e 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: 1039993.800 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage - 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter ] + [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f + 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 10 (remaining gas: 1039993.080 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 f5449fc5e286bf2dd476469da829c0a5f4a7522e..bf8972c11a988bca46dacb3cfcaf188922845bb4 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: 1039993.800 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage - 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter ] + [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f + 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 10 (remaining gas: 1039993.080 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 19b6ceb048afebd316658784115c6c161a4e0c4c..2049c5f554f8bd69a4f9c66393626a3bb1736d9d 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: 1039993.800 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.080 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 954995c5be292de7ad7dc5368f4c781efde39b07..6cdd490784e1b2ff3c9ac75682709b6e93f31152 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: 1039993.800 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.080 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 a70a5da7c59a61ca6cdbf3699e02bb16afd522a5..3a6267f7a96d389b3dc9f768307ad6b994b8dfbe 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: 1039993.800 units remaining) - [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 52435875175126190479447740508185965837690552500527637822603658699938581184514 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 52435875175126190479447740508185965837690552500527637822603658699938581184514 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 52435875175126190479447740508185965837690552500527637822603658699938581184514 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 0c71091d7fa9ea534399ffca3c3544980fd9baea..a4e7eecd058e5ae5f912a372200470982d360f60 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ 0 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 0 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 0 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 0 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0000000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 e9a1a829af15e0bc29e5667ba272b8223c235455..2c0cd04401df6446f57eeddf276852c3f850a4f7 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ 1 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 1 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 1 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 1 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 f6c37e44237f668fc07292919e1c1daee6736662..9822bd4ffcb03720f65a566fcc8923c08f35dfdc 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: 6 (remaining gas: 1039993.940 units remaining) [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039993.800 units remaining) - [ 2 @parameter - 0x0100000000000000000000000000000000000000000000000000000000000000 @storage ] + [ 2 + 0x0100000000000000000000000000000000000000000000000000000000000000 ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x0100000000000000000000000000000000000000000000000000000000000000 @storage - 2 @parameter ] + [ 0x0100000000000000000000000000000000000000000000000000000000000000 + 2 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x0200000000000000000000000000000000000000000000000000000000000000 ] - location: 10 (remaining gas: 1039993.080 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 7f545b837955f43bde5a6c9879635fdb364931e4..18dee1ad0cc57b4fce2897879174ce0bad055790 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: 1039993.800 units remaining) - [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter - 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage ] + [ 22620284817922784902564672469917992996328211127984472897491698543785655336309 + 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f @storage - 22620284817922784902564672469917992996328211127984472897491698543785655336309 @parameter ] + [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f + 22620284817922784902564672469917992996328211127984472897491698543785655336309 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ] - location: 10 (remaining gas: 1039993.080 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 d74246325d90b465f7b3d9cac3ee698a05e4222b..1cd6c17168000107fe62fbdfcadf2a99f58092fd 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: 1039993.800 units remaining) - [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter - 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage ] + [ 33644916630334844239120348434626468649534186770809802792596996408934105684394 + 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f @storage - 33644916630334844239120348434626468649534186770809802792596996408934105684394 @parameter ] + [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f + 33644916630334844239120348434626468649534186770809802792596996408934105684394 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ] - location: 10 (remaining gas: 1039993.080 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 63c86e71dfc79780c1fd7b9043736b9a492d2413..74d682518d2431a79a34f38e7785b7884075d76c 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: 1039993.800 units remaining) - [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 69615968247920749285624776342583898043608129789011377475114141186797415307882 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 69615968247920749285624776342583898043608129789011377475114141186797415307882 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 69615968247920749285624776342583898043608129789011377475114141186797415307882 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.080 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 a8bf26df34fac741f5b19ef0a3587908a430d0ce..e7451fd5c2f91fde0c9d25dc7e4807323b9d17f6 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: 1039993.800 units remaining) - [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter - 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage ] + [ 17180093072794558806177035834397932205917577288483739652510482486858834123369 + 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ] - location: 8 (remaining gas: 1039993.670 units remaining) - [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d @storage - 17180093072794558806177035834397932205917577288483739652510482486858834123369 @parameter ] + [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d + 17180093072794558806177035834397932205917577288483739652510482486858834123369 ] - location: 9 (remaining gas: 1039993.220 units remaining) [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ] - location: 10 (remaining gas: 1039993.080 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 5ea61782f04bc673da54029603cc52a223c9c7cc..9943f508b66a1b2a07f9c16b5c7fe3c01d3a4a9f 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: 8 (remaining gas: 1039993.920 units remaining) [ (Pair (Pair 34 17) 0) ] - location: 9 (remaining gas: 1039993.780 units remaining) - [ (Pair 34 17) @parameter ] + [ (Pair 34 17) ] - location: 10 (remaining gas: 1039993.640 units remaining) [ 34 ] - location: 11 (remaining gas: 1039993.500 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 ccbd80bd631109b2898a4915b4f3b4d931f09422..391e16d5e601bb6347c849975fc7f4ff69ccf71a 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: 8 (remaining gas: 1039993.920 units remaining) [ (Pair (Pair 34 17) 0) ] - location: 9 (remaining gas: 1039993.780 units remaining) - [ (Pair 34 17) @parameter ] + [ (Pair 34 17) ] - location: 10 (remaining gas: 1039993.640 units remaining) [ 17 ] - location: 11 (remaining gas: 1039993.500 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 0f21c75af2acb0715b0b939d2fee5cd326d83911..3c5d7344aefc2b8e6d64c0e9eb7c89e88d05190b 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,122 +10,122 @@ trace - location: 10 (remaining gas: 1039941.990 units remaining) [ (Pair (Pair 1 4 2 Unit) Unit) ] - location: 11 (remaining gas: 1039941.850 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 12 (remaining gas: 1039941.710 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: 1039941.570 units remaining) [ 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 14 (remaining gas: 1039941.430 units remaining) [ 1 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 19 (remaining gas: 1039941.100 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 20 (remaining gas: 1039940.960 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039940.890 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 22 (remaining gas: 1039940.700 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039940.630 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 27 (remaining gas: 1039940.490 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: 1039940.350 units remaining) [ 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 30 (remaining gas: 1039940.210 units remaining) [ 1 1 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 35 (remaining gas: 1039939.880 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 36 (remaining gas: 1039939.740 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039939.670 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 38 (remaining gas: 1039939.480 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039939.410 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 43 (remaining gas: 1039939.270 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: 1039939.129 units remaining) [ 4 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 46 (remaining gas: 1039938.989 units remaining) [ 4 4 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 51 (remaining gas: 1039938.659 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 52 (remaining gas: 1039938.519 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039938.449 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 54 (remaining gas: 1039938.259 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039938.189 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 59 (remaining gas: 1039938.049 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: 1039937.907 units remaining) [ 2 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 62 (remaining gas: 1039937.767 units remaining) [ 2 2 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 67 (remaining gas: 1039937.437 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 68 (remaining gas: 1039937.297 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039937.227 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 70 (remaining gas: 1039937.037 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039936.967 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 75 (remaining gas: 1039936.827 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: 1039936.684 units remaining) [ Unit - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 78 (remaining gas: 1039936.544 units remaining) [ Unit Unit - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 81 (remaining gas: 1039936.354 units remaining) [ 0 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 82 (remaining gas: 1039936.214 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039936.144 units remaining) [ True - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 84 (remaining gas: 1039935.954 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: -1 (remaining gas: 1039935.884 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 89 (remaining gas: 1039935.744 units remaining) [ ] - location: 90 (remaining gas: 1039935.604 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 5c1d3eb46fe0a76c50a7484a2dc35ae0b1bec356..6dcdcf182766c96bffbd9fc7fba19f1bc687e2e0 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: 15 (remaining gas: 1039983.796 units remaining) [ (Pair (Pair 1 4 2 Unit) None) ] - location: 16 (remaining gas: 1039983.656 units remaining) - [ (Pair 1 4 2 Unit) @parameter ] + [ (Pair 1 4 2 Unit) ] - location: 17 (remaining gas: 1039983.516 units remaining) [ 2 - (Pair 1 4 2 Unit) @parameter ] + (Pair 1 4 2 Unit) ] - location: 20 (remaining gas: 1039983.375 units remaining) [ (Pair 2 4 2 Unit) ] - location: 22 (remaining gas: 1039983.235 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 27afa2cb30777f3a56261002b760bbd32b8b601f..760e35fdea10fd4ba318956c204c9916a8c35b86 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: 10 (remaining gas: 1039984.270 units remaining) [ (Pair Unit 1 4 2 Unit) ] - location: 11 (remaining gas: 1039984.130 units remaining) - [ (Pair 1 4 2 Unit) @storage ] + [ (Pair 1 4 2 Unit) ] - location: 12 (remaining gas: 1039983.990 units remaining) [ 2 - (Pair 1 4 2 Unit) @storage ] + (Pair 1 4 2 Unit) ] - location: 15 (remaining gas: 1039983.849 units remaining) [ (Pair 2 4 2 Unit) ] - location: 17 (remaining gas: 1039983.709 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 204a0fa5661404553dfed18705070b3fc28dedfe..16571fb64ac5d98b0b07f668393cf2baa6725e98 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,282 +15,282 @@ trace - location: 9 (remaining gas: 1039960.920 units remaining) [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ] - location: 10 (remaining gas: 1039960.780 units remaining) - [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 11 (remaining gas: 1039960.640 units remaining) [ {} - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 16 (remaining gas: 1039960.340 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: 19 (remaining gas: 1039959.580 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 18 (remaining gas: 1039959.510 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039959.370 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 18 (remaining gas: 1039959.300 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039959.160 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 18 (remaining gas: 1039959.090 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039958.950 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 18 (remaining gas: 1039958.880 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 19 (remaining gas: 1039958.740 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 18 (remaining gas: 1039958.670 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 17 (remaining gas: 1039958.670 units remaining) [ { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: -1 (remaining gas: 1039958.600 units remaining) [ { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 14 (remaining gas: 1039958.600 units remaining) [ {} { False ; False ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 20 (remaining gas: 1039958.470 units remaining) [ { False ; False ; True ; False ; False } {} - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 21 (remaining gas: 1039958.330 units remaining) [ { { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 24 (remaining gas: 1039958.030 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: 27 (remaining gas: 1039957.270 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 26 (remaining gas: 1039957.200 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039957.060 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 26 (remaining gas: 1039956.990 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039956.850 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 26 (remaining gas: 1039956.780 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039956.640 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 26 (remaining gas: 1039956.570 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 27 (remaining gas: 1039956.430 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 26 (remaining gas: 1039956.360 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 25 (remaining gas: 1039956.360 units remaining) [ { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: -1 (remaining gas: 1039956.290 units remaining) [ { True ; True ; False ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 22 (remaining gas: 1039956.290 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: 1039956.160 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: 1039956.020 units remaining) [ { { True ; True ; False ; True ; True } ; { False ; False ; True ; False ; False } } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 32 (remaining gas: 1039955.720 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: 35 (remaining gas: 1039954.960 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 34 (remaining gas: 1039954.890 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039954.750 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 34 (remaining gas: 1039954.680 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039954.540 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 34 (remaining gas: 1039954.470 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039954.330 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 34 (remaining gas: 1039954.260 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 35 (remaining gas: 1039954.120 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 34 (remaining gas: 1039954.050 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 33 (remaining gas: 1039954.050 units remaining) [ { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: -1 (remaining gas: 1039953.980 units remaining) [ { True ; True ; True ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 30 (remaining gas: 1039953.980 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: 1039953.850 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: 1039953.710 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: 40 (remaining gas: 1039953.410 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: 43 (remaining gas: 1039952.650 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 42 (remaining gas: 1039952.580 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039952.440 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 42 (remaining gas: 1039952.370 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039952.230 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 42 (remaining gas: 1039952.160 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039952.020 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 42 (remaining gas: 1039951.950 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 43 (remaining gas: 1039951.810 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 42 (remaining gas: 1039951.740 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 41 (remaining gas: 1039951.740 units remaining) [ { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: -1 (remaining gas: 1039951.670 units remaining) [ { True ; True ; False ; False ; False } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 38 (remaining gas: 1039951.670 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: 1039951.540 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: 1039951.400 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: 48 (remaining gas: 1039951.100 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: 51 (remaining gas: 1039950.340 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 50 (remaining gas: 1039950.270 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039950.130 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 50 (remaining gas: 1039950.060 units remaining) [ False - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039949.920 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 50 (remaining gas: 1039949.850 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039949.710 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 50 (remaining gas: 1039949.640 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 51 (remaining gas: 1039949.500 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 50 (remaining gas: 1039949.430 units remaining) [ True - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 49 (remaining gas: 1039949.430 units remaining) [ { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: -1 (remaining gas: 1039949.360 units remaining) [ { False ; False ; True ; True ; True } - { -9999999 ; -1 ; 0 ; 1 ; 9999999 } @parameter ] + { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ] - location: 46 (remaining gas: 1039949.360 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: 1039949.230 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: 1039949.090 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: 58 (remaining gas: 1039948.170 units remaining) [ False ] - location: 57 (remaining gas: 1039948.100 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 3850a148ee16148608aca710b552fd5e7ca88c50..16662def692ffeaf45c90ea87db73896f8d256bf 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,10 +10,10 @@ trace - location: 8 (remaining gas: 1039991.972 units remaining) [ (Pair { "World!" } {}) ] - location: 9 (remaining gas: 1039991.832 units remaining) - [ { "World!" } @parameter ] + [ { "World!" } ] - location: 12 (remaining gas: 1039991.120 units remaining) - [ "Hello " @hello - "World!" @parameter.elt ] + [ "Hello " + "World!" ] - location: 15 (remaining gas: 1039990.980 units remaining) [ "Hello World!" ] - location: -1 (remaining gas: 1039990.910 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 3721695b0bf9a8629513aad59fb620f8a2570883..6b815438589e276c78a026e23b1a63fc7c46b7b4 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,17 +10,17 @@ trace - location: 8 (remaining gas: 1039991.678 units remaining) [ (Pair { "test1" ; "test2" } {}) ] - location: 9 (remaining gas: 1039991.538 units remaining) - [ { "test1" ; "test2" } @parameter ] + [ { "test1" ; "test2" } ] - location: 12 (remaining gas: 1039990.814 units remaining) - [ "Hello " @hello - "test1" @parameter.elt ] + [ "Hello " + "test1" ] - location: 15 (remaining gas: 1039990.674 units remaining) [ "Hello test1" ] - location: -1 (remaining gas: 1039990.604 units remaining) [ "Hello test1" ] - location: 12 (remaining gas: 1039990.464 units remaining) - [ "Hello " @hello - "test2" @parameter.elt ] + [ "Hello " + "test2" ] - location: 15 (remaining gas: 1039990.324 units remaining) [ "Hello test2" ] - location: -1 (remaining gas: 1039990.254 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 384f4bea748d0912c6280a2d68ee4ab38ad8fd60..b65ffe0fb11bdaab3dbff3621e323a747d815144 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: 8 (remaining gas: 1039992.286 units remaining) [ (Pair {} {}) ] - location: 9 (remaining gas: 1039992.146 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039991.586 units remaining) [ {} ] - location: 16 (remaining gas: 1039991.446 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 c4746fa12bc150c2fccb37751b759ac1794405c9..09de44fa60abff4c08add73ef81f76de6531b1c0 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,17 +10,17 @@ trace - location: 8 (remaining gas: 1039991.880 units remaining) [ (Pair { 0xab ; 0xcd } {}) ] - location: 9 (remaining gas: 1039991.740 units remaining) - [ { 0xab ; 0xcd } @parameter ] + [ { 0xab ; 0xcd } ] - location: 12 (remaining gas: 1039991.016 units remaining) [ 0xff - 0xab @parameter.elt ] + 0xab ] - location: 15 (remaining gas: 1039990.876 units remaining) [ 0xffab ] - location: -1 (remaining gas: 1039990.806 units remaining) [ 0xffab ] - location: 12 (remaining gas: 1039990.666 units remaining) [ 0xff - 0xcd @parameter.elt ] + 0xcd ] - location: 15 (remaining gas: 1039990.526 units remaining) [ 0xffcd ] - location: -1 (remaining gas: 1039990.456 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 a0efb327ffb6281b52270b6833b2a83600539d34..e9e1424fcd8cbf7f9d12c6fe4a096c09004a2050 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,10 +10,10 @@ trace - location: 8 (remaining gas: 1039992.120 units remaining) [ (Pair { 0xcd } {}) ] - location: 9 (remaining gas: 1039991.980 units remaining) - [ { 0xcd } @parameter ] + [ { 0xcd } ] - location: 12 (remaining gas: 1039991.268 units remaining) [ 0xff - 0xcd @parameter.elt ] + 0xcd ] - location: 15 (remaining gas: 1039991.128 units remaining) [ 0xffcd ] - location: -1 (remaining gas: 1039991.058 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 4ebfbdde2057e5275e79d95530dec7cd4db17afb..e03385f03e47a3a150fd47c49a543aadf34fee0c 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: 8 (remaining gas: 1039992.360 units remaining) [ (Pair {} {}) ] - location: 9 (remaining gas: 1039992.220 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039991.660 units remaining) [ {} ] - location: 16 (remaining gas: 1039991.520 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 a716263b9ea54c7f7410673269a42c4be2856778..aa60c9718cea1f90fe975202f95cb522b877151e 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,21 +10,21 @@ trace - location: 7 (remaining gas: 1039985.686 units remaining) [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ] - location: 8 (remaining gas: 1039985.546 units remaining) - [ { "Hello" ; " " ; "World" ; "!" } @parameter ] + [ { "Hello" ; " " ; "World" ; "!" } ] - location: 9 (remaining gas: 1039985.406 units remaining) [ "" - { "Hello" ; " " ; "World" ; "!" } @parameter ] + { "Hello" ; " " ; "World" ; "!" } ] - location: 12 (remaining gas: 1039985.276 units remaining) - [ { "Hello" ; " " ; "World" ; "!" } @parameter + [ { "Hello" ; " " ; "World" ; "!" } "" ] - location: 15 (remaining gas: 1039984.558 units remaining) [ "" - "Hello" @parameter.elt ] + "Hello" ] - location: 18 (remaining gas: 1039984.258 units remaining) [ {} - "Hello" @parameter.elt ] + "Hello" ] - location: 20 (remaining gas: 1039984.128 units remaining) - [ "Hello" @parameter.elt + [ "Hello" {} ] - location: 21 (remaining gas: 1039983.988 units remaining) [ { "Hello" } ] @@ -41,12 +41,12 @@ trace [ "Hello" ] - location: 15 (remaining gas: 1039983.398 units remaining) [ "Hello" - " " @parameter.elt ] + " " ] - location: 18 (remaining gas: 1039983.098 units remaining) [ {} - " " @parameter.elt ] + " " ] - location: 20 (remaining gas: 1039982.968 units remaining) - [ " " @parameter.elt + [ " " {} ] - location: 21 (remaining gas: 1039982.828 units remaining) [ { " " } ] @@ -63,12 +63,12 @@ trace [ "Hello " ] - location: 15 (remaining gas: 1039982.238 units remaining) [ "Hello " - "World" @parameter.elt ] + "World" ] - location: 18 (remaining gas: 1039981.938 units remaining) [ {} - "World" @parameter.elt ] + "World" ] - location: 20 (remaining gas: 1039981.808 units remaining) - [ "World" @parameter.elt + [ "World" {} ] - location: 21 (remaining gas: 1039981.668 units remaining) [ { "World" } ] @@ -85,12 +85,12 @@ trace [ "Hello World" ] - location: 15 (remaining gas: 1039981.077 units remaining) [ "Hello World" - "!" @parameter.elt ] + "!" ] - location: 18 (remaining gas: 1039980.777 units remaining) [ {} - "!" @parameter.elt ] + "!" ] - location: 20 (remaining gas: 1039980.647 units remaining) - [ "!" @parameter.elt + [ "!" {} ] - location: 21 (remaining gas: 1039980.507 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 fc1a651bf85f89e0387c8985f9479a115bf08671..f92474dfbf3cddb73cd311946235b7b0a2a93de8 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,21 +10,21 @@ trace - location: 7 (remaining gas: 1039986.030 units remaining) [ (Pair { "a" ; "b" ; "c" } "") ] - location: 8 (remaining gas: 1039985.890 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 9 (remaining gas: 1039985.750 units remaining) [ "" - { "a" ; "b" ; "c" } @parameter ] + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039985.620 units remaining) - [ { "a" ; "b" ; "c" } @parameter + [ { "a" ; "b" ; "c" } "" ] - location: 15 (remaining gas: 1039984.909 units remaining) [ "" - "a" @parameter.elt ] + "a" ] - location: 18 (remaining gas: 1039984.609 units remaining) [ {} - "a" @parameter.elt ] + "a" ] - location: 20 (remaining gas: 1039984.479 units remaining) - [ "a" @parameter.elt + [ "a" {} ] - location: 21 (remaining gas: 1039984.339 units remaining) [ { "a" } ] @@ -41,12 +41,12 @@ trace [ "a" ] - location: 15 (remaining gas: 1039983.749 units remaining) [ "a" - "b" @parameter.elt ] + "b" ] - location: 18 (remaining gas: 1039983.449 units remaining) [ {} - "b" @parameter.elt ] + "b" ] - location: 20 (remaining gas: 1039983.319 units remaining) - [ "b" @parameter.elt + [ "b" {} ] - location: 21 (remaining gas: 1039983.179 units remaining) [ { "b" } ] @@ -63,12 +63,12 @@ trace [ "ab" ] - location: 15 (remaining gas: 1039982.589 units remaining) [ "ab" - "c" @parameter.elt ] + "c" ] - location: 18 (remaining gas: 1039982.289 units remaining) [ {} - "c" @parameter.elt ] + "c" ] - location: 20 (remaining gas: 1039982.159 units remaining) - [ "c" @parameter.elt + [ "c" {} ] - location: 21 (remaining gas: 1039982.019 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 d0275dfeb131d79ac650cf86ddd72ec9ec12247f..6dabaf7988a57c22e29a9e521b218bc7250fba44 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: 7 (remaining gas: 1039986.822 units remaining) [ (Pair {} "") ] - location: 8 (remaining gas: 1039986.682 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039986.542 units remaining) [ "" - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039986.412 units remaining) - [ {} @parameter + [ {} "" ] - location: 13 (remaining gas: 1039985.852 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 75bd2d37bf2f0b9d599c8c11a955a14c12142c10..2abbcdb6e840a74b0aeb15198c9addd861d0f16b 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: 7 (remaining gas: 1039993.830 units remaining) [ (Pair 99 { -5 ; 10 }) ] - location: 8 (remaining gas: 1039993.690 units remaining) - [ 99 @parameter - { -5 ; 10 } @storage ] + [ 99 + { -5 ; 10 } ] - location: 9 (remaining gas: 1039993.550 units remaining) [ { 99 ; -5 ; 10 } ] - location: 10 (remaining gas: 1039993.410 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 286853d7c31c9b85aef20bb1c9ee224c6682cddd..c6be46b0f641087cf242a651d745357ea5dbe191 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: 7 (remaining gas: 1039994.070 units remaining) [ (Pair -5 { 10 }) ] - location: 8 (remaining gas: 1039993.930 units remaining) - [ -5 @parameter - { 10 } @storage ] + [ -5 + { 10 } ] - location: 9 (remaining gas: 1039993.790 units remaining) [ { -5 ; 10 } ] - location: 10 (remaining gas: 1039993.650 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 81361e78b4fec1263e87254bcab1de6f4b70825e..b3aad979e1eeffea37e519166f41c01337c52496 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: 7 (remaining gas: 1039994.310 units remaining) [ (Pair 10 {}) ] - location: 8 (remaining gas: 1039994.170 units remaining) - [ 10 @parameter - {} @storage ] + [ 10 + {} ] - location: 9 (remaining gas: 1039994.030 units remaining) [ { 10 } ] - location: 10 (remaining gas: 1039993.890 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 d5085a2096199261b1e39e2405efe7c7c7c4f6f8..48a2f83d7f396ef36c7b656b4cb6609bfc27807c 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,13 +10,13 @@ trace - location: 11 (remaining gas: 1039956.652 units remaining) [ (Pair (Pair { "A" } { "B" }) None) ] - location: 12 (remaining gas: 1039956.512 units remaining) - [ (Pair { "A" } { "B" }) @parameter ] + [ (Pair { "A" } { "B" }) ] - location: 13 (remaining gas: 1039956.372 units remaining) - [ (Pair { "A" } { "B" }) @parameter - (Pair { "A" } { "B" }) @parameter ] + [ (Pair { "A" } { "B" }) + (Pair { "A" } { "B" }) ] - location: 14 (remaining gas: 1039956.232 units remaining) [ { "A" } - (Pair { "A" } { "B" }) @parameter ] + (Pair { "A" } { "B" }) ] - location: 17 (remaining gas: 1039955.932 units remaining) [ { "B" } ] - location: 16 (remaining gas: 1039955.862 units remaining) @@ -40,7 +40,7 @@ trace (Pair "A" {}) { "B" } ] - location: 25 (remaining gas: 1039954.445 units remaining) - [ "A" @elt + [ "A" (Pair "A" {}) { "B" } ] - location: 28 (remaining gas: 1039954.145 units remaining) @@ -50,16 +50,16 @@ trace [ {} { "B" } ] - location: 26 (remaining gas: 1039954.075 units remaining) - [ "A" @elt + [ "A" {} { "B" } ] - location: 29 (remaining gas: 1039953.935 units remaining) [ True - "A" @elt + "A" {} { "B" } ] - location: 32 (remaining gas: 1039953.805 units remaining) - [ "A" @elt + [ "A" True {} { "B" } ] @@ -96,7 +96,7 @@ trace (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - location: 45 (remaining gas: 1039951.928 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "A" } True) (Pair "B" { "A" } True) ] - location: 49 (remaining gas: 1039951.568 units remaining) @@ -128,7 +128,7 @@ trace { "A" } True ] - location: 46 (remaining gas: 1039950.508 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 311ee147dfe42c137cdcb4e71bd68feceae26eb4..80aefe6433bcd084ea59d3fdbbaf4fc82bd0fb65 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,13 +10,13 @@ trace - location: 11 (remaining gas: 1039955.272 units remaining) [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ] - location: 12 (remaining gas: 1039955.132 units remaining) - [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 13 (remaining gas: 1039954.992 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: 1039954.852 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } - (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) @parameter ] + (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ] - location: 17 (remaining gas: 1039954.552 units remaining) [ { "B" ; "C" ; "asdf" } ] - location: 16 (remaining gas: 1039954.482 units remaining) @@ -40,7 +40,7 @@ trace (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039953.044 units remaining) - [ "B" @elt + [ "B" (Pair "B" {}) { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039952.744 units remaining) @@ -50,16 +50,16 @@ trace [ {} { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039952.674 units remaining) - [ "B" @elt + [ "B" {} { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039952.534 units remaining) [ True - "B" @elt + "B" {} { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039952.404 units remaining) - [ "B" @elt + [ "B" True {} { "B" ; "C" ; "asdf" } ] @@ -77,7 +77,7 @@ trace (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039951.774 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039951.474 units remaining) @@ -87,16 +87,16 @@ trace [ { "B" } { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039951.404 units remaining) - [ "B" @elt + [ "B" { "B" } { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039951.264 units remaining) [ True - "B" @elt + "B" { "B" } { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039951.134 units remaining) - [ "B" @elt + [ "B" True { "B" } { "B" ; "C" ; "asdf" } ] @@ -114,7 +114,7 @@ trace (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039950.504 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" }) { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039950.204 units remaining) @@ -124,16 +124,16 @@ trace [ { "B" } { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039950.134 units remaining) - [ "asdf" @elt + [ "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039949.994 units remaining) [ True - "asdf" @elt + "asdf" { "B" } { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039949.864 units remaining) - [ "asdf" @elt + [ "asdf" True { "B" } { "B" ; "C" ; "asdf" } ] @@ -151,7 +151,7 @@ trace (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - location: 25 (remaining gas: 1039949.233 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" ; "asdf" }) { "B" ; "C" ; "asdf" } ] - location: 28 (remaining gas: 1039948.933 units remaining) @@ -161,16 +161,16 @@ trace [ { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 26 (remaining gas: 1039948.863 units remaining) - [ "C" @elt + [ "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 29 (remaining gas: 1039948.723 units remaining) [ True - "C" @elt + "C" { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] - location: 32 (remaining gas: 1039948.593 units remaining) - [ "C" @elt + [ "C" True { "B" ; "asdf" } { "B" ; "C" ; "asdf" } ] @@ -207,7 +207,7 @@ trace (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039946.702 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039946.342 units remaining) @@ -239,7 +239,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039945.282 units remaining) - [ "B" @elt + [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -277,7 +277,7 @@ trace (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039943.722 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039943.362 units remaining) @@ -309,7 +309,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039942.302 units remaining) - [ "C" @elt + [ "C" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -347,7 +347,7 @@ trace (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039940.742 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039940.382 units remaining) @@ -379,7 +379,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039939.322 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 e14e4235136941a647928acf273479080ebcbf0f..be078a6f20b5321e0343e6a3fbf401f2b4ac24a7 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,13 +10,13 @@ trace - location: 11 (remaining gas: 1039955.272 units remaining) [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ] - location: 12 (remaining gas: 1039955.132 units remaining) - [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 13 (remaining gas: 1039954.992 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: 1039954.852 units remaining) [ { "B" ; "C" ; "asdf" } - (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) @parameter ] + (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ] - location: 17 (remaining gas: 1039954.552 units remaining) [ { "B" ; "B" ; "asdf" ; "C" } ] - location: 16 (remaining gas: 1039954.482 units remaining) @@ -40,7 +40,7 @@ trace (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039953.051 units remaining) - [ "B" @elt + [ "B" (Pair "B" {}) { "B" ; "B" ; "asdf" ; "C" } ] - location: 28 (remaining gas: 1039952.751 units remaining) @@ -50,16 +50,16 @@ trace [ {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039952.681 units remaining) - [ "B" @elt + [ "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039952.541 units remaining) [ True - "B" @elt + "B" {} { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039952.411 units remaining) - [ "B" @elt + [ "B" True {} { "B" ; "B" ; "asdf" ; "C" } ] @@ -77,7 +77,7 @@ trace (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039951.781 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 28 (remaining gas: 1039951.481 units remaining) @@ -87,16 +87,16 @@ trace [ { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039951.411 units remaining) - [ "C" @elt + [ "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039951.271 units remaining) [ True - "C" @elt + "C" { "B" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039951.141 units remaining) - [ "C" @elt + [ "C" True { "B" } { "B" ; "B" ; "asdf" ; "C" } ] @@ -114,7 +114,7 @@ trace (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 25 (remaining gas: 1039950.511 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" ; "C" }) { "B" ; "B" ; "asdf" ; "C" } ] - location: 28 (remaining gas: 1039950.211 units remaining) @@ -124,16 +124,16 @@ trace [ { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 26 (remaining gas: 1039950.141 units remaining) - [ "asdf" @elt + [ "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 29 (remaining gas: 1039950.001 units remaining) [ True - "asdf" @elt + "asdf" { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] - location: 32 (remaining gas: 1039949.871 units remaining) - [ "asdf" @elt + [ "asdf" True { "B" ; "C" } { "B" ; "B" ; "asdf" ; "C" } ] @@ -170,7 +170,7 @@ trace (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039947.972 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039947.612 units remaining) @@ -202,7 +202,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039946.552 units remaining) - [ "B" @elt + [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -240,7 +240,7 @@ trace (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039944.992 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" ; "C" ; "asdf" } True) (Pair "B" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039944.632 units remaining) @@ -272,7 +272,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039943.572 units remaining) - [ "B" @elt + [ "B" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -310,7 +310,7 @@ trace (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039942.012 units remaining) - [ "asdf" @elt + [ "asdf" (Pair "asdf" { "B" ; "C" ; "asdf" } True) (Pair "asdf" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039941.652 units remaining) @@ -342,7 +342,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039940.592 units remaining) - [ "asdf" @elt + [ "asdf" { "B" ; "C" ; "asdf" } { "B" ; "C" ; "asdf" } True ] @@ -380,7 +380,7 @@ trace (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 45 (remaining gas: 1039939.032 units remaining) - [ "C" @elt + [ "C" (Pair "C" { "B" ; "C" ; "asdf" } True) (Pair "C" { "B" ; "C" ; "asdf" } True) ] - location: 49 (remaining gas: 1039938.672 units remaining) @@ -412,7 +412,7 @@ trace { "B" ; "C" ; "asdf" } True ] - location: 46 (remaining gas: 1039937.612 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 22a82ff63bc5b831e4bbf1f9b3e81ffc46d27dc5..580f15d7c3ffec1965791b37f0b8a4902aaacfc5 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,13 +10,13 @@ trace - location: 11 (remaining gas: 1039956.652 units remaining) [ (Pair (Pair { "B" } { "B" }) None) ] - location: 12 (remaining gas: 1039956.512 units remaining) - [ (Pair { "B" } { "B" }) @parameter ] + [ (Pair { "B" } { "B" }) ] - location: 13 (remaining gas: 1039956.372 units remaining) - [ (Pair { "B" } { "B" }) @parameter - (Pair { "B" } { "B" }) @parameter ] + [ (Pair { "B" } { "B" }) + (Pair { "B" } { "B" }) ] - location: 14 (remaining gas: 1039956.232 units remaining) [ { "B" } - (Pair { "B" } { "B" }) @parameter ] + (Pair { "B" } { "B" }) ] - location: 17 (remaining gas: 1039955.932 units remaining) [ { "B" } ] - location: 16 (remaining gas: 1039955.862 units remaining) @@ -40,7 +40,7 @@ trace (Pair "B" {}) { "B" } ] - location: 25 (remaining gas: 1039954.445 units remaining) - [ "B" @elt + [ "B" (Pair "B" {}) { "B" } ] - location: 28 (remaining gas: 1039954.145 units remaining) @@ -50,16 +50,16 @@ trace [ {} { "B" } ] - location: 26 (remaining gas: 1039954.075 units remaining) - [ "B" @elt + [ "B" {} { "B" } ] - location: 29 (remaining gas: 1039953.935 units remaining) [ True - "B" @elt + "B" {} { "B" } ] - location: 32 (remaining gas: 1039953.805 units remaining) - [ "B" @elt + [ "B" True {} { "B" } ] @@ -96,7 +96,7 @@ trace (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - location: 45 (remaining gas: 1039951.928 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "B" } True) (Pair "B" { "B" } True) ] - location: 49 (remaining gas: 1039951.568 units remaining) @@ -128,7 +128,7 @@ trace { "B" } True ] - location: 46 (remaining gas: 1039950.508 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 6fd056d8d37b7c44d238d229f3b107fee406069f..5530ac7fafd64d4c6f09e9e262462721a37ed3ad 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,13 +10,13 @@ trace - location: 11 (remaining gas: 1039956.652 units remaining) [ (Pair (Pair { "c" } { "B" }) None) ] - location: 12 (remaining gas: 1039956.512 units remaining) - [ (Pair { "c" } { "B" }) @parameter ] + [ (Pair { "c" } { "B" }) ] - location: 13 (remaining gas: 1039956.372 units remaining) - [ (Pair { "c" } { "B" }) @parameter - (Pair { "c" } { "B" }) @parameter ] + [ (Pair { "c" } { "B" }) + (Pair { "c" } { "B" }) ] - location: 14 (remaining gas: 1039956.232 units remaining) [ { "c" } - (Pair { "c" } { "B" }) @parameter ] + (Pair { "c" } { "B" }) ] - location: 17 (remaining gas: 1039955.932 units remaining) [ { "B" } ] - location: 16 (remaining gas: 1039955.862 units remaining) @@ -40,7 +40,7 @@ trace (Pair "c" {}) { "B" } ] - location: 25 (remaining gas: 1039954.445 units remaining) - [ "c" @elt + [ "c" (Pair "c" {}) { "B" } ] - location: 28 (remaining gas: 1039954.145 units remaining) @@ -50,16 +50,16 @@ trace [ {} { "B" } ] - location: 26 (remaining gas: 1039954.075 units remaining) - [ "c" @elt + [ "c" {} { "B" } ] - location: 29 (remaining gas: 1039953.935 units remaining) [ True - "c" @elt + "c" {} { "B" } ] - location: 32 (remaining gas: 1039953.805 units remaining) - [ "c" @elt + [ "c" True {} { "B" } ] @@ -96,7 +96,7 @@ trace (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - location: 45 (remaining gas: 1039951.928 units remaining) - [ "B" @elt + [ "B" (Pair "B" { "c" } True) (Pair "B" { "c" } True) ] - location: 49 (remaining gas: 1039951.568 units remaining) @@ -128,7 +128,7 @@ trace { "c" } True ] - location: 46 (remaining gas: 1039950.508 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 1cb27faa2a900bff4a509b638af540d0bff0e59e..ae94d8bd3faa12db56df0fddf5b9aa60fda5e45f 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,13 +10,13 @@ trace - location: 11 (remaining gas: 1039957.180 units remaining) [ (Pair (Pair {} {}) None) ] - location: 12 (remaining gas: 1039957.040 units remaining) - [ (Pair {} {}) @parameter ] + [ (Pair {} {}) ] - location: 13 (remaining gas: 1039956.900 units remaining) - [ (Pair {} {}) @parameter - (Pair {} {}) @parameter ] + [ (Pair {} {}) + (Pair {} {}) ] - location: 14 (remaining gas: 1039956.760 units remaining) [ {} - (Pair {} {}) @parameter ] + (Pair {} {}) ] - location: 17 (remaining gas: 1039956.460 units remaining) [ {} ] - location: 16 (remaining gas: 1039956.390 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 bd7be66234adeb5d41bc29f99aa41c68451fd057..1c80065f3aa021d912cef218c757566ff884175a 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: 6 (remaining gas: 1039931.695 units remaining) [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ] - location: 7 (remaining gas: 1039931.555 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 8 (remaining gas: 1039686.269 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter.contract ] + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 16 (remaining gas: 1039685.999 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.contract.some ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 10 (remaining gas: 1039685.929 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @parameter.contract.some ] + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 17 (remaining gas: 1039685.789 units remaining) [ ] - location: 18 (remaining gas: 1039685.649 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 576bf80c8d0c207213ef387eddaf1f17fd87ea22..c9ac02fd3c29286c50b18b2ef1d0213f908ae795 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: 1039985.040 units remaining) [ Unit ] - location: 10 (remaining gas: 1039984.900 units remaining) - [ 50000 @amount + [ 50000 Unit ] - location: 11 (remaining gas: 1039984.760 units remaining) [ None - 50000 @amount + 50000 Unit ] - location: 13 (remaining gas: 1039983.180 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 ca63de915fd4408f49b4acbf8ca290e7f3a73846..501893507ebb559e732309c2fd89781ca5ad1fd5 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039989.940 units remaining) [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039989.800 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: 1039989.660 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: 1039989.520 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: 14 (remaining gas: 1039989.220 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 13 (remaining gas: 1039989.150 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 ad14692ba8ae2d85f2f55ff54d45cd3387801951..cc71d6d7f79ba32f98c9d99492c8280928c5f1f5 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039990.060 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: 1039989.920 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: 1039989.780 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: 14 (remaining gas: 1039989.480 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 13 (remaining gas: 1039989.410 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 34036824f1780f5220617535567b13d08c337afe..04e46ecf6043b3abc82971a0c9a13555eef1bc02 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ] - location: 9 (remaining gas: 1039990.060 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: 1039989.920 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: 1039989.780 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: 14 (remaining gas: 1039989.480 units remaining) [ "1970-01-01T00:00:01Z" ] - location: 13 (remaining gas: 1039989.410 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 961d725b18255eb1f1a8f1047f44b36eeda4e298..6617fd25137d4e2f909f3a3025672d21a4eb5f12 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ] - location: 9 (remaining gas: 1039990.060 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: 1039989.920 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: 1039989.780 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: 14 (remaining gas: 1039989.480 units remaining) [ "1970-01-01T00:00:00Z" ] - location: 13 (remaining gas: 1039989.410 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 779764ff28b6ab69338ba61f26b3dc30ab6a7da1..37efa7826bc2d8aff1cc386a532237c54921f566 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,64 +10,64 @@ trace - location: 23 (remaining gas: 1039861.200 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: 1039861.060 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: 1039860.920 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: 1039860.720 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: 30 (remaining gas: 1039860.420 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: 29 (remaining gas: 1039860.350 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: 1039860.350 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: 34 (remaining gas: 1039860.042 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: 33 (remaining gas: 1039859.972 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: 1039859.972 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: 38 (remaining gas: 1039859.660 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: 37 (remaining gas: 1039859.590 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: 1039859.590 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: 42 (remaining gas: 1039859.274 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: 41 (remaining gas: 1039859.204 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: 1039859.204 units remaining) [ 17 16 @@ -75,15 +75,15 @@ 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: 46 (remaining gas: 1039858.884 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: 45 (remaining gas: 1039858.814 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: 1039858.814 units remaining) [ 17 16 @@ -92,15 +92,15 @@ 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: 50 (remaining gas: 1039858.490 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: 49 (remaining gas: 1039858.420 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: 1039858.420 units remaining) [ 17 16 @@ -110,15 +110,15 @@ 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: 54 (remaining gas: 1039858.092 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: 53 (remaining gas: 1039858.022 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: 1039858.022 units remaining) [ 17 16 @@ -129,15 +129,15 @@ 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: 58 (remaining gas: 1039857.690 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: 57 (remaining gas: 1039857.620 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: 1039857.620 units remaining) [ 17 16 @@ -149,15 +149,15 @@ 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: 62 (remaining gas: 1039857.284 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: 61 (remaining gas: 1039857.214 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: 1039857.214 units remaining) [ 17 16 @@ -170,15 +170,15 @@ 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: 66 (remaining gas: 1039856.874 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: 65 (remaining gas: 1039856.804 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: 1039856.804 units remaining) [ 17 16 @@ -192,15 +192,15 @@ 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: 70 (remaining gas: 1039856.460 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: 69 (remaining gas: 1039856.390 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: 1039856.390 units remaining) [ 17 16 @@ -215,15 +215,15 @@ 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: 74 (remaining gas: 1039856.042 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: 73 (remaining gas: 1039855.972 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: 1039855.972 units remaining) [ 17 16 @@ -239,15 +239,15 @@ 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: 78 (remaining gas: 1039855.620 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: 77 (remaining gas: 1039855.550 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: 1039855.550 units remaining) [ 17 16 @@ -264,15 +264,15 @@ 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: 82 (remaining gas: 1039855.194 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: 81 (remaining gas: 1039855.124 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: 1039855.124 units remaining) [ 17 16 @@ -290,15 +290,15 @@ 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: 86 (remaining gas: 1039854.764 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: 85 (remaining gas: 1039854.694 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: 1039854.694 units remaining) [ 17 16 @@ -317,7 +317,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: -1 (remaining gas: 1039854.624 units remaining) [ 17 16 @@ -336,7 +336,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: 1039854.464 units remaining) [ 17 16 @@ -355,7 +355,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: 1039854.300 units remaining) [ 16 17 @@ -374,7 +374,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: 1039854.132 units remaining) [ 15 16 @@ -393,7 +393,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: 1039853.960 units remaining) [ 14 15 @@ -412,7 +412,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: 1039853.784 units remaining) [ 13 14 @@ -431,7 +431,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: 1039853.604 units remaining) [ 12 13 @@ -450,7 +450,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: 1039853.420 units remaining) [ 11 12 @@ -469,7 +469,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: 1039853.232 units remaining) [ 10 11 @@ -488,7 +488,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: 1039853.040 units remaining) [ 9 10 @@ -507,7 +507,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: 1039852.844 units remaining) [ 8 9 @@ -526,7 +526,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: 1039852.644 units remaining) [ 7 8 @@ -545,7 +545,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: 1039852.440 units remaining) [ 6 7 @@ -564,7 +564,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: 1039852.232 units remaining) [ 5 6 @@ -583,7 +583,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: 1039852.020 units remaining) [ 4 5 @@ -602,7 +602,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: 1039851.804 units remaining) [ 3 4 @@ -621,7 +621,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: 1039851.584 units remaining) [ 2 3 @@ -640,7 +640,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: 1039851.360 units remaining) [ 1 2 @@ -659,7 +659,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: 1039851.200 units remaining) [ 1 2 @@ -678,7 +678,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: 1039851.036 units remaining) [ 2 1 @@ -697,7 +697,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: 1039850.868 units remaining) [ 3 2 @@ -716,7 +716,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: 1039850.696 units remaining) [ 4 3 @@ -735,7 +735,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: 1039850.520 units remaining) [ 5 4 @@ -754,7 +754,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: 1039850.340 units remaining) [ 6 5 @@ -773,7 +773,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: 1039850.156 units remaining) [ 7 6 @@ -792,7 +792,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: 1039849.968 units remaining) [ 8 7 @@ -811,7 +811,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: 1039849.776 units remaining) [ 9 8 @@ -830,7 +830,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: 1039849.580 units remaining) [ 10 9 @@ -849,7 +849,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: 1039849.380 units remaining) [ 11 10 @@ -868,7 +868,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: 1039849.176 units remaining) [ 12 11 @@ -887,7 +887,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: 1039848.968 units remaining) [ 13 12 @@ -906,7 +906,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: 1039848.756 units remaining) [ 14 13 @@ -925,7 +925,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: 1039848.540 units remaining) [ 15 14 @@ -944,7 +944,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: 1039848.320 units remaining) [ 16 15 @@ -963,7 +963,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: 1039848.096 units remaining) [ 17 16 @@ -982,13 +982,13 @@ 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: 159 (remaining gas: 1039847.676 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: 158 (remaining gas: 1039847.606 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: 1039847.606 units remaining) [ 17 16 @@ -1006,13 +1006,13 @@ 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: 163 (remaining gas: 1039847.250 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: 162 (remaining gas: 1039847.180 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: 1039847.180 units remaining) [ 17 16 @@ -1029,13 +1029,13 @@ 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: 167 (remaining gas: 1039846.828 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: 166 (remaining gas: 1039846.758 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: 1039846.758 units remaining) [ 17 16 @@ -1051,13 +1051,13 @@ 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: 171 (remaining gas: 1039846.410 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: 170 (remaining gas: 1039846.340 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: 1039846.340 units remaining) [ 17 16 @@ -1072,13 +1072,13 @@ 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: 175 (remaining gas: 1039845.996 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: 174 (remaining gas: 1039845.926 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: 1039845.926 units remaining) [ 17 16 @@ -1092,13 +1092,13 @@ 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: 179 (remaining gas: 1039845.586 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: 178 (remaining gas: 1039845.516 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: 1039845.516 units remaining) [ 17 16 @@ -1111,13 +1111,13 @@ 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: 183 (remaining gas: 1039845.180 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: 182 (remaining gas: 1039845.110 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: 1039845.110 units remaining) [ 17 16 @@ -1129,13 +1129,13 @@ 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: 187 (remaining gas: 1039844.778 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: 186 (remaining gas: 1039844.708 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: 1039844.708 units remaining) [ 17 16 @@ -1146,13 +1146,13 @@ 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: 191 (remaining gas: 1039844.380 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: 190 (remaining gas: 1039844.310 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: 1039844.310 units remaining) [ 17 16 @@ -1162,13 +1162,13 @@ 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: 195 (remaining gas: 1039843.986 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: 194 (remaining gas: 1039843.916 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: 1039843.916 units remaining) [ 17 16 @@ -1177,13 +1177,13 @@ 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: 199 (remaining gas: 1039843.596 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: 198 (remaining gas: 1039843.526 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: 1039843.526 units remaining) [ 17 16 @@ -1191,59 +1191,59 @@ 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: 203 (remaining gas: 1039843.210 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: 202 (remaining gas: 1039843.140 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: 1039843.140 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: 207 (remaining gas: 1039842.828 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: 206 (remaining gas: 1039842.758 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: 1039842.758 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: 211 (remaining gas: 1039842.450 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: 210 (remaining gas: 1039842.380 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: 1039842.380 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: 214 (remaining gas: 1039842.080 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: 213 (remaining gas: 1039842.010 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: 1039842.010 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: 1039841.870 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: -1 (remaining gas: 1039841.800 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: 1039839.070 units remaining) [ 0 ] - location: 219 (remaining gas: 1039838.930 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 c3378eb895e2a1c58d2b5d2f96380fc067c7bf6d..1d2af0d95d911d40969fc2e1c56f98bfd3c9be5b 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,64 +10,64 @@ trace - location: 23 (remaining gas: 1039861.200 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: 1039861.060 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: 1039860.920 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: 1039860.720 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: 30 (remaining gas: 1039860.420 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: 29 (remaining gas: 1039860.350 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: 1039860.350 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: 34 (remaining gas: 1039860.042 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: 33 (remaining gas: 1039859.972 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: 1039859.972 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: 38 (remaining gas: 1039859.660 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: 37 (remaining gas: 1039859.590 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: 1039859.590 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: 42 (remaining gas: 1039859.274 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: 41 (remaining gas: 1039859.204 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: 1039859.204 units remaining) [ 2 3 @@ -75,15 +75,15 @@ 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: 46 (remaining gas: 1039858.884 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: 45 (remaining gas: 1039858.814 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: 1039858.814 units remaining) [ 2 3 @@ -92,15 +92,15 @@ 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: 50 (remaining gas: 1039858.490 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: 49 (remaining gas: 1039858.420 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: 1039858.420 units remaining) [ 2 3 @@ -110,15 +110,15 @@ 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: 54 (remaining gas: 1039858.092 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: 53 (remaining gas: 1039858.022 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: 1039858.022 units remaining) [ 2 3 @@ -129,15 +129,15 @@ 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: 58 (remaining gas: 1039857.690 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: 57 (remaining gas: 1039857.620 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: 1039857.620 units remaining) [ 2 3 @@ -149,15 +149,15 @@ 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: 62 (remaining gas: 1039857.284 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: 61 (remaining gas: 1039857.214 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: 1039857.214 units remaining) [ 2 3 @@ -170,15 +170,15 @@ 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: 66 (remaining gas: 1039856.874 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: 65 (remaining gas: 1039856.804 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: 1039856.804 units remaining) [ 2 3 @@ -192,15 +192,15 @@ 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: 70 (remaining gas: 1039856.460 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: 69 (remaining gas: 1039856.390 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: 1039856.390 units remaining) [ 2 3 @@ -215,15 +215,15 @@ 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: 74 (remaining gas: 1039856.042 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: 73 (remaining gas: 1039855.972 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: 1039855.972 units remaining) [ 2 3 @@ -239,15 +239,15 @@ 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: 78 (remaining gas: 1039855.620 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: 77 (remaining gas: 1039855.550 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: 1039855.550 units remaining) [ 2 3 @@ -264,15 +264,15 @@ 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: 82 (remaining gas: 1039855.194 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: 81 (remaining gas: 1039855.124 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: 1039855.124 units remaining) [ 2 3 @@ -290,15 +290,15 @@ 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: 86 (remaining gas: 1039854.764 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: 85 (remaining gas: 1039854.694 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: 1039854.694 units remaining) [ 2 3 @@ -317,7 +317,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: -1 (remaining gas: 1039854.624 units remaining) [ 2 3 @@ -336,7 +336,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: 1039854.464 units remaining) [ 2 3 @@ -355,7 +355,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: 1039854.300 units remaining) [ 3 2 @@ -374,7 +374,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: 1039854.132 units remaining) [ 12 3 @@ -393,7 +393,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: 1039853.960 units remaining) [ 16 12 @@ -412,7 +412,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: 1039853.784 units remaining) [ 10 16 @@ -431,7 +431,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: 1039853.604 units remaining) [ 14 10 @@ -450,7 +450,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: 1039853.420 units remaining) [ 19 14 @@ -469,7 +469,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: 1039853.232 units remaining) [ 9 19 @@ -488,7 +488,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: 1039853.040 units remaining) [ 18 9 @@ -507,7 +507,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: 1039852.844 units remaining) [ 6 18 @@ -526,7 +526,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: 1039852.644 units remaining) [ 8 6 @@ -545,7 +545,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: 1039852.440 units remaining) [ 11 8 @@ -564,7 +564,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: 1039852.232 units remaining) [ 4 11 @@ -583,7 +583,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: 1039852.020 units remaining) [ 13 4 @@ -602,7 +602,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: 1039851.804 units remaining) [ 15 13 @@ -621,7 +621,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: 1039851.584 units remaining) [ 5 15 @@ -640,7 +640,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: 1039851.360 units remaining) [ 1 5 @@ -659,7 +659,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: 1039851.200 units remaining) [ 1 5 @@ -678,7 +678,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: 1039851.036 units remaining) [ 5 1 @@ -697,7 +697,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: 1039850.868 units remaining) [ 15 5 @@ -716,7 +716,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: 1039850.696 units remaining) [ 13 15 @@ -735,7 +735,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: 1039850.520 units remaining) [ 4 13 @@ -754,7 +754,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: 1039850.340 units remaining) [ 11 4 @@ -773,7 +773,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: 1039850.156 units remaining) [ 8 11 @@ -792,7 +792,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: 1039849.968 units remaining) [ 6 8 @@ -811,7 +811,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: 1039849.776 units remaining) [ 18 6 @@ -830,7 +830,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: 1039849.580 units remaining) [ 9 18 @@ -849,7 +849,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: 1039849.380 units remaining) [ 19 9 @@ -868,7 +868,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: 1039849.176 units remaining) [ 14 19 @@ -887,7 +887,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: 1039848.968 units remaining) [ 10 14 @@ -906,7 +906,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: 1039848.756 units remaining) [ 16 10 @@ -925,7 +925,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: 1039848.540 units remaining) [ 12 16 @@ -944,7 +944,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: 1039848.320 units remaining) [ 3 12 @@ -963,7 +963,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: 1039848.096 units remaining) [ 2 3 @@ -982,13 +982,13 @@ 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: 159 (remaining gas: 1039847.676 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: 158 (remaining gas: 1039847.606 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: 1039847.606 units remaining) [ 2 3 @@ -1006,13 +1006,13 @@ 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: 163 (remaining gas: 1039847.250 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: 162 (remaining gas: 1039847.180 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: 1039847.180 units remaining) [ 2 3 @@ -1029,13 +1029,13 @@ 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: 167 (remaining gas: 1039846.828 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: 166 (remaining gas: 1039846.758 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: 1039846.758 units remaining) [ 2 3 @@ -1051,13 +1051,13 @@ 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: 171 (remaining gas: 1039846.410 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: 170 (remaining gas: 1039846.340 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: 1039846.340 units remaining) [ 2 3 @@ -1072,13 +1072,13 @@ 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: 175 (remaining gas: 1039845.996 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: 174 (remaining gas: 1039845.926 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: 1039845.926 units remaining) [ 2 3 @@ -1092,13 +1092,13 @@ 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: 179 (remaining gas: 1039845.586 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: 178 (remaining gas: 1039845.516 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: 1039845.516 units remaining) [ 2 3 @@ -1111,13 +1111,13 @@ 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: 183 (remaining gas: 1039845.180 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: 182 (remaining gas: 1039845.110 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: 1039845.110 units remaining) [ 2 3 @@ -1129,13 +1129,13 @@ 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: 187 (remaining gas: 1039844.778 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: 186 (remaining gas: 1039844.708 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: 1039844.708 units remaining) [ 2 3 @@ -1146,13 +1146,13 @@ 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: 191 (remaining gas: 1039844.380 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: 190 (remaining gas: 1039844.310 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: 1039844.310 units remaining) [ 2 3 @@ -1162,13 +1162,13 @@ 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: 195 (remaining gas: 1039843.986 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: 194 (remaining gas: 1039843.916 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: 1039843.916 units remaining) [ 2 3 @@ -1177,13 +1177,13 @@ 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: 199 (remaining gas: 1039843.596 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: 198 (remaining gas: 1039843.526 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: 1039843.526 units remaining) [ 2 3 @@ -1191,59 +1191,59 @@ 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: 203 (remaining gas: 1039843.210 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: 202 (remaining gas: 1039843.140 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: 1039843.140 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: 207 (remaining gas: 1039842.828 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: 206 (remaining gas: 1039842.758 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: 1039842.758 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: 211 (remaining gas: 1039842.450 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: 210 (remaining gas: 1039842.380 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: 1039842.380 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: 214 (remaining gas: 1039842.080 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: 213 (remaining gas: 1039842.010 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: 1039842.010 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: 1039841.870 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: -1 (remaining gas: 1039841.800 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: 1039839.070 units remaining) [ 0 ] - location: 219 (remaining gas: 1039838.930 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 f4cfbeb69cad19c87cba8ca307ec89eb45f56d19..4041a78b55603da06a20fdeaf8e77edc47594430 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: 14 (remaining gas: 1039984.510 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039984.370 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: 1039984.230 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 2349a3c47b238f491d337214715aa5050d575ce9..0f0f01177ead7d4add012b03fe97789b3dc5f157 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: 10 (remaining gas: 1039989.600 units remaining) [ (Pair (Pair 1 1) 0 0) ] - location: 11 (remaining gas: 1039989.460 units remaining) - [ (Pair 1 1) @parameter ] + [ (Pair 1 1) ] - location: 12 (remaining gas: 1039989.320 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 400392671cf014be431e0b00796d8c87e5aa6cd9..26e0931c7591f9d607406989ed56da15f1903435 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: 10 (remaining gas: 1039989.600 units remaining) [ (Pair (Pair 15 9) 0 0) ] - location: 11 (remaining gas: 1039989.460 units remaining) - [ (Pair 15 9) @parameter ] + [ (Pair 15 9) ] - location: 12 (remaining gas: 1039989.320 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 8d66497b1a2210d2a22d8216770ae7ee7db6a1f8..153e022c1ff1bac135707ba1c825027bd089a502 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: 14 (remaining gas: 1039983.300 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039983.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: 1039983.020 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 896654e1c5f4b449965c69eaff74aa7bfac1b7ae..1a7f99a82d70814c616f367b2d262add156c4c1f 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: 14 (remaining gas: 1039988.260 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039988.120 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.980 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 0b1ae7b25a2c439b3c00dff532ff7dcb991e31da..781bea8a81d867791bb6cca80eb369cb6113a0b8 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: 14 (remaining gas: 1039985.260 units remaining) [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ] - location: 15 (remaining gas: 1039985.120 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: 1039984.980 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 133eeae947f0b1a76c6b2861f826e3e61f6a7167..d98fc3601ec91bfab3251dca0de6e141396380ad 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: 24 (remaining gas: 1039966.445 units remaining) [ (Pair (Pair -8 2) None None None None) ] - location: 25 (remaining gas: 1039966.305 units remaining) - [ (Pair -8 2) @parameter ] + [ (Pair -8 2) ] - location: 26 (remaining gas: 1039966.165 units remaining) - [ (Pair -8 2) @parameter - (Pair -8 2) @parameter ] + [ (Pair -8 2) + (Pair -8 2) ] - location: 27 (remaining gas: 1039966.025 units remaining) [ -8 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 28 (remaining gas: 1039965.885 units remaining) [ 8 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 31 (remaining gas: 1039965.585 units remaining) [ 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 30 (remaining gas: 1039965.515 units remaining) [ 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 29 (remaining gas: 1039965.515 units remaining) [ 8 2 - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 32 (remaining gas: 1039965.155 units remaining) [ (Some (Pair 4 0)) - (Pair -8 2) @parameter ] + (Pair -8 2) ] - location: 33 (remaining gas: 1039965.025 units remaining) - [ (Pair -8 2) @parameter + [ (Pair -8 2) (Some (Pair 4 0)) ] - location: 34 (remaining gas: 1039964.885 units remaining) - [ (Pair -8 2) @parameter - (Pair -8 2) @parameter + [ (Pair -8 2) + (Pair -8 2) (Some (Pair 4 0)) ] - location: 35 (remaining gas: 1039964.745 units remaining) [ -8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) ] - location: 36 (remaining gas: 1039964.605 units remaining) [ 8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) ] - location: 37 (remaining gas: 1039964.245 units remaining) [ (Some (Pair 4 0)) - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) ] - location: 38 (remaining gas: 1039964.115 units remaining) - [ (Pair -8 2) @parameter + [ (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 39 (remaining gas: 1039963.975 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: 1039963.835 units remaining) [ -8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 43 (remaining gas: 1039963.535 units remaining) [ 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 42 (remaining gas: 1039963.465 units remaining) [ 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 41 (remaining gas: 1039963.465 units remaining) [ -8 2 - (Pair -8 2) @parameter + (Pair -8 2) (Some (Pair 4 0)) (Some (Pair 4 0)) ] - location: 44 (remaining gas: 1039963.105 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: 1039962.975 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 7a80de49116d4a5dee1d064800bf18b8fd388491..41f408ea403e4374f7cf8a5f2c5ab4b718d9a5f4 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: 24 (remaining gas: 1039966.445 units remaining) [ (Pair (Pair 10 -3) None None None None) ] - location: 25 (remaining gas: 1039966.305 units remaining) - [ (Pair 10 -3) @parameter ] + [ (Pair 10 -3) ] - location: 26 (remaining gas: 1039966.165 units remaining) - [ (Pair 10 -3) @parameter - (Pair 10 -3) @parameter ] + [ (Pair 10 -3) + (Pair 10 -3) ] - location: 27 (remaining gas: 1039966.025 units remaining) [ 10 -3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 28 (remaining gas: 1039965.885 units remaining) [ 10 -3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 31 (remaining gas: 1039965.585 units remaining) [ 3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 30 (remaining gas: 1039965.515 units remaining) [ 3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 29 (remaining gas: 1039965.515 units remaining) [ 10 3 - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 32 (remaining gas: 1039965.155 units remaining) [ (Some (Pair 3 1)) - (Pair 10 -3) @parameter ] + (Pair 10 -3) ] - location: 33 (remaining gas: 1039965.025 units remaining) - [ (Pair 10 -3) @parameter + [ (Pair 10 -3) (Some (Pair 3 1)) ] - location: 34 (remaining gas: 1039964.885 units remaining) - [ (Pair 10 -3) @parameter - (Pair 10 -3) @parameter + [ (Pair 10 -3) + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 35 (remaining gas: 1039964.745 units remaining) [ 10 -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 36 (remaining gas: 1039964.605 units remaining) [ 10 -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 37 (remaining gas: 1039964.245 units remaining) [ (Some (Pair -3 1)) - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair 3 1)) ] - location: 38 (remaining gas: 1039964.115 units remaining) - [ (Pair 10 -3) @parameter + [ (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 39 (remaining gas: 1039963.975 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: 1039963.835 units remaining) [ 10 -3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 43 (remaining gas: 1039963.535 units remaining) [ 3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 42 (remaining gas: 1039963.465 units remaining) [ 3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 41 (remaining gas: 1039963.465 units remaining) [ 10 3 - (Pair 10 -3) @parameter + (Pair 10 -3) (Some (Pair -3 1)) (Some (Pair 3 1)) ] - location: 44 (remaining gas: 1039963.105 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: 1039962.975 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 904a8edfd94a957b92d3136694a0c07d078fb108..970823cd295bf8ae0f98dde94e57d57abe798e8d 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: 24 (remaining gas: 1039966.445 units remaining) [ (Pair (Pair 10 0) None None None None) ] - location: 25 (remaining gas: 1039966.305 units remaining) - [ (Pair 10 0) @parameter ] + [ (Pair 10 0) ] - location: 26 (remaining gas: 1039966.165 units remaining) - [ (Pair 10 0) @parameter - (Pair 10 0) @parameter ] + [ (Pair 10 0) + (Pair 10 0) ] - location: 27 (remaining gas: 1039966.025 units remaining) [ 10 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 28 (remaining gas: 1039965.885 units remaining) [ 10 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 31 (remaining gas: 1039965.585 units remaining) [ 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 30 (remaining gas: 1039965.515 units remaining) [ 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 29 (remaining gas: 1039965.515 units remaining) [ 10 0 - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 32 (remaining gas: 1039965.155 units remaining) [ None - (Pair 10 0) @parameter ] + (Pair 10 0) ] - location: 33 (remaining gas: 1039965.025 units remaining) - [ (Pair 10 0) @parameter + [ (Pair 10 0) None ] - location: 34 (remaining gas: 1039964.885 units remaining) - [ (Pair 10 0) @parameter - (Pair 10 0) @parameter + [ (Pair 10 0) + (Pair 10 0) None ] - location: 35 (remaining gas: 1039964.745 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None ] - location: 36 (remaining gas: 1039964.605 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None ] - location: 37 (remaining gas: 1039964.245 units remaining) [ None - (Pair 10 0) @parameter + (Pair 10 0) None ] - location: 38 (remaining gas: 1039964.115 units remaining) - [ (Pair 10 0) @parameter + [ (Pair 10 0) None None ] - location: 39 (remaining gas: 1039963.975 units remaining) - [ (Pair 10 0) @parameter - (Pair 10 0) @parameter + [ (Pair 10 0) + (Pair 10 0) None None ] - location: 40 (remaining gas: 1039963.835 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 43 (remaining gas: 1039963.535 units remaining) [ 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 42 (remaining gas: 1039963.465 units remaining) [ 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 41 (remaining gas: 1039963.465 units remaining) [ 10 0 - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 44 (remaining gas: 1039963.105 units remaining) [ None - (Pair 10 0) @parameter + (Pair 10 0) None None ] - location: 45 (remaining gas: 1039962.975 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 69f14e21e488e10149ed645305b0c5db22f8b2c3..167b54a5a735fea8ad59dd18c38f4b068d8e2867 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Left 0)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 10 (Left 0)) @parameter ] + [ (Pair 10 (Left 0)) ] - location: 20 (remaining gas: 1039981.890 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 02b77a1389aaf9aabab378a51479a243b24c32a3..2cd5bf4e4d077fbb1f3b76183ce121fe0c4b5da7 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Left 10)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 10 (Left 10)) @parameter ] + [ (Pair 10 (Left 10)) ] - location: 20 (remaining gas: 1039981.890 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 9beeef0cc4bcd075c01aa8758e1365e1713aea95..a23feb1665dd6bb5ed2a3dd8e37474bf9b59eaf1 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Left 3)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 10 (Left 3)) @parameter ] + [ (Pair 10 (Left 3)) ] - location: 20 (remaining gas: 1039981.890 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 0f0a03710ef2c4d6e7d1d4e7bf0d394db26bac0f..42f26c31167ab8c666ed79b15afb2f0df2cc5d76 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Right 0)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 10 (Right 0)) @parameter ] + [ (Pair 10 (Right 0)) ] - location: 20 (remaining gas: 1039981.890 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 58eb82c1499cab0c13ff3d4a5e70c26b0d988d72..a822fcf3fbf629b6ab79c77da8102d25260a00d7 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Right 10)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 10 (Right 10)) @parameter ] + [ (Pair 10 (Right 10)) ] - location: 20 (remaining gas: 1039981.890 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 b4c37fe7c1670cea5d8f0ef2a549d3e8901ec729..c490ac9f213c9e6c05c628b4691feea5de5ebe5a 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 10 (Right 3)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 10 (Right 3)) @parameter ] + [ (Pair 10 (Right 3)) ] - location: 20 (remaining gas: 1039981.890 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 137dfd74adb3a610b06ab29c7a2731a2683e4727..ae1ac009cf79ff7d1893b3e5016ee6088ff1cdf9 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: 18 (remaining gas: 1039982.170 units remaining) [ (Pair (Pair 5 (Right 10)) (Left None)) ] - location: 19 (remaining gas: 1039982.030 units remaining) - [ (Pair 5 (Right 10)) @parameter ] + [ (Pair 5 (Right 10)) ] - location: 20 (remaining gas: 1039981.890 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 396ad54a11d9034f370a670ac693951481947f35..2848c740197d9e7a46ef6e4484ba707fabef2efc 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,31 +10,31 @@ trace - location: 6 (remaining gas: 1039986.458 units remaining) [ (Pair "" "?") ] - location: 7 (remaining gas: 1039986.318 units remaining) - [ "" @parameter ] + [ "" ] - location: 8 (remaining gas: 1039986.178 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } - "" @parameter ] + "" ] - location: 22 (remaining gas: 1039986.048 units remaining) - [ "" @parameter + [ "" { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - location: 11 (remaining gas: 1039985.888 units remaining) - [ "" @arg ] + [ "" ] - location: 12 (remaining gas: 1039985.748 units remaining) [ "_abc" - "" @arg ] + "" ] - location: 15 (remaining gas: 1039985.608 units remaining) [ {} "_abc" - "" @arg ] + "" ] - location: 17 (remaining gas: 1039985.478 units remaining) [ "_abc" {} - "" @arg ] + "" ] - location: 18 (remaining gas: 1039985.338 units remaining) [ { "_abc" } - "" @arg ] + "" ] - location: 19 (remaining gas: 1039985.208 units remaining) - [ "" @arg + [ "" { "_abc" } ] - location: 20 (remaining gas: 1039985.068 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 eaad2b786a51f40d26a8ea68f5a9ff768d595254..866c2ce5242b4ad66cd6fd79d3b0b2a89bdd6bcf 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,31 +10,31 @@ trace - location: 6 (remaining gas: 1039986.418 units remaining) [ (Pair "test" "?") ] - location: 7 (remaining gas: 1039986.278 units remaining) - [ "test" @parameter ] + [ "test" ] - location: 8 (remaining gas: 1039986.138 units remaining) [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } - "test" @parameter ] + "test" ] - location: 22 (remaining gas: 1039986.008 units remaining) - [ "test" @parameter + [ "test" { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ] - location: 11 (remaining gas: 1039985.848 units remaining) - [ "test" @arg ] + [ "test" ] - location: 12 (remaining gas: 1039985.708 units remaining) [ "_abc" - "test" @arg ] + "test" ] - location: 15 (remaining gas: 1039985.568 units remaining) [ {} "_abc" - "test" @arg ] + "test" ] - location: 17 (remaining gas: 1039985.438 units remaining) [ "_abc" {} - "test" @arg ] + "test" ] - location: 18 (remaining gas: 1039985.298 units remaining) [ { "_abc" } - "test" @arg ] + "test" ] - location: 19 (remaining gas: 1039985.168 units remaining) - [ "test" @arg + [ "test" { "_abc" } ] - location: 20 (remaining gas: 1039985.028 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 ebb65ef0e5c754bcb4c6c83d4b27466dbcada31b..1a9b86569ac35c0ad1c5d3a09ef0580662093cfe 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,18 +10,18 @@ trace - location: 7 (remaining gas: 1039990.235 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ] - location: 8 (remaining gas: 1039990.095 units remaining) - [ { 1 ; 2 ; 3 ; 4 } @parameter ] + [ { 1 ; 2 ; 3 ; 4 } ] - location: 13 (remaining gas: 1039989.625 units remaining) [ ] - location: 12 (remaining gas: 1039989.555 units remaining) [ ] - location: 11 (remaining gas: 1039989.555 units remaining) - [ 1 @parameter.hd ] + [ 1 ] - location: 10 (remaining gas: 1039989.485 units remaining) - [ 1 @parameter.hd ] + [ 1 ] - location: 18 (remaining gas: 1039989.345 units remaining) [ {} - 1 @parameter.hd ] + 1 ] - location: 20 (remaining gas: 1039989.205 units remaining) [ (Pair {} 1) ] - location: -1 (remaining gas: 1039989.135 units remaining) 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 2194563500f97d935541bf648c64a697d4ee9a7d..cacd39ee7a1b0c87781dfb2ab58362f0e39a4a77 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,18 +10,18 @@ trace - location: 7 (remaining gas: 1039990.955 units remaining) [ (Pair { 4 } 111) ] - location: 8 (remaining gas: 1039990.815 units remaining) - [ { 4 } @parameter ] + [ { 4 } ] - location: 13 (remaining gas: 1039990.345 units remaining) [ ] - location: 12 (remaining gas: 1039990.275 units remaining) [ ] - location: 11 (remaining gas: 1039990.275 units remaining) - [ 4 @parameter.hd ] + [ 4 ] - location: 10 (remaining gas: 1039990.205 units remaining) - [ 4 @parameter.hd ] + [ 4 ] - location: 18 (remaining gas: 1039990.065 units remaining) [ {} - 4 @parameter.hd ] + 4 ] - location: 20 (remaining gas: 1039989.925 units remaining) [ (Pair {} 4) ] - location: -1 (remaining gas: 1039989.855 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 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 16d1157581165fd106247cfa65ab6d45e78962df..d79c6a1f57eb31914b0582e27da4a59c4ddcb419 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039989.571 units remaining) [ (Pair "hello" (Some 4) {}) ] - location: 13 (remaining gas: 1039989.371 units remaining) - [ "hello" @parameter - (Pair (Some 4) {}) @storage ] + [ "hello" + (Pair (Some 4) {}) ] - location: 16 (remaining gas: 1039989.071 units remaining) [ (Some 4) {} ] @@ -19,11 +19,11 @@ trace [ (Some 4) {} ] - location: 14 (remaining gas: 1039989.001 units remaining) - [ "hello" @parameter + [ "hello" (Some 4) {} ] - location: -1 (remaining gas: 1039988.931 units remaining) - [ "hello" @parameter + [ "hello" (Some 4) {} ] - location: 17 (remaining gas: 1039988.711 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 7492936056d490a615334e132551ab4f83730813..fb6a459187b71a149675584e720b44dd64a55c08 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039988.977 units remaining) [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039988.777 units remaining) - [ "hi" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hi" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039988.477 units remaining) [ (Some 5) { Elt "hello" 4 } ] @@ -19,11 +19,11 @@ trace [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039988.407 units remaining) - [ "hi" @parameter + [ "hi" (Some 5) { Elt "hello" 4 } ] - location: -1 (remaining gas: 1039988.337 units remaining) - [ "hi" @parameter + [ "hi" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039988.117 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 02e10e86b2e736124bb6bf0a00d365bcbd2c583b..9108da4cdb3ccdce36beb50ee662f7afe54b18e7 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039988.947 units remaining) [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039988.747 units remaining) - [ "hello" @parameter - (Pair (Some 5) { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair (Some 5) { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039988.447 units remaining) [ (Some 5) { Elt "hello" 4 } ] @@ -19,11 +19,11 @@ trace [ (Some 5) { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039988.377 units remaining) - [ "hello" @parameter + [ "hello" (Some 5) { Elt "hello" 4 } ] - location: -1 (remaining gas: 1039988.307 units remaining) - [ "hello" @parameter + [ "hello" (Some 5) { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039988.087 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 499670a118080389e43a9bfcba61194d64c1151c..dde870c3b5d34b8878e05580ec0a5837aaf693c2 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039988.563 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039988.363 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039988.063 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] @@ -19,11 +19,11 @@ trace [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039987.993 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: -1 (remaining gas: 1039987.923 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039987.703 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 2290fe5c45d7313dc90f271454c68b8f4ea38cf5..8700371d96995d24e4dc9d0d0733088375e9fedd 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039988.563 units remaining) [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 13 (remaining gas: 1039988.363 units remaining) - [ "1" @parameter - (Pair None { Elt "1" 1 ; Elt "2" 2 }) @storage ] + [ "1" + (Pair None { Elt "1" 1 ; Elt "2" 2 }) ] - location: 16 (remaining gas: 1039988.063 units remaining) [ None { Elt "1" 1 ; Elt "2" 2 } ] @@ -19,11 +19,11 @@ trace [ None { Elt "1" 1 ; Elt "2" 2 } ] - location: 14 (remaining gas: 1039987.993 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: -1 (remaining gas: 1039987.923 units remaining) - [ "1" @parameter + [ "1" None { Elt "1" 1 ; Elt "2" 2 } ] - location: 17 (remaining gas: 1039987.703 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 c5fba1f2da93107d198ad3110d1c219958863076..d6b7112eac2c332aeec703bd62134f7c0aa708fd 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039989.187 units remaining) [ (Pair "hello" None { Elt "hello" 4 }) ] - location: 13 (remaining gas: 1039988.987 units remaining) - [ "hello" @parameter - (Pair None { Elt "hello" 4 }) @storage ] + [ "hello" + (Pair None { Elt "hello" 4 }) ] - location: 16 (remaining gas: 1039988.687 units remaining) [ None { Elt "hello" 4 } ] @@ -19,11 +19,11 @@ trace [ None { Elt "hello" 4 } ] - location: 14 (remaining gas: 1039988.617 units remaining) - [ "hello" @parameter + [ "hello" None { Elt "hello" 4 } ] - location: -1 (remaining gas: 1039988.547 units remaining) - [ "hello" @parameter + [ "hello" None { Elt "hello" 4 } ] - location: 17 (remaining gas: 1039988.327 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 daee8998207d9862a26b736e265ac90fe6e24df1..680b0d4e75067a936438de971832d1999f1a7b14 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039989.811 units remaining) [ (Pair "hello" None {}) ] - location: 13 (remaining gas: 1039989.611 units remaining) - [ "hello" @parameter - (Pair None {}) @storage ] + [ "hello" + (Pair None {}) ] - location: 16 (remaining gas: 1039989.311 units remaining) [ None {} ] @@ -19,11 +19,11 @@ trace [ None {} ] - location: 14 (remaining gas: 1039989.241 units remaining) - [ "hello" @parameter + [ "hello" None {} ] - location: -1 (remaining gas: 1039989.171 units remaining) - [ "hello" @parameter + [ "hello" None {} ] - location: 17 (remaining gas: 1039988.951 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 6c1d7f1b7c9844771860ded789c3e4049ab543f2..72b416274a56d964f225e82e836f44eff1516e65 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,10 +13,10 @@ trace [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 13 (remaining gas: 1039983.915 units remaining) - [ "1" @parameter + [ "1" (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 17 (remaining gas: 1039983.555 units remaining) - [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) @storage ] + [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ] - location: 18 (remaining gas: 1039983.415 units remaining) [ { Elt "1" "one" ; Elt "2" "two" } ] - location: -1 (remaining gas: 1039983.345 units remaining) @@ -28,7 +28,7 @@ trace [ { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 14 (remaining gas: 1039983.135 units remaining) - [ "1" @parameter + [ "1" { Elt "1" "one" ; Elt "2" "two" } { Elt "1" "one" ; Elt "2" "two" } ] - location: 20 (remaining gas: 1039982.995 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 88dc727336c30a23c46df311be2624dbc0908ab6..555b5aaed507cb3662d4a5d3adff88b9f7e3a7ee 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,10 +13,10 @@ trace [ (Pair "" None { Elt "hello" "hi" }) (Pair "" None { Elt "hello" "hi" }) ] - location: 13 (remaining gas: 1039984.643 units remaining) - [ "" @parameter + [ "" (Pair "" None { Elt "hello" "hi" }) ] - location: 17 (remaining gas: 1039984.283 units remaining) - [ (Pair None { Elt "hello" "hi" }) @storage ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 18 (remaining gas: 1039984.143 units remaining) [ { Elt "hello" "hi" } ] - location: -1 (remaining gas: 1039984.073 units remaining) @@ -28,7 +28,7 @@ trace [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039983.863 units remaining) - [ "" @parameter + [ "" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039983.723 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 2315e1208690c6fa5092d37bcd427ef7e8cb0e7b..61f35ec40beae73161311554a6430e5f32112991 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,10 +13,10 @@ trace [ (Pair "hello" None { Elt "hello" "hi" }) (Pair "hello" None { Elt "hello" "hi" }) ] - location: 13 (remaining gas: 1039984.593 units remaining) - [ "hello" @parameter + [ "hello" (Pair "hello" None { Elt "hello" "hi" }) ] - location: 17 (remaining gas: 1039984.233 units remaining) - [ (Pair None { Elt "hello" "hi" }) @storage ] + [ (Pair None { Elt "hello" "hi" }) ] - location: 18 (remaining gas: 1039984.093 units remaining) [ { Elt "hello" "hi" } ] - location: -1 (remaining gas: 1039984.023 units remaining) @@ -28,7 +28,7 @@ trace [ { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 14 (remaining gas: 1039983.813 units remaining) - [ "hello" @parameter + [ "hello" { Elt "hello" "hi" } { Elt "hello" "hi" } ] - location: 20 (remaining gas: 1039983.673 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 db69332122e71afb84ecbb1534858e6632285f74..9d35bf8bdbaf1ac8ecb6e8474e886dce0e278660 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: 7 (remaining gas: 1039964.690 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ] - location: 8 (remaining gas: 1039964.550 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter ] + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - location: 9 (remaining gas: 1039963.910 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 10 (remaining gas: 1039963.770 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 31f4aefb11ea4238ee3b28785ef79b8c414eba70..96133416e22118040c91fd4502630711ebfdb261 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: 7 (remaining gas: 1039964.690 units remaining) [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ] - location: 8 (remaining gas: 1039964.550 units remaining) - [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" @parameter ] + [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" ] - location: 9 (remaining gas: 1039963.910 units remaining) [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ] - location: 10 (remaining gas: 1039963.770 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 0054f1607dde17a3610b5aff491c4e99bf92fbc8..bccade5dfb201022b49c30f8df6587e9fbbb55f3 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: 6 (remaining gas: 1039993.926 units remaining) [ (Pair "12345" 0x00) ] - location: 7 (remaining gas: 1039993.786 units remaining) - [ "12345" @parameter ] + [ "12345" ] - location: 8 (remaining gas: 1039981.486 units remaining) - [ 0x0501000000053132333435 @parameter.packed ] + [ 0x0501000000053132333435 ] - location: 9 (remaining gas: 1039980.913 units remaining) [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ] - location: 10 (remaining gas: 1039980.773 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 06fa4cfdb06bebfaf3bd490151a5bffaf8c00e02..ddbb989add163f32b1c44ddece82e462e27bf11b 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: 6 (remaining gas: 1039993.906 units remaining) [ (Pair "abcdefg" 0x00) ] - location: 7 (remaining gas: 1039993.766 units remaining) - [ "abcdefg" @parameter ] + [ "abcdefg" ] - location: 8 (remaining gas: 1039981.466 units remaining) - [ 0x05010000000761626364656667 @parameter.packed ] + [ 0x05010000000761626364656667 ] - location: 9 (remaining gas: 1039980.890 units remaining) [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ] - location: 10 (remaining gas: 1039980.750 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 01e97ef5596d862558a517a36556f6431020e9f0..7466b440cec5c6c7d3bc5f3b7e4647fefe6f7ed5 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: 7 (remaining gas: 1039991.240 units remaining) [ (Pair False None) ] - location: 8 (remaining gas: 1039991.100 units remaining) - [ False @parameter ] + [ False ] - location: 15 (remaining gas: 1039990.840 units remaining) [ False ] - location: 14 (remaining gas: 1039990.770 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 1abd1ad123f803a879ac1cd262ff3e5648fa1e57..99aabec742124baabd84f1e6f9afcd41fdda3780 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: 7 (remaining gas: 1039991.240 units remaining) [ (Pair True None) ] - location: 8 (remaining gas: 1039991.100 units remaining) - [ True @parameter ] + [ True ] - location: 11 (remaining gas: 1039990.840 units remaining) [ True ] - location: 10 (remaining gas: 1039990.770 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 36eda6d77511325ccc35c8a12babc3552db55ebe..9dc65c432085d4319d5c99af95c552d2c6188ec5 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: 7 (remaining gas: 1039992.188 units remaining) [ (Pair (Some "hello") "?") ] - location: 8 (remaining gas: 1039992.048 units remaining) - [ (Some "hello") @parameter ] + [ (Some "hello") ] - location: 15 (remaining gas: 1039991.778 units remaining) [ "hello" ] - location: 9 (remaining gas: 1039991.708 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 9116fd5c60dc7f7cfb289f24029e8e8c9f3a0f2e..c2c99ac6d8dfd54bde6c0e6659a79c364cb000e1 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: 7 (remaining gas: 1039992.492 units remaining) [ (Pair None "?") ] - location: 8 (remaining gas: 1039992.352 units remaining) - [ None @parameter ] + [ None ] - location: 12 (remaining gas: 1039992.012 units remaining) [ "" ] - location: 11 (remaining gas: 1039991.942 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 3b8bf5e4a94b5180d9d46441f0d1d65785573c5f..0170467954f5d91614258f6a21bb3c7c68afc9d8 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair 0 None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ 0 @parameter ] + [ 0 ] - location: 9 (remaining gas: 1039993.410 units remaining) [ 0 ] - location: 10 (remaining gas: 1039993.270 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 d8a45a0366ded3974f0f4d6ef961c7a9e1c041a9..14730804d5d1eaeef3c0e4c0e3e5457ccb2571d0 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair 1 None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ 1 @parameter ] + [ 1 ] - location: 9 (remaining gas: 1039993.410 units remaining) [ 1 ] - location: 10 (remaining gas: 1039993.270 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 0afc7c07ba6ca3b29034f926406dbe58f6c1dd2d..8d6605bfd268f5821748bc05ce76a1970080165e 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair 9999 None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ 9999 @parameter ] + [ 9999 ] - location: 9 (remaining gas: 1039993.410 units remaining) [ 9999 ] - location: 10 (remaining gas: 1039993.270 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 42b8ccf85770d4448bd0932668b8d6ddca460fa6..c91bb4d7a5ba24bd9d12abafe9d6f45d7d377bfe 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ 0x48656c6c6f2c20776f726c6421 @parameter ] + [ 0x48656c6c6f2c20776f726c6421 ] - location: 9 (remaining gas: 1039991.700 units remaining) [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ] - location: 10 (remaining gas: 1039991.560 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 b81da49054aeea4e912c49a7e47f63fa98ff35b3..f924ffb5605252f5ed379e224b61fef92d0ebc36 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,7 +10,7 @@ trace - location: 10 (remaining gas: 1039991.066 units remaining) [ (Pair (Left True) (Left "X")) ] - location: 11 (remaining gas: 1039990.926 units remaining) - [ (Left True) @parameter ] + [ (Left True) ] - location: 14 (remaining gas: 1039990.636 units remaining) [ (Right True) ] - location: 13 (remaining gas: 1039990.566 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 6c2c501ecec1f70161b52049a2766f3041fd832b..964e1c8309e762b8fabbe8cf1e2ca948334f9048 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,7 +10,7 @@ trace - location: 10 (remaining gas: 1039991.042 units remaining) [ (Pair (Right "a") (Left "X")) ] - location: 11 (remaining gas: 1039990.902 units remaining) - [ (Right "a") @parameter ] + [ (Right "a") ] - location: 17 (remaining gas: 1039990.612 units remaining) [ (Left "a") ] - location: 16 (remaining gas: 1039990.542 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 0bdabc3860fde5d9f032c41ce4e3e50954dde19b..e83b2e89a51fcf9d86db77c7bab64c8ab0d9cfaa 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.600 units remaining) [ ] - location: 8 (remaining gas: 1039994.380 units remaining) - [ 1 @level ] + [ 1 ] - location: 9 (remaining gas: 1039994.240 units remaining) [ {} - 1 @level ] + 1 ] - location: 11 (remaining gas: 1039994.100 units remaining) [ (Pair {} 1) ] - location: -1 (remaining gas: 1039994.030 units remaining) 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 1db5f3c1768db54609c8fc99287cc77e766b78d7..35af3cea2df012f400b67a08acc6dbda1aad83ee 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: 7 (remaining gas: 1039992.104 units remaining) [ (Pair { "d" ; "e" ; "f" } "abc") ] - location: 8 (remaining gas: 1039991.964 units remaining) - [ { "d" ; "e" ; "f" } @parameter - "abc" @storage ] + [ { "d" ; "e" ; "f" } + "abc" ] - location: 9 (remaining gas: 1039991.834 units remaining) - [ "abc" @storage - { "d" ; "e" ; "f" } @parameter ] + [ "abc" + { "d" ; "e" ; "f" } ] - location: 10 (remaining gas: 1039991.694 units remaining) [ { "abc" ; "d" ; "e" ; "f" } ] - location: 11 (remaining gas: 1039991.494 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 93a911f602f26fb16233c2130dc73bac1eb6906c..d7404425fb5e1876bac65a40735bdbf50c521fbf 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: 7 (remaining gas: 1039992.896 units remaining) [ (Pair {} "abc") ] - location: 8 (remaining gas: 1039992.756 units remaining) - [ {} @parameter - "abc" @storage ] + [ {} + "abc" ] - location: 9 (remaining gas: 1039992.626 units remaining) - [ "abc" @storage - {} @parameter ] + [ "abc" + {} ] - location: 10 (remaining gas: 1039992.486 units remaining) [ { "abc" } ] - location: 11 (remaining gas: 1039992.316 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 7dcbd264bebf40e9cb4c37c79db848d9c5b0e2f6..7ea69fa4e9fa93dee31021d7b9a60b7f565d7fc6 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: 7 (remaining gas: 1039992.220 units remaining) [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ] - location: 8 (remaining gas: 1039992.080 units remaining) - [ { 0x00 ; 0x11 ; 0x00 } @parameter - 0x @storage ] + [ { 0x00 ; 0x11 ; 0x00 } + 0x ] - location: 9 (remaining gas: 1039991.950 units remaining) - [ 0x @storage - { 0x00 ; 0x11 ; 0x00 } @parameter ] + [ 0x + { 0x00 ; 0x11 ; 0x00 } ] - location: 10 (remaining gas: 1039991.810 units remaining) [ { 0x ; 0x00 ; 0x11 ; 0x00 } ] - location: 11 (remaining gas: 1039991.610 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 b5ec6358fbb017f7eb6d7ecb7900dc357e5fb619..1566324be953c686e0676ae87a709e32ffaf3116 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: 7 (remaining gas: 1039992.940 units remaining) [ (Pair {} 0x) ] - location: 8 (remaining gas: 1039992.800 units remaining) - [ {} @parameter - 0x @storage ] + [ {} + 0x ] - location: 9 (remaining gas: 1039992.670 units remaining) - [ 0x @storage - {} @parameter ] + [ 0x + {} ] - location: 10 (remaining gas: 1039992.530 units remaining) [ { 0x } ] - location: 11 (remaining gas: 1039992.360 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 ff2b4bd5b5b3880a91bb8819635c032db90fff3d..7d839851f8d22cd864b76de7ef05c3c87461229b 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: 7 (remaining gas: 1039992.220 units remaining) [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ] - location: 8 (remaining gas: 1039992.080 units remaining) - [ { 0xcd ; 0xef ; 0x00 } @parameter - 0x00ab @storage ] + [ { 0xcd ; 0xef ; 0x00 } + 0x00ab ] - location: 9 (remaining gas: 1039991.950 units remaining) - [ 0x00ab @storage - { 0xcd ; 0xef ; 0x00 } @parameter ] + [ 0x00ab + { 0xcd ; 0xef ; 0x00 } ] - location: 10 (remaining gas: 1039991.810 units remaining) [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ] - location: 11 (remaining gas: 1039991.610 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 47129c1fb71dd027956e56934c0ed685bd38967c..575f511c43c922402edf20040c21b22a6f7e34ed 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: 7 (remaining gas: 1039992.940 units remaining) [ (Pair {} 0xabcd) ] - location: 8 (remaining gas: 1039992.800 units remaining) - [ {} @parameter - 0xabcd @storage ] + [ {} + 0xabcd ] - location: 9 (remaining gas: 1039992.670 units remaining) - [ 0xabcd @storage - {} @parameter ] + [ 0xabcd + {} ] - location: 10 (remaining gas: 1039992.530 units remaining) [ { 0xabcd } ] - location: 11 (remaining gas: 1039992.360 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 62fcde5204c2dc02dc4afe599b664654a2e3c634..e4cf48ff0c292957afc546e9c9eb0feea329779f 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: 8 (remaining gas: 1039993.974 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - location: 9 (remaining gas: 1039993.834 units remaining) - [ { "1" ; "2" ; "3" } @parameter ] + [ { "1" ; "2" ; "3" } ] - location: 10 (remaining gas: 1039993.694 units remaining) [ {} - { "1" ; "2" ; "3" } @parameter ] + { "1" ; "2" ; "3" } ] - location: 12 (remaining gas: 1039993.554 units remaining) [ (Pair {} { "1" ; "2" ; "3" }) ] - location: -1 (remaining gas: 1039993.484 units remaining) 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 9ed51f1b7a18dd182341766756ad9d5b490b7e0a..a94ee76d7e0c6f49406ab120c6e8222e2f3bb088 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: 8 (remaining gas: 1039993.974 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - location: 9 (remaining gas: 1039993.834 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039993.694 units remaining) [ {} - { "a" ; "b" ; "c" } @parameter ] + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039993.554 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - location: -1 (remaining gas: 1039993.484 units remaining) 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 06588fd16a51c527eb6241182fb1e95dbc66c580..fc1ef71fdda21cb685df8b52de891794d0937e1e 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: 8 (remaining gas: 1039994.766 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039994.626 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039994.486 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039994.346 units remaining) [ (Pair {} {}) ] - location: -1 (remaining gas: 1039994.276 units remaining) 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 5f71d0c03aa3a901a38b84cc78c542555fc8fa54..fb29b157df02a7ff07f64e93f7a1f851981acef4 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039992.849 units remaining) [ (Pair { "1" ; "2" ; "3" } { "" }) ] - location: 9 (remaining gas: 1039992.709 units remaining) - [ { "1" ; "2" ; "3" } @parameter ] + [ { "1" ; "2" ; "3" } ] - location: 11 (remaining gas: 1039992.043 units remaining) - [ "1" @parameter.elt ] + [ "1" ] - location: 11 (remaining gas: 1039991.973 units remaining) - [ "2" @parameter.elt ] + [ "2" ] - location: 11 (remaining gas: 1039991.903 units remaining) - [ "3" @parameter.elt ] + [ "3" ] - location: 10 (remaining gas: 1039991.903 units remaining) [ { "1" ; "2" ; "3" } ] - location: 12 (remaining gas: 1039991.763 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 1cea9f4efdd9f9ab3c0f2b3c27d13fdd1bf26184..dff346b0694c282ad70ea1a0c3521ae9ca4e8f0c 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039992.849 units remaining) [ (Pair { "a" ; "b" ; "c" } { "" }) ] - location: 9 (remaining gas: 1039992.709 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 11 (remaining gas: 1039992.043 units remaining) - [ "a" @parameter.elt ] + [ "a" ] - location: 11 (remaining gas: 1039991.973 units remaining) - [ "b" @parameter.elt ] + [ "b" ] - location: 11 (remaining gas: 1039991.903 units remaining) - [ "c" @parameter.elt ] + [ "c" ] - location: 10 (remaining gas: 1039991.903 units remaining) [ { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039991.763 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 e2483a069b92d609df9b17a270bf9cad6cbaad84..da3dd58421bac01ce17ea598c32cb96e444529fc 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: 8 (remaining gas: 1039993.641 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039993.501 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039992.941 units remaining) [ {} ] - location: 12 (remaining gas: 1039992.801 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 172dc2787ae1b43b3340d8e46d47d5d4ae2cfb41..dd82acbdee0fa8f9ae4da6fc56f4c216efc98bf6 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,12 +10,12 @@ trace - location: 7 (remaining gas: 1039991.060 units remaining) [ (Pair { 10 ; 2 ; 1 } 0) ] - location: 8 (remaining gas: 1039990.920 units remaining) - [ { 10 ; 2 ; 1 } @parameter ] + [ { 10 ; 2 ; 1 } ] - location: 9 (remaining gas: 1039990.780 units remaining) [ 1 - { 10 ; 2 ; 1 } @parameter ] + { 10 ; 2 ; 1 } ] - location: 12 (remaining gas: 1039990.650 units remaining) - [ { 10 ; 2 ; 1 } @parameter + [ { 10 ; 2 ; 1 } 1 ] - location: 15 (remaining gas: 1039989.923 units remaining) [ 10 ] 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 20e8e8cc44d673e23ba355e667fd583603130778..694be8520cafc454e09839f1c4079aa5e5c258b3 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,12 +10,12 @@ trace - location: 7 (remaining gas: 1039991.060 units remaining) [ (Pair { 3 ; 6 ; 9 } 0) ] - location: 8 (remaining gas: 1039990.920 units remaining) - [ { 3 ; 6 ; 9 } @parameter ] + [ { 3 ; 6 ; 9 } ] - location: 9 (remaining gas: 1039990.780 units remaining) [ 1 - { 3 ; 6 ; 9 } @parameter ] + { 3 ; 6 ; 9 } ] - location: 12 (remaining gas: 1039990.650 units remaining) - [ { 3 ; 6 ; 9 } @parameter + [ { 3 ; 6 ; 9 } 1 ] - location: 15 (remaining gas: 1039989.923 units remaining) [ 3 ] 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 184bda18ce327c7a339cba10416299542295e59b..99b7bebd73096a93909ff81e40d7a2a8eb4e0e87 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,12 +10,12 @@ trace - location: 8 (remaining gas: 1039984.380 units remaining) [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ] - location: 9 (remaining gas: 1039984.240 units remaining) - [ { 1 ; 1 ; 1 ; 1 } @parameter ] + [ { 1 ; 1 ; 1 ; 1 } ] - location: 10 (remaining gas: 1039984.100 units remaining) [ 0 - { 1 ; 1 ; 1 ; 1 } @parameter ] + { 1 ; 1 ; 1 ; 1 } ] - location: 13 (remaining gas: 1039983.970 units remaining) - [ { 1 ; 1 ; 1 ; 1 } @parameter + [ { 1 ; 1 ; 1 ; 1 } 0 ] - location: 18 (remaining gas: 1039983.062 units remaining) [ 0 @@ -24,7 +24,7 @@ trace [ 0 0 ] - location: 16 (remaining gas: 1039982.992 units remaining) - [ 1 @parameter.elt + [ 1 0 0 ] - location: 19 (remaining gas: 1039982.852 units remaining) @@ -50,7 +50,7 @@ trace [ 1 1 ] - location: 16 (remaining gas: 1039981.902 units remaining) - [ 1 @parameter.elt + [ 1 1 1 ] - location: 19 (remaining gas: 1039981.762 units remaining) @@ -76,7 +76,7 @@ trace [ 2 2 ] - location: 16 (remaining gas: 1039980.812 units remaining) - [ 1 @parameter.elt + [ 1 2 2 ] - location: 19 (remaining gas: 1039980.672 units remaining) @@ -102,7 +102,7 @@ trace [ 3 3 ] - location: 16 (remaining gas: 1039979.722 units remaining) - [ 1 @parameter.elt + [ 1 3 3 ] - location: 19 (remaining gas: 1039979.582 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 992a8885abd68ecf0dfdbd51c81ae4e3d346d427..b3b248a8da3ccacf8a9f262224ad52406e461c50 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,12 +10,12 @@ trace - location: 8 (remaining gas: 1039984.380 units remaining) [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ] - location: 9 (remaining gas: 1039984.240 units remaining) - [ { 1 ; 2 ; 3 ; 0 } @parameter ] + [ { 1 ; 2 ; 3 ; 0 } ] - location: 10 (remaining gas: 1039984.100 units remaining) [ 0 - { 1 ; 2 ; 3 ; 0 } @parameter ] + { 1 ; 2 ; 3 ; 0 } ] - location: 13 (remaining gas: 1039983.970 units remaining) - [ { 1 ; 2 ; 3 ; 0 } @parameter + [ { 1 ; 2 ; 3 ; 0 } 0 ] - location: 18 (remaining gas: 1039983.062 units remaining) [ 0 @@ -24,7 +24,7 @@ trace [ 0 0 ] - location: 16 (remaining gas: 1039982.992 units remaining) - [ 1 @parameter.elt + [ 1 0 0 ] - location: 19 (remaining gas: 1039982.852 units remaining) @@ -50,7 +50,7 @@ trace [ 1 1 ] - location: 16 (remaining gas: 1039981.902 units remaining) - [ 2 @parameter.elt + [ 2 1 1 ] - location: 19 (remaining gas: 1039981.762 units remaining) @@ -76,7 +76,7 @@ trace [ 2 2 ] - location: 16 (remaining gas: 1039980.812 units remaining) - [ 3 @parameter.elt + [ 3 2 2 ] - location: 19 (remaining gas: 1039980.672 units remaining) @@ -102,7 +102,7 @@ trace [ 3 3 ] - location: 16 (remaining gas: 1039979.722 units remaining) - [ 0 @parameter.elt + [ 0 3 3 ] - location: 19 (remaining gas: 1039979.582 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 0d38983a6639d40f7ec1e4209a5e98f301221037..680c01aedfa804eb7da6292aa511a792f50716dc 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: 8 (remaining gas: 1039985.340 units remaining) [ (Pair {} { 0 }) ] - location: 9 (remaining gas: 1039985.200 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039985.060 units remaining) [ 0 - {} @parameter ] + {} ] - location: 13 (remaining gas: 1039984.930 units remaining) - [ {} @parameter + [ {} 0 ] - location: 14 (remaining gas: 1039984.370 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 a46e67990c1c3edf33c5ceb4039a4a4232f7ad8b..f51e75d8a797febeeed5cbb130b3c8101d1876b1 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: 7 (remaining gas: 1039993.130 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - location: 8 (remaining gas: 1039992.990 units remaining) - [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } @parameter ] + [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - location: 9 (remaining gas: 1039992.850 units remaining) [ 6 ] - location: 10 (remaining gas: 1039992.710 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 1c32ff8dbe252ee66ed9a1bbc7d0c54bb74a2921..4049122350936a11e799efbccfa881df4bf12d2b 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: 7 (remaining gas: 1039993.850 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039993.710 units remaining) - [ { 1 ; 2 ; 3 } @parameter ] + [ { 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039993.570 units remaining) [ 3 ] - location: 10 (remaining gas: 1039993.430 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 02799210c166f2afdaa4ffc3bc14121935efc395..83ce3527b5dc6446ff9dfd1ff911bffa18843496 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: 7 (remaining gas: 1039994.330 units remaining) [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039994.190 units remaining) - [ { 1 } @parameter ] + [ { 1 } ] - location: 9 (remaining gas: 1039994.050 units remaining) [ 1 ] - location: 10 (remaining gas: 1039993.910 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 7b85a238d4261c67f384752892b854c9f4458ff1..d71f7a1e908ed538138f9e03d62b2a10116ca494 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: 7 (remaining gas: 1039994.570 units remaining) [ (Pair {} 111) ] - location: 8 (remaining gas: 1039994.430 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039994.290 units remaining) [ 0 ] - location: 10 (remaining gas: 1039994.150 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 7116610703063327b0d8aed7036b43913eb4b09c..4a90c98c6d0347ee491a47be06438950b8d81514 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: 8 (remaining gas: 1039976.864 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039976.724 units remaining) - [ { "c" ; "b" ; "a" } @parameter ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039976.584 units remaining) [ {} - { "c" ; "b" ; "a" } @parameter ] + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039976.454 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 13 (remaining gas: 1039976.314 units remaining) [ (Pair { "c" ; "b" ; "a" } {}) ] @@ -25,25 +25,25 @@ trace [ (Pair { "c" ; "b" ; "a" } {}) (Pair { "c" ; "b" ; "a" } {}) ] - location: 20 (remaining gas: 1039975.754 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } (Pair { "c" ; "b" ; "a" } {}) ] - location: 23 (remaining gas: 1039975.454 units remaining) [ {} ] - location: 22 (remaining gas: 1039975.384 units remaining) [ {} ] - location: 21 (remaining gas: 1039975.384 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 26 (remaining gas: 1039975.084 units remaining) - [ { "b" ; "a" } @parameter.tl - "c" @parameter.hd + [ { "b" ; "a" } + "c" {} ] - location: 29 (remaining gas: 1039974.784 units remaining) [ { "c" } ] - location: 28 (remaining gas: 1039974.714 units remaining) [ { "c" } ] - location: 27 (remaining gas: 1039974.714 units remaining) - [ { "b" ; "a" } @parameter.tl + [ { "b" ; "a" } { "c" } ] - location: 30 (remaining gas: 1039974.574 units remaining) [ (Pair { "b" ; "a" } { "c" }) ] @@ -57,25 +57,25 @@ trace [ (Pair { "b" ; "a" } { "c" }) (Pair { "b" ; "a" } { "c" }) ] - location: 20 (remaining gas: 1039973.934 units remaining) - [ { "b" ; "a" } @parameter + [ { "b" ; "a" } (Pair { "b" ; "a" } { "c" }) ] - location: 23 (remaining gas: 1039973.634 units remaining) [ { "c" } ] - location: 22 (remaining gas: 1039973.564 units remaining) [ { "c" } ] - location: 21 (remaining gas: 1039973.564 units remaining) - [ { "b" ; "a" } @parameter + [ { "b" ; "a" } { "c" } ] - location: 26 (remaining gas: 1039973.264 units remaining) - [ { "a" } @parameter.tl - "b" @parameter.hd + [ { "a" } + "b" { "c" } ] - location: 29 (remaining gas: 1039972.964 units remaining) [ { "b" ; "c" } ] - location: 28 (remaining gas: 1039972.894 units remaining) [ { "b" ; "c" } ] - location: 27 (remaining gas: 1039972.894 units remaining) - [ { "a" } @parameter.tl + [ { "a" } { "b" ; "c" } ] - location: 30 (remaining gas: 1039972.754 units remaining) [ (Pair { "a" } { "b" ; "c" }) ] @@ -89,25 +89,25 @@ trace [ (Pair { "a" } { "b" ; "c" }) (Pair { "a" } { "b" ; "c" }) ] - location: 20 (remaining gas: 1039972.114 units remaining) - [ { "a" } @parameter + [ { "a" } (Pair { "a" } { "b" ; "c" }) ] - location: 23 (remaining gas: 1039971.814 units remaining) [ { "b" ; "c" } ] - location: 22 (remaining gas: 1039971.744 units remaining) [ { "b" ; "c" } ] - location: 21 (remaining gas: 1039971.744 units remaining) - [ { "a" } @parameter + [ { "a" } { "b" ; "c" } ] - location: 26 (remaining gas: 1039971.444 units remaining) - [ {} @parameter.tl - "a" @parameter.hd + [ {} + "a" { "b" ; "c" } ] - location: 29 (remaining gas: 1039971.144 units remaining) [ { "a" ; "b" ; "c" } ] - location: 28 (remaining gas: 1039971.074 units remaining) [ { "a" ; "b" ; "c" } ] - location: 27 (remaining gas: 1039971.074 units remaining) - [ {} @parameter.tl + [ {} { "a" ; "b" ; "c" } ] - location: 30 (remaining gas: 1039970.934 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] @@ -121,14 +121,14 @@ trace [ (Pair {} { "a" ; "b" ; "c" }) (Pair {} { "a" ; "b" ; "c" }) ] - location: 20 (remaining gas: 1039970.294 units remaining) - [ {} @parameter + [ {} (Pair {} { "a" ; "b" ; "c" }) ] - location: 23 (remaining gas: 1039969.994 units remaining) [ { "a" ; "b" ; "c" } ] - location: 22 (remaining gas: 1039969.924 units remaining) [ { "a" ; "b" ; "c" } ] - location: 21 (remaining gas: 1039969.924 units remaining) - [ {} @parameter + [ {} { "a" ; "b" ; "c" } ] - location: 35 (remaining gas: 1039969.614 units remaining) [ (Right { "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 22664ccea1ee4d25862b12e9594676a3b5400106..47881ebc3ef54d7569a03109f12fb61c78a80848 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: 8 (remaining gas: 1039977.656 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039977.516 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039977.376 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039977.246 units remaining) - [ {} @parameter + [ {} {} ] - location: 13 (remaining gas: 1039977.106 units remaining) [ (Pair {} {}) ] @@ -25,14 +25,14 @@ trace [ (Pair {} {}) (Pair {} {}) ] - location: 20 (remaining gas: 1039976.546 units remaining) - [ {} @parameter + [ {} (Pair {} {}) ] - location: 23 (remaining gas: 1039976.246 units remaining) [ {} ] - location: 22 (remaining gas: 1039976.176 units remaining) [ {} ] - location: 21 (remaining gas: 1039976.176 units remaining) - [ {} @parameter + [ {} {} ] - location: 35 (remaining gas: 1039975.866 units remaining) [ (Right {}) ] 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 0240d2535873a21ad20ae9262961d25dc281b1c4..209cd9353b6c568c3ef211cd95362a5d01d24574 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: 10 (remaining gas: 1039993.280 units remaining) [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ] - location: 11 (remaining gas: 1039993.140 units remaining) - [ { Elt 0 0 ; Elt 3 4 } @parameter ] + [ { Elt 0 0 ; Elt 3 4 } ] - location: 12 (remaining gas: 1039993 units remaining) [ {} - { Elt 0 0 ; Elt 3 4 } @parameter ] + { Elt 0 0 ; Elt 3 4 } ] - location: 14 (remaining gas: 1039992.860 units remaining) [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ] - location: -1 (remaining gas: 1039992.790 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 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 669752847e4be5895afa2a5d3761e1407e34c708..536e126a4ff554ee962b12b7e59d5c195b090156 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: 10 (remaining gas: 1039993.990 units remaining) [ (Pair { Elt 0 0 } {}) ] - location: 11 (remaining gas: 1039993.850 units remaining) - [ { Elt 0 0 } @parameter ] + [ { Elt 0 0 } ] - location: 12 (remaining gas: 1039993.710 units remaining) [ {} - { Elt 0 0 } @parameter ] + { Elt 0 0 } ] - location: 14 (remaining gas: 1039993.570 units remaining) [ (Pair {} { Elt 0 0 }) ] - location: -1 (remaining gas: 1039993.500 units remaining) 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 27738be18327d397392845ae55e32c022a0b87e7..23c238e6d810e848c50c7b6ac0aa9209ccf03bf2 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: 10 (remaining gas: 1039993.990 units remaining) [ (Pair { Elt 0 1 } {}) ] - location: 11 (remaining gas: 1039993.850 units remaining) - [ { Elt 0 1 } @parameter ] + [ { Elt 0 1 } ] - location: 12 (remaining gas: 1039993.710 units remaining) [ {} - { Elt 0 1 } @parameter ] + { Elt 0 1 } ] - location: 14 (remaining gas: 1039993.570 units remaining) [ (Pair {} { Elt 0 1 }) ] - location: -1 (remaining gas: 1039993.500 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 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 6dcc03b00032005be64325578eabb1b626012c59..7b7f1a9b3dc9cb0acc9ff75b455c1c85972fe9a6 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,66 +10,66 @@ trace - location: 10 (remaining gas: 1039975.900 units remaining) [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ] - location: 11 (remaining gas: 1039975.760 units remaining) - [ { Elt 0 100 ; Elt 2 100 } @parameter ] + [ { Elt 0 100 ; Elt 2 100 } ] - location: 12 (remaining gas: 1039975.620 units remaining) - [ 0 @acc_e - { Elt 0 100 ; Elt 2 100 } @parameter ] + [ 0 + { Elt 0 100 ; Elt 2 100 } ] - location: 15 (remaining gas: 1039975.480 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: 1039975.340 units remaining) [ (Pair 0 0) - { Elt 0 100 ; Elt 2 100 } @parameter ] + { Elt 0 100 ; Elt 2 100 } ] - location: 19 (remaining gas: 1039975.210 units remaining) - [ { Elt 0 100 ; Elt 2 100 } @parameter + [ { Elt 0 100 ; Elt 2 100 } (Pair 0 0) ] - location: 24 (remaining gas: 1039974.690 units remaining) [ (Pair 0 0) (Pair 0 0) ] - location: 25 (remaining gas: 1039974.550 units remaining) - [ 0 @acc_k + [ 0 (Pair 0 0) ] - location: 28 (remaining gas: 1039974.250 units remaining) - [ 0 @acc_e ] + [ 0 ] - location: 27 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_e ] + [ 0 ] - location: 26 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_k - 0 @acc_e ] + [ 0 + 0 ] - location: -1 (remaining gas: 1039974.110 units remaining) - [ 0 @acc_k - 0 @acc_e ] + [ 0 + 0 ] - location: 22 (remaining gas: 1039974.110 units remaining) [ (Pair 0 100) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 29 (remaining gas: 1039973.970 units remaining) [ (Pair 0 100) (Pair 0 100) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 32 (remaining gas: 1039973.670 units remaining) - [ 0 @key - 0 @acc_k - 0 @acc_e ] + [ 0 + 0 + 0 ] - location: 33 (remaining gas: 1039973.530 units remaining) [ 0 - 0 @acc_e ] + 0 ] - location: -1 (remaining gas: 1039973.460 units remaining) [ 0 - 0 @acc_e ] + 0 ] - location: 30 (remaining gas: 1039973.460 units remaining) [ (Pair 0 100) 0 - 0 @acc_e ] + 0 ] - location: 34 (remaining gas: 1039973.330 units remaining) [ 0 (Pair 0 100) - 0 @acc_e ] + 0 ] - location: 37 (remaining gas: 1039973.030 units remaining) - [ 100 @elt - 0 @acc_e ] + [ 100 + 0 ] - location: 38 (remaining gas: 1039972.890 units remaining) [ 100 ] - location: -1 (remaining gas: 1039972.820 units remaining) @@ -85,48 +85,48 @@ trace [ (Pair 0 100) (Pair 0 100) ] - location: 25 (remaining gas: 1039972.170 units remaining) - [ 0 @acc_k + [ 0 (Pair 0 100) ] - location: 28 (remaining gas: 1039971.870 units remaining) - [ 100 @acc_e ] + [ 100 ] - location: 27 (remaining gas: 1039971.800 units remaining) - [ 100 @acc_e ] + [ 100 ] - location: 26 (remaining gas: 1039971.800 units remaining) - [ 0 @acc_k - 100 @acc_e ] + [ 0 + 100 ] - location: -1 (remaining gas: 1039971.730 units remaining) - [ 0 @acc_k - 100 @acc_e ] + [ 0 + 100 ] - location: 22 (remaining gas: 1039971.730 units remaining) [ (Pair 2 100) - 0 @acc_k - 100 @acc_e ] + 0 + 100 ] - location: 29 (remaining gas: 1039971.590 units remaining) [ (Pair 2 100) (Pair 2 100) - 0 @acc_k - 100 @acc_e ] + 0 + 100 ] - location: 32 (remaining gas: 1039971.290 units remaining) - [ 2 @key - 0 @acc_k - 100 @acc_e ] + [ 2 + 0 + 100 ] - location: 33 (remaining gas: 1039971.150 units remaining) [ 2 - 100 @acc_e ] + 100 ] - location: -1 (remaining gas: 1039971.080 units remaining) [ 2 - 100 @acc_e ] + 100 ] - location: 30 (remaining gas: 1039971.080 units remaining) [ (Pair 2 100) 2 - 100 @acc_e ] + 100 ] - location: 34 (remaining gas: 1039970.950 units remaining) [ 2 (Pair 2 100) - 100 @acc_e ] + 100 ] - location: 37 (remaining gas: 1039970.650 units remaining) - [ 100 @elt - 100 @acc_e ] + [ 100 + 100 ] - location: 38 (remaining gas: 1039970.510 units remaining) [ 200 ] - location: -1 (remaining gas: 1039970.440 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 7ef195fcc6023aa2a379930d9159bdeab8c8d3f1..f4ddd847bc3ea5d400e5c643494c4cd58de0da6e 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,66 +10,66 @@ trace - location: 10 (remaining gas: 1039975.900 units remaining) [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ] - location: 11 (remaining gas: 1039975.760 units remaining) - [ { Elt 1 1 ; Elt 2 100 } @parameter ] + [ { Elt 1 1 ; Elt 2 100 } ] - location: 12 (remaining gas: 1039975.620 units remaining) - [ 0 @acc_e - { Elt 1 1 ; Elt 2 100 } @parameter ] + [ 0 + { Elt 1 1 ; Elt 2 100 } ] - location: 15 (remaining gas: 1039975.480 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: 1039975.340 units remaining) [ (Pair 0 0) - { Elt 1 1 ; Elt 2 100 } @parameter ] + { Elt 1 1 ; Elt 2 100 } ] - location: 19 (remaining gas: 1039975.210 units remaining) - [ { Elt 1 1 ; Elt 2 100 } @parameter + [ { Elt 1 1 ; Elt 2 100 } (Pair 0 0) ] - location: 24 (remaining gas: 1039974.690 units remaining) [ (Pair 0 0) (Pair 0 0) ] - location: 25 (remaining gas: 1039974.550 units remaining) - [ 0 @acc_k + [ 0 (Pair 0 0) ] - location: 28 (remaining gas: 1039974.250 units remaining) - [ 0 @acc_e ] + [ 0 ] - location: 27 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_e ] + [ 0 ] - location: 26 (remaining gas: 1039974.180 units remaining) - [ 0 @acc_k - 0 @acc_e ] + [ 0 + 0 ] - location: -1 (remaining gas: 1039974.110 units remaining) - [ 0 @acc_k - 0 @acc_e ] + [ 0 + 0 ] - location: 22 (remaining gas: 1039974.110 units remaining) [ (Pair 1 1) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 29 (remaining gas: 1039973.970 units remaining) [ (Pair 1 1) (Pair 1 1) - 0 @acc_k - 0 @acc_e ] + 0 + 0 ] - location: 32 (remaining gas: 1039973.670 units remaining) - [ 1 @key - 0 @acc_k - 0 @acc_e ] + [ 1 + 0 + 0 ] - location: 33 (remaining gas: 1039973.530 units remaining) [ 1 - 0 @acc_e ] + 0 ] - location: -1 (remaining gas: 1039973.460 units remaining) [ 1 - 0 @acc_e ] + 0 ] - location: 30 (remaining gas: 1039973.460 units remaining) [ (Pair 1 1) 1 - 0 @acc_e ] + 0 ] - location: 34 (remaining gas: 1039973.330 units remaining) [ 1 (Pair 1 1) - 0 @acc_e ] + 0 ] - location: 37 (remaining gas: 1039973.030 units remaining) - [ 1 @elt - 0 @acc_e ] + [ 1 + 0 ] - location: 38 (remaining gas: 1039972.890 units remaining) [ 1 ] - location: -1 (remaining gas: 1039972.820 units remaining) @@ -85,48 +85,48 @@ trace [ (Pair 1 1) (Pair 1 1) ] - location: 25 (remaining gas: 1039972.170 units remaining) - [ 1 @acc_k + [ 1 (Pair 1 1) ] - location: 28 (remaining gas: 1039971.870 units remaining) - [ 1 @acc_e ] + [ 1 ] - location: 27 (remaining gas: 1039971.800 units remaining) - [ 1 @acc_e ] + [ 1 ] - location: 26 (remaining gas: 1039971.800 units remaining) - [ 1 @acc_k - 1 @acc_e ] + [ 1 + 1 ] - location: -1 (remaining gas: 1039971.730 units remaining) - [ 1 @acc_k - 1 @acc_e ] + [ 1 + 1 ] - location: 22 (remaining gas: 1039971.730 units remaining) [ (Pair 2 100) - 1 @acc_k - 1 @acc_e ] + 1 + 1 ] - location: 29 (remaining gas: 1039971.590 units remaining) [ (Pair 2 100) (Pair 2 100) - 1 @acc_k - 1 @acc_e ] + 1 + 1 ] - location: 32 (remaining gas: 1039971.290 units remaining) - [ 2 @key - 1 @acc_k - 1 @acc_e ] + [ 2 + 1 + 1 ] - location: 33 (remaining gas: 1039971.150 units remaining) [ 3 - 1 @acc_e ] + 1 ] - location: -1 (remaining gas: 1039971.080 units remaining) [ 3 - 1 @acc_e ] + 1 ] - location: 30 (remaining gas: 1039971.080 units remaining) [ (Pair 2 100) 3 - 1 @acc_e ] + 1 ] - location: 34 (remaining gas: 1039970.950 units remaining) [ 3 (Pair 2 100) - 1 @acc_e ] + 1 ] - location: 37 (remaining gas: 1039970.650 units remaining) - [ 100 @elt - 1 @acc_e ] + [ 100 + 1 ] - location: 38 (remaining gas: 1039970.510 units remaining) [ 101 ] - location: -1 (remaining gas: 1039970.440 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 8bbdbfd47b04aa821b2e614e920afff90fe040ae..f8355e8bea2853304f22ac557c5f92ebcf54447f 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: 8 (remaining gas: 1039987.192 units remaining) [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ] - location: 9 (remaining gas: 1039987.052 units remaining) - [ 15 @parameter - { Elt "bar" 5 ; Elt "foo" 1 } @storage ] + [ 15 + { Elt "bar" 5 ; Elt "foo" 1 } ] - location: 10 (remaining gas: 1039986.922 units remaining) - [ { Elt "bar" 5 ; Elt "foo" 1 } @storage - 15 @parameter ] + [ { Elt "bar" 5 ; Elt "foo" 1 } + 15 ] - location: 13 (remaining gas: 1039985.120 units remaining) - [ 5 @elt - 15 @parameter ] + [ 5 + 15 ] - location: 16 (remaining gas: 1039984.820 units remaining) - [ 15 @parameter - 15 @parameter ] + [ 15 + 15 ] - location: 15 (remaining gas: 1039984.750 units remaining) - [ 15 @parameter - 15 @parameter ] + [ 15 + 15 ] - location: 14 (remaining gas: 1039984.750 units remaining) - [ 5 @elt - 15 @parameter - 15 @parameter ] + [ 5 + 15 + 15 ] - location: 17 (remaining gas: 1039984.610 units remaining) [ 20 - 15 @parameter ] + 15 ] - location: -1 (remaining gas: 1039984.540 units remaining) [ 20 - 15 @parameter ] + 15 ] - location: 13 (remaining gas: 1039984.400 units remaining) - [ 1 @elt - 15 @parameter ] + [ 1 + 15 ] - location: 16 (remaining gas: 1039984.100 units remaining) - [ 15 @parameter - 15 @parameter ] + [ 15 + 15 ] - location: 15 (remaining gas: 1039984.030 units remaining) - [ 15 @parameter - 15 @parameter ] + [ 15 + 15 ] - location: 14 (remaining gas: 1039984.030 units remaining) - [ 1 @elt - 15 @parameter - 15 @parameter ] + [ 1 + 15 + 15 ] - location: 17 (remaining gas: 1039983.890 units remaining) [ 16 - 15 @parameter ] + 15 ] - location: -1 (remaining gas: 1039983.820 units remaining) [ 16 - 15 @parameter ] + 15 ] - location: 11 (remaining gas: 1039983.820 units remaining) [ { Elt "bar" 20 ; Elt "foo" 16 } - 15 @parameter ] + 15 ] - location: 20 (remaining gas: 1039983.520 units remaining) [ ] - location: 19 (remaining gas: 1039983.450 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 e27faabb4bc9dd9ef321c0d7a2cee1d6ec5381ed..1fce11179570a89c54bc9153f67ad5323b8c75b6 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,33 +10,33 @@ trace - location: 8 (remaining gas: 1039987.916 units remaining) [ (Pair 10 { Elt "foo" 1 }) ] - location: 9 (remaining gas: 1039987.776 units remaining) - [ 10 @parameter - { Elt "foo" 1 } @storage ] + [ 10 + { Elt "foo" 1 } ] - location: 10 (remaining gas: 1039987.646 units remaining) - [ { Elt "foo" 1 } @storage - 10 @parameter ] + [ { Elt "foo" 1 } + 10 ] - location: 13 (remaining gas: 1039986.605 units remaining) - [ 1 @elt - 10 @parameter ] + [ 1 + 10 ] - location: 16 (remaining gas: 1039986.305 units remaining) - [ 10 @parameter - 10 @parameter ] + [ 10 + 10 ] - location: 15 (remaining gas: 1039986.235 units remaining) - [ 10 @parameter - 10 @parameter ] + [ 10 + 10 ] - location: 14 (remaining gas: 1039986.235 units remaining) - [ 1 @elt - 10 @parameter - 10 @parameter ] + [ 1 + 10 + 10 ] - location: 17 (remaining gas: 1039986.095 units remaining) [ 11 - 10 @parameter ] + 10 ] - location: -1 (remaining gas: 1039986.025 units remaining) [ 11 - 10 @parameter ] + 10 ] - location: 11 (remaining gas: 1039986.025 units remaining) [ { Elt "foo" 11 } - 10 @parameter ] + 10 ] - location: 20 (remaining gas: 1039985.725 units remaining) [ ] - location: 19 (remaining gas: 1039985.655 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 4d1508b7f73e60390583dad9099e3e4e1eb77ad7..6b5efc3eb92213c40f307c26a0702e66b8564cd4 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,14 +10,14 @@ trace - location: 8 (remaining gas: 1039988.520 units remaining) [ (Pair 10 {}) ] - location: 9 (remaining gas: 1039988.380 units remaining) - [ 10 @parameter - {} @storage ] + [ 10 + {} ] - location: 10 (remaining gas: 1039988.250 units remaining) - [ {} @storage - 10 @parameter ] + [ {} + 10 ] - location: 11 (remaining gas: 1039988.110 units remaining) [ {} - 10 @parameter ] + 10 ] - location: 20 (remaining gas: 1039987.810 units remaining) [ ] - location: 19 (remaining gas: 1039987.740 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 0ac0f989c9fb71547ee89770422a18131955877f..ec93ea928bbaa8bc93d09aff49494482e1ea6b0e 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039987.090 units remaining) [ (Pair 1 { Elt 0 1 } None) ] - location: 12 (remaining gas: 1039986.950 units remaining) - [ 1 @parameter - (Pair { Elt 0 1 } None) @storage ] + [ 1 + (Pair { Elt 0 1 } None) ] - location: 15 (remaining gas: 1039986.650 units remaining) [ { Elt 0 1 } ] - location: 16 (remaining gas: 1039986.510 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt 0 1 } { Elt 0 1 } ] - location: 13 (remaining gas: 1039986.440 units remaining) - [ 1 @parameter + [ 1 { Elt 0 1 } { Elt 0 1 } ] - location: 17 (remaining gas: 1039986.300 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 d04bfb3978efe50e2e8fab31b0533fd1864d70a9..a0bfb11263a71399cdfd19fee99178d0dde214c4 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039987.090 units remaining) [ (Pair 1 { Elt 1 0 } None) ] - location: 12 (remaining gas: 1039986.950 units remaining) - [ 1 @parameter - (Pair { Elt 1 0 } None) @storage ] + [ 1 + (Pair { Elt 1 0 } None) ] - location: 15 (remaining gas: 1039986.650 units remaining) [ { Elt 1 0 } ] - location: 16 (remaining gas: 1039986.510 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt 1 0 } { Elt 1 0 } ] - location: 13 (remaining gas: 1039986.440 units remaining) - [ 1 @parameter + [ 1 { Elt 1 0 } { Elt 1 0 } ] - location: 17 (remaining gas: 1039986.300 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 8254acc18cec6bba729ae8890d22fd65f4ce7c87..299bc410705402758848e119f9cbaeeb58c58ad0 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.380 units remaining) [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039986.240 units remaining) - [ 1 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 1 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.940 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.800 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.730 units remaining) - [ 1 @parameter + [ 1 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.590 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 13a4ff6d8754c8672583ad6ae1b164c1360aaeb1..53907dcd117e91237d37b2ad6edbbaa6c6131b52 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.380 units remaining) [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039986.240 units remaining) - [ 2 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 2 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.940 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.800 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.730 units remaining) - [ 2 @parameter + [ 2 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.590 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 3f38b1f6da058594a78ab5ace8280f61748f5d23..eae18f9e7f931eea0d4b502971cdfa82b0d829ad 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.380 units remaining) [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ] - location: 12 (remaining gas: 1039986.240 units remaining) - [ 3 @parameter - (Pair { Elt 1 4 ; Elt 2 11 } None) @storage ] + [ 3 + (Pair { Elt 1 4 ; Elt 2 11 } None) ] - location: 15 (remaining gas: 1039985.940 units remaining) [ { Elt 1 4 ; Elt 2 11 } ] - location: 16 (remaining gas: 1039985.800 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 13 (remaining gas: 1039985.730 units remaining) - [ 3 @parameter + [ 3 { Elt 1 4 ; Elt 2 11 } { Elt 1 4 ; Elt 2 11 } ] - location: 17 (remaining gas: 1039985.590 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 b231e18b018955f87926df95f5111a025767347f..94d75a8df821aeda5be907f8693742e17dea3101 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039987.650 units remaining) [ (Pair 1 {} None) ] - location: 12 (remaining gas: 1039987.510 units remaining) - [ 1 @parameter - (Pair {} None) @storage ] + [ 1 + (Pair {} None) ] - location: 15 (remaining gas: 1039987.210 units remaining) [ {} ] - location: 16 (remaining gas: 1039987.070 units remaining) @@ -21,7 +21,7 @@ trace [ {} {} ] - location: 13 (remaining gas: 1039987 units remaining) - [ 1 @parameter + [ 1 {} {} ] - location: 17 (remaining gas: 1039986.860 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 3e9f7acf8a4546c6f439a20d312595d161d8fc08..26a548da9d4ee407b2dd69631b0fc9d89aaebbce 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.278 units remaining) [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039986.138 units remaining) - [ "bar" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "bar" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.838 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.698 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.628 units remaining) - [ "bar" @parameter + [ "bar" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039985.488 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 65059dd5471d579a2d9a3675202a5f578fc1d541..9a38d8589f60f9f459a99b4d8206305f6d5179d9 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.278 units remaining) [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039986.138 units remaining) - [ "foo" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "foo" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.838 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.698 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.628 units remaining) - [ "foo" @parameter + [ "foo" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039985.488 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 31b2afffb3d7d9f7a6fc79aa6227e84484820631..68ae7058a2b2ada321a3a40b4fd09cd1051d0503 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039986.278 units remaining) [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 12 (remaining gas: 1039986.138 units remaining) - [ "baz" @parameter - (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) @storage ] + [ "baz" + (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ] - location: 15 (remaining gas: 1039985.838 units remaining) [ { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 16 (remaining gas: 1039985.698 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 13 (remaining gas: 1039985.628 units remaining) - [ "baz" @parameter + [ "baz" { Elt "bar" 4 ; Elt "foo" 11 } { Elt "bar" 4 ; Elt "foo" 11 } ] - location: 17 (remaining gas: 1039985.488 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 eff6dc5f2438d854d4857f0055f4519d825cfc16..44d96e8677d27b0d95869aef58ace8d42a00a4a5 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039987.002 units remaining) [ (Pair "foo" { Elt "foo" 0 } None) ] - location: 12 (remaining gas: 1039986.862 units remaining) - [ "foo" @parameter - (Pair { Elt "foo" 0 } None) @storage ] + [ "foo" + (Pair { Elt "foo" 0 } None) ] - location: 15 (remaining gas: 1039986.562 units remaining) [ { Elt "foo" 0 } ] - location: 16 (remaining gas: 1039986.422 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 13 (remaining gas: 1039986.352 units remaining) - [ "foo" @parameter + [ "foo" { Elt "foo" 0 } { Elt "foo" 0 } ] - location: 17 (remaining gas: 1039986.212 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 f83cd9ba6564394581f3e34262d89352d5933dbe..a11b609c8f0e8018a23e78e89b0f8e337a54b82f 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039987.002 units remaining) [ (Pair "bar" { Elt "foo" 1 } None) ] - location: 12 (remaining gas: 1039986.862 units remaining) - [ "bar" @parameter - (Pair { Elt "foo" 1 } None) @storage ] + [ "bar" + (Pair { Elt "foo" 1 } None) ] - location: 15 (remaining gas: 1039986.562 units remaining) [ { Elt "foo" 1 } ] - location: 16 (remaining gas: 1039986.422 units remaining) @@ -21,7 +21,7 @@ trace [ { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 13 (remaining gas: 1039986.352 units remaining) - [ "bar" @parameter + [ "bar" { Elt "foo" 1 } { Elt "foo" 1 } ] - location: 17 (remaining gas: 1039986.212 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 85a2bf03c15f93d48e912a33e2a4925d8b361719..fd5ef4c54d76b765403ad418eef6c82aa3342af6 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,8 +10,8 @@ trace - location: 11 (remaining gas: 1039987.606 units remaining) [ (Pair "bar" {} None) ] - location: 12 (remaining gas: 1039987.466 units remaining) - [ "bar" @parameter - (Pair {} None) @storage ] + [ "bar" + (Pair {} None) ] - location: 15 (remaining gas: 1039987.166 units remaining) [ {} ] - location: 16 (remaining gas: 1039987.026 units remaining) @@ -21,7 +21,7 @@ trace [ {} {} ] - location: 13 (remaining gas: 1039986.956 units remaining) - [ "bar" @parameter + [ "bar" {} {} ] - location: 17 (remaining gas: 1039986.816 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 34cab593491bcbbd7d8acca5cb99a7b72e00151b..e582b13a707cfee85c153426c23a469e2603c192 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: 8 (remaining gas: 1039990.296 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: 1039990.156 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: 1039990.006 units remaining) [ 6 ] - location: 11 (remaining gas: 1039989.866 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 46448bb879b586eaeb3562aa8570ba63e9e4d619..1f13d87ac3d2b0c5ac52c5648f062ed8fd3af5f2 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: 8 (remaining gas: 1039992.408 units remaining) [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ] - location: 9 (remaining gas: 1039992.268 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: 1039992.118 units remaining) [ 3 ] - location: 11 (remaining gas: 1039991.978 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 0d22054525e415370935f4d2256ed582dd97b31e..ab6e657839054a0d68c829cdff46c37a0892aed7 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: 8 (remaining gas: 1039993.816 units remaining) [ (Pair { Elt "a" 1 } 111) ] - location: 9 (remaining gas: 1039993.676 units remaining) - [ { Elt "a" 1 } @parameter ] + [ { Elt "a" 1 } ] - location: 10 (remaining gas: 1039993.526 units remaining) [ 1 ] - location: 11 (remaining gas: 1039993.386 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 643d7f1d5b53890f2cfaa87abc26520969ccf713..326fa345e63e2bcb5e12748cd74dc6a6163e9346 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: 8 (remaining gas: 1039994.400 units remaining) [ (Pair {} 111) ] - location: 9 (remaining gas: 1039994.260 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039994.110 units remaining) [ 0 ] - location: 11 (remaining gas: 1039993.970 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 1666f3bfdc80fe7559b53526b5f8463e3b04b427..7062a216299f01ad99570de4c04f10cbe537b057 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: 6 (remaining gas: 1039937.860 units remaining) [ (Pair Unit Unit) ] - location: 7 (remaining gas: 1039937.720 units remaining) - [ Unit @parameter ] + [ Unit ] - location: 8 (remaining gas: 1039937.580 units remaining) [ ] - location: 9 (remaining gas: 1039937.440 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 9921037a252d169e10be0f57ea25d75f0d300a40..f95389c47fb9d45885c99d6961fc1f2ece3d8384 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: 6 (remaining gas: 1039986.695 units remaining) [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039986.555 units remaining) - [ 257 @parameter ] + [ 257 ] - location: 8 (remaining gas: 1039986.415 units remaining) [ 1 - 257 @parameter ] + 257 ] - location: 11 (remaining gas: 1039986.285 units remaining) - [ 257 @parameter + [ 257 1 ] - location: 12 (remaining gas: 1039986.025 units remaining) [ (Some (Pair 257 0)) ] - location: 19 (remaining gas: 1039985.755 units remaining) - [ (Pair 257 0) @some ] + [ (Pair 257 0) ] - location: 13 (remaining gas: 1039985.685 units remaining) - [ (Pair 257 0) @some ] + [ (Pair 257 0) ] - location: 20 (remaining gas: 1039985.545 units remaining) [ 257 ] - location: 21 (remaining gas: 1039985.405 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 49f60bde8d69fc29e08bfffb924b34518413aced..f33a6416e3dfc78b2597fa18157f4a882975ee7e 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: 6 (remaining gas: 1039986.695 units remaining) [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ] - location: 7 (remaining gas: 1039986.555 units remaining) - [ 16 @parameter ] + [ 16 ] - location: 8 (remaining gas: 1039986.415 units remaining) [ 1 - 16 @parameter ] + 16 ] - location: 11 (remaining gas: 1039986.285 units remaining) - [ 16 @parameter + [ 16 1 ] - location: 12 (remaining gas: 1039986.025 units remaining) [ (Some (Pair 16 0)) ] - location: 19 (remaining gas: 1039985.755 units remaining) - [ (Pair 16 0) @some ] + [ (Pair 16 0) ] - location: 13 (remaining gas: 1039985.685 units remaining) - [ (Pair 16 0) @some ] + [ (Pair 16 0) ] - location: 20 (remaining gas: 1039985.545 units remaining) [ 16 ] - location: 21 (remaining gas: 1039985.405 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 430cb47720aaed27d621c9a64e455f54c31b27e8..ddf95d511161c3176bd237bf30eb60703c1094d4 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,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.530 units remaining) [ (Pair (Left -2) 0) ] - location: 9 (remaining gas: 1039992.390 units remaining) - [ (Left -2) @parameter ] + [ (Left -2) ] - location: 12 (remaining gas: 1039992.100 units remaining) [ 2 ] - location: 11 (remaining gas: 1039992.030 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 b3c8762a1f8dbdb2cc9183a77a6c30109dacce9f..be1cdabb60ce7c65e46f380ae9dd3740e47cf0b4 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,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.530 units remaining) [ (Pair (Left 0) 0) ] - location: 9 (remaining gas: 1039992.390 units remaining) - [ (Left 0) @parameter ] + [ (Left 0) ] - location: 12 (remaining gas: 1039992.100 units remaining) [ 0 ] - location: 11 (remaining gas: 1039992.030 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 b27288b176c5d1499aa739ef98f60d68dc1b08fe..31c9b8be3534e72af82a2ce9c91d4d900a7d59a7 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,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.530 units remaining) [ (Pair (Left 2) 0) ] - location: 9 (remaining gas: 1039992.390 units remaining) - [ (Left 2) @parameter ] + [ (Left 2) ] - location: 12 (remaining gas: 1039992.100 units remaining) [ -2 ] - location: 11 (remaining gas: 1039992.030 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 4b47aa8c69f326af27a1ed0215f156f32c7b16e0..992dd0ff65c4e12a7d40eea0fb5a0b35895ed3d8 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,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.530 units remaining) [ (Pair (Right 0) 0) ] - location: 9 (remaining gas: 1039992.390 units remaining) - [ (Right 0) @parameter ] + [ (Right 0) ] - location: 14 (remaining gas: 1039992.100 units remaining) [ 0 ] - location: 13 (remaining gas: 1039992.030 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 49fac67cdb24af2c9a591aa90d65f0a3bcaec2c2..5e121c53b347009c8f6363d7336441220db14ab9 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,7 +10,7 @@ trace - location: 8 (remaining gas: 1039992.530 units remaining) [ (Pair (Right 2) 0) ] - location: 9 (remaining gas: 1039992.390 units remaining) - [ (Right 2) @parameter ] + [ (Right 2) ] - location: 14 (remaining gas: 1039992.100 units remaining) [ -2 ] - location: 13 (remaining gas: 1039992.030 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 25f91795949da13ea99bfa3e68aa46f5d09dd873..5d6c3fc641513294a4340c0d05b8dc00feef9d89 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair False None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ False @parameter ] + [ False ] - location: 9 (remaining gas: 1039993.400 units remaining) [ True ] - location: 10 (remaining gas: 1039993.260 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 ec5429f438d9014f66e8d2c35ecc7511866b31b6..6b09a334e8e7662bd8dbdd88ca8ed6c1ec1391b1 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair True None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ True @parameter ] + [ True ] - location: 9 (remaining gas: 1039993.400 units remaining) [ False ] - location: 10 (remaining gas: 1039993.260 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 d7c99e1a20ae3dbd3337482453c5c0b68dfb3939..b7fa314cbe9d48229d348eacb7f607e79186f017 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Left -8) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Left -8) @parameter ] + [ (Left -8) ] - location: 13 (remaining gas: 1039991.075 units remaining) [ 7 ] - location: 12 (remaining gas: 1039991.005 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 c0e542192141663d89d3bcbc763820f736fd452a..7fc2eeecdb32e0dc37b6c0fa4b7d0c72c5fb3837 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Left -9) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Left -9) @parameter ] + [ (Left -9) ] - location: 13 (remaining gas: 1039991.075 units remaining) [ 8 ] - location: 12 (remaining gas: 1039991.005 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 0be0f6bad8434895582bb2f7d1338545d1015aaf..886c458aedd2842c7b9d6cd78e327df3103d3989 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Left 0) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Left 0) @parameter ] + [ (Left 0) ] - location: 13 (remaining gas: 1039991.075 units remaining) [ -1 ] - location: 12 (remaining gas: 1039991.005 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 0b73d171a7e40fe6e249a8a0416600158b0dc127..a617c98163d6a6e08cda953826852da136aa72c1 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Left 7) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Left 7) @parameter ] + [ (Left 7) ] - location: 13 (remaining gas: 1039991.075 units remaining) [ -8 ] - location: 12 (remaining gas: 1039991.005 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 2b4a375a90e42f074e8d98dbdcf89d4099111707..cced83e12c1bae8bde759e1507e2d30f941e745b 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Left 8) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Left 8) @parameter ] + [ (Left 8) ] - location: 13 (remaining gas: 1039991.075 units remaining) [ -9 ] - location: 12 (remaining gas: 1039991.005 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 9cbaf3c34d336ad97dff52afb66711e6114330bc..002d1d8bc2052962362e1be411fa0d270939ea0b 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Right 0) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Right 0) @parameter ] + [ (Right 0) ] - location: 15 (remaining gas: 1039991.075 units remaining) [ -1 ] - location: 14 (remaining gas: 1039991.005 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 b95b10c5559cad9ad28fd6f90401e85deef531fb..42e8f73a2117f9410c441a46990a94763bb5ee92 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Right 7) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Right 7) @parameter ] + [ (Right 7) ] - location: 15 (remaining gas: 1039991.075 units remaining) [ -8 ] - location: 14 (remaining gas: 1039991.005 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 95627ed86bc34443e4f35dda3a17323006f86fcc..80870afc072eb6c3f1dd3ddd86d4495654fdf135 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,7 +10,7 @@ trace - location: 9 (remaining gas: 1039991.480 units remaining) [ (Pair (Right 8) None) ] - location: 10 (remaining gas: 1039991.340 units remaining) - [ (Right 8) @parameter ] + [ (Right 8) ] - location: 15 (remaining gas: 1039991.075 units remaining) [ -9 ] - location: 14 (remaining gas: 1039991.005 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 400d8df30c3979593c5f4ebfd6d74ece37ed6141..5a54ac1107fc1e525e6f053b5bec9253818a8475 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: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair False False) None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair False False) @parameter ] + [ (Pair False False) ] - location: 11 (remaining gas: 1039988.870 units remaining) - [ (Pair False False) @parameter - (Pair False False) @parameter ] + [ (Pair False False) + (Pair False False) ] - location: 12 (remaining gas: 1039988.730 units remaining) [ False - (Pair False False) @parameter ] + (Pair False False) ] - location: 13 (remaining gas: 1039988.600 units remaining) - [ (Pair False False) @parameter + [ (Pair False False) False ] - location: 14 (remaining gas: 1039988.460 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 f2467ea84cd54ecb9739e35673f226c06beac356..2e0f2a0637b1c3c46b55ecf0827bf1d3b19bebb0 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: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair False True) None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair False True) @parameter ] + [ (Pair False True) ] - location: 11 (remaining gas: 1039988.870 units remaining) - [ (Pair False True) @parameter - (Pair False True) @parameter ] + [ (Pair False True) + (Pair False True) ] - location: 12 (remaining gas: 1039988.730 units remaining) [ False - (Pair False True) @parameter ] + (Pair False True) ] - location: 13 (remaining gas: 1039988.600 units remaining) - [ (Pair False True) @parameter + [ (Pair False True) False ] - location: 14 (remaining gas: 1039988.460 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 6277be717fd417717f61f398ab39de6a3b01a335..fe803eb099a49899c5d924a658f41319cc08b1f5 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: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair True False) None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair True False) @parameter ] + [ (Pair True False) ] - location: 11 (remaining gas: 1039988.870 units remaining) - [ (Pair True False) @parameter - (Pair True False) @parameter ] + [ (Pair True False) + (Pair True False) ] - location: 12 (remaining gas: 1039988.730 units remaining) [ True - (Pair True False) @parameter ] + (Pair True False) ] - location: 13 (remaining gas: 1039988.600 units remaining) - [ (Pair True False) @parameter + [ (Pair True False) True ] - location: 14 (remaining gas: 1039988.460 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 bced723191159066b53c53b740f70c445945ada0..90a77413fea812a88345f8ef25aa403645bb46b7 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: 9 (remaining gas: 1039989.150 units remaining) [ (Pair (Pair True True) None) ] - location: 10 (remaining gas: 1039989.010 units remaining) - [ (Pair True True) @parameter ] + [ (Pair True True) ] - location: 11 (remaining gas: 1039988.870 units remaining) - [ (Pair True True) @parameter - (Pair True True) @parameter ] + [ (Pair True True) + (Pair True True) ] - location: 12 (remaining gas: 1039988.730 units remaining) [ True - (Pair True True) @parameter ] + (Pair True True) ] - location: 13 (remaining gas: 1039988.600 units remaining) - [ (Pair True True) @parameter + [ (Pair True True) True ] - location: 14 (remaining gas: 1039988.460 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 e567d16a1e9c72c63771ce4956bca484b1dd85b2..6aecd5c9175fffb54781c00851beb84a557b7a6e 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: 9 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 0 8) None) ] - location: 10 (remaining gas: 1039991.980 units remaining) - [ (Pair 0 8) @parameter ] + [ (Pair 0 8) ] - location: 11 (remaining gas: 1039991.840 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 e304dad7a11d73244837e8ab3b5d73f15b799356..e41c72735df0e35496f0b4c219d1d617e25f3514 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: 9 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 14 1) None) ] - location: 10 (remaining gas: 1039991.980 units remaining) - [ (Pair 14 1) @parameter ] + [ (Pair 14 1) ] - location: 11 (remaining gas: 1039991.840 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 65b414663165c4004e916ac70f105b3700c187a9..38d1d83aaeefe910d7e353c430716d308307f2c7 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: 9 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 15 4) None) ] - location: 10 (remaining gas: 1039991.980 units remaining) - [ (Pair 15 4) @parameter ] + [ (Pair 15 4) ] - location: 11 (remaining gas: 1039991.840 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 e1fada0d65e639ac83ab420d4996931e8afda3ab..92f041015501852f7b061bebd3a44240e7340835 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: 9 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 4 8) None) ] - location: 10 (remaining gas: 1039991.980 units remaining) - [ (Pair 4 8) @parameter ] + [ (Pair 4 8) ] - location: 11 (remaining gas: 1039991.840 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 3f9a2b9ea45b579a5a1a218fc42b96bef5762ace..fdac7f51e681e8b377ec306d217a1f8fce577164 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: 9 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 7 7) None) ] - location: 10 (remaining gas: 1039991.980 units remaining) - [ (Pair 7 7) @parameter ] + [ (Pair 7 7) ] - location: 11 (remaining gas: 1039991.840 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 da9bacc36810e15076fc3e983952e112089e0a2d..98347d4d8660366e4d5a5562233a4f3665305aa4 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: 9 (remaining gas: 1039992.120 units remaining) [ (Pair (Pair 8 0) None) ] - location: 10 (remaining gas: 1039991.980 units remaining) - [ (Pair 8 0) @parameter ] + [ (Pair 8 0) ] - location: 11 (remaining gas: 1039991.840 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 b5150bb9af9d1e6ef3ba1268141c75df27ca0ef0..017e2f0115d75245d4269b874963bd8526dcf801 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: 1039757.776 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: 1039757.636 units remaining) [ -1 (Pair -1 @@ -57,7 +57,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 21 (remaining gas: 1039757.336 units remaining) [ -1 (Pair 1 @@ -90,7 +90,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 22 (remaining gas: 1039748.966 units remaining) - [ 0x050041 @packed + [ 0x050041 -1 (Pair 1 "foobar" @@ -101,7 +101,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 23 (remaining gas: 1039741.666 units remaining) - [ (Some -1) @packed.unpacked + [ (Some -1) -1 (Pair 1 "foobar" @@ -112,7 +112,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 31 (remaining gas: 1039741.396 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -123,7 +123,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 25 (remaining gas: 1039741.326 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -237,7 +237,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 47 (remaining gas: 1039731.576 units remaining) - [ 0x050001 @packed + [ 0x050001 1 (Pair "foobar" 0x00aabbcc @@ -247,7 +247,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 48 (remaining gas: 1039724.276 units remaining) - [ (Some 1) @packed.unpacked + [ (Some 1) 1 (Pair "foobar" 0x00aabbcc @@ -257,7 +257,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 56 (remaining gas: 1039724.006 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -267,7 +267,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 50 (remaining gas: 1039723.936 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -369,7 +369,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 72 (remaining gas: 1039710.186 units remaining) - [ 0x050100000006666f6f626172 @packed + [ 0x050100000006666f6f626172 "foobar" (Pair 0x00aabbcc 1000 @@ -378,7 +378,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 73 (remaining gas: 1039702.812 units remaining) - [ (Some "foobar") @packed.unpacked + [ (Some "foobar") "foobar" (Pair 0x00aabbcc 1000 @@ -387,7 +387,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 81 (remaining gas: 1039702.542 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -396,7 +396,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 75 (remaining gas: 1039702.472 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -486,7 +486,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 97 (remaining gas: 1039688.752 units remaining) - [ 0x050a0000000400aabbcc @packed + [ 0x050a0000000400aabbcc 0x00aabbcc (Pair 1000 False @@ -494,7 +494,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 98 (remaining gas: 1039654.452 units remaining) - [ (Some 0x00aabbcc) @packed.unpacked + [ (Some 0x00aabbcc) 0x00aabbcc (Pair 1000 False @@ -502,7 +502,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 106 (remaining gas: 1039654.182 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -510,7 +510,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 100 (remaining gas: 1039654.112 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -588,28 +588,28 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 122 (remaining gas: 1039644.392 units remaining) - [ 0x0500a80f @packed + [ 0x0500a80f 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 123 (remaining gas: 1039637.092 units remaining) - [ (Some 1000) @packed.unpacked + [ (Some 1000) 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 131 (remaining gas: 1039636.822 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 125 (remaining gas: 1039636.752 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -675,25 +675,25 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 147 (remaining gas: 1039627.048 units remaining) - [ 0x050303 @packed + [ 0x050303 False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 148 (remaining gas: 1039619.748 units remaining) - [ (Some False) @packed.unpacked + [ (Some False) False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 156 (remaining gas: 1039619.478 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 150 (remaining gas: 1039619.408 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -744,19 +744,19 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 172 (remaining gas: 1039597.520 units remaining) - [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 173 (remaining gas: 1039559.160 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 181 (remaining gas: 1039558.890 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 175 (remaining gas: 1039558.820 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 184 (remaining gas: 1039558.430 units remaining) @@ -789,19 +789,19 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 197 (remaining gas: 1039549.010 units remaining) - [ 0x050095bbb0d70b @packed + [ 0x050095bbb0d70b "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 198 (remaining gas: 1039541.710 units remaining) - [ (Some "2019-09-09T08:35:33Z") @packed.unpacked + [ (Some "2019-09-09T08:35:33Z") "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 206 (remaining gas: 1039541.440 units remaining) - [ "2019-09-09T08:35:33Z" @packed.unpacked.some + [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 200 (remaining gas: 1039541.370 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: 1039541.050 units remaining) @@ -821,16 +821,16 @@ trace [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 218 (remaining gas: 1039509.540 units remaining) - [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 219 (remaining gas: 1039413.240 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 227 (remaining gas: 1039412.970 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 221 (remaining gas: 1039412.900 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 230 (remaining gas: 1039412.502 units remaining) [ 0 ] @@ -845,21 +845,21 @@ trace - location: 238 (remaining gas: 1039411.892 units remaining) [ 0 ] - location: 241 (remaining gas: 1039403.592 units remaining) - [ 0x050000 @packed ] + [ 0x050000 ] - location: 242 (remaining gas: 1039398.292 units remaining) - [ (Some 0) @packed.unpacked ] + [ (Some 0) ] - location: 250 (remaining gas: 1039398.022 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 244 (remaining gas: 1039397.952 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 251 (remaining gas: 1039397.812 units remaining) [ ] - location: 252 (remaining gas: 1039397.672 units remaining) [ -1 ] - location: 255 (remaining gas: 1039389.372 units remaining) - [ 0x050041 @packed ] + [ 0x050041 ] - location: 256 (remaining gas: 1039286.312 units remaining) - [ None @packed.unpacked ] + [ None ] - location: 260 (remaining gas: 1039286.042 units remaining) [ ] - location: 258 (remaining gas: 1039285.972 units remaining) @@ -867,7 +867,7 @@ trace - location: 265 (remaining gas: 1039285.832 units remaining) [ 0x ] - location: 268 (remaining gas: 1039285.772 units remaining) - [ None @unpacked ] + [ None ] - location: 272 (remaining gas: 1039285.502 units remaining) [ ] - location: 270 (remaining gas: 1039285.432 units remaining) @@ -875,7 +875,7 @@ trace - location: 277 (remaining gas: 1039285.292 units remaining) [ 0x04 ] - location: 280 (remaining gas: 1039285.232 units remaining) - [ None @unpacked ] + [ None ] - location: 284 (remaining gas: 1039284.962 units remaining) [ ] - location: 282 (remaining gas: 1039284.892 units remaining) @@ -883,7 +883,7 @@ trace - location: 289 (remaining gas: 1039284.752 units remaining) [ 0x05 ] - location: 292 (remaining gas: 1039284.692 units remaining) - [ None @unpacked ] + [ None ] - location: 296 (remaining gas: 1039284.422 units remaining) [ ] - location: 294 (remaining gas: 1039284.352 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 38e6b7b587bd47f90312109d07e3ab17d09d4648..e22e54a4c29897297b112109d5d55edc09696ab9 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: 1039757.776 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: 1039757.636 units remaining) [ -1 (Pair -1 @@ -57,7 +57,7 @@ trace False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" - "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @parameter ] + "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 21 (remaining gas: 1039757.336 units remaining) [ -1 (Pair 1 @@ -90,7 +90,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 22 (remaining gas: 1039748.966 units remaining) - [ 0x050041 @packed + [ 0x050041 -1 (Pair 1 "foobar" @@ -101,7 +101,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 23 (remaining gas: 1039741.666 units remaining) - [ (Some -1) @packed.unpacked + [ (Some -1) -1 (Pair 1 "foobar" @@ -112,7 +112,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 31 (remaining gas: 1039741.396 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -123,7 +123,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 25 (remaining gas: 1039741.326 units remaining) - [ -1 @packed.unpacked.some + [ -1 -1 (Pair 1 "foobar" @@ -237,7 +237,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 47 (remaining gas: 1039731.576 units remaining) - [ 0x050001 @packed + [ 0x050001 1 (Pair "foobar" 0x00aabbcc @@ -247,7 +247,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 48 (remaining gas: 1039724.276 units remaining) - [ (Some 1) @packed.unpacked + [ (Some 1) 1 (Pair "foobar" 0x00aabbcc @@ -257,7 +257,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 56 (remaining gas: 1039724.006 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -267,7 +267,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 50 (remaining gas: 1039723.936 units remaining) - [ 1 @packed.unpacked.some + [ 1 1 (Pair "foobar" 0x00aabbcc @@ -369,7 +369,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 72 (remaining gas: 1039710.186 units remaining) - [ 0x050100000006666f6f626172 @packed + [ 0x050100000006666f6f626172 "foobar" (Pair 0x00aabbcc 1000 @@ -378,7 +378,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 73 (remaining gas: 1039702.812 units remaining) - [ (Some "foobar") @packed.unpacked + [ (Some "foobar") "foobar" (Pair 0x00aabbcc 1000 @@ -387,7 +387,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 81 (remaining gas: 1039702.542 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -396,7 +396,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 75 (remaining gas: 1039702.472 units remaining) - [ "foobar" @packed.unpacked.some + [ "foobar" "foobar" (Pair 0x00aabbcc 1000 @@ -486,7 +486,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 97 (remaining gas: 1039688.752 units remaining) - [ 0x050a0000000400aabbcc @packed + [ 0x050a0000000400aabbcc 0x00aabbcc (Pair 1000 False @@ -494,7 +494,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 98 (remaining gas: 1039654.452 units remaining) - [ (Some 0x00aabbcc) @packed.unpacked + [ (Some 0x00aabbcc) 0x00aabbcc (Pair 1000 False @@ -502,7 +502,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 106 (remaining gas: 1039654.182 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -510,7 +510,7 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 100 (remaining gas: 1039654.112 units remaining) - [ 0x00aabbcc @packed.unpacked.some + [ 0x00aabbcc 0x00aabbcc (Pair 1000 False @@ -588,28 +588,28 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 122 (remaining gas: 1039644.392 units remaining) - [ 0x0500a80f @packed + [ 0x0500a80f 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 123 (remaining gas: 1039637.092 units remaining) - [ (Some 1000) @packed.unpacked + [ (Some 1000) 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 131 (remaining gas: 1039636.822 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 125 (remaining gas: 1039636.752 units remaining) - [ 1000 @packed.unpacked.some + [ 1000 1000 (Pair False "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @@ -675,25 +675,25 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 147 (remaining gas: 1039627.048 units remaining) - [ 0x050303 @packed + [ 0x050303 False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 148 (remaining gas: 1039619.748 units remaining) - [ (Some False) @packed.unpacked + [ (Some False) False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 156 (remaining gas: 1039619.478 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 150 (remaining gas: 1039619.408 units remaining) - [ False @packed.unpacked.some + [ False False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "2019-09-09T08:35:33Z" @@ -744,19 +744,19 @@ trace "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 172 (remaining gas: 1039597.520 units remaining) - [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 173 (remaining gas: 1039559.160 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 181 (remaining gas: 1039558.890 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 175 (remaining gas: 1039558.820 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ] - location: 184 (remaining gas: 1039558.430 units remaining) @@ -789,19 +789,19 @@ trace "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 197 (remaining gas: 1039549.010 units remaining) - [ 0x050095bbb0d70b @packed + [ 0x050095bbb0d70b "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 198 (remaining gas: 1039541.710 units remaining) - [ (Some "2019-09-09T08:35:33Z") @packed.unpacked + [ (Some "2019-09-09T08:35:33Z") "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 206 (remaining gas: 1039541.440 units remaining) - [ "2019-09-09T08:35:33Z" @packed.unpacked.some + [ "2019-09-09T08:35:33Z" "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 200 (remaining gas: 1039541.370 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: 1039541.050 units remaining) @@ -821,16 +821,16 @@ trace [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 218 (remaining gas: 1039509.540 units remaining) - [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 219 (remaining gas: 1039413.240 units remaining) - [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked + [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 227 (remaining gas: 1039412.970 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 221 (remaining gas: 1039412.900 units remaining) - [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" @packed.unpacked.some + [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ] - location: 230 (remaining gas: 1039412.502 units remaining) [ 0 ] @@ -845,21 +845,21 @@ trace - location: 238 (remaining gas: 1039411.892 units remaining) [ 0 ] - location: 241 (remaining gas: 1039403.592 units remaining) - [ 0x050000 @packed ] + [ 0x050000 ] - location: 242 (remaining gas: 1039398.292 units remaining) - [ (Some 0) @packed.unpacked ] + [ (Some 0) ] - location: 250 (remaining gas: 1039398.022 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 244 (remaining gas: 1039397.952 units remaining) - [ 0 @packed.unpacked.some ] + [ 0 ] - location: 251 (remaining gas: 1039397.812 units remaining) [ ] - location: 252 (remaining gas: 1039397.672 units remaining) [ -1 ] - location: 255 (remaining gas: 1039389.372 units remaining) - [ 0x050041 @packed ] + [ 0x050041 ] - location: 256 (remaining gas: 1039286.312 units remaining) - [ None @packed.unpacked ] + [ None ] - location: 260 (remaining gas: 1039286.042 units remaining) [ ] - location: 258 (remaining gas: 1039285.972 units remaining) @@ -867,7 +867,7 @@ trace - location: 265 (remaining gas: 1039285.832 units remaining) [ 0x ] - location: 268 (remaining gas: 1039285.772 units remaining) - [ None @unpacked ] + [ None ] - location: 272 (remaining gas: 1039285.502 units remaining) [ ] - location: 270 (remaining gas: 1039285.432 units remaining) @@ -875,7 +875,7 @@ trace - location: 277 (remaining gas: 1039285.292 units remaining) [ 0x04 ] - location: 280 (remaining gas: 1039285.232 units remaining) - [ None @unpacked ] + [ None ] - location: 284 (remaining gas: 1039284.962 units remaining) [ ] - location: 282 (remaining gas: 1039284.892 units remaining) @@ -883,7 +883,7 @@ trace - location: 289 (remaining gas: 1039284.752 units remaining) [ 0x05 ] - location: 292 (remaining gas: 1039284.692 units remaining) - [ None @unpacked ] + [ None ] - location: 296 (remaining gas: 1039284.422 units remaining) [ ] - location: 294 (remaining gas: 1039284.352 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 56f418df6df94c41255b1b52d50b8848e31544e1..aed76a71b5ec24c999e2fed26076d8b6769bd327 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: 1039742.861 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: 1039742.721 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: 33 (remaining gas: 1039742.421 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -98,7 +98,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 34 (remaining gas: 1039717.561 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -110,7 +110,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 37 (remaining gas: 1039692.611 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -121,7 +121,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 38 (remaining gas: 1039625.311 units remaining) - [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") @packed.unpacked + [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -132,7 +132,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 46 (remaining gas: 1039625.041 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -143,7 +143,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 40 (remaining gas: 1039624.971 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: 47 (remaining gas: 1039600.181 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -165,7 +165,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039600.111 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: 1039600.111 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -302,7 +302,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 63 (remaining gas: 1039590.390 units remaining) - [ 0x05030b @packed + [ 0x05030b Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") @@ -313,7 +313,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 66 (remaining gas: 1039581.930 units remaining) - [ 0x05030b @packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -323,7 +323,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 67 (remaining gas: 1039574.630 units remaining) - [ (Some Unit) @packed.unpacked + [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -333,7 +333,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 75 (remaining gas: 1039574.360 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -343,7 +343,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 69 (remaining gas: 1039574.290 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -353,7 +353,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 76 (remaining gas: 1039565.990 units remaining) - [ 0x05030b @packed.unpacked.some.packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -363,7 +363,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039565.920 units remaining) - [ 0x05030b @packed.unpacked.some.packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -373,8 +373,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 64 (remaining gas: 1039565.920 units remaining) - [ 0x05030b @packed - 0x05030b @packed.unpacked.some.packed + [ 0x05030b + 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -487,7 +487,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 92 (remaining gas: 1039524.160 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } @@ -497,7 +497,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 95 (remaining gas: 1039483.660 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -506,7 +506,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 96 (remaining gas: 1039435.330 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -515,7 +515,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 104 (remaining gas: 1039435.060 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -524,7 +524,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 98 (remaining gas: 1039434.990 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -533,7 +533,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 105 (remaining gas: 1039394.650 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -542,7 +542,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039394.580 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -551,8 +551,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 93 (remaining gas: 1039394.580 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") { Unit } { True } @@ -653,7 +653,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 121 (remaining gas: 1039352.578 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit } { True } @@ -662,7 +662,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 124 (remaining gas: 1039311.838 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -670,7 +670,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 125 (remaining gas: 1039249.268 units remaining) - [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) @packed.unpacked + [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")) (Pair { Unit } { True } (Pair 19 10) @@ -678,7 +678,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 134 (remaining gas: 1039248.998 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked.some + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } (Pair 19 10) @@ -686,7 +686,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 128 (remaining gas: 1039248.928 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked.some + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair { Unit } { True } (Pair 19 10) @@ -694,7 +694,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 135 (remaining gas: 1039208.348 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -702,7 +702,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039208.278 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -710,8 +710,8 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 122 (remaining gas: 1039208.278 units remaining) - [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair { Unit } { True } (Pair 19 10) @@ -800,7 +800,7 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 151 (remaining gas: 1039198.316 units remaining) - [ 0x050200000002030b @packed + [ 0x050200000002030b { Unit } (Pair { True } (Pair 19 10) @@ -808,50 +808,50 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 154 (remaining gas: 1039189.616 units remaining) - [ 0x050200000002030b @packed + [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 155 (remaining gas: 1039168.076 units remaining) - [ (Some { Unit }) @packed.unpacked + [ (Some { Unit }) (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 164 (remaining gas: 1039167.806 units remaining) - [ { Unit } @packed.unpacked.some + [ { Unit } (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 158 (remaining gas: 1039167.736 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: 1039159.196 units remaining) - [ 0x050200000002030b @packed.unpacked.some.packed + [ 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039159.126 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: 1039159.126 units remaining) - [ 0x050200000002030b @packed - 0x050200000002030b @packed.unpacked.some.packed + [ 0x050200000002030b + 0x050200000002030b (Pair { True } (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @@ -928,51 +928,51 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 181 (remaining gas: 1039149.166 units remaining) - [ 0x050200000002030a @packed + [ 0x050200000002030a { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 184 (remaining gas: 1039140.466 units remaining) - [ 0x050200000002030a @packed + [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 185 (remaining gas: 1039118.845 units remaining) - [ (Some { True }) @packed.unpacked + [ (Some { True }) (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 194 (remaining gas: 1039118.575 units remaining) - [ { True } @packed.unpacked.some + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 188 (remaining gas: 1039118.505 units remaining) - [ { True } @packed.unpacked.some + [ { True } (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 195 (remaining gas: 1039109.965 units remaining) - [ 0x050200000002030a @packed.unpacked.some.packed + [ 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039109.895 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: 1039109.895 units remaining) - [ 0x050200000002030a @packed - 0x050200000002030a @packed.unpacked.some.packed + [ 0x050200000002030a + 0x050200000002030a (Pair (Pair 19 10) (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } @@ -1037,44 +1037,44 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 211 (remaining gas: 1039099.695 units remaining) - [ 0x0507070013000a @packed + [ 0x0507070013000a (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 214 (remaining gas: 1039090.755 units remaining) - [ 0x0507070013000a @packed + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 215 (remaining gas: 1039054.975 units remaining) - [ (Some (Pair 19 10)) @packed.unpacked + [ (Some (Pair 19 10)) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 225 (remaining gas: 1039054.705 units remaining) - [ (Pair 19 10) @packed.unpacked.some + [ (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 219 (remaining gas: 1039054.635 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: 1039045.855 units remaining) - [ 0x0507070013000a @packed.unpacked.some.packed + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1039045.785 units remaining) - [ 0x0507070013000a @packed.unpacked.some.packed + [ 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 212 (remaining gas: 1039045.785 units remaining) - [ 0x0507070013000a @packed - 0x0507070013000a @packed.unpacked.some.packed + [ 0x0507070013000a + 0x0507070013000a (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] @@ -1124,30 +1124,30 @@ trace (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 242 (remaining gas: 1039023.745 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 245 (remaining gas: 1039002.965 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 246 (remaining gas: 1038950.365 units remaining) - [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) @packed.unpacked + [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 256 (remaining gas: 1038950.095 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked.some + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 250 (remaining gas: 1038950.025 units remaining) - [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") @packed.unpacked.some + [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 257 (remaining gas: 1038929.405 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: -1 (remaining gas: 1038929.335 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 243 (remaining gas: 1038929.335 units remaining) - [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed - 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a @packed.unpacked.some.packed + [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a + 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ] - location: 260 (remaining gas: 1038929.035 units remaining) [ 0 @@ -1179,30 +1179,30 @@ trace { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 273 (remaining gas: 1038906.455 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 276 (remaining gas: 1038884.835 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: 277 (remaining gas: 1038794.177 units remaining) - [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) @packed.unpacked + [ (Some { Elt 0 "foo" ; Elt 1 "bar" }) { PACK } ] - location: 287 (remaining gas: 1038793.907 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } @packed.unpacked.some + [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 281 (remaining gas: 1038793.837 units remaining) - [ { Elt 0 "foo" ; Elt 1 "bar" } @packed.unpacked.some + [ { Elt 0 "foo" ; Elt 1 "bar" } { PACK } ] - location: 288 (remaining gas: 1038772.377 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: -1 (remaining gas: 1038772.307 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: 274 (remaining gas: 1038772.307 units remaining) - [ 0x050200000018070400000100000003666f6f070400010100000003626172 @packed - 0x050200000018070400000100000003666f6f070400010100000003626172 @packed.unpacked.some.packed + [ 0x050200000018070400000100000003666f6f070400010100000003626172 + 0x050200000018070400000100000003666f6f070400010100000003626172 { PACK } ] - location: 291 (remaining gas: 1038772.007 units remaining) [ 0 @@ -1221,23 +1221,23 @@ trace [ { PACK } { PACK } ] - location: 300 (remaining gas: 1038762.597 units remaining) - [ 0x050200000002030c @packed + [ 0x050200000002030c { PACK } ] - location: 303 (remaining gas: 1038753.637 units remaining) - [ 0x050200000002030c @packed ] + [ 0x050200000002030c ] - location: 304 (remaining gas: 1038731.457 units remaining) - [ (Some { PACK }) @packed.unpacked ] + [ (Some { PACK }) ] - location: 314 (remaining gas: 1038731.187 units remaining) - [ { PACK } @packed.unpacked.some ] + [ { PACK } ] - location: 308 (remaining gas: 1038731.117 units remaining) - [ { PACK } @packed.unpacked.some ] + [ { PACK } ] - location: 315 (remaining gas: 1038722.317 units remaining) - [ 0x050200000002030c @packed.unpacked.some.packed ] + [ 0x050200000002030c ] - location: -1 (remaining gas: 1038722.247 units remaining) - [ 0x050200000002030c @packed.unpacked.some.packed ] + [ 0x050200000002030c ] - location: 301 (remaining gas: 1038722.247 units remaining) - [ 0x050200000002030c @packed - 0x050200000002030c @packed.unpacked.some.packed ] + [ 0x050200000002030c + 0x050200000002030c ] - location: 318 (remaining gas: 1038721.947 units remaining) [ 0 ] - location: 319 (remaining gas: 1038721.807 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 a834f2f22388d0b6e49575eae3e63418288c14d2..e69242a586d510481c034766cff9ebc27d99ddeb 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: 1039753.050 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: 1039752.910 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: 33 (remaining gas: 1039752.610 units remaining) [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit @@ -98,7 +98,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 34 (remaining gas: 1039727.750 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" @@ -110,7 +110,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 37 (remaining gas: 1039702.800 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -121,7 +121,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 38 (remaining gas: 1039635.500 units remaining) - [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") @packed.unpacked + [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav") (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -132,7 +132,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 46 (remaining gas: 1039635.230 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -143,7 +143,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 40 (remaining gas: 1039635.160 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @packed.unpacked.some + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -154,7 +154,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 47 (remaining gas: 1039610.370 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -165,7 +165,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039610.300 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -176,8 +176,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 35 (remaining gas: 1039610.300 units remaining) - [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed - 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f @packed.unpacked.some.packed + [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f + 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f (Pair Unit "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -302,7 +302,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 63 (remaining gas: 1039600.579 units remaining) - [ 0x05030b @packed + [ 0x05030b Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None @@ -313,7 +313,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 66 (remaining gas: 1039592.119 units remaining) - [ 0x05030b @packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -323,7 +323,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 67 (remaining gas: 1039584.819 units remaining) - [ (Some Unit) @packed.unpacked + [ (Some Unit) (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -333,7 +333,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 75 (remaining gas: 1039584.549 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -343,7 +343,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 69 (remaining gas: 1039584.479 units remaining) - [ Unit @packed.unpacked.some + [ Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -353,7 +353,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 76 (remaining gas: 1039576.179 units remaining) - [ 0x05030b @packed.unpacked.some.packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -363,7 +363,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039576.109 units remaining) - [ 0x05030b @packed.unpacked.some.packed + [ 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -373,8 +373,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 64 (remaining gas: 1039576.109 units remaining) - [ 0x05030b @packed - 0x05030b @packed.unpacked.some.packed + [ 0x05030b + 0x05030b (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" None {} @@ -487,7 +487,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 92 (remaining gas: 1039534.349 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None {} @@ -497,7 +497,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 95 (remaining gas: 1039493.849 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -506,7 +506,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 96 (remaining gas: 1039445.519 units remaining) - [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") @packed.unpacked + [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe") (Pair None {} {} @@ -515,7 +515,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 104 (remaining gas: 1039445.249 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} {} @@ -524,7 +524,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 98 (remaining gas: 1039445.179 units remaining) - [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" @packed.unpacked.some + [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe" (Pair None {} {} @@ -533,7 +533,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 105 (remaining gas: 1039404.839 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -542,7 +542,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039404.769 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -551,8 +551,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 93 (remaining gas: 1039404.769 units remaining) - [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed - 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 @packed.unpacked.some.packed + [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 + 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306 (Pair None {} {} @@ -653,7 +653,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 121 (remaining gas: 1039395.047 units remaining) - [ 0x050306 @packed + [ 0x050306 None (Pair {} {} @@ -662,7 +662,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 124 (remaining gas: 1039386.587 units remaining) - [ 0x050306 @packed + [ 0x050306 (Pair {} {} (Pair 40 -10) @@ -670,7 +670,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 125 (remaining gas: 1039379.287 units remaining) - [ (Some None) @packed.unpacked + [ (Some None) (Pair {} {} (Pair 40 -10) @@ -678,7 +678,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 134 (remaining gas: 1039379.017 units remaining) - [ None @packed.unpacked.some + [ None (Pair {} {} (Pair 40 -10) @@ -686,7 +686,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 128 (remaining gas: 1039378.947 units remaining) - [ None @packed.unpacked.some + [ None (Pair {} {} (Pair 40 -10) @@ -694,7 +694,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 135 (remaining gas: 1039370.647 units remaining) - [ 0x050306 @packed.unpacked.some.packed + [ 0x050306 (Pair {} {} (Pair 40 -10) @@ -702,7 +702,7 @@ trace {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039370.577 units remaining) - [ 0x050306 @packed.unpacked.some.packed + [ 0x050306 (Pair {} {} (Pair 40 -10) @@ -710,8 +710,8 @@ trace {} { DUP ; DROP ; PACK }) ] - location: 122 (remaining gas: 1039370.577 units remaining) - [ 0x050306 @packed - 0x050306 @packed.unpacked.some.packed + [ 0x050306 + 0x050306 (Pair {} {} (Pair 40 -10) @@ -788,30 +788,30 @@ trace {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 151 (remaining gas: 1039360.857 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 154 (remaining gas: 1039352.397 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 155 (remaining gas: 1039345.097 units remaining) - [ (Some {}) @packed.unpacked + [ (Some {}) (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 164 (remaining gas: 1039344.827 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 158 (remaining gas: 1039344.757 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 165 (remaining gas: 1039336.457 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039336.387 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: 1039336.387 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: 1039336.087 units remaining) [ 0 @@ -843,30 +843,30 @@ trace {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 181 (remaining gas: 1039326.667 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 184 (remaining gas: 1039318.207 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 185 (remaining gas: 1039310.907 units remaining) - [ (Some {}) @packed.unpacked + [ (Some {}) (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 194 (remaining gas: 1039310.637 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 188 (remaining gas: 1039310.567 units remaining) - [ {} @packed.unpacked.some + [ {} (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 195 (remaining gas: 1039302.267 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039302.197 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: 1039302.197 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: 1039301.897 units remaining) [ 0 @@ -898,30 +898,30 @@ trace (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 211 (remaining gas: 1039291.997 units remaining) - [ 0x0507070028004a @packed + [ 0x0507070028004a (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 214 (remaining gas: 1039283.057 units remaining) - [ 0x0507070028004a @packed + [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 215 (remaining gas: 1039247.277 units remaining) - [ (Some (Pair 40 -10)) @packed.unpacked + [ (Some (Pair 40 -10)) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 225 (remaining gas: 1039247.007 units remaining) - [ (Pair 40 -10) @packed.unpacked.some + [ (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 219 (remaining gas: 1039246.937 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: 1039238.157 units remaining) - [ 0x0507070028004a @packed.unpacked.some.packed + [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039238.087 units remaining) - [ 0x0507070028004a @packed.unpacked.some.packed + [ 0x0507070028004a (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ] - location: 212 (remaining gas: 1039238.087 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: 1039237.787 units remaining) [ 0 @@ -953,30 +953,30 @@ trace (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 242 (remaining gas: 1039226.127 units remaining) - [ 0x0505080095bbb0d70b @packed + [ 0x0505080095bbb0d70b (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 245 (remaining gas: 1039215.427 units remaining) - [ 0x0505080095bbb0d70b @packed + [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: 246 (remaining gas: 1039193.887 units remaining) - [ (Some (Right "2019-09-09T08:35:33Z")) @packed.unpacked + [ (Some (Right "2019-09-09T08:35:33Z")) (Pair {} { DUP ; DROP ; PACK }) ] - location: 256 (remaining gas: 1039193.617 units remaining) - [ (Right "2019-09-09T08:35:33Z") @packed.unpacked.some + [ (Right "2019-09-09T08:35:33Z") (Pair {} { DUP ; DROP ; PACK }) ] - location: 250 (remaining gas: 1039193.547 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: 1039183.007 units remaining) - [ 0x0505080095bbb0d70b @packed.unpacked.some.packed + [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: -1 (remaining gas: 1039182.937 units remaining) - [ 0x0505080095bbb0d70b @packed.unpacked.some.packed + [ 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: 243 (remaining gas: 1039182.937 units remaining) - [ 0x0505080095bbb0d70b @packed - 0x0505080095bbb0d70b @packed.unpacked.some.packed + [ 0x0505080095bbb0d70b + 0x0505080095bbb0d70b (Pair {} { DUP ; DROP ; PACK }) ] - location: 260 (remaining gas: 1039182.637 units remaining) [ 0 @@ -1008,30 +1008,30 @@ trace {} { DUP ; DROP ; PACK } ] - location: 273 (remaining gas: 1039173.217 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 {} { DUP ; DROP ; PACK } ] - location: 276 (remaining gas: 1039164.757 units remaining) - [ 0x050200000000 @packed + [ 0x050200000000 { DUP ; DROP ; PACK } ] - location: 277 (remaining gas: 1039157.457 units remaining) - [ (Some {}) @packed.unpacked + [ (Some {}) { DUP ; DROP ; PACK } ] - location: 287 (remaining gas: 1039157.187 units remaining) - [ {} @packed.unpacked.some + [ {} { DUP ; DROP ; PACK } ] - location: 281 (remaining gas: 1039157.117 units remaining) - [ {} @packed.unpacked.some + [ {} { DUP ; DROP ; PACK } ] - location: 288 (remaining gas: 1039148.817 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 { DUP ; DROP ; PACK } ] - location: -1 (remaining gas: 1039148.747 units remaining) - [ 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 { DUP ; DROP ; PACK } ] - location: 274 (remaining gas: 1039148.747 units remaining) - [ 0x050200000000 @packed - 0x050200000000 @packed.unpacked.some.packed + [ 0x050200000000 + 0x050200000000 { DUP ; DROP ; PACK } ] - location: 291 (remaining gas: 1039148.447 units remaining) [ 0 @@ -1050,23 +1050,23 @@ trace [ { DUP ; DROP ; PACK } { DUP ; DROP ; PACK } ] - location: 300 (remaining gas: 1039134.437 units remaining) - [ 0x05020000000603210320030c @packed + [ 0x05020000000603210320030c { DUP ; DROP ; PACK } ] - location: 303 (remaining gas: 1039120.877 units remaining) - [ 0x05020000000603210320030c @packed ] + [ 0x05020000000603210320030c ] - location: 304 (remaining gas: 1039068.957 units remaining) - [ (Some { DUP ; DROP ; PACK }) @packed.unpacked ] + [ (Some { DUP ; DROP ; PACK }) ] - location: 314 (remaining gas: 1039068.687 units remaining) - [ { DUP ; DROP ; PACK } @packed.unpacked.some ] + [ { DUP ; DROP ; PACK } ] - location: 308 (remaining gas: 1039068.617 units remaining) - [ { DUP ; DROP ; PACK } @packed.unpacked.some ] + [ { DUP ; DROP ; PACK } ] - location: 315 (remaining gas: 1039055.217 units remaining) - [ 0x05020000000603210320030c @packed.unpacked.some.packed ] + [ 0x05020000000603210320030c ] - location: -1 (remaining gas: 1039055.147 units remaining) - [ 0x05020000000603210320030c @packed.unpacked.some.packed ] + [ 0x05020000000603210320030c ] - location: 301 (remaining gas: 1039055.147 units remaining) - [ 0x05020000000603210320030c @packed - 0x05020000000603210320030c @packed.unpacked.some.packed ] + [ 0x05020000000603210320030c + 0x05020000000603210320030c ] - location: 318 (remaining gas: 1039054.847 units remaining) [ 0 ] - location: 319 (remaining gas: 1039054.707 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 9111d2014509098f6dd4a1c87031c49a940a206a..1b8b2b4f4cf1d7d8c2f843c10b9f0f43341dd034 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: 11 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair False False) None) ] - location: 12 (remaining gas: 1039992.880 units remaining) - [ (Pair False False) @parameter ] + [ (Pair False False) ] - location: 13 (remaining gas: 1039992.740 units remaining) [ (Some (Pair False False)) ] - location: 14 (remaining gas: 1039992.600 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 34af3223486fe27a84c6a66601e455309d387d81..ccf4843ec7985f165c6f26a54ff68ed15e137410 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: 11 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair False True) None) ] - location: 12 (remaining gas: 1039992.880 units remaining) - [ (Pair False True) @parameter ] + [ (Pair False True) ] - location: 13 (remaining gas: 1039992.740 units remaining) [ (Some (Pair False True)) ] - location: 14 (remaining gas: 1039992.600 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 ce7074f7d9ef7f9e2d5e3c8537fa305121695b65..56144d4dc16d280989fb02ce1acd68f7129abcba 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: 11 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair True False) None) ] - location: 12 (remaining gas: 1039992.880 units remaining) - [ (Pair True False) @parameter ] + [ (Pair True False) ] - location: 13 (remaining gas: 1039992.740 units remaining) [ (Some (Pair True False)) ] - location: 14 (remaining gas: 1039992.600 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 e4443e1b7623d34c90d84f240105dce89510747a..0fad87508c2a4cf5b34df732c54f49bc155b450e 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: 11 (remaining gas: 1039993.020 units remaining) [ (Pair (Pair True True) None) ] - location: 12 (remaining gas: 1039992.880 units remaining) - [ (Pair True True) @parameter ] + [ (Pair True True) ] - location: 13 (remaining gas: 1039992.740 units remaining) [ (Some (Pair True True)) ] - location: 14 (remaining gas: 1039992.600 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 ae8b1a0f5a42cd5892250979ff556af73a1ad65d..37d79ba6f086300710489afcb921540cf0222116 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,15 +16,15 @@ trace [ (Pair 38 14) { UNPAIR ; ADD } ] - location: 16 (remaining gas: 1039988.760 units remaining) - [ 38 @parameter - 14 @storage + [ 38 + 14 { UNPAIR ; ADD } ] - location: 19 (remaining gas: 1039987.215 units remaining) [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 18 (remaining gas: 1039987.145 units remaining) [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 17 (remaining gas: 1039987.145 units remaining) - [ 38 @parameter + [ 38 { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ] - location: 12 (remaining gas: 1039986.985 units remaining) [ 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 23fbbaa1a5a2e4fd4b895ceb199f094b2626a8ca..8affd84ce63b8bb934b71bcecd6260cef6660ab0 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,30 +10,30 @@ trace - location: 7 (remaining gas: 1039978.900 units remaining) [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ] - location: 8 (remaining gas: 1039978.760 units remaining) - [ 4 @p - { 0 ; 1 ; 2 ; 3 } @s ] + [ 4 + { 0 ; 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039978.620 units remaining) [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } - 4 @p - { 0 ; 1 ; 2 ; 3 } @s ] + 4 + { 0 ; 1 ; 2 ; 3 } ] - location: 23 (remaining gas: 1039978.490 units remaining) - [ 4 @p + [ 4 { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } - { 0 ; 1 ; 2 ; 3 } @s ] + { 0 ; 1 ; 2 ; 3 } ] - location: 24 (remaining gas: 1039977.105 units remaining) [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } - { 0 ; 1 ; 2 ; 3 } @s ] + { 0 ; 1 ; 2 ; 3 } ] - location: 25 (remaining gas: 1039976.965 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: 1039975.580 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: 1039975.450 units remaining) - [ { 0 ; 1 ; 2 ; 3 } @s + [ { 0 ; 1 ; 2 ; 3 } { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] @@ -52,7 +52,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039974.472 units remaining) - [ 0 @s.elt + [ 0 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -116,7 +116,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039972.450 units remaining) - [ 1 @s.elt + [ 1 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -180,7 +180,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039970.424 units remaining) - [ 2 @s.elt + [ 2 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } @@ -244,7 +244,7 @@ trace PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ] - location: 32 (remaining gas: 1039968.398 units remaining) - [ 3 @s.elt + [ 3 { PUSH int 3 ; PAIR ; { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } 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 c5dc6e75b6452b68fcf6d600b6817720a4f64967..15f135b4bc0a632efd9c53fdb259bcc5127c37ce 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,12 +10,12 @@ trace - location: 8 (remaining gas: 1039990.414 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039990.274 units remaining) - [ { "c" ; "b" ; "a" } @parameter ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039990.134 units remaining) [ {} - { "c" ; "b" ; "a" } @parameter ] + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039990.004 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 15 (remaining gas: 1039989.283 units remaining) [ { "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 f236a2165550bd01c91214a3cedf5ce5b67ed751..998a65754a1f228e084e300046c56bcc82833a09 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: 8 (remaining gas: 1039991.206 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039991.066 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039990.926 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039990.796 units remaining) - [ {} @parameter + [ {} {} ] - location: 13 (remaining gas: 1039990.236 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 6b89f5a1f5964a229b25e9646a03d7d62ec1a24e..0d43a25e1a49c65cf3239197397cf609af500b64 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,81 +10,81 @@ trace - location: 8 (remaining gas: 1039981.974 units remaining) [ (Pair { "c" ; "b" ; "a" } { "" }) ] - location: 9 (remaining gas: 1039981.834 units remaining) - [ { "c" ; "b" ; "a" } @parameter ] + [ { "c" ; "b" ; "a" } ] - location: 10 (remaining gas: 1039981.694 units remaining) [ {} - { "c" ; "b" ; "a" } @parameter ] + { "c" ; "b" ; "a" } ] - location: 12 (remaining gas: 1039981.564 units remaining) - [ { "c" ; "b" ; "a" } @parameter + [ { "c" ; "b" ; "a" } {} ] - location: 13 (remaining gas: 1039981.424 units remaining) [ True - { "c" ; "b" ; "a" } @parameter + { "c" ; "b" ; "a" } {} ] - location: 20 (remaining gas: 1039980.994 units remaining) - [ { "b" ; "a" } @parameter.tl - "c" @parameter.hd + [ { "b" ; "a" } + "c" {} ] - location: 23 (remaining gas: 1039980.694 units remaining) [ { "c" } ] - location: 22 (remaining gas: 1039980.624 units remaining) [ { "c" } ] - location: 21 (remaining gas: 1039980.624 units remaining) - [ { "b" ; "a" } @parameter.tl + [ { "b" ; "a" } { "c" } ] - location: 24 (remaining gas: 1039980.484 units remaining) [ True - { "b" ; "a" } @parameter.tl + { "b" ; "a" } { "c" } ] - location: -1 (remaining gas: 1039980.414 units remaining) [ True - { "b" ; "a" } @parameter.tl + { "b" ; "a" } { "c" } ] - location: 17 (remaining gas: 1039980.344 units remaining) [ True { "b" ; "a" } { "c" } ] - location: 20 (remaining gas: 1039979.974 units remaining) - [ { "a" } @parameter.tl - "b" @parameter.hd + [ { "a" } + "b" { "c" } ] - location: 23 (remaining gas: 1039979.674 units remaining) [ { "b" ; "c" } ] - location: 22 (remaining gas: 1039979.604 units remaining) [ { "b" ; "c" } ] - location: 21 (remaining gas: 1039979.604 units remaining) - [ { "a" } @parameter.tl + [ { "a" } { "b" ; "c" } ] - location: 24 (remaining gas: 1039979.464 units remaining) [ True - { "a" } @parameter.tl + { "a" } { "b" ; "c" } ] - location: -1 (remaining gas: 1039979.394 units remaining) [ True - { "a" } @parameter.tl + { "a" } { "b" ; "c" } ] - location: 17 (remaining gas: 1039979.324 units remaining) [ True { "a" } { "b" ; "c" } ] - location: 20 (remaining gas: 1039978.954 units remaining) - [ {} @parameter.tl - "a" @parameter.hd + [ {} + "a" { "b" ; "c" } ] - location: 23 (remaining gas: 1039978.654 units remaining) [ { "a" ; "b" ; "c" } ] - location: 22 (remaining gas: 1039978.584 units remaining) [ { "a" ; "b" ; "c" } ] - location: 21 (remaining gas: 1039978.584 units remaining) - [ {} @parameter.tl + [ {} { "a" ; "b" ; "c" } ] - location: 24 (remaining gas: 1039978.444 units remaining) [ True - {} @parameter.tl + {} { "a" ; "b" ; "c" } ] - location: -1 (remaining gas: 1039978.374 units remaining) [ True - {} @parameter.tl + {} { "a" ; "b" ; "c" } ] - location: 17 (remaining gas: 1039978.304 units remaining) [ True @@ -106,7 +106,7 @@ trace {} { "a" ; "b" ; "c" } ] - location: 16 (remaining gas: 1039977.574 units remaining) - [ {} @parameter + [ {} { "a" ; "b" ; "c" } ] - location: 33 (remaining gas: 1039977.434 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 90aa1c6c3d9e64554183bdd306a3c7c583c1dde4..077aff5eaa6a1dcbe9bb3a15c67fb29c55f16618 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,16 +10,16 @@ trace - location: 8 (remaining gas: 1039982.766 units remaining) [ (Pair {} { "" }) ] - location: 9 (remaining gas: 1039982.626 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039982.486 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039982.356 units remaining) - [ {} @parameter + [ {} {} ] - location: 13 (remaining gas: 1039982.216 units remaining) [ True - {} @parameter + {} {} ] - location: 28 (remaining gas: 1039981.776 units remaining) [ {} @@ -37,7 +37,7 @@ trace {} {} ] - location: 16 (remaining gas: 1039981.426 units remaining) - [ {} @parameter + [ {} {} ] - location: 33 (remaining gas: 1039981.286 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 f60f32e052790b7c0bad55f06f27221643bb259a..8c3a1c3702781a147fbd5fed825ebf0f9df775dd 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.600 units remaining) [ ] - location: 9 (remaining gas: 1039994.300 units remaining) - [ {} @sapling ] + [ {} ] - location: 11 (remaining gas: 1039994.160 units remaining) [ {} - {} @sapling ] + {} ] - location: 13 (remaining gas: 1039994.020 units remaining) [ (Pair {} {}) ] - location: -1 (remaining gas: 1039993.950 units remaining) 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 637267502fe56fcd0e4ac5f3ab2472327a3aeb30..9568b478412219c27fff7cbd806af4b28643f024 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 @@ -17,20 +17,20 @@ trace [ Unit { DROP ; SELF_ADDRESS } ] - location: 11 (remaining gas: 1039982.810 units remaining) - [ Unit @arg ] + [ Unit ] - location: 12 (remaining gas: 1039982.670 units remaining) [ ] - location: 13 (remaining gas: 1039982.530 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: -1 (remaining gas: 1039982.460 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 15 (remaining gas: 1039982.460 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 16 (remaining gas: 1039982.320 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 17 (remaining gas: 1039982.180 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self.address + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 20 (remaining gas: 1039981.782 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 a3a54486df12db73e2571541f5fc1eb07e74f549..98590911f7b9d0deda55c752beeba442e687d9d0 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: 1039981.600 units remaining) [ ] - location: 14 (remaining gas: 1039981.460 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 15 (remaining gas: 1039981.320 units remaining) [ ] - location: 16 (remaining gas: 1039981.180 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 17 (remaining gas: 1039981.040 units remaining) [ ] - location: 18 (remaining gas: 1039980.900 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 19 (remaining gas: 1039950 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 20 (remaining gas: 1039949.860 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 21 (remaining gas: 1039918.960 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @self.packed ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 24 (remaining gas: 1039918.660 units remaining) [ 0 ] - location: 25 (remaining gas: 1039918.520 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 9d4b0c8da9433ff7b697acc13d9c52fbac43d462..b672abf9cf9c21c0c1ee8cd717817980587e9fd9 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,48 +12,48 @@ trace - location: 13 (remaining gas: 1039953.810 units remaining) [ ] - location: 14 (remaining gas: 1039953.670 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 15 (remaining gas: 1039922.770 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 16 (remaining gas: 1039922.630 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 17 (remaining gas: 1039891.730 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 18 (remaining gas: 1039891.590 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - location: 21 (remaining gas: 1039891.300 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 20 (remaining gas: 1039891.230 units remaining) - [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 19 (remaining gas: 1039891.230 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked - 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 @Apacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 24 (remaining gas: 1039890.930 units remaining) [ -1 - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 25 (remaining gas: 1039890.790 units remaining) [ True - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: -1 (remaining gas: 1039890.720 units remaining) [ True - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 27 (remaining gas: 1039890.530 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: -1 (remaining gas: 1039890.460 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 32 (remaining gas: 1039890.320 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 33 (remaining gas: 1039859.420 units remaining) - [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @selfpacked - 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 @defpacked ] + [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 + 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - location: 36 (remaining gas: 1039859.120 units remaining) [ 0 ] - location: 37 (remaining gas: 1039858.980 units remaining) @@ -65,39 +65,39 @@ trace - location: -1 (remaining gas: 1039858.650 units remaining) [ ] - location: 44 (remaining gas: 1039858.510 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 45 (remaining gas: 1039858.380 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - location: 48 (remaining gas: 1039858.240 units remaining) [ ] - location: 49 (remaining gas: 1039858.100 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] - location: 50 (remaining gas: 1039857.970 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] - location: 53 (remaining gas: 1039857.830 units remaining) [ ] - location: 54 (remaining gas: 1039857.690 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] - location: 55 (remaining gas: 1039857.560 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] - location: 60 (remaining gas: 1039857.420 units remaining) [ ] - location: 61 (remaining gas: 1039857.280 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] - location: 62 (remaining gas: 1039857.150 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] - location: 65 (remaining gas: 1039857.010 units remaining) [ ] - location: 66 (remaining gas: 1039856.870 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 67 (remaining gas: 1039856.740 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 76 (remaining gas: 1039856.600 units remaining) [ ] - location: 77 (remaining gas: 1039856.460 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 78 (remaining gas: 1039856.330 units remaining) - [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" @self ] + [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - location: 87 (remaining gas: 1039856.190 units remaining) [ ] - location: 88 (remaining gas: 1039856.050 units remaining) 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 0f2bb032f31e31d02f9af8b7aaff99464beba462..32fb4dbc977bd413a455c665cc581c6d5bf2e3ea 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,39 +13,39 @@ trace [ (Pair "" "hello" 0) (Pair "" "hello" 0) ] - location: 10 (remaining gas: 1039985.007 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair "" "hello" 0) ] - location: 13 (remaining gas: 1039984.707 units remaining) - [ "" @parameter ] + [ "" ] - location: 12 (remaining gas: 1039984.637 units remaining) - [ "" @parameter ] + [ "" ] - location: 11 (remaining gas: 1039984.637 units remaining) - [ (Pair "hello" 0) @storage - "" @parameter ] + [ (Pair "hello" 0) + "" ] - location: 15 (remaining gas: 1039984.437 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - "" @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "" ] - location: 16 (remaining gas: 1039984.297 units remaining) [ "hello" - (Pair "hello" 0) @storage - "" @parameter ] + (Pair "hello" 0) + "" ] - location: 17 (remaining gas: 1039984.157 units remaining) - [ (Pair "hello" 0) @storage - "" @parameter ] + [ (Pair "hello" 0) + "" ] - location: 18 (remaining gas: 1039984.017 units remaining) - [ 0 @storage.n - "" @parameter ] + [ 0 + "" ] - location: 19 (remaining gas: 1039983.887 units remaining) - [ "" @parameter - 0 @storage.n ] + [ "" + 0 ] - location: 20 (remaining gas: 1039983.747 units remaining) - [ (Pair "" 0) @storage ] + [ (Pair "" 0) ] - location: -1 (remaining gas: 1039983.677 units remaining) - [ (Pair "" 0) @storage ] + [ (Pair "" 0) ] - location: 21 (remaining gas: 1039983.537 units remaining) [ {} - (Pair "" 0) @storage ] + (Pair "" 0) ] - location: 23 (remaining gas: 1039983.397 units remaining) [ (Pair {} "" 0) ] - location: -1 (remaining gas: 1039983.327 units remaining) 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 7bb2dca1dfe728cab8de72d041536dcf6be4cd90..21f181c9c9a4f481396e0de7316bc699c4c0c721 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,39 +13,39 @@ trace [ (Pair "abc" "hello" 0) (Pair "abc" "hello" 0) ] - location: 10 (remaining gas: 1039984.977 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair "abc" "hello" 0) ] - location: 13 (remaining gas: 1039984.677 units remaining) - [ "abc" @parameter ] + [ "abc" ] - location: 12 (remaining gas: 1039984.607 units remaining) - [ "abc" @parameter ] + [ "abc" ] - location: 11 (remaining gas: 1039984.607 units remaining) - [ (Pair "hello" 0) @storage - "abc" @parameter ] + [ (Pair "hello" 0) + "abc" ] - location: 15 (remaining gas: 1039984.407 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - "abc" @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "abc" ] - location: 16 (remaining gas: 1039984.267 units remaining) [ "hello" - (Pair "hello" 0) @storage - "abc" @parameter ] + (Pair "hello" 0) + "abc" ] - location: 17 (remaining gas: 1039984.127 units remaining) - [ (Pair "hello" 0) @storage - "abc" @parameter ] + [ (Pair "hello" 0) + "abc" ] - location: 18 (remaining gas: 1039983.987 units remaining) - [ 0 @storage.n - "abc" @parameter ] + [ 0 + "abc" ] - location: 19 (remaining gas: 1039983.857 units remaining) - [ "abc" @parameter - 0 @storage.n ] + [ "abc" + 0 ] - location: 20 (remaining gas: 1039983.717 units remaining) - [ (Pair "abc" 0) @storage ] + [ (Pair "abc" 0) ] - location: -1 (remaining gas: 1039983.647 units remaining) - [ (Pair "abc" 0) @storage ] + [ (Pair "abc" 0) ] - location: 21 (remaining gas: 1039983.507 units remaining) [ {} - (Pair "abc" 0) @storage ] + (Pair "abc" 0) ] - location: 23 (remaining gas: 1039983.367 units remaining) [ (Pair {} "abc" 0) ] - location: -1 (remaining gas: 1039983.297 units remaining) 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 86e5b0f6ff1855f91aeba8bdcc6f33ca4dac0bdb..2c3e86c69d4c049f47c47a5a956182325d8f02e8 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,39 +13,39 @@ trace [ (Pair "world" "hello" 0) (Pair "world" "hello" 0) ] - location: 10 (remaining gas: 1039984.957 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair "world" "hello" 0) ] - location: 13 (remaining gas: 1039984.657 units remaining) - [ "world" @parameter ] + [ "world" ] - location: 12 (remaining gas: 1039984.587 units remaining) - [ "world" @parameter ] + [ "world" ] - location: 11 (remaining gas: 1039984.587 units remaining) - [ (Pair "hello" 0) @storage - "world" @parameter ] + [ (Pair "hello" 0) + "world" ] - location: 15 (remaining gas: 1039984.387 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - "world" @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + "world" ] - location: 16 (remaining gas: 1039984.247 units remaining) [ "hello" - (Pair "hello" 0) @storage - "world" @parameter ] + (Pair "hello" 0) + "world" ] - location: 17 (remaining gas: 1039984.107 units remaining) - [ (Pair "hello" 0) @storage - "world" @parameter ] + [ (Pair "hello" 0) + "world" ] - location: 18 (remaining gas: 1039983.967 units remaining) - [ 0 @storage.n - "world" @parameter ] + [ 0 + "world" ] - location: 19 (remaining gas: 1039983.837 units remaining) - [ "world" @parameter - 0 @storage.n ] + [ "world" + 0 ] - location: 20 (remaining gas: 1039983.697 units remaining) - [ (Pair "world" 0) @storage ] + [ (Pair "world" 0) ] - location: -1 (remaining gas: 1039983.627 units remaining) - [ (Pair "world" 0) @storage ] + [ (Pair "world" 0) ] - location: 21 (remaining gas: 1039983.487 units remaining) [ {} - (Pair "world" 0) @storage ] + (Pair "world" 0) ] - location: 23 (remaining gas: 1039983.347 units remaining) [ (Pair {} "world" 0) ] - location: -1 (remaining gas: 1039983.277 units remaining) 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 99928a15f788b81169be7a57ed22e441cbd0f9ea..00fabae5f917f0480255ccb110097b5bc820f293 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,36 +13,36 @@ trace [ (Pair 1 "hello" 0) (Pair 1 "hello" 0) ] - location: 10 (remaining gas: 1039985.771 units remaining) - [ (Pair "hello" 0) @storage + [ (Pair "hello" 0) (Pair 1 "hello" 0) ] - location: 13 (remaining gas: 1039985.471 units remaining) - [ 1 @parameter ] + [ 1 ] - location: 12 (remaining gas: 1039985.401 units remaining) - [ 1 @parameter ] + [ 1 ] - location: 11 (remaining gas: 1039985.401 units remaining) - [ (Pair "hello" 0) @storage - 1 @parameter ] + [ (Pair "hello" 0) + 1 ] - location: 15 (remaining gas: 1039985.201 units remaining) - [ (Pair "hello" 0) @storage - (Pair "hello" 0) @storage - 1 @parameter ] + [ (Pair "hello" 0) + (Pair "hello" 0) + 1 ] - location: 16 (remaining gas: 1039985.061 units remaining) [ 0 - (Pair "hello" 0) @storage - 1 @parameter ] + (Pair "hello" 0) + 1 ] - location: 17 (remaining gas: 1039984.921 units remaining) - [ (Pair "hello" 0) @storage - 1 @parameter ] + [ (Pair "hello" 0) + 1 ] - location: 18 (remaining gas: 1039984.781 units remaining) - [ "hello" @storage.s - 1 @parameter ] + [ "hello" + 1 ] - location: 19 (remaining gas: 1039984.641 units remaining) - [ (Pair "hello" 1) @storage ] + [ (Pair "hello" 1) ] - location: -1 (remaining gas: 1039984.571 units remaining) - [ (Pair "hello" 1) @storage ] + [ (Pair "hello" 1) ] - location: 20 (remaining gas: 1039984.431 units remaining) [ {} - (Pair "hello" 1) @storage ] + (Pair "hello" 1) ] - location: 22 (remaining gas: 1039984.291 units remaining) [ (Pair {} "hello" 1) ] - location: -1 (remaining gas: 1039984.221 units remaining) 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 90f24907b12532965c5f6b7d56d86968477a870e..a384a14a49250ffb9e5925a36b95ae2778e6a250 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,36 +13,36 @@ trace [ (Pair 3 "hello" 500) (Pair 3 "hello" 500) ] - location: 10 (remaining gas: 1039985.771 units remaining) - [ (Pair "hello" 500) @storage + [ (Pair "hello" 500) (Pair 3 "hello" 500) ] - location: 13 (remaining gas: 1039985.471 units remaining) - [ 3 @parameter ] + [ 3 ] - location: 12 (remaining gas: 1039985.401 units remaining) - [ 3 @parameter ] + [ 3 ] - location: 11 (remaining gas: 1039985.401 units remaining) - [ (Pair "hello" 500) @storage - 3 @parameter ] + [ (Pair "hello" 500) + 3 ] - location: 15 (remaining gas: 1039985.201 units remaining) - [ (Pair "hello" 500) @storage - (Pair "hello" 500) @storage - 3 @parameter ] + [ (Pair "hello" 500) + (Pair "hello" 500) + 3 ] - location: 16 (remaining gas: 1039985.061 units remaining) [ 500 - (Pair "hello" 500) @storage - 3 @parameter ] + (Pair "hello" 500) + 3 ] - location: 17 (remaining gas: 1039984.921 units remaining) - [ (Pair "hello" 500) @storage - 3 @parameter ] + [ (Pair "hello" 500) + 3 ] - location: 18 (remaining gas: 1039984.781 units remaining) - [ "hello" @storage.s - 3 @parameter ] + [ "hello" + 3 ] - location: 19 (remaining gas: 1039984.641 units remaining) - [ (Pair "hello" 3) @storage ] + [ (Pair "hello" 3) ] - location: -1 (remaining gas: 1039984.571 units remaining) - [ (Pair "hello" 3) @storage ] + [ (Pair "hello" 3) ] - location: 20 (remaining gas: 1039984.431 units remaining) [ {} - (Pair "hello" 3) @storage ] + (Pair "hello" 3) ] - location: 22 (remaining gas: 1039984.291 units remaining) [ (Pair {} "hello" 3) ] - location: -1 (remaining gas: 1039984.221 units remaining) 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 e30541807548685f4e070310deecb08804d9ac1e..5b416f00cf65e865016a0e78a322417b46f441c1 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,36 +13,36 @@ trace [ (Pair 100 "hello" 7) (Pair 100 "hello" 7) ] - location: 10 (remaining gas: 1039985.771 units remaining) - [ (Pair "hello" 7) @storage + [ (Pair "hello" 7) (Pair 100 "hello" 7) ] - location: 13 (remaining gas: 1039985.471 units remaining) - [ 100 @parameter ] + [ 100 ] - location: 12 (remaining gas: 1039985.401 units remaining) - [ 100 @parameter ] + [ 100 ] - location: 11 (remaining gas: 1039985.401 units remaining) - [ (Pair "hello" 7) @storage - 100 @parameter ] + [ (Pair "hello" 7) + 100 ] - location: 15 (remaining gas: 1039985.201 units remaining) - [ (Pair "hello" 7) @storage - (Pair "hello" 7) @storage - 100 @parameter ] + [ (Pair "hello" 7) + (Pair "hello" 7) + 100 ] - location: 16 (remaining gas: 1039985.061 units remaining) [ 7 - (Pair "hello" 7) @storage - 100 @parameter ] + (Pair "hello" 7) + 100 ] - location: 17 (remaining gas: 1039984.921 units remaining) - [ (Pair "hello" 7) @storage - 100 @parameter ] + [ (Pair "hello" 7) + 100 ] - location: 18 (remaining gas: 1039984.781 units remaining) - [ "hello" @storage.s - 100 @parameter ] + [ "hello" + 100 ] - location: 19 (remaining gas: 1039984.641 units remaining) - [ (Pair "hello" 100) @storage ] + [ (Pair "hello" 100) ] - location: -1 (remaining gas: 1039984.571 units remaining) - [ (Pair "hello" 100) @storage ] + [ (Pair "hello" 100) ] - location: 20 (remaining gas: 1039984.431 units remaining) [ {} - (Pair "hello" 100) @storage ] + (Pair "hello" 100) ] - location: 22 (remaining gas: 1039984.291 units remaining) [ (Pair {} "hello" 100) ] - location: -1 (remaining gas: 1039984.221 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 81808359d9f2e88962dea6f14a08b30f45668132..37518df1f935267722b11317958083a6e8832a53 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: 8 (remaining gas: 1039993.748 units remaining) [ (Pair { "a" ; "b" ; "c" } {}) ] - location: 9 (remaining gas: 1039993.608 units remaining) - [ { "a" ; "b" ; "c" } @parameter ] + [ { "a" ; "b" ; "c" } ] - location: 10 (remaining gas: 1039993.468 units remaining) [ {} - { "a" ; "b" ; "c" } @parameter ] + { "a" ; "b" ; "c" } ] - location: 12 (remaining gas: 1039993.328 units remaining) [ (Pair {} { "a" ; "b" ; "c" }) ] - location: -1 (remaining gas: 1039993.258 units remaining) 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 752b64b9259f4c51599b4dfe04095f93616dc4b3..65413a7f1697c2df47465f205e523c0fc616e651 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: 8 (remaining gas: 1039994.151 units remaining) [ (Pair { "asdf" ; "bcde" } {}) ] - location: 9 (remaining gas: 1039994.011 units remaining) - [ { "asdf" ; "bcde" } @parameter ] + [ { "asdf" ; "bcde" } ] - location: 10 (remaining gas: 1039993.871 units remaining) [ {} - { "asdf" ; "bcde" } @parameter ] + { "asdf" ; "bcde" } ] - location: 12 (remaining gas: 1039993.731 units remaining) [ (Pair {} { "asdf" ; "bcde" }) ] - location: -1 (remaining gas: 1039993.661 units remaining) 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 fbfd815d55587bdb15c4347994ecdc9c40dbfd30..826fa127630172138237fae2c05b2297397c50e9 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: 8 (remaining gas: 1039995.020 units remaining) [ (Pair {} {}) ] - location: 9 (remaining gas: 1039994.880 units remaining) - [ {} @parameter ] + [ {} ] - location: 10 (remaining gas: 1039994.740 units remaining) [ {} - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039994.600 units remaining) [ (Pair {} {}) ] - location: -1 (remaining gas: 1039994.530 units remaining) 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 ce525432f6ebef5358794e2d603b0479da3c8941..e28f7d50e02e555acd21fc1e8a79db88c1e4e47a 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,12 +10,12 @@ trace - location: 7 (remaining gas: 1039990.050 units remaining) [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039989.910 units remaining) - [ { -100 ; 1 ; 2 ; 3 } @parameter ] + [ { -100 ; 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039989.770 units remaining) [ 0 - { -100 ; 1 ; 2 ; 3 } @parameter ] + { -100 ; 1 ; 2 ; 3 } ] - location: 12 (remaining gas: 1039989.640 units remaining) - [ { -100 ; 1 ; 2 ; 3 } @parameter + [ { -100 ; 1 ; 2 ; 3 } 0 ] - location: 15 (remaining gas: 1039989.216 units remaining) [ -100 ] 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 1d0194349a3803d6ea7da534434fd33afa41706d..c9de6de5bbcfec65dd4367d383d67710cda4f810 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,12 +10,12 @@ trace - location: 7 (remaining gas: 1039991.460 units remaining) [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039991.320 units remaining) - [ { 1 } @parameter ] + [ { 1 } ] - location: 9 (remaining gas: 1039991.180 units remaining) [ 0 - { 1 } @parameter ] + { 1 } ] - location: 12 (remaining gas: 1039991.050 units remaining) - [ { 1 } @parameter + [ { 1 } 0 ] - location: 15 (remaining gas: 1039990.734 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 2d684bbc214ea1d68eb7e48575647fd7b40f7274..22dde2254c501c4407df0949b87813a7d20c7a75 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: 7 (remaining gas: 1039991.780 units remaining) [ (Pair {} 111) ] - location: 8 (remaining gas: 1039991.640 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039991.500 units remaining) [ 0 - {} @parameter ] + {} ] - location: 12 (remaining gas: 1039991.370 units remaining) - [ {} @parameter + [ {} 0 ] - location: 13 (remaining gas: 1039991.230 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 5fce395a2d52437fc4975eee93ae1a93cdbd0a50..2c9609074cfe452bbbc18597c6e7f688157dc713 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,11 +17,11 @@ trace (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 13 (remaining gas: 1039979.727 units remaining) - [ "" @parameter + [ "" (Pair "" { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 17 (remaining gas: 1039979.367 units remaining) - [ (Pair { "Hello" ; "World" } None) @storage + [ (Pair { "Hello" ; "World" } None) (Pair "" { "Hello" ; "World" } None) ] - location: 18 (remaining gas: 1039979.227 units remaining) [ { "Hello" ; "World" } @@ -33,7 +33,7 @@ trace [ { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - location: 14 (remaining gas: 1039979.087 units remaining) - [ "" @parameter + [ "" { "Hello" ; "World" } (Pair "" { "Hello" ; "World" } None) ] - location: 19 (remaining gas: 1039978.947 units remaining) @@ -43,7 +43,7 @@ trace [ (Some False) (Pair "" { "Hello" ; "World" } None) ] - location: 24 (remaining gas: 1039978.447 units remaining) - [ (Pair { "Hello" ; "World" } None) @storage ] + [ (Pair { "Hello" ; "World" } None) ] - location: 25 (remaining gas: 1039978.307 units remaining) [ { "Hello" ; "World" } ] - location: -1 (remaining gas: 1039978.237 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 85bc7a391f23751039414e450b1e99ca9698a0f0..309ed029a695a66032e3e9b6f15bc04fe9dcc679 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,11 +17,11 @@ trace (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 13 (remaining gas: 1039980.242 units remaining) - [ "Hi" @parameter + [ "Hi" (Pair "Hi" { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 17 (remaining gas: 1039979.882 units remaining) - [ (Pair { "Hi" } None) @storage + [ (Pair { "Hi" } None) (Pair "Hi" { "Hi" } None) ] - location: 18 (remaining gas: 1039979.742 units remaining) [ { "Hi" } @@ -33,7 +33,7 @@ trace [ { "Hi" } (Pair "Hi" { "Hi" } None) ] - location: 14 (remaining gas: 1039979.602 units remaining) - [ "Hi" @parameter + [ "Hi" { "Hi" } (Pair "Hi" { "Hi" } None) ] - location: 19 (remaining gas: 1039979.462 units remaining) @@ -43,7 +43,7 @@ trace [ (Some True) (Pair "Hi" { "Hi" } None) ] - location: 24 (remaining gas: 1039978.962 units remaining) - [ (Pair { "Hi" } None) @storage ] + [ (Pair { "Hi" } None) ] - location: 25 (remaining gas: 1039978.822 units remaining) [ { "Hi" } ] - location: -1 (remaining gas: 1039978.752 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 a86af8deacf9d7cb78ab408e2d1d65e51a57dd92..b595ecaf7b6ad12d5c7c7e75dca5453f346ad235 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,11 +17,11 @@ trace (Pair "Hi" {} None) (Pair "Hi" {} None) ] - location: 13 (remaining gas: 1039980.596 units remaining) - [ "Hi" @parameter + [ "Hi" (Pair "Hi" {} None) (Pair "Hi" {} None) ] - location: 17 (remaining gas: 1039980.236 units remaining) - [ (Pair {} None) @storage + [ (Pair {} None) (Pair "Hi" {} None) ] - location: 18 (remaining gas: 1039980.096 units remaining) [ {} @@ -33,7 +33,7 @@ trace [ {} (Pair "Hi" {} None) ] - location: 14 (remaining gas: 1039979.956 units remaining) - [ "Hi" @parameter + [ "Hi" {} (Pair "Hi" {} None) ] - location: 19 (remaining gas: 1039979.816 units remaining) @@ -43,7 +43,7 @@ trace [ (Some False) (Pair "Hi" {} None) ] - location: 24 (remaining gas: 1039979.316 units remaining) - [ (Pair {} None) @storage ] + [ (Pair {} None) ] - location: 25 (remaining gas: 1039979.176 units remaining) [ {} ] - location: -1 (remaining gas: 1039979.106 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 f641cc926c4fd659da090eaa4c7699f2b6a263a5..4e8e80f15dd1e24b4b9c9af1380a4931a8c1e996 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: 7 (remaining gas: 1039991.900 units remaining) [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ] - location: 8 (remaining gas: 1039991.760 units remaining) - [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } @parameter ] + [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ] - location: 9 (remaining gas: 1039991.620 units remaining) [ 6 ] - location: 10 (remaining gas: 1039991.480 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 99a0329dc37cf77f51e93b3ef782ea218f3746c5..b5f719f69b34123c0989de82fcf38572f0aa3e4c 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: 7 (remaining gas: 1039993.310 units remaining) [ (Pair { 1 ; 2 ; 3 } 111) ] - location: 8 (remaining gas: 1039993.170 units remaining) - [ { 1 ; 2 ; 3 } @parameter ] + [ { 1 ; 2 ; 3 } ] - location: 9 (remaining gas: 1039993.030 units remaining) [ 3 ] - location: 10 (remaining gas: 1039992.890 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 bb0aef40bd8aab8ba8c5311da638feab183c60b3..bb8f44edb6d81b2edef82e4ebb77e8d5af2a5864 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: 7 (remaining gas: 1039994.250 units remaining) [ (Pair { 1 } 111) ] - location: 8 (remaining gas: 1039994.110 units remaining) - [ { 1 } @parameter ] + [ { 1 } ] - location: 9 (remaining gas: 1039993.970 units remaining) [ 1 ] - location: 10 (remaining gas: 1039993.830 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 c6e7e5309aa75f2ed39911f380af582b480c2971..8f0eb330fc0f7cddcfb4cd9fb89b03ba20a3c56e 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: 7 (remaining gas: 1039994.570 units remaining) [ (Pair {} 111) ] - location: 8 (remaining gas: 1039994.430 units remaining) - [ {} @parameter ] + [ {} ] - location: 9 (remaining gas: 1039994.290 units remaining) [ 0 ] - location: 10 (remaining gas: 1039994.150 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 b5a76591fb5554e4cee9a176e7410a767190da50..73f783d1866c86865c10c8724ec6b88d9c07dcdb 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: 7 (remaining gas: 1039993.690 units remaining) [ (Pair 0x48656c6c6f2c20776f726c6421 None) ] - location: 8 (remaining gas: 1039993.550 units remaining) - [ 0x48656c6c6f2c20776f726c6421 @parameter ] + [ 0x48656c6c6f2c20776f726c6421 ] - location: 9 (remaining gas: 1039991.674 units remaining) [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ] - location: 10 (remaining gas: 1039991.534 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 b8f6a0f7dd03daa58305654a38f1b3bc8c3544d7..b92bb415b5e608e8c3a292927328947df456b185 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 0 0)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Left (Pair 0 0)) @parameter ] + [ (Left (Pair 0 0)) ] - location: 17 (remaining gas: 1039988.390 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 7af8cacdfb8dc48aa25332ab9eeda602a65be785..4ca691e17c67991a787467b7b4dbb14142b3ae4a 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 0 1)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Left (Pair 0 1)) @parameter ] + [ (Left (Pair 0 1)) ] - location: 17 (remaining gas: 1039988.390 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 88872a209374adbee3bb6577d562d77394024523..13bf4f6e386a57c1fbdccd2b9635553038796e70 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 1 2)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Left (Pair 1 2)) @parameter ] + [ (Left (Pair 1 2)) ] - location: 17 (remaining gas: 1039988.390 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 569053fe5b80a306acab8bfa5d4fe58d5a24ce2f..cc4b732e4e40ec9e43341275db11446faa2b09ba 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 15 2)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Left (Pair 15 2)) @parameter ] + [ (Left (Pair 15 2)) ] - location: 17 (remaining gas: 1039988.390 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 d0f29922302841fb449b47d82e65b981550f1af3..5e5d5fb27cfd78c04af93a2553d0c8d2f4517ece 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Left (Pair 8 1)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Left (Pair 8 1)) @parameter ] + [ (Left (Pair 8 1)) ] - location: 17 (remaining gas: 1039988.390 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 af25e29cb48306c49bb91a85a9a61ac9de449bea..210b39ea280afad9d665b39c12c31eeb4dc6ba7d 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Right (Pair 0 0)) @parameter ] + [ (Right (Pair 0 0)) ] - location: 20 (remaining gas: 1039988.390 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 927a77656a06e039e0aaf21ae4d49558bb1ce82e..14197a57b31b555b5ccaab0780f8cd0e17a6f499 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Right (Pair 0 1)) @parameter ] + [ (Right (Pair 0 1)) ] - location: 20 (remaining gas: 1039988.390 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 30f8b88d7e0e994cae9d694cd11f54bb591f7243..35cd7dd043ab5c30651b90b7526ecb0680b69c29 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 1 2)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Right (Pair 1 2)) @parameter ] + [ (Right (Pair 1 2)) ] - location: 20 (remaining gas: 1039988.390 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 b5e0abee9459f05553012164a7534408b49fdf8a..402c9d7bd3ccf5246fba37f73f5468dccc1e60af 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 15 2)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Right (Pair 15 2)) @parameter ] + [ (Right (Pair 15 2)) ] - location: 20 (remaining gas: 1039988.390 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 45226de767465ab1ac0d9b020e8e323b79725f31..946b019ec81b85bd4f21dfdb778b991b28ad56d3 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,7 +10,7 @@ trace - location: 13 (remaining gas: 1039988.820 units remaining) [ (Pair (Right (Pair 8 1)) None) ] - location: 14 (remaining gas: 1039988.680 units remaining) - [ (Right (Pair 8 1)) @parameter ] + [ (Right (Pair 8 1)) ] - location: 20 (remaining gas: 1039988.390 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 514549d1b36064de3fc84c76a40928d3cf0cf94e..73e93695b882cb23307cf3b06a17afa0fbac3c10 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,11 +10,11 @@ trace - location: 9 (remaining gas: 1039988.315 units remaining) [ (Pair (Pair 0 0) None) ] - location: 10 (remaining gas: 1039988.175 units remaining) - [ (Pair 0 0) @parameter - None @storage ] + [ (Pair 0 0) + None ] - location: 11 (remaining gas: 1039988.045 units remaining) - [ None @storage - (Pair 0 0) @parameter ] + [ None + (Pair 0 0) ] - location: 15 (remaining gas: 1039987.705 units remaining) [ ] - location: 16 (remaining gas: 1039987.565 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 008950114a4104e8872d194d87c249ba68050307..9755b3c6b113cb0f2db77bbd7d9412c88118e303 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 0 0) (Some "Foo")) ] - location: 10 (remaining gas: 1039987.891 units remaining) - [ (Pair 0 0) @parameter - (Some "Foo") @storage ] + [ (Pair 0 0) + (Some "Foo") ] - location: 11 (remaining gas: 1039987.761 units remaining) - [ (Some "Foo") @storage - (Pair 0 0) @parameter ] + [ (Some "Foo") + (Pair 0 0) ] - location: 19 (remaining gas: 1039987.431 units remaining) - [ (Pair 0 0) @parameter - "Foo" @storage.some ] + [ (Pair 0 0) + "Foo" ] - location: 20 (remaining gas: 1039987.291 units remaining) [ 0 0 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039987.151 units remaining) - [ (Some "") @storage.some.slice ] + [ (Some "") ] - location: -1 (remaining gas: 1039987.081 units remaining) - [ (Some "") @storage.some.slice ] + [ (Some "") ] - location: 12 (remaining gas: 1039987.011 units remaining) [ (Some "") ] - location: 22 (remaining gas: 1039986.871 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 1d5bdf7cf9732d22207f32d7e2c17ad9027ca30c..030cf90ce698938263bd69450bb3c1b3b0acbeac 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 0 10) (Some "Foo")) ] - location: 10 (remaining gas: 1039987.891 units remaining) - [ (Pair 0 10) @parameter - (Some "Foo") @storage ] + [ (Pair 0 10) + (Some "Foo") ] - location: 11 (remaining gas: 1039987.761 units remaining) - [ (Some "Foo") @storage - (Pair 0 10) @parameter ] + [ (Some "Foo") + (Pair 0 10) ] - location: 19 (remaining gas: 1039987.431 units remaining) - [ (Pair 0 10) @parameter - "Foo" @storage.some ] + [ (Pair 0 10) + "Foo" ] - location: 20 (remaining gas: 1039987.291 units remaining) [ 0 10 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039987.151 units remaining) - [ None @storage.some.slice ] + [ None ] - location: -1 (remaining gas: 1039987.081 units remaining) - [ None @storage.some.slice ] + [ None ] - location: 12 (remaining gas: 1039987.011 units remaining) [ None ] - location: 22 (remaining gas: 1039986.871 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 4e81ce6193965bd031db1f6e2979dbab1a17cfb3..3faf6245b51e383a1a40b71fd74d0153e488101f 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 0 2) (Some "Foo")) ] - location: 10 (remaining gas: 1039987.891 units remaining) - [ (Pair 0 2) @parameter - (Some "Foo") @storage ] + [ (Pair 0 2) + (Some "Foo") ] - location: 11 (remaining gas: 1039987.761 units remaining) - [ (Some "Foo") @storage - (Pair 0 2) @parameter ] + [ (Some "Foo") + (Pair 0 2) ] - location: 19 (remaining gas: 1039987.431 units remaining) - [ (Pair 0 2) @parameter - "Foo" @storage.some ] + [ (Pair 0 2) + "Foo" ] - location: 20 (remaining gas: 1039987.291 units remaining) [ 0 2 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039987.151 units remaining) - [ (Some "Fo") @storage.some.slice ] + [ (Some "Fo") ] - location: -1 (remaining gas: 1039987.081 units remaining) - [ (Some "Fo") @storage.some.slice ] + [ (Some "Fo") ] - location: 12 (remaining gas: 1039987.011 units remaining) [ (Some "Fo") ] - location: 22 (remaining gas: 1039986.871 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 797b6e721bffe304876985923f1a0f1a291ebf13..e250efda3020510cc6efcfea0ea45abcddd5f8ad 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 1 1) (Some "Foo")) ] - location: 10 (remaining gas: 1039987.891 units remaining) - [ (Pair 1 1) @parameter - (Some "Foo") @storage ] + [ (Pair 1 1) + (Some "Foo") ] - location: 11 (remaining gas: 1039987.761 units remaining) - [ (Some "Foo") @storage - (Pair 1 1) @parameter ] + [ (Some "Foo") + (Pair 1 1) ] - location: 19 (remaining gas: 1039987.431 units remaining) - [ (Pair 1 1) @parameter - "Foo" @storage.some ] + [ (Pair 1 1) + "Foo" ] - location: 20 (remaining gas: 1039987.291 units remaining) [ 1 1 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039987.151 units remaining) - [ (Some "o") @storage.some.slice ] + [ (Some "o") ] - location: -1 (remaining gas: 1039987.081 units remaining) - [ (Some "o") @storage.some.slice ] + [ (Some "o") ] - location: 12 (remaining gas: 1039987.011 units remaining) [ (Some "o") ] - location: 22 (remaining gas: 1039986.871 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 0ee9f112b7a1ed015ba2c5e41b6533bd5543f7f1..9552e056ce6e09fee41cc5eaa34172d700acba42 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 1 3) (Some "Foo")) ] - location: 10 (remaining gas: 1039987.891 units remaining) - [ (Pair 1 3) @parameter - (Some "Foo") @storage ] + [ (Pair 1 3) + (Some "Foo") ] - location: 11 (remaining gas: 1039987.761 units remaining) - [ (Some "Foo") @storage - (Pair 1 3) @parameter ] + [ (Some "Foo") + (Pair 1 3) ] - location: 19 (remaining gas: 1039987.431 units remaining) - [ (Pair 1 3) @parameter - "Foo" @storage.some ] + [ (Pair 1 3) + "Foo" ] - location: 20 (remaining gas: 1039987.291 units remaining) [ 1 3 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039987.151 units remaining) - [ None @storage.some.slice ] + [ None ] - location: -1 (remaining gas: 1039987.081 units remaining) - [ None @storage.some.slice ] + [ None ] - location: 12 (remaining gas: 1039987.011 units remaining) [ None ] - location: 22 (remaining gas: 1039986.871 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 943ef227376714922a042c0ceed5fe66e5848e4c..82d9b12439ddb338dd63c34bbdda07b687f7b7aa 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.031 units remaining) [ (Pair (Pair 10 5) (Some "Foo")) ] - location: 10 (remaining gas: 1039987.891 units remaining) - [ (Pair 10 5) @parameter - (Some "Foo") @storage ] + [ (Pair 10 5) + (Some "Foo") ] - location: 11 (remaining gas: 1039987.761 units remaining) - [ (Some "Foo") @storage - (Pair 10 5) @parameter ] + [ (Some "Foo") + (Pair 10 5) ] - location: 19 (remaining gas: 1039987.431 units remaining) - [ (Pair 10 5) @parameter - "Foo" @storage.some ] + [ (Pair 10 5) + "Foo" ] - location: 20 (remaining gas: 1039987.291 units remaining) [ 10 5 - "Foo" @storage.some ] + "Foo" ] - location: 21 (remaining gas: 1039987.151 units remaining) - [ None @storage.some.slice ] + [ None ] - location: -1 (remaining gas: 1039987.081 units remaining) - [ None @storage.some.slice ] + [ None ] - location: 12 (remaining gas: 1039987.011 units remaining) [ None ] - location: 22 (remaining gas: 1039986.871 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 4c024a25b0b5af8bc9255c956c8edf220d5b5958..e6226c01c5ee97e0ddd475d328b96ab4a8c20f2f 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,22 +11,22 @@ trace [ (Pair (Pair 1 10000) (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ] - location: 10 (remaining gas: 1039927.921 units remaining) - [ (Pair 1 10000) @parameter - (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") @storage ] + [ (Pair 1 10000) + (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") ] - location: 11 (remaining gas: 1039927.791 units remaining) - [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") @storage - (Pair 1 10000) @parameter ] + [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") + (Pair 1 10000) ] - location: 19 (remaining gas: 1039927.461 units remaining) - [ (Pair 1 10000) @parameter - "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some ] + [ (Pair 1 10000) + "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - location: 20 (remaining gas: 1039927.321 units remaining) [ 1 10000 - "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" @storage.some ] + "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ] - location: 21 (remaining gas: 1039926.806 units remaining) - [ None @storage.some.slice ] + [ None ] - location: -1 (remaining gas: 1039926.736 units remaining) - [ None @storage.some.slice ] + [ None ] - location: 12 (remaining gas: 1039926.666 units remaining) [ None ] - location: 22 (remaining gas: 1039926.526 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 7acfc36720ef59c084d08ce35f00ef4fa622d937..bbec77d63acf6f4eb8893bff761e77616270af55 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,11 +10,11 @@ trace - location: 9 (remaining gas: 1039988.315 units remaining) [ (Pair (Pair 0 1) None) ] - location: 10 (remaining gas: 1039988.175 units remaining) - [ (Pair 0 1) @parameter - None @storage ] + [ (Pair 0 1) + None ] - location: 11 (remaining gas: 1039988.045 units remaining) - [ None @storage - (Pair 0 1) @parameter ] + [ None + (Pair 0 1) ] - location: 15 (remaining gas: 1039987.705 units remaining) [ ] - location: 16 (remaining gas: 1039987.565 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 f936750d7a7b3f80311286cef5884cba16b23b80..d0c593267fdd3325260d012311a6ea90d0885be6 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 0 0) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 0 0) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 0 0) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 0 0) @parameter ] + [ (Some 0xaabbcc) + (Pair 0 0) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 0 0) @parameter - 0xaabbcc @storage.some ] + [ (Pair 0 0) + 0xaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 0 0 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0x) @storage.some.slice ] + [ (Some 0x) ] - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0x) @storage.some.slice ] + [ (Some 0x) ] - location: 12 (remaining gas: 1039987.055 units remaining) [ (Some 0x) ] - location: 22 (remaining gas: 1039986.915 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 b06c993ff5389f6fb9f163ce97c93e4eedc005f9..cfcef2babc8dcc6ef1d1386cd098e3aff05c5b79 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 0 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 0 1) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 0 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 0 1) @parameter ] + [ (Some 0xaabbcc) + (Pair 0 1) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 0 1) @parameter - 0xaabbcc @storage.some ] + [ (Pair 0 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 0 1 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xaa) @storage.some.slice ] + [ (Some 0xaa) ] - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xaa) @storage.some.slice ] + [ (Some 0xaa) ] - location: 12 (remaining gas: 1039987.055 units remaining) [ (Some 0xaa) ] - location: 22 (remaining gas: 1039986.915 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 975c7d8b3f73cbe284d19e3acae99540c4f55222..afb2f1de5894b5fc979332764893db7855241fe9 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 1 1) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 1) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 1) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 1 1) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 1 1 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xbb) @storage.some.slice ] + [ (Some 0xbb) ] - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xbb) @storage.some.slice ] + [ (Some 0xbb) ] - location: 12 (remaining gas: 1039987.055 units remaining) [ (Some 0xbb) ] - location: 22 (remaining gas: 1039986.915 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 03c5a705c9ca174193eb3e5cee2b0455191bcbd8..e47654f09c5975a7db470f0447c50b86ddbb9956 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 1) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 1 1) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 1) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 1) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 1) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 1 1) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 1) + 0xaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 1 1 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xbb) @storage.some.slice ] + [ (Some 0xbb) ] - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xbb) @storage.some.slice ] + [ (Some 0xbb) ] - location: 12 (remaining gas: 1039987.055 units remaining) [ (Some 0xbb) ] - location: 22 (remaining gas: 1039986.915 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 85903d27cc50e9ce74dd2154d77535197e863f60..b5babcb686a37313141f252e24140b03ab535273 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 2) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 1 2) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 2) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 2) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 2) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 1 2) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 2) + 0xaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 1 2 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039987.195 units remaining) - [ (Some 0xbbcc) @storage.some.slice ] + [ (Some 0xbbcc) ] - location: -1 (remaining gas: 1039987.125 units remaining) - [ (Some 0xbbcc) @storage.some.slice ] + [ (Some 0xbbcc) ] - location: 12 (remaining gas: 1039987.055 units remaining) [ (Some 0xbbcc) ] - location: 22 (remaining gas: 1039986.915 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 77831d407a98b10aa35dd7a2970f7759240d53e2..bc240d22172f92363dfb2111f6685d3bf2e86d0a 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,22 +10,22 @@ trace - location: 9 (remaining gas: 1039988.075 units remaining) [ (Pair (Pair 1 3) (Some 0xaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 1 3) @parameter - (Some 0xaabbcc) @storage ] + [ (Pair 1 3) + (Some 0xaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbcc) @storage - (Pair 1 3) @parameter ] + [ (Some 0xaabbcc) + (Pair 1 3) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 1 3) @parameter - 0xaabbcc @storage.some ] + [ (Pair 1 3) + 0xaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 1 3 - 0xaabbcc @storage.some ] + 0xaabbcc ] - location: 21 (remaining gas: 1039987.195 units remaining) - [ None @storage.some.slice ] + [ None ] - location: -1 (remaining gas: 1039987.125 units remaining) - [ None @storage.some.slice ] + [ None ] - location: 12 (remaining gas: 1039987.055 units remaining) [ None ] - location: 22 (remaining gas: 1039986.915 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 1e20ce18c446d46f92443f45f8d97f3da4907f87..b292ccfc648c2598b4f815c06cd0e303b1f00409 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,22 +11,22 @@ trace [ (Pair (Pair 1 10000) (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ] - location: 10 (remaining gas: 1039987.935 units remaining) - [ (Pair 1 10000) @parameter - (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) @storage ] + [ (Pair 1 10000) + (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) ] - location: 11 (remaining gas: 1039987.805 units remaining) - [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) @storage - (Pair 1 10000) @parameter ] + [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) + (Pair 1 10000) ] - location: 19 (remaining gas: 1039987.475 units remaining) - [ (Pair 1 10000) @parameter - 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some ] + [ (Pair 1 10000) + 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - location: 20 (remaining gas: 1039987.335 units remaining) [ 1 10000 - 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc @storage.some ] + 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ] - location: 21 (remaining gas: 1039986.820 units remaining) - [ None @storage.some.slice ] + [ None ] - location: -1 (remaining gas: 1039986.750 units remaining) - [ None @storage.some.slice ] + [ None ] - location: 12 (remaining gas: 1039986.680 units remaining) [ None ] - location: 22 (remaining gas: 1039986.540 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 d5ffa24502742a3124ea6a385e6246135d99b8e5..90fef231f2763d38dc1f37dcbb8c87f49fd066d2 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: 7 (remaining gas: 1039994.376 units remaining) [ (Pair "Hello" None) ] - location: 8 (remaining gas: 1039994.236 units remaining) - [ "Hello" @parameter ] + [ "Hello" ] - location: 9 (remaining gas: 1039994.096 units remaining) [ (Some "Hello") ] - location: 10 (remaining gas: 1039993.956 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 f1a76c74d2864d13266eb264784dc761dcb33839..345d20c425aab2c1042cb3ed3d5a6c897e5a5c17 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: 7 (remaining gas: 1039994.386 units remaining) [ (Pair "abcd" None) ] - location: 8 (remaining gas: 1039994.246 units remaining) - [ "abcd" @parameter ] + [ "abcd" ] - location: 9 (remaining gas: 1039994.106 units remaining) [ (Some "abcd") ] - location: 10 (remaining gas: 1039993.966 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 7142350b5fd41958d3816b25197173492f578ece..09c7c7cd1374aa662c8996f7fbf5ee310ed398aa 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039990.060 units remaining) - [ (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" -100) ] - location: 10 (remaining gas: 1039989.920 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: 1039989.780 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" -100) @parameter ] + (Pair "1970-01-01T00:01:40Z" -100) ] - location: 14 (remaining gas: 1039989.480 units remaining) [ -100 ] - location: 13 (remaining gas: 1039989.410 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 49a92fce50c1149bd285d6792196fdd7171c2805..c679ba5ed3444ae721a62a7ab8e9a1efb753f814 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039990.060 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 100) ] - location: 10 (remaining gas: 1039989.920 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: 1039989.780 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 100) @parameter ] + (Pair "1970-01-01T00:01:40Z" 100) ] - location: 14 (remaining gas: 1039989.480 units remaining) [ 100 ] - location: 13 (remaining gas: 1039989.410 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 f8a6e61ed8a475b719b6bc2588e07826cc7a4f0f..b386b92fceeaba707f273230072cef008ebfad49 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,13 +10,13 @@ trace - location: 8 (remaining gas: 1039990.200 units remaining) [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ] - location: 9 (remaining gas: 1039990.060 units remaining) - [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 10 (remaining gas: 1039989.920 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: 1039989.780 units remaining) [ "1970-01-01T00:01:40Z" - (Pair "1970-01-01T00:01:40Z" 2000000000000000000) @parameter ] + (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ] - location: 14 (remaining gas: 1039989.480 units remaining) [ 2000000000000000000 ] - location: 13 (remaining gas: 1039989.410 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 a54871f6577204f898ce487e031a752978b9f8ec..9acbb4b9af9bd86241ed75214095b238d8efccf0 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,37 +10,37 @@ trace - location: 11 (remaining gas: 1039981.110 units remaining) [ (Pair (Pair 2000000 1000000) None) ] - location: 12 (remaining gas: 1039980.970 units remaining) - [ (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) ] - location: 13 (remaining gas: 1039980.830 units remaining) - [ (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 14 (remaining gas: 1039980.690 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.550 units remaining) [ 2000000 - (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 18 (remaining gas: 1039980.250 units remaining) [ 1000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 17 (remaining gas: 1039980.180 units remaining) [ 1000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 16 (remaining gas: 1039980.180 units remaining) [ 2000000 1000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 19 (remaining gas: 1039980.020 units remaining) [ 3000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 22 (remaining gas: 1039979.720 units remaining) - [ (Pair 2000000 1000000) @parameter - (Pair 2000000 1000000) @parameter ] + [ (Pair 2000000 1000000) + (Pair 2000000 1000000) ] - location: 23 (remaining gas: 1039979.580 units remaining) [ 2000000 - (Pair 2000000 1000000) @parameter ] + (Pair 2000000 1000000) ] - location: 26 (remaining gas: 1039979.280 units remaining) [ 1000000 ] - location: 25 (remaining gas: 1039979.210 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 03648b5c39a7e327bbdcd6a0e244c926c5c10bda..20b4bd1c8eba8be7733da527d6a688d982c5af85 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,37 +10,37 @@ trace - location: 11 (remaining gas: 1039981.110 units remaining) [ (Pair (Pair 2310000 1010000) None) ] - location: 12 (remaining gas: 1039980.970 units remaining) - [ (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) ] - location: 13 (remaining gas: 1039980.830 units remaining) - [ (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 14 (remaining gas: 1039980.690 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.550 units remaining) [ 2310000 - (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 18 (remaining gas: 1039980.250 units remaining) [ 1010000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 17 (remaining gas: 1039980.180 units remaining) [ 1010000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 16 (remaining gas: 1039980.180 units remaining) [ 2310000 1010000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 19 (remaining gas: 1039980.020 units remaining) [ 3320000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 22 (remaining gas: 1039979.720 units remaining) - [ (Pair 2310000 1010000) @parameter - (Pair 2310000 1010000) @parameter ] + [ (Pair 2310000 1010000) + (Pair 2310000 1010000) ] - location: 23 (remaining gas: 1039979.580 units remaining) [ 2310000 - (Pair 2310000 1010000) @parameter ] + (Pair 2310000 1010000) ] - location: 26 (remaining gas: 1039979.280 units remaining) [ 1010000 ] - location: 25 (remaining gas: 1039979.210 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 0d5705c29814004a701c54a70a73a2ce0b520b4e..beb5f1e72fd7f48ac19a3d0e87602bc8930f9580 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: 9 (remaining gas: 1039986.880 units remaining) [ (Pair (Pair 1 4 2) 0) ] - location: 10 (remaining gas: 1039986.740 units remaining) - [ (Pair 1 4 2) @parameter ] + [ (Pair 1 4 2) ] - location: 11 (remaining gas: 1039986.590 units remaining) [ 1 4 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 847976182dd414c2fed1735ee8195c2d874904b7..a51364186dd4d61f92e13fa74a96d469ac6f34c8 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: 1039844.452 units remaining) [ ] - location: 14 (remaining gas: 1039844.312 units remaining) - [ Unit @b ] + [ Unit ] - location: 15 (remaining gas: 1039844.172 units remaining) - [ Unit @a - Unit @b ] + [ Unit + Unit ] - location: 16 (remaining gas: 1039844.032 units remaining) [ (Pair Unit Unit) ] - location: 17 (remaining gas: 1039843.892 units remaining) - [ Unit @c - Unit @d ] + [ Unit + Unit ] - location: 18 (remaining gas: 1039843.724 units remaining) [ ] - location: 20 (remaining gas: 1039843.584 units remaining) - [ Unit @b ] + [ Unit ] - location: 21 (remaining gas: 1039843.444 units remaining) - [ Unit @a - Unit @b ] + [ Unit + Unit ] - location: 22 (remaining gas: 1039843.304 units remaining) [ (Pair Unit Unit) ] - location: 23 (remaining gas: 1039843.164 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 24 (remaining gas: 1039843.024 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 25 (remaining gas: 1039842.856 units remaining) [ (Pair Unit Unit) ] @@ -55,8 +55,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 28 (remaining gas: 1039842.576 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 29 (remaining gas: 1039842.408 units remaining) [ (Pair Unit Unit) ] @@ -64,8 +64,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 32 (remaining gas: 1039842.128 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 33 (remaining gas: 1039841.960 units remaining) [ (Pair Unit Unit) ] @@ -73,8 +73,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 36 (remaining gas: 1039841.680 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 37 (remaining gas: 1039841.512 units remaining) [ (Pair Unit Unit) ] @@ -82,8 +82,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 40 (remaining gas: 1039841.232 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 41 (remaining gas: 1039841.064 units remaining) [ (Pair Unit Unit) ] @@ -91,8 +91,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 44 (remaining gas: 1039840.784 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 45 (remaining gas: 1039840.616 units remaining) [ (Pair Unit Unit) ] @@ -100,8 +100,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 48 (remaining gas: 1039840.336 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 49 (remaining gas: 1039840.168 units remaining) [ (Pair Unit Unit) ] @@ -109,8 +109,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 52 (remaining gas: 1039839.888 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 53 (remaining gas: 1039839.720 units remaining) [ (Pair Unit Unit) ] @@ -118,8 +118,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 56 (remaining gas: 1039839.440 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 57 (remaining gas: 1039839.272 units remaining) [ (Pair Unit Unit) ] @@ -127,8 +127,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 60 (remaining gas: 1039838.992 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 61 (remaining gas: 1039838.824 units remaining) [ (Pair Unit Unit) ] @@ -136,8 +136,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 64 (remaining gas: 1039838.544 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 65 (remaining gas: 1039838.376 units remaining) [ (Pair Unit Unit) ] @@ -145,26 +145,26 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 68 (remaining gas: 1039838.096 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 69 (remaining gas: 1039837.928 units remaining) [ (Pair Unit Unit) ] - location: 71 (remaining gas: 1039837.788 units remaining) [ ] - location: 72 (remaining gas: 1039837.648 units remaining) - [ Unit @d ] + [ Unit ] - location: 73 (remaining gas: 1039837.508 units remaining) - [ Unit @c - Unit @d ] + [ Unit + Unit ] - location: 74 (remaining gas: 1039837.368 units remaining) [ (Pair Unit Unit) ] - location: 75 (remaining gas: 1039837.228 units remaining) [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 76 (remaining gas: 1039837.088 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 77 (remaining gas: 1039836.920 units remaining) [ (Pair Unit Unit) ] @@ -172,8 +172,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 80 (remaining gas: 1039836.640 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 81 (remaining gas: 1039836.472 units remaining) [ (Pair Unit Unit) ] @@ -181,8 +181,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 84 (remaining gas: 1039836.192 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 85 (remaining gas: 1039836.024 units remaining) [ (Pair Unit Unit) ] @@ -190,8 +190,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 88 (remaining gas: 1039835.744 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 89 (remaining gas: 1039835.576 units remaining) [ (Pair Unit Unit) ] @@ -199,8 +199,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 92 (remaining gas: 1039835.296 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 93 (remaining gas: 1039835.128 units remaining) [ (Pair Unit Unit) ] @@ -208,8 +208,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 96 (remaining gas: 1039834.848 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 97 (remaining gas: 1039834.680 units remaining) [ (Pair Unit Unit) ] @@ -217,8 +217,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 100 (remaining gas: 1039834.400 units remaining) - [ Unit @c - Unit @d + [ Unit + Unit (Pair Unit Unit) ] - location: 101 (remaining gas: 1039834.232 units remaining) [ (Pair Unit Unit) ] @@ -226,8 +226,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 104 (remaining gas: 1039833.952 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 105 (remaining gas: 1039833.784 units remaining) [ (Pair Unit Unit) ] @@ -235,8 +235,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 108 (remaining gas: 1039833.504 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 109 (remaining gas: 1039833.336 units remaining) [ (Pair Unit Unit) ] @@ -244,8 +244,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 112 (remaining gas: 1039833.056 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 113 (remaining gas: 1039832.888 units remaining) [ (Pair Unit Unit) ] @@ -253,8 +253,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 116 (remaining gas: 1039832.608 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 117 (remaining gas: 1039832.440 units remaining) [ (Pair Unit Unit) ] @@ -262,8 +262,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 120 (remaining gas: 1039832.160 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 121 (remaining gas: 1039831.992 units remaining) [ (Pair Unit Unit) ] @@ -343,8 +343,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 156 (remaining gas: 1039828.016 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 157 (remaining gas: 1039827.848 units remaining) [ (Pair Unit Unit) ] @@ -352,8 +352,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 160 (remaining gas: 1039827.568 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 161 (remaining gas: 1039827.400 units remaining) [ (Pair Unit Unit) ] @@ -361,8 +361,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 164 (remaining gas: 1039827.120 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 165 (remaining gas: 1039826.952 units remaining) [ (Pair Unit Unit) ] @@ -370,8 +370,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 168 (remaining gas: 1039826.672 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 169 (remaining gas: 1039826.504 units remaining) [ (Pair Unit Unit) ] @@ -379,8 +379,8 @@ trace [ (Pair Unit Unit) (Pair Unit Unit) ] - location: 172 (remaining gas: 1039826.224 units remaining) - [ Unit @a - Unit @b + [ Unit + Unit (Pair Unit Unit) ] - location: 173 (remaining gas: 1039826.056 units remaining) [ (Pair Unit Unit) ] @@ -392,64 +392,64 @@ trace [ Unit Unit ] - location: 178 (remaining gas: 1039825.496 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 179 (remaining gas: 1039825.356 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 180 (remaining gas: 1039825.216 units remaining) - [ Unit @p.a - Unit @b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 181 (remaining gas: 1039825.048 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 183 (remaining gas: 1039824.908 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 184 (remaining gas: 1039824.768 units remaining) - [ Unit @a - Unit @p.b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 185 (remaining gas: 1039824.600 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 187 (remaining gas: 1039824.460 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 188 (remaining gas: 1039824.320 units remaining) - [ Unit @p.a - Unit @p.b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 189 (remaining gas: 1039824.152 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 191 (remaining gas: 1039824.012 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 192 (remaining gas: 1039823.872 units remaining) - [ Unit @a - Unit @p.b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 193 (remaining gas: 1039823.704 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 195 (remaining gas: 1039823.564 units remaining) - [ (Pair Unit Unit) @p - (Pair Unit Unit) @p ] + [ (Pair Unit Unit) + (Pair Unit Unit) ] - location: 196 (remaining gas: 1039823.424 units remaining) - [ Unit @p.a - Unit @b - (Pair Unit Unit) @p ] + [ Unit + Unit + (Pair Unit Unit) ] - location: 197 (remaining gas: 1039823.256 units remaining) - [ (Pair Unit Unit) @p ] + [ (Pair Unit Unit) ] - location: 199 (remaining gas: 1039823.116 units remaining) [ ] - location: 200 (remaining gas: 1039822.976 units remaining) - [ Unit @b ] + [ Unit ] - location: 201 (remaining gas: 1039822.836 units remaining) - [ Unit @a - Unit @b ] + [ Unit + Unit ] - location: 202 (remaining gas: 1039822.696 units remaining) - [ (Pair Unit Unit) @c ] + [ (Pair Unit Unit) ] - location: 203 (remaining gas: 1039822.556 units remaining) - [ Unit @b - Unit @a ] + [ Unit + Unit ] - location: 204 (remaining gas: 1039822.388 units remaining) [ ] - location: 206 (remaining gas: 1039822.248 units remaining) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" index 8ac4aff2ad0850c7e3d5a2530a9d37f77e52a247..8c9356129b587325980137e6d96364f7eba9867c 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b2c677ad7b.out" @@ -10,7 +10,7 @@ trace - location: 8 (remaining gas: 1039961.660 units remaining) [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ] - location: 9 (remaining gas: 1039961.520 units remaining) - [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" @parameter ] + [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ] - location: 10 (remaining gas: 1039960.880 units remaining) [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ] - location: 11 (remaining gas: 1039745.412 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 ef06a157be102470026a1b4a525a682f6deb635a..19f1b87ff10b6cbfeee9054f8dc48d80fac1a0be 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair False False)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Left (Pair False False)) @parameter ] + [ (Left (Pair False False)) ] - location: 19 (remaining gas: 1039985.690 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 fab8a4c7f00ed326fc6b1623f53a1c1e814dee80..508cb8d8d0be832a9d976ddcda6e1e49bc5ada84 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair False True)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Left (Pair False True)) @parameter ] + [ (Left (Pair False True)) ] - location: 19 (remaining gas: 1039985.690 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 dacf12743a86a6e50eae496ac4c20b186d4e629d..c8679e0e65b9dc33aaf41ddcbf25c9a38d420fa5 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair True False)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Left (Pair True False)) @parameter ] + [ (Left (Pair True False)) ] - location: 19 (remaining gas: 1039985.690 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 243292b7636adb7205ef8bfc5c8e5e36329fcfcc..90e794dac7372de0f41a536159f14e49ac968b9b 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Left (Pair True True)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Left (Pair True True)) @parameter ] + [ (Left (Pair True True)) ] - location: 19 (remaining gas: 1039985.690 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 0b460597de9b8f45b6cfd4e1388276622baba5ad..526870e4b09ef52586517c73ede0926e4823b66d 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Right (Pair 0 0)) @parameter ] + [ (Right (Pair 0 0)) ] - location: 24 (remaining gas: 1039985.690 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 33a73cd6fabbe147a8128e33dd531aee69accbec..342495081d74e76884b349ae8dce7a072332e4e2 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Right (Pair 0 1)) @parameter ] + [ (Right (Pair 0 1)) ] - location: 24 (remaining gas: 1039985.690 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 a9e58da37eccef9abe3508d229aca3912188926b..dd54c8a735ef79e1ed0ac7d4547913b5c27ace57 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 1 0)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Right (Pair 1 0)) @parameter ] + [ (Right (Pair 1 0)) ] - location: 24 (remaining gas: 1039985.690 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 819d1c45f020eb62a7b43bbc62c8bd81a76872f2..d39b0f8863ca2b67dca366fa26cb853a874643d0 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 1 1)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Right (Pair 1 1)) @parameter ] + [ (Right (Pair 1 1)) ] - location: 24 (remaining gas: 1039985.690 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 b4259dac6665fc2176dc4295f9ffa4e1b3b916b7..0948c7b75c76f395b918209442fc33b50ecd542f 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 42 21)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Right (Pair 42 21)) @parameter ] + [ (Right (Pair 42 21)) ] - location: 24 (remaining gas: 1039985.690 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 7924c60b56175aec958a742d55a70f9da3706eb4..da3a7ab96385d7943a4a7301d5e90cf08671d87b 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,7 +10,7 @@ trace - location: 15 (remaining gas: 1039986.120 units remaining) [ (Pair (Right (Pair 42 63)) None) ] - location: 16 (remaining gas: 1039985.980 units remaining) - [ (Right (Pair 42 63)) @parameter ] + [ (Right (Pair 42 63)) ] - location: 24 (remaining gas: 1039985.690 units remaining) [ 42 63 ] 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 9eeb93805a14c3761ed68733280df47f3106b520..154b38facb404f4eaabbfc27dd12311d1f5f9d7f 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: 1039974.721 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) @parameter ] + 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ] - location: 16 (remaining gas: 1039974.581 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] @@ -28,7 +28,7 @@ trace 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 20 (remaining gas: 1039947.271 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 @packed + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 23 (remaining gas: 1039946.970 units remaining) @@ -45,11 +45,11 @@ trace - location: -1 (remaining gas: 1039946.500 units remaining) [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ] - location: 31 (remaining gas: 1039781.966 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: 45 (remaining gas: 1039781.696 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: 39 (remaining gas: 1039781.626 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: 1039781.486 units remaining) [ ] - location: 47 (remaining gas: 1039781.346 units remaining) @@ -80,7 +80,7 @@ trace Unit) ] - location: 15 (remaining gas: 1039974.721 units remaining) [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) - 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) @parameter ] + 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ] - location: 16 (remaining gas: 1039974.581 units remaining) [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] @@ -95,7 +95,7 @@ trace 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 20 (remaining gas: 1039947.271 units remaining) - [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 @packed + [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ] - location: 23 (remaining gas: 1039946.970 units remaining) diff --git a/tests_python/tests_alpha/test_contract.py b/tests_python/tests_alpha/test_contract.py index 95ed80a352f1709ed3dea584e1ac3da1acfc3c72..19b3f15ea44b334ad4e49099c2745853f1bae0c5 100644 --- a/tests_python/tests_alpha/test_contract.py +++ b/tests_python/tests_alpha/test_contract.py @@ -450,11 +450,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"), @@ -1299,6 +1294,8 @@ class TestBadAnnotation: contract_file.write(script) session[name] = contract + # Test now fails because annotations are ignored + @pytest.mark.xfail def test_bad_annotation(self, client: Client, session: dict): name = 'bad_annot.tz' contract = session[name] diff --git a/tests_python/tests_alpha/test_contract_annotations.py b/tests_python/tests_alpha/test_contract_annotations.py index c34dcc016ee148b71e324b5ea1a35bb30b9b5b09..50d90e3c9b60709656bf25fc0a8cd423b7739f52 100644 --- a/tests_python/tests_alpha/test_contract_annotations.py +++ b/tests_python/tests_alpha/test_contract_annotations.py @@ -25,6 +25,8 @@ class TestAnnotations: def test_field_annotation_in_type_numeral(self, client): client.typecheck_data('Pair 0 0', 'pair (nat %1) (int %2)') + # Test now fails because annotations are ignored + @pytest.mark.xfail def test_field_annotation_in_type_invalid_character(self, client): assert_typecheck_data_failure( client, @@ -43,6 +45,8 @@ class TestAnnotations: '{ CAR %1 }', 'lambda (pair (nat %1) (int %2)) nat' ) + # Test now fails because annotations are ignored + @pytest.mark.xfail def test_field_annotation_in_instruction_invalid_character(self, client): assert_typecheck_data_failure( client,