From b4dd8161c41c0b1aeeb9e1c546a1b8ecf91bcff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Fri, 16 Dec 2022 11:07:52 +0000 Subject: [PATCH 1/4] Proto: Reset regressions from Mumbai Snapshotting MR --- .gitlab/ci/jobs/test/unit.yml | 50 ++++++++++++++++++- .../lib_benchmark/michelson_samplers.ml | 3 +- src/proto_alpha/lib_protocol/main.ml | 2 +- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index b976756d22e0..7830735d5fdb 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -162,6 +162,55 @@ unit:016_PtMumbai: - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} - ./scripts/ci/merge_coverage.sh +unit:016_PtMumbai: + extends: + - .unit_test_template_x86_64_coverage + # We use an extra level of indirection for TEST_TARGETS, to avoid + # overly long job names causing GitLab CI to silently fail. + variables: + # Note the use of @ resp. @@ to select tests recursively resp. non-recursively + proto_016_PtMumbai__lib_protocol__1: > + @@src/proto_016_PtMumbai/lib_protocol/test/integration/runtest + @src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/runtest + @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 + @src/proto_016_PtMumbai/lib_protocol/runtezt + proto_016_PtMumbai__lib_protocol__pbt1: > + @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest1 + proto_016_PtMumbai__lib_protocol__pbt2: > + @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest2 + proto_016_PtMumbai__lib_protocol__pbt3: > + @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest3 + proto_016_PtMumbai: > + @src/proto_016_PtMumbai/lib_benchmark/runtest + @src/proto_016_PtMumbai/lib_client/runtest + @src/proto_016_PtMumbai/lib_plugin/runtest + @src/proto_016_PtMumbai/lib_delegate/runtest + @src/proto_016_PtMumbai/lib_dal/runtest + parallel: + matrix: + - TEST_TARGETS: + - proto_016_PtMumbai__lib_protocol__1 + - proto_016_PtMumbai__lib_protocol__2 + - proto_016_PtMumbai__lib_protocol__3 + - proto_016_PtMumbai__lib_protocol__pbt1 + - proto_016_PtMumbai__lib_protocol__pbt2 + - proto_016_PtMumbai__lib_protocol__pbt3 + - proto_016_PtMumbai + script: + - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} + - ./scripts/ci/merge_coverage.sh +unit:non-proto-x86_64: + extends: + - .unit_test_template_x86_64_coverage + variables: + MAKE_TARGETS: test-nonproto-unit test-webassembly + unit:alpha: extends: - .unit_test_template_x86_64_coverage @@ -210,7 +259,6 @@ unit:non-proto-x86_64: - .unit_test_template_x86_64_coverage variables: MAKE_TARGETS: test-nonproto-unit test-webassembly - unit:non-proto-arm64: extends: .unit_test_template_arm64 variables: diff --git a/src/proto_alpha/lib_benchmark/michelson_samplers.ml b/src/proto_alpha/lib_benchmark/michelson_samplers.ml index edb666c749d0..fafdce74e0c3 100644 --- a/src/proto_alpha/lib_benchmark/michelson_samplers.ml +++ b/src/proto_alpha/lib_benchmark/michelson_samplers.ml @@ -540,13 +540,12 @@ end) fun arg_ty -> let open M in let* ru = sc_rollup in - let* entrypoint = entrypoint in let destination = Alpha_context.Destination.Sc_rollup ru in return (Typed_contract.Internal_for_tests.typed_exn arg_ty destination - entrypoint) + Alpha_context.Entrypoint.default) let generate_any_type_contract : type arg argc. diff --git a/src/proto_alpha/lib_protocol/main.ml b/src/proto_alpha/lib_protocol/main.ml index 8dba30c32503..ebb66598b180 100644 --- a/src/proto_alpha/lib_protocol/main.ml +++ b/src/proto_alpha/lib_protocol/main.ml @@ -422,4 +422,4 @@ module Mempool = struct ~grandparent_round) end -(* Vanity nonce: 6455568396538124 *) +(* Vanity nonce: TBD *) -- GitLab From d01ce8b0c6b12edd1faddfbe44000c0b0aa6d974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Fri, 16 Dec 2022 11:26:54 +0000 Subject: [PATCH 2/4] Back-port merge request 7094 that got accidentally reverted --- src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml b/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml index f2c1a9f96a14..04305666cb4e 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml +++ b/src/proto_016_PtMumbai/lib_benchmark/michelson_samplers.ml @@ -551,13 +551,12 @@ end) fun arg_ty -> let open M in let* ru = sc_rollup in - let* entrypoint = entrypoint in let destination = Alpha_context.Destination.Sc_rollup ru in return (Typed_contract.Internal_for_tests.typed_exn arg_ty destination - entrypoint) + Alpha_context.Entrypoint.default) let generate_any_type_contract : type arg argc. -- GitLab From dc2e455e244e170cab665916679918581d8f7c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Fri, 16 Dec 2022 11:30:33 +0000 Subject: [PATCH 3/4] Test: De-duplicate unit test section for Mumbai --- .gitlab/ci/jobs/test/unit.yml | 44 ----------------------------------- 1 file changed, 44 deletions(-) diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index 7830735d5fdb..0d1d79239148 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -118,50 +118,6 @@ unit:015_PtLimaPt: - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} - ./scripts/ci/merge_coverage.sh -unit:016_PtMumbai: - extends: - - .unit_test_template_x86_64_coverage - # We use an extra level of indirection for TEST_TARGETS, to avoid - # overly long job names causing GitLab CI to silently fail. - variables: - # Note the use of @ resp. @@ to select tests recursively resp. non-recursively - proto_016_PtMumbai__lib_protocol__1: > - @@src/proto_016_PtMumbai/lib_protocol/test/integration/runtest - @src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/runtest - @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 - @src/proto_016_PtMumbai/lib_protocol/runtezt - proto_016_PtMumbai__lib_protocol__pbt1: > - @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest1 - proto_016_PtMumbai__lib_protocol__pbt2: > - @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest2 - proto_016_PtMumbai__lib_protocol__pbt3: > - @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest3 - proto_016_PtMumbai: > - @src/proto_016_PtMumbai/lib_benchmark/runtest - @src/proto_016_PtMumbai/lib_client/runtest - @src/proto_016_PtMumbai/lib_plugin/runtest - @src/proto_016_PtMumbai/lib_delegate/runtest - @src/proto_016_PtMumbai/lib_dal/runtest - parallel: - matrix: - - TEST_TARGETS: - - proto_016_PtMumbai__lib_protocol__1 - - proto_016_PtMumbai__lib_protocol__2 - - proto_016_PtMumbai__lib_protocol__3 - - proto_016_PtMumbai__lib_protocol__pbt1 - - proto_016_PtMumbai__lib_protocol__pbt2 - - proto_016_PtMumbai__lib_protocol__pbt3 - - proto_016_PtMumbai - script: - - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} - - ./scripts/ci/merge_coverage.sh - unit:016_PtMumbai: extends: - .unit_test_template_x86_64_coverage -- GitLab From 616d0763a97364129bf5b8c06b69f1d423bb97c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Fri, 16 Dec 2022 11:32:25 +0000 Subject: [PATCH 4/4] Test: De-duplicate non-proto test section --- .gitlab/ci/jobs/test/unit.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index 0d1d79239148..b976756d22e0 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -161,11 +161,6 @@ unit:016_PtMumbai: script: - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} - ./scripts/ci/merge_coverage.sh -unit:non-proto-x86_64: - extends: - - .unit_test_template_x86_64_coverage - variables: - MAKE_TARGETS: test-nonproto-unit test-webassembly unit:alpha: extends: @@ -215,6 +210,7 @@ unit:non-proto-x86_64: - .unit_test_template_x86_64_coverage variables: MAKE_TARGETS: test-nonproto-unit test-webassembly + unit:non-proto-arm64: extends: .unit_test_template_arm64 variables: -- GitLab