diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index a72a3e188d9e5b77bb8fde0073a97ac91be10f07..57590a0ec0da2265c4c7cf2ca70c7fbd0c90de04 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -54,7 +54,6 @@ unit:015_PtLimaPt: @src/proto_015_PtLimaPt/lib_protocol/test/integration/gas/runtest proto_015_PtLimaPt__lib_protocol__2: > @src/proto_015_PtLimaPt/lib_protocol/test/integration/michelson/runtest - @src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/runtest @src/proto_015_PtLimaPt/lib_protocol/test/integration/validate/runtest proto_015_PtLimaPt__lib_protocol__3: > @src/proto_015_PtLimaPt/lib_protocol/test/unit/runtest @@ -91,7 +90,6 @@ unit:016_PtMumbai: @src/proto_016_PtMumbai/lib_protocol/test/integration/gas/runtest proto_016_PtMumbai__lib_protocol__2: > @src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/runtest - @src/proto_016_PtMumbai/lib_protocol/test/integration/operations/runtest @src/proto_016_PtMumbai/lib_protocol/test/integration/validate/runtest proto_016_PtMumbai__lib_protocol__3: > @src/proto_016_PtMumbai/lib_protocol/test/unit/runtest @@ -131,7 +129,6 @@ unit:alpha: @src/proto_alpha/lib_protocol/test/integration/gas/runtest proto_alpha__lib_protocol__2: > @src/proto_alpha/lib_protocol/test/integration/michelson/runtest - @src/proto_alpha/lib_protocol/test/integration/operations/runtest @src/proto_alpha/lib_protocol/test/integration/validate/runtest proto_alpha__lib_protocol__3: > @src/proto_alpha/lib_protocol/test/unit/runtest diff --git a/manifest/main.ml b/manifest/main.ml index 68ee9193a05a81a1d906cf256c6291894ccd48cf..0c6a768f5e557b90c76f7cebcdd4b514f74dd7bf 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3942,15 +3942,34 @@ end = struct ] in let _integration_operations = - test - "main" + let modules = + [ + ("test_main", true); + ("test_activation", true); + ("test_combined_operations", true); + ("test_failing_noop", true); + ("test_origination", true); + ("test_paid_storage_increase", true); + ("test_reveal", true); + ("test_sc_rollup_transfer", true); + ("test_sc_rollup", true); + ("test_transfer", true); + ("test_voting", true); + ("test_zk_rollup", true); + ("test_transfer_ticket", N.(number >= 016)); + ("test_tx_rollup", N.(number <= 016)); + ] + |> List.filter_map (fun (n, b) -> if b then Some n else None) + in + tezt + modules ~path:(path // "lib_protocol/test/integration/operations") ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~with_macos_security_framework:true ~dep_globs:(conditional_list [("contracts/*", N.(number >= 013))]) ~deps: [ - alcotest_lwt; + alcotezt; octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; main |> open_; diff --git a/opam/tezos-protocol-015-PtLimaPt-tests.opam b/opam/tezos-protocol-015-PtLimaPt-tests.opam index 4ef48983946ea6ed83474543ce2be13366522527..c2575aebfe9822b65ae930ce080dc05cf09c5627 100644 --- a/opam/tezos-protocol-015-PtLimaPt-tests.opam +++ b/opam/tezos-protocol-015-PtLimaPt-tests.opam @@ -31,6 +31,7 @@ depends: [ "tezos-stdlib-unix" {with-test} "tezos-stdlib" {with-test} "tezos-scoru-wasm" {with-test} + "octez-alcotezt" {with-test} "tezt-tezos" {with-test} ] build: [ diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index 9520acf154ffb8445aae6a8e03f358ce53188568..f7f2a92e7e1f82b10dbe750c432598f042ea2c13 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -35,6 +35,7 @@ depends: [ "tezos-stdlib" {with-test} "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} + "octez-alcotezt" {with-test} "tezt-tezos" {with-test} ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 63e248aa4ec70d724924f622965146da3ecda59a..158cbd1672928e827f74025c85d65e6607afd503 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -35,6 +35,7 @@ depends: [ "tezos-stdlib" {with-test} "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} + "octez-alcotezt" {with-test} "tezt-tezos" {with-test} ] build: [ diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune index 907be740836b3a16d49c040548c4423c387741a3..25d5aff3515af727be51bf4cd90458c40cfa6116 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune @@ -1,31 +1,63 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name main) +(library + (name + src_proto_015_PtLimaPt_lib_protocol_test_integration_operations_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries - alcotest-lwt + tezt.core + octez-alcotezt tezos-base tezos-protocol-015-PtLimaPt tezos-client-015-PtLimaPt tezos-015-PtLimaPt-test-helpers tezos-base-test-helpers tezos-protocol-plugin-015-PtLimaPt) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base + -open Octez_alcotezt -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_015_PtLimaPt -open Tezos_client_015_PtLimaPt -open Tezos_015_PtLimaPt_test_helpers -open Tezos_base_test_helpers - -open Tezos_protocol_plugin_015_PtLimaPt)) + -open Tezos_protocol_plugin_015_PtLimaPt) + (modules + test_main + test_activation + test_combined_operations + test_failing_noop + test_origination + test_paid_storage_increase + test_reveal + test_sc_rollup_transfer + test_sc_rollup + test_transfer + test_voting + test_zk_rollup + test_tx_rollup)) + +(executable + (name main) + (libraries + src_proto_015_PtLimaPt_lib_protocol_test_integration_operations_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-protocol-015-PtLimaPt-tests) (deps (glob_files contracts/*)) (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/main.ml b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_main.ml similarity index 73% rename from src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/main.ml rename to src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_main.ml index afcec61e65e4a3e501b6d47c2d4ea69267bf815f..8b458921ad555acacd2f0f238afe760292c6f6ec 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/main.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_main.ml @@ -34,17 +34,18 @@ let () = Alcotest_lwt.run "protocol > integration > operations" [ - ("voting", Test_voting.tests); - ("origination", Test_origination.tests); - ("revelation", Test_reveal.tests); - ("transfer", Test_transfer.tests); - ("activation", Test_activation.tests); - ("paid storage increase", Test_paid_storage_increase.tests); - ("combined", Test_combined_operations.tests); - ("failing_noop operation", Test_failing_noop.tests); - ("tx rollup", Test_tx_rollup.tests); - ("sc rollup", Test_sc_rollup.tests); - ("sc rollup transfer", Test_sc_rollup_transfer.tests); - ("zk rollup", Test_zk_rollup.tests); + (Protocol.name ^ ": voting", Test_voting.tests); + (Protocol.name ^ ": origination", Test_origination.tests); + (Protocol.name ^ ": revelation", Test_reveal.tests); + (Protocol.name ^ ": transfer", Test_transfer.tests); + (Protocol.name ^ ": activation", Test_activation.tests); + ( Protocol.name ^ ": paid storage increase", + Test_paid_storage_increase.tests ); + (Protocol.name ^ ": combined", Test_combined_operations.tests); + (Protocol.name ^ ": failing_noop operation", Test_failing_noop.tests); + (Protocol.name ^ ": tx rollup", Test_tx_rollup.tests); + (Protocol.name ^ ": sc rollup", Test_sc_rollup.tests); + (Protocol.name ^ ": sc rollup transfer", Test_sc_rollup_transfer.tests); + (Protocol.name ^ ": zk rollup", Test_zk_rollup.tests); ] |> Lwt_main.run diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_tx_rollup.ml index f7ae246ea29aee65500a3fef7692236e1801c424..346ab605e95129b7bf54be4e9c30bf10ae085058 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_tx_rollup.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/test_tx_rollup.ml @@ -114,6 +114,10 @@ let test_sunset () = op >>=? fun _i -> return_unit +let path = + project_root + // "src/proto_015_PtLimaPt/lib_protocol/test/integration/operations" + (** [parsing_tests] try originating contracts using the type [tx_rollup_l2_address], test that it only works when rollups are enabled. @@ -163,10 +167,10 @@ let parsing_tests = (fun () -> test_origination ~tx_rollup_enable:false path "Unit"); ]) [ - ("deposit", "contracts/tx_rollup_deposit.tz"); - ("type", "contracts/tx_rollup_parse_type.tz"); - ("comparable_type", "contracts/tx_rollup_parse_comparable_type.tz"); - ("data", "contracts/tx_rollup_parse_data.tz"); + ("deposit", path // "contracts/tx_rollup_deposit.tz"); + ("type", path // "contracts/tx_rollup_parse_type.tz"); + ("comparable_type", path // "contracts/tx_rollup_parse_comparable_type.tz"); + ("data", path // "contracts/tx_rollup_parse_data.tz"); ] let message_hash_testable : Tx_rollup_message_hash.t Alcotest.testable = @@ -379,8 +383,9 @@ let raw_level level = assert_ok @@ Raw_level.of_int32 level (** Create a deposit on the layer1 side through the origination of a contract and return the associated deposit message to apply in the layer2. *) let make_deposit b tx_rollup l1_src addr = + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" l1_src b @@ -997,8 +1002,9 @@ let test_inbox_count_too_big () = let message_count = constant.parametric.tx_rollup.max_messages_per_inbox in let contents = "some contents" in originate b contract >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" contract b @@ -1118,8 +1124,9 @@ let test_additional_space_allocation_for_valid_deposit () = let tx_rollup_origination_size = 1 in context_init1 ~tx_rollup_origination_size () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" account b @@ -1149,8 +1156,9 @@ let test_additional_space_allocation_for_valid_deposit () = let test_valid_deposit_inexistant_rollup () = let _, _, pkh = gen_l2_account () in context_init1 () >>=? fun (b, account) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" account b @@ -1178,8 +1186,9 @@ let test_invalid_deposit_not_ticket () = context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_incorrect_param.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_incorrect_param.tz" + script "Unit" account b @@ -1248,8 +1257,9 @@ let test_invalid_deposit_too_big_ticket () = constant.parametric.tx_rollup.max_ticket_payload_size in originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_string.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_string.tz" + script "Unit" account b @@ -1299,8 +1309,9 @@ let test_invalid_deposit_too_big_ticket_type () = constant.parametric.tx_rollup.max_ticket_payload_size in originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_pair_string.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_pair_string.tz" + script "Unit" account b @@ -1356,8 +1367,9 @@ let test_valid_deposit_big_ticket () = constant.parametric.tx_rollup.max_ticket_payload_size in originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_string.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_string.tz" + script "Unit" account b @@ -1396,8 +1408,9 @@ let test_invalid_entrypoint () = context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_incorrect_param.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_incorrect_param.tz" + script "Unit" account b @@ -1421,8 +1434,9 @@ let test_invalid_entrypoint () = let test_invalid_l2_address () = context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" account b @@ -1449,8 +1463,9 @@ let test_valid_deposit_invalid_amount () = let _, _, pkh = gen_l2_account () in context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_one_mutez.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_one_mutez.tz" + script "Unit" account b @@ -1733,13 +1748,7 @@ let tx_level level = assert_ok @@ Tx_rollup_level.of_int32 level let test_storage_burn_for_commitment () = let check_storage_delta ~__POS__ msg ~size_before ~size_after ~expected_delta = - Alcotest.( - check - ~pos:__POS__ - zestable - msg - expected_delta - Z.(sub size_after size_before)) + Alcotest.(check zestable msg expected_delta Z.(sub size_after size_before)) in let tx_rollup_origination_size = 1 in context_init1 ~tx_rollup_origination_size () >>=? fun (b, contract) -> @@ -1810,7 +1819,6 @@ let test_storage_burn_for_commitment_and_bond () = = Alcotest.( check - ~pos:__POS__ zestable msg (Z.of_int expected_delta) @@ -1869,7 +1877,6 @@ let test_storage_burn_for_commitment_and_bond () = ~expected_delta:commitment_remove_delta ; Alcotest.( check - ~pos:__POS__ int "The delta of adding and removing a commitment is zero (modulo \ preallocation)" @@ -4052,7 +4059,6 @@ let test_state_message_storage_preallocation () = {!Tx_rollup_inbox_storage.prepare_inbox}. *) let inbox_preparation = Tx_rollup_inbox.size in Alcotest.check - ~pos:__POS__ zestable "the storage occupied by the first message is the size of the inbox plus \ the preallocation for commiting the message" @@ -4067,7 +4073,6 @@ let test_state_message_storage_preallocation () = Tx_rollup_state.Internal_for_tests.get_occupied_storage state in Alcotest.check - ~pos:__POS__ zestable "the storage occupied by the second message null thanks to the merklisation" Z.zero diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune index 716886a0132f636d59ffd1218e61a0e930141385..c87f5ed32461ac776d031927303ed6a403ef5c1d 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune @@ -1,31 +1,64 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name main) +(library + (name + src_proto_016_PtMumbai_lib_protocol_test_integration_operations_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries - alcotest-lwt + tezt.core + octez-alcotezt tezos-base tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-016-PtMumbai-test-helpers tezos-base-test-helpers tezos-protocol-plugin-016-PtMumbai) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base + -open Octez_alcotezt -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_016_PtMumbai -open Tezos_client_016_PtMumbai -open Tezos_016_PtMumbai_test_helpers -open Tezos_base_test_helpers - -open Tezos_protocol_plugin_016_PtMumbai)) + -open Tezos_protocol_plugin_016_PtMumbai) + (modules + test_main + test_activation + test_combined_operations + test_failing_noop + test_origination + test_paid_storage_increase + test_reveal + test_sc_rollup_transfer + test_sc_rollup + test_transfer + test_voting + test_zk_rollup + test_transfer_ticket + test_tx_rollup)) + +(executable + (name main) + (libraries + src_proto_016_PtMumbai_lib_protocol_test_integration_operations_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-protocol-016-PtMumbai-tests) (deps (glob_files contracts/*)) (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/main.ml b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_main.ml similarity index 71% rename from src/proto_alpha/lib_protocol/test/integration/operations/main.ml rename to src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_main.ml index 70c8dc01c195427d94a3bdbf80b7377552bb8da5..f0f6eb5a23f5f8db5a7388ff489aa027dbc01993 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/main.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_main.ml @@ -34,17 +34,19 @@ let () = Alcotest_lwt.run "protocol > integration > operations" [ - ("voting", Test_voting.tests); - ("origination", Test_origination.tests); - ("revelation", Test_reveal.tests); - ("transfer", Test_transfer.tests); - ("activation", Test_activation.tests); - ("paid storage increase", Test_paid_storage_increase.tests); - ("combined", Test_combined_operations.tests); - ("failing_noop operation", Test_failing_noop.tests); - ("sc rollup", Test_sc_rollup.tests); - ("sc rollup transfer", Test_sc_rollup_transfer.tests); - ("zk rollup", Test_zk_rollup.tests); - ("transfer ticket", Test_transfer_ticket.tests); + (Protocol.name ^ ": voting", Test_voting.tests); + (Protocol.name ^ ": origination", Test_origination.tests); + (Protocol.name ^ ": revelation", Test_reveal.tests); + (Protocol.name ^ ": transfer", Test_transfer.tests); + (Protocol.name ^ ": activation", Test_activation.tests); + ( Protocol.name ^ ": paid storage increase", + Test_paid_storage_increase.tests ); + (Protocol.name ^ ": combined", Test_combined_operations.tests); + (Protocol.name ^ ": failing_noop operation", Test_failing_noop.tests); + (Protocol.name ^ ": tx rollup", Test_tx_rollup.tests); + (Protocol.name ^ ": sc rollup", Test_sc_rollup.tests); + (Protocol.name ^ ": sc rollup transfer", Test_sc_rollup_transfer.tests); + (Protocol.name ^ ": zk rollup", Test_zk_rollup.tests); + (Protocol.name ^ ": transfer ticket", Test_transfer_ticket.tests); ] |> Lwt_main.run diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_tx_rollup.ml index 6b05f9fd4bc9af2ac5c08c7e5a5995cfdedc535a..505ef555d059a4c66466fcc977e2e85f921825e3 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_tx_rollup.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/test_tx_rollup.ml @@ -114,6 +114,10 @@ let test_sunset () = op >>=? fun (_i : Incremental.t) -> return_unit +let path = + project_root + // "src/proto_016_PtMumbai/lib_protocol/test/integration/operations" + (** [parsing_tests] try originating contracts using the type [tx_rollup_l2_address], test that it only works when rollups are enabled. @@ -163,10 +167,10 @@ let parsing_tests = (fun () -> test_origination ~tx_rollup_enable:false path "Unit"); ]) [ - ("deposit", "contracts/tx_rollup_deposit.tz"); - ("type", "contracts/tx_rollup_parse_type.tz"); - ("comparable_type", "contracts/tx_rollup_parse_comparable_type.tz"); - ("data", "contracts/tx_rollup_parse_data.tz"); + ("deposit", path // "contracts/tx_rollup_deposit.tz"); + ("type", path // "contracts/tx_rollup_parse_type.tz"); + ("comparable_type", path // "contracts/tx_rollup_parse_comparable_type.tz"); + ("data", path // "contracts/tx_rollup_parse_data.tz"); ] let message_hash_testable : Tx_rollup_message_hash.t Alcotest.testable = @@ -383,8 +387,9 @@ let raw_level level = assert_ok @@ Raw_level.of_int32 level (** Create a deposit on the layer1 side through the origination of a contract and return the associated deposit message to apply in the layer2. *) let make_deposit b tx_rollup l1_src addr = + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" l1_src b @@ -1004,8 +1009,9 @@ let test_inbox_count_too_big () = let message_count = constant.parametric.tx_rollup.max_messages_per_inbox in let contents = "some contents" in originate b contract >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" contract b @@ -1124,8 +1130,9 @@ let test_additional_space_allocation_for_valid_deposit () = let tx_rollup_origination_size = 1 in context_init1 ~tx_rollup_origination_size () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" account b @@ -1155,8 +1162,9 @@ let test_additional_space_allocation_for_valid_deposit () = let test_valid_deposit_inexistant_rollup () = let _, _, pkh = gen_l2_account () in context_init1 () >>=? fun (b, account) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" account b @@ -1184,8 +1192,9 @@ let test_invalid_deposit_not_ticket () = context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_incorrect_param.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_incorrect_param.tz" + script "Unit" account b @@ -1254,8 +1263,9 @@ let test_invalid_deposit_too_big_ticket () = constant.parametric.tx_rollup.max_ticket_payload_size in originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_string.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_string.tz" + script "Unit" account b @@ -1305,8 +1315,9 @@ let test_invalid_deposit_too_big_ticket_type () = constant.parametric.tx_rollup.max_ticket_payload_size in originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_pair_string.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_pair_string.tz" + script "Unit" account b @@ -1362,8 +1373,9 @@ let test_valid_deposit_big_ticket () = constant.parametric.tx_rollup.max_ticket_payload_size in originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_string.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_string.tz" + script "Unit" account b @@ -1402,8 +1414,9 @@ let test_invalid_entrypoint () = context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_incorrect_param.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_incorrect_param.tz" + script "Unit" account b @@ -1427,8 +1440,9 @@ let test_invalid_entrypoint () = let test_invalid_l2_address () = context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit.tz" + script "Unit" account b @@ -1455,8 +1469,9 @@ let test_valid_deposit_invalid_amount () = let _, _, pkh = gen_l2_account () in context_init1 () >>=? fun (b, account) -> originate b account >>=? fun (b, tx_rollup) -> + let script = path // "contracts/tx_rollup_deposit_one_mutez.tz" in Contract_helpers.originate_contract - "contracts/tx_rollup_deposit_one_mutez.tz" + script "Unit" account b @@ -1739,13 +1754,7 @@ let tx_level level = assert_ok @@ Tx_rollup_level.of_int32 level let test_storage_burn_for_commitment () = let check_storage_delta ~__POS__ msg ~size_before ~size_after ~expected_delta = - Alcotest.( - check - ~pos:__POS__ - zestable - msg - expected_delta - Z.(sub size_after size_before)) + Alcotest.(check zestable msg expected_delta Z.(sub size_after size_before)) in let tx_rollup_origination_size = 1 in context_init1 ~tx_rollup_origination_size () >>=? fun (b, contract) -> @@ -1817,7 +1826,6 @@ let test_storage_burn_for_commitment_and_bond () = = Alcotest.( check - ~pos:__POS__ zestable msg (Z.of_int expected_delta) @@ -1876,7 +1884,6 @@ let test_storage_burn_for_commitment_and_bond () = ~expected_delta:commitment_remove_delta ; Alcotest.( check - ~pos:__POS__ int "The delta of adding and removing a commitment is zero (modulo \ preallocation)" @@ -4062,7 +4069,6 @@ let test_state_message_storage_preallocation () = {!Tx_rollup_inbox_storage.prepare_inbox}. *) let inbox_preparation = Tx_rollup_inbox.size in Alcotest.check - ~pos:__POS__ zestable "the storage occupied by the first message is the size of the inbox plus \ the preallocation for commiting the message" @@ -4077,7 +4083,6 @@ let test_state_message_storage_preallocation () = Tx_rollup_state.Internal_for_tests.get_occupied_storage state in Alcotest.check - ~pos:__POS__ zestable "the storage occupied by the second message null thanks to the merklisation" Z.zero diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune index d9d62ec910588d7be33cd8445125095ea1c9fb72..568b945cfaa7250e59c0af1d83e4b0dd337433f2 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -1,31 +1,62 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name main) +(library + (name src_proto_alpha_lib_protocol_test_integration_operations_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries - alcotest-lwt + tezt.core + octez-alcotezt tezos-base tezos-protocol-alpha tezos-client-alpha tezos-alpha-test-helpers tezos-base-test-helpers tezos-protocol-plugin-alpha) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base + -open Octez_alcotezt -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_alpha_test_helpers -open Tezos_base_test_helpers - -open Tezos_protocol_plugin_alpha)) + -open Tezos_protocol_plugin_alpha) + (modules + test_main + test_activation + test_combined_operations + test_failing_noop + test_origination + test_paid_storage_increase + test_reveal + test_sc_rollup_transfer + test_sc_rollup + test_transfer + test_voting + test_zk_rollup + test_transfer_ticket)) + +(executable + (name main) + (libraries + src_proto_alpha_lib_protocol_test_integration_operations_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-protocol-alpha-tests) (deps (glob_files contracts/*)) (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/main.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_main.ml similarity index 72% rename from src/proto_016_PtMumbai/lib_protocol/test/integration/operations/main.ml rename to src/proto_alpha/lib_protocol/test/integration/operations/test_main.ml index 1f33d0e6828c128606fd91f82ab801321b9b8c20..47126d7dba28be7dd84b73d51668b708ad0ded03 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/main.ml +++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_main.ml @@ -34,18 +34,18 @@ let () = Alcotest_lwt.run "protocol > integration > operations" [ - ("voting", Test_voting.tests); - ("origination", Test_origination.tests); - ("revelation", Test_reveal.tests); - ("transfer", Test_transfer.tests); - ("activation", Test_activation.tests); - ("paid storage increase", Test_paid_storage_increase.tests); - ("combined", Test_combined_operations.tests); - ("failing_noop operation", Test_failing_noop.tests); - ("tx rollup", Test_tx_rollup.tests); - ("sc rollup", Test_sc_rollup.tests); - ("sc rollup transfer", Test_sc_rollup_transfer.tests); - ("zk rollup", Test_zk_rollup.tests); - ("transfer ticket", Test_transfer_ticket.tests); + (Protocol.name ^ ": voting", Test_voting.tests); + (Protocol.name ^ ": origination", Test_origination.tests); + (Protocol.name ^ ": revelation", Test_reveal.tests); + (Protocol.name ^ ": transfer", Test_transfer.tests); + (Protocol.name ^ ": activation", Test_activation.tests); + ( Protocol.name ^ ": paid storage increase", + Test_paid_storage_increase.tests ); + (Protocol.name ^ ": combined", Test_combined_operations.tests); + (Protocol.name ^ ": failing_noop operation", Test_failing_noop.tests); + (Protocol.name ^ ": sc rollup", Test_sc_rollup.tests); + (Protocol.name ^ ": sc rollup transfer", Test_sc_rollup_transfer.tests); + (Protocol.name ^ ": zk rollup", Test_zk_rollup.tests); + (Protocol.name ^ ": transfer ticket", Test_transfer_ticket.tests); ] |> Lwt_main.run diff --git a/tezt/tests/dune b/tezt/tests/dune index 99ccc8f229825187e14daa615b96681b6c24be1e..4e2ee32990b0259848d33604dbb91388840b9e9a 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -14,14 +14,17 @@ tezos-stdlib-unix tezos-protocol-alpha src_proto_alpha_lib_protocol_test_regression_tezt_lib + src_proto_alpha_lib_protocol_test_integration_operations_tezt_lib src_proto_alpha_lib_plugin_test_tezt_lib src_proto_alpha_lib_delegate_test_tezt_lib src_proto_alpha_lib_client_test_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_regression_tezt_lib + src_proto_016_PtMumbai_lib_protocol_test_integration_operations_tezt_lib src_proto_016_PtMumbai_lib_plugin_test_tezt_lib src_proto_016_PtMumbai_lib_delegate_test_tezt_lib src_proto_016_PtMumbai_lib_client_test_tezt_lib src_proto_015_PtLimaPt_lib_protocol_test_regression_tezt_lib + src_proto_015_PtLimaPt_lib_protocol_test_integration_operations_tezt_lib src_proto_015_PtLimaPt_lib_plugin_test_tezt_lib src_proto_015_PtLimaPt_lib_delegate_test_tezt_lib src_proto_015_PtLimaPt_lib_client_test_tezt_lib