From 9766338eafef1dc6e2f73c6c9fdb50597dc22225 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 3 Feb 2022 00:06:16 +0100 Subject: [PATCH 1/6] Proto/Michelson: use Gas_monad for find_entrypoint --- src/proto_alpha/lib_plugin/plugin.ml | 18 +++++---- .../lib_protocol/contract_services.ml | 26 +++++++------ .../lib_protocol/script_interpreter.ml | 6 ++- .../lib_protocol/script_ir_translator.ml | 39 +++++++++++-------- .../lib_protocol/script_ir_translator.mli | 2 +- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/src/proto_alpha/lib_plugin/plugin.ml b/src/proto_alpha/lib_plugin/plugin.ml index 776617f192eb..95f149728440 100644 --- a/src/proto_alpha/lib_plugin/plugin.ml +++ b/src/proto_alpha/lib_plugin/plugin.ml @@ -2182,14 +2182,16 @@ module RPC = struct parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; root_name; _}, ctxt) -> Lwt.return - ( ( parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> - Script_ir_translator.find_entrypoint - ~error_details:Informative - ~root_name - arg_type - entrypoint ) - >>? fun (_f, Ex_ty ty) -> + ( parse_parameter_ty ctxt ~legacy arg_type + >>? fun (Ex_ty arg_type, _) -> + Gas_monad.run ctxt + @@ Script_ir_translator.find_entrypoint + ~error_details:Informative + ~root_name + arg_type + entrypoint + >>? fun (r, ctxt) -> + r >>? fun (_f, Ex_ty ty) -> unparse_ty ~loc:() ctxt ty >|? fun (ty_node, _) -> Micheline.strip_locations ty_node ) in diff --git a/src/proto_alpha/lib_protocol/contract_services.ml b/src/proto_alpha/lib_protocol/contract_services.ml index 239121808a6e..95905a392922 100644 --- a/src/proto_alpha/lib_protocol/contract_services.ml +++ b/src/proto_alpha/lib_protocol/contract_services.ml @@ -367,18 +367,20 @@ let[@coq_axiom_with_reason "gadt"] register () = parse_toplevel ctxt ~legacy expr >>=? fun ({arg_type; root_name; _}, ctxt) -> Lwt.return - (( parse_parameter_ty ctxt ~legacy arg_type - >>? fun (Ex_ty arg_type, _) -> - Script_ir_translator.find_entrypoint - ~error_details:Informative - ~root_name - arg_type - entrypoint ) - |> function - | Ok (_f, Ex_ty ty) -> - unparse_ty ~loc:() ctxt ty >|? fun (ty_node, _) -> - Some (Micheline.strip_locations ty_node) - | Error _ -> Result.return_none)) ; + ( parse_parameter_ty ctxt ~legacy arg_type + >>? fun (Ex_ty arg_type, _) -> + Gas_monad.run ctxt + @@ Script_ir_translator.find_entrypoint + ~error_details:Informative + ~root_name + arg_type + entrypoint + >>? fun (r, ctxt) -> + r |> function + | Ok (_f, Ex_ty ty) -> + unparse_ty ~loc:() ctxt ty >|? fun (ty_node, _) -> + Some (Micheline.strip_locations ty_node) + | Error _ -> Result.return_none )) ; opt_register1 ~chunked:true S.list_entrypoints (fun ctxt v () () -> Contract.get_script_code ctxt v >>=? fun (_, expr) -> match expr with diff --git a/src/proto_alpha/lib_protocol/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml index 13db0be58c67..b0ca163de6c1 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter.ml @@ -1699,9 +1699,11 @@ let execute logger ctxt mode step_constants ~entrypoint ~internal views; }, ctxt ) -> - record_trace - (Bad_contract_parameter step_constants.self) + Gas_monad.run + ctxt (find_entrypoint ~error_details:Informative arg_type ~root_name entrypoint) + >>?= fun (r, ctxt) -> + record_trace (Bad_contract_parameter step_constants.self) r >>?= fun (box, _) -> trace (Bad_contract_parameter step_constants.self) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index f6806f9b93f9..1bdf2d9e7886 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1802,7 +1802,9 @@ type 'before dup_n_proof_argument = let find_entrypoint (type full error_trace) ~(error_details : error_trace error_details) (full : full ty) ~root_name - entrypoint : ((Script.node -> Script.node) * ex_ty, error_trace) result = + entrypoint : ((Script.node -> Script.node) * ex_ty, error_trace) Gas_monad.t + = + let open Gas_monad in let loc = Micheline.dummy_location in let rec find_entrypoint : type t. @@ -1825,25 +1827,26 @@ let find_entrypoint (type full error_trace) | _ -> None in if field_annot_opt_eq_entrypoint_lax root_name entrypoint then - ok ((fun e -> e), Ex_ty full) + return ((fun e -> e), Ex_ty full) else match find_entrypoint full entrypoint with - | Some result -> ok result + | Some result -> return result | None -> - if Entrypoint.is_default entrypoint then ok ((fun e -> e), Ex_ty full) + if Entrypoint.is_default entrypoint then + return ((fun e -> e), Ex_ty full) else - Error - (match error_details with - | Fast -> (Inconsistent_types_fast : error_trace) - | Informative -> trace_of_error @@ No_such_entrypoint entrypoint) + of_result + @@ Error + (match error_details with + | Fast -> (Inconsistent_types_fast : error_trace) + | Informative -> trace_of_error @@ No_such_entrypoint entrypoint) let find_entrypoint_for_type (type full exp error_trace) ~legacy ~error_details ~(full : full ty) ~(expected : exp ty) ~root_name entrypoint loc : (Entrypoint.t * exp ty, error_trace) Gas_monad.t = let open Gas_monad in - match find_entrypoint ~error_details full ~root_name entrypoint with - | Error _ as err -> of_result err - | Ok (_, Ex_ty ty) -> ( + find_entrypoint ~error_details full ~root_name entrypoint >>$ function + | (_, Ex_ty ty) -> ( match root_name with | Some (Field_annot fa) when Compare.String.((fa :> string) = "root") @@ -4575,12 +4578,14 @@ and[@coq_axiom_with_reason "gadt"] parse_instr : error (Forbidden_instr_in_context (loc, Script_tc_errors.View, prim)) | Toplevel {param_type; root_name; storage_type = _} -> - find_entrypoint - ~error_details:Informative - param_type - ~root_name - entrypoint - >>? fun (_, Ex_ty param_type) -> + Gas_monad.run ctxt + @@ find_entrypoint + ~error_details:Informative + param_type + ~root_name + entrypoint + >>? fun (r, ctxt) -> + r >>? fun (_, Ex_ty param_type) -> contract_t loc param_type >>? fun res_ty -> let instr = { diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli index 41d1db2e7acc..610231722f45 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.mli +++ b/src/proto_alpha/lib_protocol/script_ir_translator.mli @@ -409,7 +409,7 @@ val find_entrypoint : 't Script_typed_ir.ty -> root_name:Script_ir_annot.field_annot option -> Entrypoint.t -> - ((Script.node -> Script.node) * ex_ty, 'error_trace) result + ((Script.node -> Script.node) * ex_ty, 'error_trace) Gas_monad.t val list_entrypoints : 't Script_typed_ir.ty -> -- GitLab From af213599cb99e0ab92ed79891ba27d06aeb2a99c Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 3 Feb 2022 00:12:26 +0100 Subject: [PATCH 2/6] Proto/Michelson: push Gas_monad further in find_entrypoint --- .../lib_protocol/script_ir_translator.ml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index 1bdf2d9e7886..bae2824f4366 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1808,30 +1808,30 @@ let find_entrypoint (type full error_trace) let loc = Micheline.dummy_location in let rec find_entrypoint : type t. - t ty -> Entrypoint.t -> ((Script.node -> Script.node) * ex_ty) option = + t ty -> + Entrypoint.t -> + ((Script.node -> Script.node) * ex_ty, unit) Gas_monad.t = fun t entrypoint -> match t with | Union_t ((tl, al), (tr, ar), _) -> ( if field_annot_opt_eq_entrypoint_lax al entrypoint then - Some ((fun e -> Prim (loc, D_Left, [e], [])), Ex_ty tl) + return ((fun e -> Prim (loc, D_Left, [e], [])), Ex_ty tl) else if field_annot_opt_eq_entrypoint_lax ar entrypoint then - Some ((fun e -> Prim (loc, D_Right, [e], [])), Ex_ty tr) + return ((fun e -> Prim (loc, D_Right, [e], [])), Ex_ty tr) else - match find_entrypoint tl entrypoint with - | Some (f, t) -> Some ((fun e -> Prim (loc, D_Left, [f e], [])), t) - | None -> ( - match find_entrypoint tr entrypoint with - | Some (f, t) -> - Some ((fun e -> Prim (loc, D_Right, [f e], [])), t) - | None -> None)) - | _ -> None + find_entrypoint tl entrypoint >??$ function + | Ok (f, t) -> return ((fun e -> Prim (loc, D_Left, [f e], [])), t) + | Error () -> + find_entrypoint tr entrypoint >|$ fun (f, t) -> + ((fun e -> Prim (loc, D_Right, [f e], [])), t)) + | _ -> of_result (Error ()) in if field_annot_opt_eq_entrypoint_lax root_name entrypoint then return ((fun e -> e), Ex_ty full) else - match find_entrypoint full entrypoint with - | Some result -> return result - | None -> + find_entrypoint full entrypoint >??$ function + | Ok result -> return result + | Error () -> if Entrypoint.is_default entrypoint then return ((fun e -> e), Ex_ty full) else -- GitLab From 5291de40b1ae24379214995ccdb0c09b00a4014a Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 3 Feb 2022 00:20:53 +0100 Subject: [PATCH 3/6] Proto/Michelson: carbonate find_entrypoint Fixes #2423 The first comparison is not carbonated to avoid changing all the traces. As it's always done once, it can be taken into account by callers. --- src/proto_alpha/lib_protocol/michelson_v1_gas.ml | 7 +++++++ src/proto_alpha/lib_protocol/michelson_v1_gas.mli | 2 ++ src/proto_alpha/lib_protocol/script_ir_translator.ml | 2 ++ 3 files changed, 11 insertions(+) diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml index fec8bcee7562..e75d9db05e2d 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml @@ -949,6 +949,11 @@ module Cost_of = struct (* TODO: benchmark *) let cost_COMPARABLE_TY_OF_TY = S.safe_int 120 + (* TODO: https://gitlab.com/tezos/tezos/-/issues/2264 + Benchmark. + Currently approximated by 2 comparisons of the longest entrypoint. *) + let cost_FIND_ENTRYPOINT = S.mul (S.safe_int 2) (cost_N_ICompare 31 31) + (* model SAPLING_TRANSACTION_ENCODING *) let cost_SAPLING_TRANSACTION_ENCODING ~inputs ~outputs = S.safe_int (1500 + (inputs * 160) + (outputs * 320)) @@ -1677,6 +1682,8 @@ module Cost_of = struct (* TODO: bench *) let check_dupable_cycle = atomic_step_cost cost_TYPECHECKING_DATA + let find_entrypoint_cycle = atomic_step_cost cost_FIND_ENTRYPOINT + let bool = free let unit = free diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli index bc8316375098..f9c7fab2ca3d 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli +++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli @@ -435,6 +435,8 @@ module Cost_of : sig val check_dupable_cycle : Gas.cost + val find_entrypoint_cycle : Gas.cost + val bool : Gas.cost val unit : Gas.cost diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml index bae2824f4366..9980521c5219 100644 --- a/src/proto_alpha/lib_protocol/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml @@ -1814,6 +1814,7 @@ let find_entrypoint (type full error_trace) fun t entrypoint -> match t with | Union_t ((tl, al), (tr, ar), _) -> ( + consume_gas Typecheck_costs.find_entrypoint_cycle >>$ fun () -> if field_annot_opt_eq_entrypoint_lax al entrypoint then return ((fun e -> Prim (loc, D_Left, [e], [])), Ex_ty tl) else if field_annot_opt_eq_entrypoint_lax ar entrypoint then @@ -1826,6 +1827,7 @@ let find_entrypoint (type full error_trace) ((fun e -> Prim (loc, D_Right, [f e], [])), t)) | _ -> of_result (Error ()) in + (* This comparison should be taken into account by the caller. *) if field_annot_opt_eq_entrypoint_lax root_name entrypoint then return ((fun e -> e), Ex_ty full) else -- GitLab From 8ed06a1c713aafd26e18a96a85e6c64a004a13da Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 3 Feb 2022 00:40:12 +0100 Subject: [PATCH 4/6] Tests/Python: update typechecking traces --- ... \"two\" }) )-(Right (Righ.7492e8cdea.out" | 52 ++++++------ ... \"two\" }))-(Left Unit)-(.21b30dd90f.out" | 26 +++--- ... \"two\" }))-(Right (Left .2873ef610c.out" | 20 ++--- ... \"two\" }))-(Right (Left .8a6f480005.out" | 20 ++--- ... \"two\" }))-(Right (Right.d336ca1903.out" | 50 ++++++------ ...Pair \"foo\" \"bar\" } { P.7f2ee47600.out" | 80 +++++++++---------- ...Left \"X\")-(Left True)-(Right True)].out" | 14 ++-- ...ft \"X\")-(Right \"a\")-(Left \"a\")].out" | 14 ++-- ...act_input_output[neg.tz-0-(Left -2)-2].out | 14 ++-- ...ract_input_output[neg.tz-0-(Left 0)-0].out | 14 ++-- ...act_input_output[neg.tz-0-(Left 2)--2].out | 14 ++-- ...act_input_output[neg.tz-0-(Right 0)-0].out | 14 ++-- ...ct_input_output[neg.tz-0-(Right 2)--2].out | 14 ++-- ...not_binary.tz-None-(Left -8)-(Some 7)].out | 16 ++-- ...not_binary.tz-None-(Left -9)-(Some 8)].out | 16 ++-- ...not_binary.tz-None-(Left 0)-(Some -1)].out | 16 ++-- ...not_binary.tz-None-(Left 7)-(Some -8)].out | 16 ++-- ...not_binary.tz-None-(Left 8)-(Some -9)].out | 16 ++-- ...ot_binary.tz-None-(Right 0)-(Some -1)].out | 16 ++-- ...ot_binary.tz-None-(Right 7)-(Some -8)].out | 16 ++-- ...ot_binary.tz-None-(Right 8)-(Some -9)].out | 16 ++-- ..._default_entrypoint.tz-Unit-Unit-Unit].out | 34 ++++---- ...entrypoint.tz-Unit-Left (Left 0)-Unit].out | 70 ++++++++-------- ...ts.tz-None-(Left (Pair 0 0))-(Some 0)].out | 18 ++--- ...ts.tz-None-(Left (Pair 0 1))-(Some 0)].out | 18 ++--- ...ts.tz-None-(Left (Pair 1 2))-(Some 4)].out | 18 ++--- ....tz-None-(Left (Pair 15 2))-(Some 60)].out | 18 ++--- ...s.tz-None-(Left (Pair 8 1))-(Some 16)].out | 18 ++--- ...s.tz-None-(Right (Pair 0 0))-(Some 0)].out | 18 ++--- ...s.tz-None-(Right (Pair 0 1))-(Some 0)].out | 18 ++--- ...s.tz-None-(Right (Pair 1 2))-(Some 0)].out | 18 ++--- ....tz-None-(Right (Pair 15 2))-(Some 3)].out | 18 ++--- ...s.tz-None-(Right (Pair 8 1))-(Some 4)].out | 18 ++--- ...Pair False False)-(Some (Left False))].out | 20 ++--- ... (Pair False True)-(Some (Left True))].out | 20 ++--- ... (Pair True False)-(Some (Left True))].out | 20 ++--- ... (Pair True True)-(Some (Left False))].out | 20 ++--- ...one-Right (Pair 0 0)-(Some (Right 0))].out | 20 ++--- ...one-Right (Pair 0 1)-(Some (Right 1))].out | 20 ++--- ...one-Right (Pair 1 0)-(Some (Right 1))].out | 20 ++--- ...one-Right (Pair 1 1)-(Some (Right 0))].out | 20 ++--- ...-Right (Pair 42 21)-(Some (Right 63))].out | 20 ++--- ...-Right (Pair 42 63)-(Some (Right 21))].out | 20 ++--- 43 files changed, 479 insertions(+), 479 deletions(-) diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" index a5fd94e28f30..b9c96dabc1dd 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" @@ -11,80 +11,80 @@ big_map diff Set map(4)["3"] to "three" Set map(4)["1"] to "one" trace - - location: 43 (remaining gas: 1039916.593 units remaining) + - location: 43 (remaining gas: 1039916.243 units remaining) [ (Pair (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039916.583 units remaining) + - location: 43 (remaining gas: 1039916.233 units remaining) [ (Right (Right (Right (Left { Pair "3" "three" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039916.573 units remaining) + - location: 44 (remaining gas: 1039916.223 units remaining) [ (Right (Right (Left { Pair "3" "three" }))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039916.563 units remaining) + - location: 60 (remaining gas: 1039916.213 units remaining) [ (Right (Left { Pair "3" "three" })) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039916.553 units remaining) + - location: 65 (remaining gas: 1039916.203 units remaining) [ (Left { Pair "3" "three" }) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039916.543 units remaining) + - location: 108 (remaining gas: 1039916.193 units remaining) [ { Pair "3" "three" } (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 110 (remaining gas: 1039916.528 units remaining) + - location: 110 (remaining gas: 1039916.178 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 113 (remaining gas: 1039916.518 units remaining) + - location: 113 (remaining gas: 1039916.168 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 113 (remaining gas: 1039916.503 units remaining) + - location: 113 (remaining gas: 1039916.153 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 119 (remaining gas: 1039916.493 units remaining) + - location: 119 (remaining gas: 1039916.143 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 110 (remaining gas: 1039916.463 units remaining) + - location: 110 (remaining gas: 1039916.113 units remaining) [ { Pair "3" "three" } { Elt "1" "one" } { Elt "2" "two" } ] - - location: 120 (remaining gas: 1039916.463 units remaining) + - location: 120 (remaining gas: 1039916.113 units remaining) [ (Pair "3" "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 122 (remaining gas: 1039916.453 units remaining) + - location: 122 (remaining gas: 1039916.103 units remaining) [ "3" "three" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 123 (remaining gas: 1039916.438 units remaining) + - location: 123 (remaining gas: 1039916.088 units remaining) [ "three" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 125 (remaining gas: 1039916.423 units remaining) + - location: 125 (remaining gas: 1039916.073 units remaining) [ (Some "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 123 (remaining gas: 1039916.393 units remaining) + - location: 123 (remaining gas: 1039916.043 units remaining) [ "3" (Some "three") { Elt "1" "one" } { Elt "2" "two" } ] - - location: 126 (remaining gas: 1039915.461 units remaining) + - location: 126 (remaining gas: 1039915.111 units remaining) [ { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" } ] - - location: 120 (remaining gas: 1039915.446 units remaining) + - location: 120 (remaining gas: 1039915.096 units remaining) [ { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" } ] - - location: 127 (remaining gas: 1039915.431 units remaining) + - location: 127 (remaining gas: 1039915.081 units remaining) [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ] - - location: 128 (remaining gas: 1039915.416 units remaining) + - location: 128 (remaining gas: 1039915.066 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039915.401 units remaining) + - location: 108 (remaining gas: 1039915.051 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039915.386 units remaining) + - location: 65 (remaining gas: 1039915.036 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039915.371 units remaining) + - location: 60 (remaining gas: 1039915.021 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039915.356 units remaining) + - location: 44 (remaining gas: 1039915.006 units remaining) [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 151 (remaining gas: 1039915.341 units remaining) + - location: 151 (remaining gas: 1039914.991 units remaining) [ {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ] - - location: 153 (remaining gas: 1039915.326 units remaining) + - location: 153 (remaining gas: 1039914.976 units remaining) [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" index c21de0497c03..b047481e0954 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" @@ -10,35 +10,35 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["2"] to "two" trace - - location: 43 (remaining gas: 1039917.501 units remaining) + - location: 43 (remaining gas: 1039917.151 units remaining) [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039917.491 units remaining) + - location: 43 (remaining gas: 1039917.141 units remaining) [ (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039917.481 units remaining) + - location: 44 (remaining gas: 1039917.131 units remaining) [ Unit (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 46 (remaining gas: 1039917.471 units remaining) + - location: 46 (remaining gas: 1039917.121 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 48 (remaining gas: 1039917.461 units remaining) + - location: 48 (remaining gas: 1039917.111 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 48 (remaining gas: 1039917.446 units remaining) + - location: 48 (remaining gas: 1039917.096 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 54 (remaining gas: 1039917.436 units remaining) + - location: 54 (remaining gas: 1039917.086 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 55 (remaining gas: 1039917.426 units remaining) + - location: 55 (remaining gas: 1039917.076 units remaining) [ { Elt "2" "two" } { Elt "1" "one" } ] - - location: 56 (remaining gas: 1039917.411 units remaining) + - location: 56 (remaining gas: 1039917.061 units remaining) [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ] - - location: 57 (remaining gas: 1039917.396 units remaining) + - location: 57 (remaining gas: 1039917.046 units remaining) [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 44 (remaining gas: 1039917.381 units remaining) + - location: 44 (remaining gas: 1039917.031 units remaining) [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 151 (remaining gas: 1039917.366 units remaining) + - location: 151 (remaining gas: 1039917.016 units remaining) [ {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ] - - location: 153 (remaining gas: 1039917.351 units remaining) + - location: 153 (remaining gas: 1039917.001 units remaining) [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" index b632f89aff9d..1bca3d9352dd 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" @@ -10,30 +10,30 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["3"] to "three" trace - - location: 43 (remaining gas: 1039913.797 units remaining) + - location: 43 (remaining gas: 1039913.447 units remaining) [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039913.787 units remaining) + - location: 43 (remaining gas: 1039913.437 units remaining) [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039913.777 units remaining) + - location: 44 (remaining gas: 1039913.427 units remaining) [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039913.767 units remaining) + - location: 60 (remaining gas: 1039913.417 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 62 (remaining gas: 1039913.757 units remaining) + - location: 62 (remaining gas: 1039913.407 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 63 (remaining gas: 1039913.747 units remaining) + - location: 63 (remaining gas: 1039913.397 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 60 (remaining gas: 1039913.732 units remaining) + - location: 60 (remaining gas: 1039913.382 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 44 (remaining gas: 1039913.717 units remaining) + - location: 44 (remaining gas: 1039913.367 units remaining) [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 151 (remaining gas: 1039913.702 units remaining) + - location: 151 (remaining gas: 1039913.352 units remaining) [ {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ] - - location: 153 (remaining gas: 1039913.687 units remaining) + - location: 153 (remaining gas: 1039913.337 units remaining) [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" index a3d2c6c6e05e..71807603c0db 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" @@ -7,29 +7,29 @@ emitted operations big_map diff trace - - location: 43 (remaining gas: 1039916.861 units remaining) + - location: 43 (remaining gas: 1039916.511 units remaining) [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039916.851 units remaining) + - location: 43 (remaining gas: 1039916.501 units remaining) [ (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039916.841 units remaining) + - location: 44 (remaining gas: 1039916.491 units remaining) [ (Left (Right Unit)) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039916.831 units remaining) + - location: 60 (remaining gas: 1039916.481 units remaining) [ (Right Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 62 (remaining gas: 1039916.821 units remaining) + - location: 62 (remaining gas: 1039916.471 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) (Right Unit) ] - - location: 63 (remaining gas: 1039916.811 units remaining) + - location: 63 (remaining gas: 1039916.461 units remaining) [ (Right Unit) ] - - location: 60 (remaining gas: 1039916.796 units remaining) + - location: 60 (remaining gas: 1039916.446 units remaining) [ (Right Unit) ] - - location: 44 (remaining gas: 1039916.781 units remaining) + - location: 44 (remaining gas: 1039916.431 units remaining) [ (Right Unit) ] - - location: 151 (remaining gas: 1039916.766 units remaining) + - location: 151 (remaining gas: 1039916.416 units remaining) [ {} (Right Unit) ] - - location: 153 (remaining gas: 1039916.751 units remaining) + - location: 153 (remaining gas: 1039916.401 units remaining) [ (Pair {} (Right Unit)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" index 2bc1e13b5b78..001fcc066650 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" @@ -10,74 +10,74 @@ big_map diff New map(4) of type (big_map string string) Unset map(4)["1"] trace - - location: 43 (remaining gas: 1039916.857 units remaining) + - location: 43 (remaining gas: 1039916.507 units remaining) [ (Pair (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ] - - location: 43 (remaining gas: 1039916.847 units remaining) + - location: 43 (remaining gas: 1039916.497 units remaining) [ (Right (Right (Right (Right { "1" })))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039916.837 units remaining) + - location: 44 (remaining gas: 1039916.487 units remaining) [ (Right (Right (Right { "1" }))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039916.827 units remaining) + - location: 60 (remaining gas: 1039916.477 units remaining) [ (Right (Right { "1" })) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039916.817 units remaining) + - location: 65 (remaining gas: 1039916.467 units remaining) [ (Right { "1" }) (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039916.807 units remaining) + - location: 108 (remaining gas: 1039916.457 units remaining) [ { "1" } (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 131 (remaining gas: 1039916.792 units remaining) + - location: 131 (remaining gas: 1039916.442 units remaining) [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ] - - location: 134 (remaining gas: 1039916.782 units remaining) + - location: 134 (remaining gas: 1039916.432 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 134 (remaining gas: 1039916.767 units remaining) + - location: 134 (remaining gas: 1039916.417 units remaining) [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ] - - location: 140 (remaining gas: 1039916.757 units remaining) + - location: 140 (remaining gas: 1039916.407 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 131 (remaining gas: 1039916.727 units remaining) + - location: 131 (remaining gas: 1039916.377 units remaining) [ { "1" } { Elt "1" "one" } { Elt "2" "two" } ] - - location: 141 (remaining gas: 1039916.727 units remaining) + - location: 141 (remaining gas: 1039916.377 units remaining) [ "1" { Elt "1" "one" } { Elt "2" "two" } ] - - location: 143 (remaining gas: 1039916.712 units remaining) + - location: 143 (remaining gas: 1039916.362 units remaining) [ { Elt "1" "one" } { Elt "2" "two" } ] - - location: 145 (remaining gas: 1039916.697 units remaining) + - location: 145 (remaining gas: 1039916.347 units remaining) [ None { Elt "1" "one" } { Elt "2" "two" } ] - - location: 143 (remaining gas: 1039916.667 units remaining) + - location: 143 (remaining gas: 1039916.317 units remaining) [ "1" None { Elt "1" "one" } { Elt "2" "two" } ] - - location: 147 (remaining gas: 1039915.735 units remaining) + - location: 147 (remaining gas: 1039915.385 units remaining) [ {} { Elt "2" "two" } ] - - location: 141 (remaining gas: 1039915.720 units remaining) + - location: 141 (remaining gas: 1039915.370 units remaining) [ {} { Elt "2" "two" } ] - - location: 148 (remaining gas: 1039915.705 units remaining) + - location: 148 (remaining gas: 1039915.355 units remaining) [ (Pair {} { Elt "2" "two" }) ] - - location: 149 (remaining gas: 1039915.690 units remaining) + - location: 149 (remaining gas: 1039915.340 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 108 (remaining gas: 1039915.675 units remaining) + - location: 108 (remaining gas: 1039915.325 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 65 (remaining gas: 1039915.660 units remaining) + - location: 65 (remaining gas: 1039915.310 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 60 (remaining gas: 1039915.645 units remaining) + - location: 60 (remaining gas: 1039915.295 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 44 (remaining gas: 1039915.630 units remaining) + - location: 44 (remaining gas: 1039915.280 units remaining) [ (Left (Pair {} { Elt "2" "two" })) ] - - location: 151 (remaining gas: 1039915.615 units remaining) + - location: 151 (remaining gas: 1039915.265 units remaining) [ {} (Left (Pair {} { Elt "2" "two" })) ] - - location: 153 (remaining gas: 1039915.600 units remaining) + - location: 153 (remaining gas: 1039915.250 units remaining) [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" index f342fec9091d..7612c5ac1487 100644 --- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" +++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" @@ -10,126 +10,126 @@ big_map diff New map(4) of type (big_map string string) Set map(4)["foo"] to "bar" trace - - location: 43 (remaining gas: 1039919.139 units remaining) + - location: 43 (remaining gas: 1039918.789 units remaining) [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ] - - location: 43 (remaining gas: 1039919.129 units remaining) + - location: 43 (remaining gas: 1039918.779 units remaining) [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit) ] - - location: 44 (remaining gas: 1039919.119 units remaining) + - location: 44 (remaining gas: 1039918.769 units remaining) [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))) (Right Unit) ] - - location: 60 (remaining gas: 1039919.109 units remaining) + - location: 60 (remaining gas: 1039918.759 units remaining) [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })) (Right Unit) ] - - location: 65 (remaining gas: 1039919.099 units remaining) + - location: 65 (remaining gas: 1039918.749 units remaining) [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) (Right Unit) ] - - location: 67 (remaining gas: 1039919.084 units remaining) + - location: 67 (remaining gas: 1039918.734 units remaining) [ (Right Unit) ] - - location: 70 (remaining gas: 1039919.074 units remaining) + - location: 70 (remaining gas: 1039918.724 units remaining) [ Unit ] - - location: 70 (remaining gas: 1039919.059 units remaining) + - location: 70 (remaining gas: 1039918.709 units remaining) [ Unit ] - - location: 76 (remaining gas: 1039919.049 units remaining) + - location: 76 (remaining gas: 1039918.699 units remaining) [ ] - - location: 67 (remaining gas: 1039919.019 units remaining) + - location: 67 (remaining gas: 1039918.669 units remaining) [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ] - - location: 77 (remaining gas: 1039919.009 units remaining) + - location: 77 (remaining gas: 1039918.659 units remaining) [ { Pair "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 78 (remaining gas: 1039918.994 units remaining) + - location: 78 (remaining gas: 1039918.644 units remaining) [ { Pair "gaz" "baz" } ] - - location: 80 (remaining gas: 1039918.979 units remaining) + - location: 80 (remaining gas: 1039918.629 units remaining) [ {} { Pair "gaz" "baz" } ] - - location: 78 (remaining gas: 1039918.949 units remaining) + - location: 78 (remaining gas: 1039918.599 units remaining) [ { Pair "foo" "bar" } {} { Pair "gaz" "baz" } ] - - location: 83 (remaining gas: 1039918.949 units remaining) + - location: 83 (remaining gas: 1039918.599 units remaining) [ (Pair "foo" "bar") {} { Pair "gaz" "baz" } ] - - location: 85 (remaining gas: 1039918.939 units remaining) + - location: 85 (remaining gas: 1039918.589 units remaining) [ "foo" "bar" {} { Pair "gaz" "baz" } ] - - location: 86 (remaining gas: 1039918.924 units remaining) + - location: 86 (remaining gas: 1039918.574 units remaining) [ "bar" {} { Pair "gaz" "baz" } ] - - location: 88 (remaining gas: 1039918.909 units remaining) + - location: 88 (remaining gas: 1039918.559 units remaining) [ (Some "bar") {} { Pair "gaz" "baz" } ] - - location: 86 (remaining gas: 1039918.879 units remaining) + - location: 86 (remaining gas: 1039918.529 units remaining) [ "foo" (Some "bar") {} { Pair "gaz" "baz" } ] - - location: 89 (remaining gas: 1039917.881 units remaining) + - location: 89 (remaining gas: 1039917.531 units remaining) [ { Elt "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 83 (remaining gas: 1039917.866 units remaining) + - location: 83 (remaining gas: 1039917.516 units remaining) [ { Elt "foo" "bar" } { Pair "gaz" "baz" } ] - - location: 90 (remaining gas: 1039917.856 units remaining) + - location: 90 (remaining gas: 1039917.506 units remaining) [ { Pair "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 91 (remaining gas: 1039917.841 units remaining) + - location: 91 (remaining gas: 1039917.491 units remaining) [ { Elt "foo" "bar" } ] - - location: 93 (remaining gas: 1039917.826 units remaining) + - location: 93 (remaining gas: 1039917.476 units remaining) [ {} { Elt "foo" "bar" } ] - - location: 91 (remaining gas: 1039917.796 units remaining) + - location: 91 (remaining gas: 1039917.446 units remaining) [ { Pair "gaz" "baz" } {} { Elt "foo" "bar" } ] - - location: 96 (remaining gas: 1039917.796 units remaining) + - location: 96 (remaining gas: 1039917.446 units remaining) [ (Pair "gaz" "baz") {} { Elt "foo" "bar" } ] - - location: 98 (remaining gas: 1039917.786 units remaining) + - location: 98 (remaining gas: 1039917.436 units remaining) [ "gaz" "baz" {} { Elt "foo" "bar" } ] - - location: 99 (remaining gas: 1039917.771 units remaining) + - location: 99 (remaining gas: 1039917.421 units remaining) [ "baz" {} { Elt "foo" "bar" } ] - - location: 101 (remaining gas: 1039917.756 units remaining) + - location: 101 (remaining gas: 1039917.406 units remaining) [ (Some "baz") {} { Elt "foo" "bar" } ] - - location: 99 (remaining gas: 1039917.726 units remaining) + - location: 99 (remaining gas: 1039917.376 units remaining) [ "gaz" (Some "baz") {} { Elt "foo" "bar" } ] - - location: 102 (remaining gas: 1039916.728 units remaining) + - location: 102 (remaining gas: 1039916.378 units remaining) [ { Elt "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 96 (remaining gas: 1039916.713 units remaining) + - location: 96 (remaining gas: 1039916.363 units remaining) [ { Elt "gaz" "baz" } { Elt "foo" "bar" } ] - - location: 103 (remaining gas: 1039916.703 units remaining) + - location: 103 (remaining gas: 1039916.353 units remaining) [ { Elt "foo" "bar" } { Elt "gaz" "baz" } ] - - location: 104 (remaining gas: 1039916.688 units remaining) + - location: 104 (remaining gas: 1039916.338 units remaining) [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ] - - location: 105 (remaining gas: 1039916.673 units remaining) + - location: 105 (remaining gas: 1039916.323 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 65 (remaining gas: 1039916.658 units remaining) + - location: 65 (remaining gas: 1039916.308 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 60 (remaining gas: 1039916.643 units remaining) + - location: 60 (remaining gas: 1039916.293 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 44 (remaining gas: 1039916.628 units remaining) + - location: 44 (remaining gas: 1039916.278 units remaining) [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 151 (remaining gas: 1039916.613 units remaining) + - location: 151 (remaining gas: 1039916.263 units remaining) [ {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ] - - location: 153 (remaining gas: 1039916.598 units remaining) + - location: 153 (remaining gas: 1039916.248 units remaining) [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ] 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 512b3b74988a..9de674574b4d 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" @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039990.926 units remaining) + - location: 11 (remaining gas: 1039990.856 units remaining) [ (Pair (Left True) (Left "X")) ] - - location: 11 (remaining gas: 1039990.916 units remaining) + - location: 11 (remaining gas: 1039990.846 units remaining) [ (Left True) ] - - location: 12 (remaining gas: 1039990.906 units remaining) + - location: 12 (remaining gas: 1039990.836 units remaining) [ True ] - - location: 14 (remaining gas: 1039990.891 units remaining) + - location: 14 (remaining gas: 1039990.821 units remaining) [ (Right True) ] - - location: 12 (remaining gas: 1039990.876 units remaining) + - location: 12 (remaining gas: 1039990.806 units remaining) [ (Right True) ] - - location: 19 (remaining gas: 1039990.861 units remaining) + - location: 19 (remaining gas: 1039990.791 units remaining) [ {} (Right True) ] - - location: 21 (remaining gas: 1039990.846 units remaining) + - location: 21 (remaining gas: 1039990.776 units remaining) [ (Pair {} (Right True)) ] diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" index 1a22dd4c63d8..4fa41324bd7b 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" @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 11 (remaining gas: 1039990.902 units remaining) + - location: 11 (remaining gas: 1039990.832 units remaining) [ (Pair (Right "a") (Left "X")) ] - - location: 11 (remaining gas: 1039990.892 units remaining) + - location: 11 (remaining gas: 1039990.822 units remaining) [ (Right "a") ] - - location: 12 (remaining gas: 1039990.882 units remaining) + - location: 12 (remaining gas: 1039990.812 units remaining) [ "a" ] - - location: 17 (remaining gas: 1039990.867 units remaining) + - location: 17 (remaining gas: 1039990.797 units remaining) [ (Left "a") ] - - location: 12 (remaining gas: 1039990.852 units remaining) + - location: 12 (remaining gas: 1039990.782 units remaining) [ (Left "a") ] - - location: 19 (remaining gas: 1039990.837 units remaining) + - location: 19 (remaining gas: 1039990.767 units remaining) [ {} (Left "a") ] - - location: 21 (remaining gas: 1039990.822 units remaining) + - location: 21 (remaining gas: 1039990.752 units remaining) [ (Pair {} (Left "a")) ] 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 b7bcb1bd13c4..067dc2690f1d 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 @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.641 units remaining) + - location: 9 (remaining gas: 1039992.571 units remaining) [ (Pair (Left -2) 0) ] - - location: 9 (remaining gas: 1039992.631 units remaining) + - location: 9 (remaining gas: 1039992.561 units remaining) [ (Left -2) ] - - location: 10 (remaining gas: 1039992.621 units remaining) + - location: 10 (remaining gas: 1039992.551 units remaining) [ -2 ] - - location: 12 (remaining gas: 1039992.581 units remaining) + - location: 12 (remaining gas: 1039992.511 units remaining) [ 2 ] - - location: 10 (remaining gas: 1039992.566 units remaining) + - location: 10 (remaining gas: 1039992.496 units remaining) [ 2 ] - - location: 15 (remaining gas: 1039992.551 units remaining) + - location: 15 (remaining gas: 1039992.481 units remaining) [ {} 2 ] - - location: 17 (remaining gas: 1039992.536 units remaining) + - location: 17 (remaining gas: 1039992.466 units remaining) [ (Pair {} 2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out index e920ea30d1ed..fb41b7c043d5 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 @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.641 units remaining) + - location: 9 (remaining gas: 1039992.571 units remaining) [ (Pair (Left 0) 0) ] - - location: 9 (remaining gas: 1039992.631 units remaining) + - location: 9 (remaining gas: 1039992.561 units remaining) [ (Left 0) ] - - location: 10 (remaining gas: 1039992.621 units remaining) + - location: 10 (remaining gas: 1039992.551 units remaining) [ 0 ] - - location: 12 (remaining gas: 1039992.581 units remaining) + - location: 12 (remaining gas: 1039992.511 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039992.566 units remaining) + - location: 10 (remaining gas: 1039992.496 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039992.551 units remaining) + - location: 15 (remaining gas: 1039992.481 units remaining) [ {} 0 ] - - location: 17 (remaining gas: 1039992.536 units remaining) + - location: 17 (remaining gas: 1039992.466 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out index 0e2abe480443..cdadc9c23b91 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 @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.641 units remaining) + - location: 9 (remaining gas: 1039992.571 units remaining) [ (Pair (Left 2) 0) ] - - location: 9 (remaining gas: 1039992.631 units remaining) + - location: 9 (remaining gas: 1039992.561 units remaining) [ (Left 2) ] - - location: 10 (remaining gas: 1039992.621 units remaining) + - location: 10 (remaining gas: 1039992.551 units remaining) [ 2 ] - - location: 12 (remaining gas: 1039992.581 units remaining) + - location: 12 (remaining gas: 1039992.511 units remaining) [ -2 ] - - location: 10 (remaining gas: 1039992.566 units remaining) + - location: 10 (remaining gas: 1039992.496 units remaining) [ -2 ] - - location: 15 (remaining gas: 1039992.551 units remaining) + - location: 15 (remaining gas: 1039992.481 units remaining) [ {} -2 ] - - location: 17 (remaining gas: 1039992.536 units remaining) + - location: 17 (remaining gas: 1039992.466 units remaining) [ (Pair {} -2) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out index 41e4517b3fd8..e8a5ec37b0c2 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 @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.641 units remaining) + - location: 9 (remaining gas: 1039992.571 units remaining) [ (Pair (Right 0) 0) ] - - location: 9 (remaining gas: 1039992.631 units remaining) + - location: 9 (remaining gas: 1039992.561 units remaining) [ (Right 0) ] - - location: 10 (remaining gas: 1039992.621 units remaining) + - location: 10 (remaining gas: 1039992.551 units remaining) [ 0 ] - - location: 14 (remaining gas: 1039992.581 units remaining) + - location: 14 (remaining gas: 1039992.511 units remaining) [ 0 ] - - location: 10 (remaining gas: 1039992.566 units remaining) + - location: 10 (remaining gas: 1039992.496 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039992.551 units remaining) + - location: 15 (remaining gas: 1039992.481 units remaining) [ {} 0 ] - - location: 17 (remaining gas: 1039992.536 units remaining) + - location: 17 (remaining gas: 1039992.466 units remaining) [ (Pair {} 0) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out index a86d80d254a5..4798833d1957 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 @@ -7,19 +7,19 @@ emitted operations big_map diff trace - - location: 9 (remaining gas: 1039992.641 units remaining) + - location: 9 (remaining gas: 1039992.571 units remaining) [ (Pair (Right 2) 0) ] - - location: 9 (remaining gas: 1039992.631 units remaining) + - location: 9 (remaining gas: 1039992.561 units remaining) [ (Right 2) ] - - location: 10 (remaining gas: 1039992.621 units remaining) + - location: 10 (remaining gas: 1039992.551 units remaining) [ 2 ] - - location: 14 (remaining gas: 1039992.581 units remaining) + - location: 14 (remaining gas: 1039992.511 units remaining) [ -2 ] - - location: 10 (remaining gas: 1039992.566 units remaining) + - location: 10 (remaining gas: 1039992.496 units remaining) [ -2 ] - - location: 15 (remaining gas: 1039992.551 units remaining) + - location: 15 (remaining gas: 1039992.481 units remaining) [ {} -2 ] - - location: 17 (remaining gas: 1039992.536 units remaining) + - location: 17 (remaining gas: 1039992.466 units remaining) [ (Pair {} -2) ] 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 236d7e4647f1..5c2f2897056a 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Left -8) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Left -8) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ -8 ] - - location: 13 (remaining gas: 1039991.570 units remaining) + - location: 13 (remaining gas: 1039991.500 units remaining) [ 7 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ 7 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some 7) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some 7) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some 7)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out index b86d5364e840..9c5f42cc4a0b 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Left -9) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Left -9) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ -9 ] - - location: 13 (remaining gas: 1039991.570 units remaining) + - location: 13 (remaining gas: 1039991.500 units remaining) [ 8 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ 8 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some 8) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some 8) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some 8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out index 335c27f4e031..9501c3a50e13 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Left 0) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Left 0) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ 0 ] - - location: 13 (remaining gas: 1039991.570 units remaining) + - location: 13 (remaining gas: 1039991.500 units remaining) [ -1 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ -1 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some -1) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some -1) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some -1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out index f6450b7e6797..1aa86fadeb18 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Left 7) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Left 7) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ 7 ] - - location: 13 (remaining gas: 1039991.570 units remaining) + - location: 13 (remaining gas: 1039991.500 units remaining) [ -8 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ -8 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some -8) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some -8) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some -8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out index e9f9849226ae..93812c591c77 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Left 8) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Left 8) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ 8 ] - - location: 13 (remaining gas: 1039991.570 units remaining) + - location: 13 (remaining gas: 1039991.500 units remaining) [ -9 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ -9 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some -9) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some -9) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some -9)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out index cc26e4c6929e..b16b9af7f1ac 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Right 0) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Right 0) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039991.570 units remaining) + - location: 15 (remaining gas: 1039991.500 units remaining) [ -1 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ -1 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some -1) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some -1) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some -1)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out index 0f59b809125d..246e8e4c05d8 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Right 7) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Right 7) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ 7 ] - - location: 15 (remaining gas: 1039991.570 units remaining) + - location: 15 (remaining gas: 1039991.500 units remaining) [ -8 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ -8 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some -8) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some -8) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some -8)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out index 91239643b8c3..0f6f27c70f9e 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 @@ -7,21 +7,21 @@ emitted operations big_map diff trace - - location: 10 (remaining gas: 1039991.640 units remaining) + - location: 10 (remaining gas: 1039991.570 units remaining) [ (Pair (Right 8) None) ] - - location: 10 (remaining gas: 1039991.630 units remaining) + - location: 10 (remaining gas: 1039991.560 units remaining) [ (Right 8) ] - - location: 11 (remaining gas: 1039991.620 units remaining) + - location: 11 (remaining gas: 1039991.550 units remaining) [ 8 ] - - location: 15 (remaining gas: 1039991.570 units remaining) + - location: 15 (remaining gas: 1039991.500 units remaining) [ -9 ] - - location: 11 (remaining gas: 1039991.555 units remaining) + - location: 11 (remaining gas: 1039991.485 units remaining) [ -9 ] - - location: 16 (remaining gas: 1039991.540 units remaining) + - location: 16 (remaining gas: 1039991.470 units remaining) [ (Some -9) ] - - location: 17 (remaining gas: 1039991.525 units remaining) + - location: 17 (remaining gas: 1039991.455 units remaining) [ {} (Some -9) ] - - location: 19 (remaining gas: 1039991.510 units remaining) + - location: 19 (remaining gas: 1039991.440 units remaining) [ (Pair {} (Some -9)) ] 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 fb138d3ee369..4c01c8b1ebde 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 @@ -7,41 +7,41 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039983.500 units remaining) + - location: 13 (remaining gas: 1039982.520 units remaining) [ (Pair (Right (Left Unit)) Unit) ] - - location: 13 (remaining gas: 1039983.490 units remaining) + - location: 13 (remaining gas: 1039982.510 units remaining) [ ] - - location: 14 (remaining gas: 1039983.475 units remaining) + - location: 14 (remaining gas: 1039982.495 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 15 (remaining gas: 1039983.465 units remaining) + - location: 15 (remaining gas: 1039982.485 units remaining) [ ] - - location: 16 (remaining gas: 1039983.450 units remaining) + - location: 16 (remaining gas: 1039982.470 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - - location: 17 (remaining gas: 1039983.440 units remaining) + - location: 17 (remaining gas: 1039982.460 units remaining) [ ] - - location: 18 (remaining gas: 1039983.425 units remaining) + - location: 18 (remaining gas: 1039982.445 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 19 (remaining gas: 1039972.472 units remaining) + - location: 19 (remaining gas: 1039971.492 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 20 (remaining gas: 1039972.457 units remaining) + - location: 20 (remaining gas: 1039971.477 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 21 (remaining gas: 1039961.504 units remaining) + - location: 21 (remaining gas: 1039960.524 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 24 (remaining gas: 1039961.469 units remaining) + - location: 24 (remaining gas: 1039960.489 units remaining) [ 0 ] - - location: 25 (remaining gas: 1039961.454 units remaining) + - location: 25 (remaining gas: 1039960.474 units remaining) [ True ] - - location: 26 (remaining gas: 1039961.444 units remaining) + - location: 26 (remaining gas: 1039960.464 units remaining) [ ] - - location: 26 (remaining gas: 1039961.429 units remaining) + - location: 26 (remaining gas: 1039960.449 units remaining) [ ] - - location: 32 (remaining gas: 1039961.419 units remaining) + - location: 32 (remaining gas: 1039960.439 units remaining) [ Unit ] - - location: 33 (remaining gas: 1039961.404 units remaining) + - location: 33 (remaining gas: 1039960.424 units remaining) [ {} Unit ] - - location: 35 (remaining gas: 1039961.389 units remaining) + - location: 35 (remaining gas: 1039960.409 units remaining) [ (Pair {} Unit) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out index 75ac09514eec..cf07bfd6c6bd 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 @@ -7,87 +7,87 @@ emitted operations big_map diff trace - - location: 13 (remaining gas: 1039954.631 units remaining) + - location: 13 (remaining gas: 1039952.881 units remaining) [ (Pair (Left (Left 0)) Unit) ] - - location: 13 (remaining gas: 1039954.621 units remaining) + - location: 13 (remaining gas: 1039952.871 units remaining) [ ] - - location: 14 (remaining gas: 1039954.606 units remaining) + - location: 14 (remaining gas: 1039952.856 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - - location: 15 (remaining gas: 1039943.620 units remaining) + - location: 15 (remaining gas: 1039941.870 units remaining) [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 16 (remaining gas: 1039943.605 units remaining) + - location: 16 (remaining gas: 1039941.855 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 17 (remaining gas: 1039932.652 units remaining) + - location: 17 (remaining gas: 1039930.902 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 18 (remaining gas: 1039932.642 units remaining) + - location: 18 (remaining gas: 1039930.892 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 19 (remaining gas: 1039932.627 units remaining) + - location: 19 (remaining gas: 1039930.877 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ] - - location: 21 (remaining gas: 1039932.617 units remaining) + - location: 21 (remaining gas: 1039930.867 units remaining) [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 19 (remaining gas: 1039932.587 units remaining) + - location: 19 (remaining gas: 1039930.837 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 24 (remaining gas: 1039932.552 units remaining) + - location: 24 (remaining gas: 1039930.802 units remaining) [ -1 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 25 (remaining gas: 1039932.537 units remaining) + - location: 25 (remaining gas: 1039930.787 units remaining) [ True 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 26 (remaining gas: 1039932.527 units remaining) + - location: 26 (remaining gas: 1039930.777 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 26 (remaining gas: 1039932.512 units remaining) + - location: 26 (remaining gas: 1039930.762 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 32 (remaining gas: 1039932.497 units remaining) + - location: 32 (remaining gas: 1039930.747 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 33 (remaining gas: 1039921.544 units remaining) + - location: 33 (remaining gas: 1039919.794 units remaining) [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ] - - location: 36 (remaining gas: 1039921.509 units remaining) + - location: 36 (remaining gas: 1039919.759 units remaining) [ 0 ] - - location: 37 (remaining gas: 1039921.494 units remaining) + - location: 37 (remaining gas: 1039919.744 units remaining) [ True ] - - location: 38 (remaining gas: 1039921.484 units remaining) + - location: 38 (remaining gas: 1039919.734 units remaining) [ ] - - location: 38 (remaining gas: 1039921.469 units remaining) + - location: 38 (remaining gas: 1039919.719 units remaining) [ ] - - location: 44 (remaining gas: 1039921.454 units remaining) + - location: 44 (remaining gas: 1039919.704 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ] - - location: 48 (remaining gas: 1039921.444 units remaining) + - location: 48 (remaining gas: 1039919.694 units remaining) [ ] - - location: 49 (remaining gas: 1039921.429 units remaining) + - location: 49 (remaining gas: 1039919.679 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ] - - location: 53 (remaining gas: 1039921.419 units remaining) + - location: 53 (remaining gas: 1039919.669 units remaining) [ ] - - location: 54 (remaining gas: 1039921.404 units remaining) + - location: 54 (remaining gas: 1039919.654 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ] - - location: 60 (remaining gas: 1039921.394 units remaining) + - location: 60 (remaining gas: 1039919.644 units remaining) [ ] - - location: 61 (remaining gas: 1039921.379 units remaining) + - location: 61 (remaining gas: 1039919.629 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ] - - location: 65 (remaining gas: 1039921.369 units remaining) + - location: 65 (remaining gas: 1039919.619 units remaining) [ ] - - location: 66 (remaining gas: 1039921.354 units remaining) + - location: 66 (remaining gas: 1039919.604 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 76 (remaining gas: 1039921.344 units remaining) + - location: 76 (remaining gas: 1039919.594 units remaining) [ ] - - location: 77 (remaining gas: 1039921.329 units remaining) + - location: 77 (remaining gas: 1039919.579 units remaining) [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ] - - location: 87 (remaining gas: 1039921.319 units remaining) + - location: 87 (remaining gas: 1039919.569 units remaining) [ ] - - location: 88 (remaining gas: 1039921.309 units remaining) + - location: 88 (remaining gas: 1039919.559 units remaining) [ Unit ] - - location: 89 (remaining gas: 1039921.294 units remaining) + - location: 89 (remaining gas: 1039919.544 units remaining) [ {} Unit ] - - location: 91 (remaining gas: 1039921.279 units remaining) + - location: 91 (remaining gas: 1039919.529 units remaining) [ (Pair {} Unit) ] 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 0a3d8d08292b..346287d1cb2f 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Left (Pair 0 0)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Left (Pair 0 0)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 0 0) ] - - location: 17 (remaining gas: 1039989.674 units remaining) + - location: 17 (remaining gas: 1039989.604 units remaining) [ 0 0 ] - - location: 18 (remaining gas: 1039989.674 units remaining) + - location: 18 (remaining gas: 1039989.604 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out index 58b068a2ce1d..70fcfadef416 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Left (Pair 0 1)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Left (Pair 0 1)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 0 1) ] - - location: 17 (remaining gas: 1039989.674 units remaining) + - location: 17 (remaining gas: 1039989.604 units remaining) [ 0 1 ] - - location: 18 (remaining gas: 1039989.674 units remaining) + - location: 18 (remaining gas: 1039989.604 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out index cb41dd04d3f4..27e590726daa 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Left (Pair 1 2)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Left (Pair 1 2)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 1 2) ] - - location: 17 (remaining gas: 1039989.674 units remaining) + - location: 17 (remaining gas: 1039989.604 units remaining) [ 1 2 ] - - location: 18 (remaining gas: 1039989.674 units remaining) + - location: 18 (remaining gas: 1039989.604 units remaining) [ 4 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 4 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 4) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 4) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 4)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out index 8ea431ec0fd3..d01afd55fe1e 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Left (Pair 15 2)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Left (Pair 15 2)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 15 2) ] - - location: 17 (remaining gas: 1039989.674 units remaining) + - location: 17 (remaining gas: 1039989.604 units remaining) [ 15 2 ] - - location: 18 (remaining gas: 1039989.674 units remaining) + - location: 18 (remaining gas: 1039989.604 units remaining) [ 60 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 60 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 60) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 60) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 60)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out index 0edde0de1638..5403c2ae5f7a 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Left (Pair 8 1)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Left (Pair 8 1)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 8 1) ] - - location: 17 (remaining gas: 1039989.674 units remaining) + - location: 17 (remaining gas: 1039989.604 units remaining) [ 8 1 ] - - location: 18 (remaining gas: 1039989.674 units remaining) + - location: 18 (remaining gas: 1039989.604 units remaining) [ 16 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 16 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 16) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 16) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 16)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out index 1e5aabfa953d..0d0f3ce5ee4a 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Right (Pair 0 0)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 0 0) ] - - location: 20 (remaining gas: 1039989.674 units remaining) + - location: 20 (remaining gas: 1039989.604 units remaining) [ 0 0 ] - - location: 21 (remaining gas: 1039989.674 units remaining) + - location: 21 (remaining gas: 1039989.604 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out index 2e48a6c8ed8b..986561eb8b8e 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Right (Pair 0 1)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 0 1) ] - - location: 20 (remaining gas: 1039989.674 units remaining) + - location: 20 (remaining gas: 1039989.604 units remaining) [ 0 1 ] - - location: 21 (remaining gas: 1039989.674 units remaining) + - location: 21 (remaining gas: 1039989.604 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out index f6e4a4cdaf2a..a0e686b1f337 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Right (Pair 1 2)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Right (Pair 1 2)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 1 2) ] - - location: 20 (remaining gas: 1039989.674 units remaining) + - location: 20 (remaining gas: 1039989.604 units remaining) [ 1 2 ] - - location: 21 (remaining gas: 1039989.674 units remaining) + - location: 21 (remaining gas: 1039989.604 units remaining) [ 0 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 0 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 0) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 0) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 0)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out index 88118280c7c4..d7eda8b0632e 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Right (Pair 15 2)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Right (Pair 15 2)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 15 2) ] - - location: 20 (remaining gas: 1039989.674 units remaining) + - location: 20 (remaining gas: 1039989.604 units remaining) [ 15 2 ] - - location: 21 (remaining gas: 1039989.674 units remaining) + - location: 21 (remaining gas: 1039989.604 units remaining) [ 3 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 3 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 3) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 3) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 3)) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out index e6485727f569..1b3a0c740978 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 @@ -7,24 +7,24 @@ emitted operations big_map diff trace - - location: 14 (remaining gas: 1039989.704 units remaining) + - location: 14 (remaining gas: 1039989.634 units remaining) [ (Pair (Right (Pair 8 1)) None) ] - - location: 14 (remaining gas: 1039989.694 units remaining) + - location: 14 (remaining gas: 1039989.624 units remaining) [ (Right (Pair 8 1)) ] - - location: 15 (remaining gas: 1039989.684 units remaining) + - location: 15 (remaining gas: 1039989.614 units remaining) [ (Pair 8 1) ] - - location: 20 (remaining gas: 1039989.674 units remaining) + - location: 20 (remaining gas: 1039989.604 units remaining) [ 8 1 ] - - location: 21 (remaining gas: 1039989.674 units remaining) + - location: 21 (remaining gas: 1039989.604 units remaining) [ 4 ] - - location: 15 (remaining gas: 1039989.659 units remaining) + - location: 15 (remaining gas: 1039989.589 units remaining) [ 4 ] - - location: 22 (remaining gas: 1039989.644 units remaining) + - location: 22 (remaining gas: 1039989.574 units remaining) [ (Some 4) ] - - location: 23 (remaining gas: 1039989.629 units remaining) + - location: 23 (remaining gas: 1039989.559 units remaining) [ {} (Some 4) ] - - location: 25 (remaining gas: 1039989.614 units remaining) + - location: 25 (remaining gas: 1039989.544 units remaining) [ (Pair {} (Some 4)) ] 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 d3e24ab55358..abafaa029466 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Left (Pair False False)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Left (Pair False False)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair False False) ] - - location: 19 (remaining gas: 1039986.729 units remaining) + - location: 19 (remaining gas: 1039986.659 units remaining) [ False False ] - - location: 20 (remaining gas: 1039986.709 units remaining) + - location: 20 (remaining gas: 1039986.639 units remaining) [ False ] - - location: 21 (remaining gas: 1039986.694 units remaining) + - location: 21 (remaining gas: 1039986.624 units remaining) [ (Left False) ] - - location: 17 (remaining gas: 1039986.679 units remaining) + - location: 17 (remaining gas: 1039986.609 units remaining) [ (Left False) ] - - location: 28 (remaining gas: 1039986.664 units remaining) + - location: 28 (remaining gas: 1039986.594 units remaining) [ (Some (Left False)) ] - - location: 29 (remaining gas: 1039986.649 units remaining) + - location: 29 (remaining gas: 1039986.579 units remaining) [ {} (Some (Left False)) ] - - location: 31 (remaining gas: 1039986.634 units remaining) + - location: 31 (remaining gas: 1039986.564 units remaining) [ (Pair {} (Some (Left False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out index 0802e45cfc60..a02a72773a68 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Left (Pair False True)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Left (Pair False True)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair False True) ] - - location: 19 (remaining gas: 1039986.729 units remaining) + - location: 19 (remaining gas: 1039986.659 units remaining) [ False True ] - - location: 20 (remaining gas: 1039986.709 units remaining) + - location: 20 (remaining gas: 1039986.639 units remaining) [ True ] - - location: 21 (remaining gas: 1039986.694 units remaining) + - location: 21 (remaining gas: 1039986.624 units remaining) [ (Left True) ] - - location: 17 (remaining gas: 1039986.679 units remaining) + - location: 17 (remaining gas: 1039986.609 units remaining) [ (Left True) ] - - location: 28 (remaining gas: 1039986.664 units remaining) + - location: 28 (remaining gas: 1039986.594 units remaining) [ (Some (Left True)) ] - - location: 29 (remaining gas: 1039986.649 units remaining) + - location: 29 (remaining gas: 1039986.579 units remaining) [ {} (Some (Left True)) ] - - location: 31 (remaining gas: 1039986.634 units remaining) + - location: 31 (remaining gas: 1039986.564 units remaining) [ (Pair {} (Some (Left True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out index 7c48164a1f51..e878bd774190 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Left (Pair True False)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Left (Pair True False)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair True False) ] - - location: 19 (remaining gas: 1039986.729 units remaining) + - location: 19 (remaining gas: 1039986.659 units remaining) [ True False ] - - location: 20 (remaining gas: 1039986.709 units remaining) + - location: 20 (remaining gas: 1039986.639 units remaining) [ True ] - - location: 21 (remaining gas: 1039986.694 units remaining) + - location: 21 (remaining gas: 1039986.624 units remaining) [ (Left True) ] - - location: 17 (remaining gas: 1039986.679 units remaining) + - location: 17 (remaining gas: 1039986.609 units remaining) [ (Left True) ] - - location: 28 (remaining gas: 1039986.664 units remaining) + - location: 28 (remaining gas: 1039986.594 units remaining) [ (Some (Left True)) ] - - location: 29 (remaining gas: 1039986.649 units remaining) + - location: 29 (remaining gas: 1039986.579 units remaining) [ {} (Some (Left True)) ] - - location: 31 (remaining gas: 1039986.634 units remaining) + - location: 31 (remaining gas: 1039986.564 units remaining) [ (Pair {} (Some (Left True))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out index 546b89b49d49..948a669aff12 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Left (Pair True True)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Left (Pair True True)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair True True) ] - - location: 19 (remaining gas: 1039986.729 units remaining) + - location: 19 (remaining gas: 1039986.659 units remaining) [ True True ] - - location: 20 (remaining gas: 1039986.709 units remaining) + - location: 20 (remaining gas: 1039986.639 units remaining) [ False ] - - location: 21 (remaining gas: 1039986.694 units remaining) + - location: 21 (remaining gas: 1039986.624 units remaining) [ (Left False) ] - - location: 17 (remaining gas: 1039986.679 units remaining) + - location: 17 (remaining gas: 1039986.609 units remaining) [ (Left False) ] - - location: 28 (remaining gas: 1039986.664 units remaining) + - location: 28 (remaining gas: 1039986.594 units remaining) [ (Some (Left False)) ] - - location: 29 (remaining gas: 1039986.649 units remaining) + - location: 29 (remaining gas: 1039986.579 units remaining) [ {} (Some (Left False)) ] - - location: 31 (remaining gas: 1039986.634 units remaining) + - location: 31 (remaining gas: 1039986.564 units remaining) [ (Pair {} (Some (Left False))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out index 16cc94e4f484..e6dccefbc5b2 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Right (Pair 0 0)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Right (Pair 0 0)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair 0 0) ] - - location: 24 (remaining gas: 1039986.729 units remaining) + - location: 24 (remaining gas: 1039986.659 units remaining) [ 0 0 ] - - location: 25 (remaining gas: 1039986.674 units remaining) + - location: 25 (remaining gas: 1039986.604 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039986.659 units remaining) + - location: 26 (remaining gas: 1039986.589 units remaining) [ (Right 0) ] - - location: 17 (remaining gas: 1039986.644 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Right 0) ] - - location: 28 (remaining gas: 1039986.629 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Right 0)) ] - - location: 29 (remaining gas: 1039986.614 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Right 0)) ] - - location: 31 (remaining gas: 1039986.599 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Right 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out index 10991242f41f..39d8ba3152a1 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Right (Pair 0 1)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Right (Pair 0 1)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair 0 1) ] - - location: 24 (remaining gas: 1039986.729 units remaining) + - location: 24 (remaining gas: 1039986.659 units remaining) [ 0 1 ] - - location: 25 (remaining gas: 1039986.674 units remaining) + - location: 25 (remaining gas: 1039986.604 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039986.659 units remaining) + - location: 26 (remaining gas: 1039986.589 units remaining) [ (Right 1) ] - - location: 17 (remaining gas: 1039986.644 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Right 1) ] - - location: 28 (remaining gas: 1039986.629 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Right 1)) ] - - location: 29 (remaining gas: 1039986.614 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Right 1)) ] - - location: 31 (remaining gas: 1039986.599 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Right 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out index 6a631338ba70..c6dcc478e5d7 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Right (Pair 1 0)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Right (Pair 1 0)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair 1 0) ] - - location: 24 (remaining gas: 1039986.729 units remaining) + - location: 24 (remaining gas: 1039986.659 units remaining) [ 1 0 ] - - location: 25 (remaining gas: 1039986.674 units remaining) + - location: 25 (remaining gas: 1039986.604 units remaining) [ 1 ] - - location: 26 (remaining gas: 1039986.659 units remaining) + - location: 26 (remaining gas: 1039986.589 units remaining) [ (Right 1) ] - - location: 17 (remaining gas: 1039986.644 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Right 1) ] - - location: 28 (remaining gas: 1039986.629 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Right 1)) ] - - location: 29 (remaining gas: 1039986.614 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Right 1)) ] - - location: 31 (remaining gas: 1039986.599 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Right 1))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out index c9d444e45324..af35611b6063 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Right (Pair 1 1)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Right (Pair 1 1)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair 1 1) ] - - location: 24 (remaining gas: 1039986.729 units remaining) + - location: 24 (remaining gas: 1039986.659 units remaining) [ 1 1 ] - - location: 25 (remaining gas: 1039986.674 units remaining) + - location: 25 (remaining gas: 1039986.604 units remaining) [ 0 ] - - location: 26 (remaining gas: 1039986.659 units remaining) + - location: 26 (remaining gas: 1039986.589 units remaining) [ (Right 0) ] - - location: 17 (remaining gas: 1039986.644 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Right 0) ] - - location: 28 (remaining gas: 1039986.629 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Right 0)) ] - - location: 29 (remaining gas: 1039986.614 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Right 0)) ] - - location: 31 (remaining gas: 1039986.599 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Right 0))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out index 19344b796a9d..02ae54ad53b0 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Right (Pair 42 21)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Right (Pair 42 21)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair 42 21) ] - - location: 24 (remaining gas: 1039986.729 units remaining) + - location: 24 (remaining gas: 1039986.659 units remaining) [ 42 21 ] - - location: 25 (remaining gas: 1039986.674 units remaining) + - location: 25 (remaining gas: 1039986.604 units remaining) [ 63 ] - - location: 26 (remaining gas: 1039986.659 units remaining) + - location: 26 (remaining gas: 1039986.589 units remaining) [ (Right 63) ] - - location: 17 (remaining gas: 1039986.644 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Right 63) ] - - location: 28 (remaining gas: 1039986.629 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Right 63)) ] - - location: 29 (remaining gas: 1039986.614 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Right 63)) ] - - location: 31 (remaining gas: 1039986.599 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Right 63))) ] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out index 73b493498495..76049d0cec98 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 @@ -7,26 +7,26 @@ emitted operations big_map diff trace - - location: 16 (remaining gas: 1039986.759 units remaining) + - location: 16 (remaining gas: 1039986.689 units remaining) [ (Pair (Right (Pair 42 63)) None) ] - - location: 16 (remaining gas: 1039986.749 units remaining) + - location: 16 (remaining gas: 1039986.679 units remaining) [ (Right (Pair 42 63)) ] - - location: 17 (remaining gas: 1039986.739 units remaining) + - location: 17 (remaining gas: 1039986.669 units remaining) [ (Pair 42 63) ] - - location: 24 (remaining gas: 1039986.729 units remaining) + - location: 24 (remaining gas: 1039986.659 units remaining) [ 42 63 ] - - location: 25 (remaining gas: 1039986.674 units remaining) + - location: 25 (remaining gas: 1039986.604 units remaining) [ 21 ] - - location: 26 (remaining gas: 1039986.659 units remaining) + - location: 26 (remaining gas: 1039986.589 units remaining) [ (Right 21) ] - - location: 17 (remaining gas: 1039986.644 units remaining) + - location: 17 (remaining gas: 1039986.574 units remaining) [ (Right 21) ] - - location: 28 (remaining gas: 1039986.629 units remaining) + - location: 28 (remaining gas: 1039986.559 units remaining) [ (Some (Right 21)) ] - - location: 29 (remaining gas: 1039986.614 units remaining) + - location: 29 (remaining gas: 1039986.544 units remaining) [ {} (Some (Right 21)) ] - - location: 31 (remaining gas: 1039986.599 units remaining) + - location: 31 (remaining gas: 1039986.529 units remaining) [ (Pair {} (Some (Right 21))) ] -- GitLab From 110a03b1f260320c0ad54de87fd07ebd714f9a65 Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 3 Feb 2022 00:40:26 +0100 Subject: [PATCH 5/6] Tests/Python: update typechecking regtests outputs --- ...eck::test_typecheck[mini_scenarios--generic_multisig.tz].out | 2 +- ...stTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out | 2 +- ...test_typecheck[opcodes--self_with_default_entrypoint.tz].out | 2 +- ...echeck::test_typecheck[opcodes--self_with_entrypoint.tz].out | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out index 8a5ab4cef036..51cfc2b46183 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/generic_multisig.tz] Well typed -Gas remaining: 1039928.421 units remaining +Gas remaining: 1039928.351 units remaining { parameter (or (unit %default) (pair %main diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out index 58940cbf6479..0a2663151c54 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/big_map_to_self.tz] Well typed -Gas remaining: 1039984.417 units remaining +Gas remaining: 1039984.347 units remaining { parameter (or (pair %have_fun (big_map string nat) unit) (unit %default)) ; storage (big_map string nat) ; code { UNPAIR diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out index 5b31d4f735d5..c5f864996ab4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_with_default_entrypoint.tz] Well typed -Gas remaining: 1039988.615 units remaining +Gas remaining: 1039987.845 units remaining { parameter (or (or (nat %A) (bool %B)) (or %maybe_C (unit %default) (string %C))) ; storage unit ; code { DROP diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out index 41cd05c68ad0..3f83a05f3a51 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_with_entrypoint.tz] Well typed -Gas remaining: 1039967.216 units remaining +Gas remaining: 1039965.676 units remaining { parameter (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ; storage unit ; code { DROP -- GitLab From 1cd36449cf0347c6b63646417fab0d7a43d17fdc Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Thu, 3 Feb 2022 10:40:40 +0100 Subject: [PATCH 6/6] Tests/Python: update liquidity baking regtests outputs --- ...ddApproveTransferRemove::test_add_liquidity.out | 10 +++++----- ...TestAddApproveTransferRemove::test_approval.out | 4 ++-- ...proveTransferRemove::test_approved_transfer.out | 4 ++-- ...ddApproveTransferRemove::test_call_approve1.out | 4 ++-- ...ddApproveTransferRemove::test_call_approve2.out | 4 ++-- ...ddApproveTransferRemove::test_call_approve3.out | 4 ++-- ...proveTransferRemove::test_call_mint_or_burn.out | 4 ++-- ...pproveTransferRemove::test_remove_liquidity.out | 10 +++++----- ...idity_baking.TestTrades::test_add_liquidity.out | 10 +++++----- ...t_liquidity_baking.TestTrades::test_buy_tok.out | 14 +++++++------- ...idity_baking.TestTrades::test_call_approve1.out | 4 ++-- ...idity_baking.TestTrades::test_call_approve2.out | 4 ++-- ...idity_baking.TestTrades::test_call_approve3.out | 4 ++-- ...y_baking.TestTrades::test_call_mint_or_burn.out | 4 ++-- ..._liquidity_baking.TestTrades::test_sell_tok.out | 8 ++++---- ..._liquidity_baking.TestTrades::test_transfer.out | 4 ++-- 16 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out index f45ffa25aa92..4c36966e17f8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_add_liquidity Node is bootstrapped. -Estimated gas: 11854.210 units (will add 100 for safety) +Estimated gas: 11855.820 units (will add 100 for safety) Estimated storage: 141 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.001551 Expected counter: [EXPECTED_COUNTER] - Gas limit: 11955 + Gas limit: 11956 Storage limit: 161 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.001551 @@ -34,7 +34,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes Paid storage size diff: 3 bytes - Consumed gas: 2911.771 + Consumed gas: 2912.681 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00075 storage fees ........................... +ꜩ0.00075 @@ -58,7 +58,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721 Storage size: 2263 bytes Paid storage size diff: 68 bytes - Consumed gas: 4394.451 + Consumed gas: 4394.801 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 @@ -75,7 +75,7 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 72007 Storage size: 2048 bytes Paid storage size diff: 70 bytes - Consumed gas: 4547.988 + Consumed gas: 4548.338 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0175 storage fees ........................... +ꜩ0.0175 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out index 4486efb58657..5a06774b6fb5 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approval Node is bootstrapped. -Estimated gas: 2375.388 units (will add 100 for safety) +Estimated gas: 2375.598 units (will add 100 for safety) Estimated storage: 68 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000 Storage size: 2116 bytes Paid storage size diff: 68 bytes - Consumed gas: 2375.388 + Consumed gas: 2375.598 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out index 969860a7142a..3c3b1bc9f966 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approved_transfer Node is bootstrapped. -Estimated gas: 4366.195 units (will add 100 for safety) +Estimated gas: 4366.545 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -36,6 +36,6 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 71007 Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000 Storage size: 2116 bytes - Consumed gas: 4366.195 + Consumed gas: 4366.545 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out index 5f5aa3fef451..976901b030bb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve1 Node is bootstrapped. -Estimated gas: 2375.464 units (will add 100 for safety) +Estimated gas: 2375.674 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2053 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.464 + Consumed gas: 2375.674 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out index c1ad2ecb6695..a61c409fffca 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve2 Node is bootstrapped. -Estimated gas: 2375.464 units (will add 100 for safety) +Estimated gas: 2375.674 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2124 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.464 + Consumed gas: 2375.674 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out index 0571b605ed5b..2d7ad66b2f75 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve3 Node is bootstrapped. -Estimated gas: 2375.464 units (will add 100 for safety) +Estimated gas: 2375.674 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2195 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.464 + Consumed gas: 2375.674 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out index f09e53f69f9c..9232405e83b0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_mint_or_burn Node is bootstrapped. -Estimated gas: 4548.314 units (will add 100 for safety) +Estimated gas: 4548.664 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -32,7 +32,7 @@ This sequence of operations was run: Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000 Storage size: 1982 bytes Paid storage size diff: 71 bytes - Consumed gas: 4548.941 + Consumed gas: 4549.291 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out index e71db7b21fa0..936b795b5065 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_remove_liquidity Node is bootstrapped. -Estimated gas: 10533.836 units (will add 100 for safety) +Estimated gas: 10535.516 units (will add 100 for safety) Estimated storage: 67 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.001416 Expected counter: [EXPECTED_COUNTER] - Gas limit: 10634 + Gas limit: 10636 Storage limit: 87 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.001416 @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes - Consumed gas: 2913.981 + Consumed gas: 2914.961 Internal operations: Transaction: Amount: ꜩ0 @@ -47,7 +47,7 @@ This sequence of operations was run: Updated big_maps: Unset map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] Storage size: 2048 bytes - Consumed gas: 2522.649 + Consumed gas: 2522.999 Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -63,7 +63,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10 Storage size: 2330 bytes Paid storage size diff: 67 bytes - Consumed gas: 3677.206 + Consumed gas: 3677.556 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out index 64c4d1f84baa..88b126d08f3b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_add_liquidity Node is bootstrapped. -Estimated gas: 11854.210 units (will add 100 for safety) +Estimated gas: 11855.820 units (will add 100 for safety) Estimated storage: 141 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.001551 Expected counter: [EXPECTED_COUNTER] - Gas limit: 11955 + Gas limit: 11956 Storage limit: 161 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.001551 @@ -34,7 +34,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes Paid storage size diff: 3 bytes - Consumed gas: 2911.771 + Consumed gas: 2912.681 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00075 storage fees ........................... +ꜩ0.00075 @@ -58,7 +58,7 @@ This sequence of operations was run: Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721 Storage size: 2263 bytes Paid storage size diff: 68 bytes - Consumed gas: 4394.451 + Consumed gas: 4394.801 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 @@ -75,7 +75,7 @@ This sequence of operations was run: Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 72007 Storage size: 2048 bytes Paid storage size diff: 70 bytes - Consumed gas: 4547.988 + Consumed gas: 4548.338 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0175 storage fees ........................... +ꜩ0.0175 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out index fa6a819409c9..6fa19c7dcde8 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_buy_tok Node is bootstrapped. -Estimated gas: 7499.668 units (will add 100 for safety) +Estimated gas: 7500.718 units (will add 100 for safety) Estimated storage: 326 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.001107 + Fee to the baker: ꜩ0.001108 Expected counter: [EXPECTED_COUNTER] - Gas limit: 7600 + Gas limit: 7601 Storage limit: 346 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.001107 - payload fees(the block proposer) ....... +ꜩ0.001107 + [CONTRACT_HASH] ... -ꜩ0.001108 + payload fees(the block proposer) ....... +ꜩ0.001108 Transaction: Amount: ꜩ9001 From: [CONTRACT_HASH] @@ -34,7 +34,7 @@ This sequence of operations was run: 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4634 bytes Paid storage size diff: 1 bytes - Consumed gas: 2402.458 + Consumed gas: 2403.158 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00025 storage fees ........................... +ꜩ0.00025 @@ -56,7 +56,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 360 Storage size: 2331 bytes Paid storage size diff: 68 bytes - Consumed gas: 3677.210 + Consumed gas: 3677.560 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out index 1cc5ac24697d..44735c8293af 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve1 Node is bootstrapped. -Estimated gas: 2375.464 units (will add 100 for safety) +Estimated gas: 2375.674 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2053 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.464 + Consumed gas: 2375.674 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out index 16aa65ef54c8..b5c58e8855cb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve2 Node is bootstrapped. -Estimated gas: 2375.464 units (will add 100 for safety) +Estimated gas: 2375.674 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2124 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.464 + Consumed gas: 2375.674 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out index f6ca037eb3a2..efaf4c64e9b4 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve3 Node is bootstrapped. -Estimated gas: 2375.464 units (will add 100 for safety) +Estimated gas: 2375.674 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000 Storage size: 2195 bytes Paid storage size diff: 71 bytes - Consumed gas: 2375.464 + Consumed gas: 2375.674 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out index 1b1cfad1ecde..5fd38c8b8206 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_call_mint_or_burn Node is bootstrapped. -Estimated gas: 4548.314 units (will add 100 for safety) +Estimated gas: 4548.664 units (will add 100 for safety) Estimated storage: 71 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -32,7 +32,7 @@ This sequence of operations was run: Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000 Storage size: 1982 bytes Paid storage size diff: 71 bytes - Consumed gas: 4548.941 + Consumed gas: 4549.291 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01775 storage fees ........................... +ꜩ0.01775 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out index f1fdd0683e6a..b458e7b11713 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_sell_tok Node is bootstrapped. -Estimated gas: 9818.099 units (will add 100 for safety) +Estimated gas: 9819.149 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.001337 Expected counter: [EXPECTED_COUNTER] - Gas limit: 9919 + Gas limit: 9920 Storage limit: 0 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.001337 @@ -33,7 +33,7 @@ This sequence of operations was run: 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } Storage size: 4633 bytes - Consumed gas: 2403.612 + Consumed gas: 2404.312 Internal operations: Transaction: Amount: ꜩ0 @@ -51,7 +51,7 @@ This sequence of operations was run: Unset map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6] Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 461 Storage size: 2331 bytes - Consumed gas: 4574.487 + Consumed gas: 4574.837 Transaction: Amount: ꜩ3891.966034 From: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out index c03b62157efc..eb4057843f4e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_transfer Node is bootstrapped. -Estimated gas: 3679.110 units (will add 100 for safety) +Estimated gas: 3679.460 units (will add 100 for safety) Estimated storage: 68 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -35,7 +35,7 @@ This sequence of operations was run: Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 260 Storage size: 2399 bytes Paid storage size diff: 68 bytes - Consumed gas: 3679.110 + Consumed gas: 3679.460 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 -- GitLab