From 866010eb43f31806b4f5cd689bd919434f0d926b Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 12:02:33 +0200 Subject: [PATCH 1/3] Everywhere: remove deps on protocol-raw --- manifest/main.ml | 25 ++++++------------- .../lib_benchmarks_proto/dune | 3 +-- .../bin_tx_rollup_client/dune | 5 ++-- .../lib_benchmarks_proto/dune | 3 +-- src/proto_alpha/bin_tx_rollup_client/dune | 5 ++-- src/proto_alpha/lib_benchmarks_proto/dune | 3 +-- 6 files changed, 15 insertions(+), 29 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index a76913efbe32..3d7259f55343 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3105,12 +3105,7 @@ end = struct List.filter_map (fun (x, b) -> if b then Some x else None) module Lib_protocol = struct - type t = { - main : target; - embedded : target; - environment : target; - raw_protocol : target; - } + type t = {main : target; embedded : target; environment : target} let make_tests ?test_helpers ?parameters ?plugin ?client ?benchmark ?benchmark_type_inference ~main ~environment ~name () = @@ -3604,12 +3599,12 @@ include Tezos_raw_protocol_%s.Main ]; ] in - {main; embedded; environment; raw_protocol} + {main; embedded; environment} end let genesis = let name = Name.other "genesis" in - let {Lib_protocol.main; embedded; environment = _; raw_protocol = _} = + let {Lib_protocol.main; embedded; environment = _} = Lib_protocol.make ~name in let client = @@ -3635,14 +3630,14 @@ include Tezos_raw_protocol_%s.Main let demo_noops = let name = Name.other "demo-noops" in - let {Lib_protocol.main; embedded; environment = _; raw_protocol = _} = + let {Lib_protocol.main; embedded; environment = _} = Lib_protocol.make ~name in register @@ make ~name ~status:Not_mainnet ~main ~embedded () let _demo_counter = let name = Name.other "demo-counter" in - let {Lib_protocol.main; embedded; environment = _; raw_protocol = _} = + let {Lib_protocol.main; embedded; environment = _} = Lib_protocol.make ~name in let client = @@ -3682,9 +3677,7 @@ include Tezos_raw_protocol_%s.Main let both o1 o2 = match (o1, o2) with Some x, Some y -> Some (x, y) | _, _ -> None in - let {Lib_protocol.main; embedded; environment; raw_protocol} = - Lib_protocol.make ~name - in + let {Lib_protocol.main; embedded; environment} = Lib_protocol.make ~name in let parameters = only_if (N.(number >= 011) && not_overridden) @@ fun () -> public_lib @@ -4306,13 +4299,12 @@ include Tezos_raw_protocol_%s.Main [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; - main |> open_; + main |> open_ |> open_ ~m:"Protocol"; client |> if_some |> open_; client_commands |> if_some |> open_; octez_client_base_unix |> open_; octez_stdlib_unix |> open_; tx_rollup |> if_some |> open_; - raw_protocol |> open_; uri; ] in @@ -4467,8 +4459,7 @@ include Tezos_raw_protocol_%s.Main octez_benchmark |> open_; benchmark |> if_some |> open_; benchmark_type_inference |> if_some |> open_; - main |> open_; - raw_protocol |> open_; + main |> open_ |> open_ ~m:"Protocol"; octez_crypto |> open_; octez_shell_benchmarks; octez_micheline |> open_; diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/dune b/src/proto_012_Psithaca/lib_benchmarks_proto/dune index cab7ecc383ca..08b76ef44d76 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/dune +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/dune @@ -15,7 +15,6 @@ tezos-benchmark-012-Psithaca tezos-benchmark-type-inference-012-Psithaca tezos-protocol-012-Psithaca - tezos-protocol-012-Psithaca.raw tezos-crypto tezos-shell-benchmarks tezos-micheline @@ -35,7 +34,7 @@ -open Tezos_benchmark_012_Psithaca -open Tezos_benchmark_type_inference_012_Psithaca -open Tezos_protocol_012_Psithaca - -open Tezos_raw_protocol_012_Psithaca + -open Tezos_protocol_012_Psithaca.Protocol -open Tezos_crypto -open Tezos_micheline -open Tezos_012_Psithaca_test_helpers diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune index cf9430bf95d9..2040f0219fc2 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune @@ -14,7 +14,6 @@ tezos-client-base-unix tezos-stdlib-unix tezos-tx-rollup-013-PtJakart - tezos-protocol-013-PtJakart.raw uri) (link_flags (:standard) @@ -24,9 +23,9 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_013_PtJakart + -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_client_013_PtJakart -open Tezos_client_013_PtJakart_commands -open Tezos_client_base_unix -open Tezos_stdlib_unix - -open Tezos_tx_rollup_013_PtJakart - -open Tezos_raw_protocol_013_PtJakart)) + -open Tezos_tx_rollup_013_PtJakart)) diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/dune b/src/proto_013_PtJakart/lib_benchmarks_proto/dune index cf8a353a8373..502bf84fb185 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/dune +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/dune @@ -15,7 +15,6 @@ tezos-benchmark-013-PtJakart tezos-benchmark-type-inference-013-PtJakart tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart.raw tezos-crypto tezos-shell-benchmarks tezos-micheline @@ -35,7 +34,7 @@ -open Tezos_benchmark_013_PtJakart -open Tezos_benchmark_type_inference_013_PtJakart -open Tezos_protocol_013_PtJakart - -open Tezos_raw_protocol_013_PtJakart + -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_crypto -open Tezos_micheline -open Tezos_013_PtJakart_test_helpers diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune index 689f1653b61e..a6993f75fc9e 100644 --- a/src/proto_alpha/bin_tx_rollup_client/dune +++ b/src/proto_alpha/bin_tx_rollup_client/dune @@ -14,7 +14,6 @@ tezos-client-base-unix tezos-stdlib-unix tezos-tx-rollup-alpha - tezos-protocol-alpha.raw uri) (link_flags (:standard) @@ -24,9 +23,9 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_alpha + -open Tezos_protocol_alpha.Protocol -open Tezos_client_alpha -open Tezos_client_alpha_commands -open Tezos_client_base_unix -open Tezos_stdlib_unix - -open Tezos_tx_rollup_alpha - -open Tezos_raw_protocol_alpha)) + -open Tezos_tx_rollup_alpha)) diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 7de0ac3e8dd7..f31b8568ca14 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -15,7 +15,6 @@ tezos-benchmark-alpha tezos-benchmark-type-inference-alpha tezos-protocol-alpha - tezos-protocol-alpha.raw tezos-crypto tezos-shell-benchmarks tezos-micheline @@ -35,7 +34,7 @@ -open Tezos_benchmark_alpha -open Tezos_benchmark_type_inference_alpha -open Tezos_protocol_alpha - -open Tezos_raw_protocol_alpha + -open Tezos_protocol_alpha.Protocol -open Tezos_crypto -open Tezos_micheline -open Tezos_alpha_test_helpers -- GitLab From 2f7b3311ac51fa7deeb54eabd0c6e395fbf32c29 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 12:13:05 +0200 Subject: [PATCH 2/3] Proto: tezos_protocol_NAME_functor doesn't depend on raw --- manifest/main.ml | 7 +------ src/proto_000_Ps9mPmXa/lib_protocol/dune | 3 +-- src/proto_001_PtCJ7pwo/lib_protocol/dune | 3 +-- src/proto_002_PsYLVpVv/lib_protocol/dune | 3 +-- src/proto_003_PsddFKi3/lib_protocol/dune | 3 +-- src/proto_004_Pt24m4xi/lib_protocol/dune | 3 +-- src/proto_005_PsBABY5H/lib_protocol/dune | 3 +-- src/proto_005_PsBabyM1/lib_protocol/dune | 3 +-- src/proto_006_PsCARTHA/lib_protocol/dune | 3 +-- src/proto_007_PsDELPH1/lib_protocol/dune | 3 +-- src/proto_008_PtEdo2Zk/lib_protocol/dune | 3 +-- src/proto_008_PtEdoTez/lib_protocol/dune | 3 +-- src/proto_009_PsFLoren/lib_protocol/dune | 3 +-- src/proto_010_PtGRANAD/lib_protocol/dune | 3 +-- src/proto_011_PtHangz2/lib_protocol/dune | 3 +-- src/proto_012_Psithaca/lib_protocol/dune | 3 +-- src/proto_013_PtJakart/lib_protocol/dune | 3 +-- src/proto_alpha/lib_protocol/dune | 3 +-- src/proto_demo_counter/lib_protocol/dune | 3 +-- src/proto_demo_noops/lib_protocol/dune | 3 +-- src/proto_genesis/lib_protocol/dune | 3 +-- 21 files changed, 21 insertions(+), 46 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 3d7259f55343..bfe1a4f83f41 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3523,12 +3523,7 @@ include Tezos_raw_protocol_%s.Main ~bisect_ppx:false ~flags:(Flags.standard ~nopervasives:true ~disable_warnings ()) ~opam_only_deps:[octez_protocol_compiler_tezos_protocol_packer] - ~deps: - [ - octez_protocol_environment; - tezos_protocol_environment_sigs; - raw_protocol; - ] + ~deps:[octez_protocol_environment; tezos_protocol_environment_sigs] ~dune: Dune. [ diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index 787a0c104e3f..c1338d7d8ebb 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -76,8 +76,7 @@ (name tezos_protocol_000_Ps9mPmXa_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-000-Ps9mPmXa.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index 5ee564582ef2..a7bf35c09b3d 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -209,8 +209,7 @@ (name tezos_protocol_001_PtCJ7pwo_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-001-PtCJ7pwo.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 4b8f316f106d..589857e27c80 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -209,8 +209,7 @@ (name tezos_protocol_002_PsYLVpVv_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-002-PsYLVpVv.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 51218ea300c7..bf9381eefae0 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -211,8 +211,7 @@ (name tezos_protocol_003_PsddFKi3_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-003-PsddFKi3.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 0f525fcea322..126d93c741b8 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -211,8 +211,7 @@ (name tezos_protocol_004_Pt24m4xi_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-004-Pt24m4xi.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index 1f234b11a7cd..53de7dff548b 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -213,8 +213,7 @@ (name tezos_protocol_005_PsBABY5H_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-005-PsBABY5H.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 01eaf41aee51..51521e781c5f 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -213,8 +213,7 @@ (name tezos_protocol_005_PsBabyM1_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-005-PsBabyM1.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index 4afd2869b36b..30bd6ec9285a 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -213,8 +213,7 @@ (name tezos_protocol_006_PsCARTHA_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-006-PsCARTHA.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index c5674ebb79a4..4ba0ca7dcd66 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -217,8 +217,7 @@ (name tezos_protocol_007_PsDELPH1_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-007-PsDELPH1.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 0861d0b09df6..3c11d0686c80 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -227,8 +227,7 @@ (name tezos_protocol_008_PtEdo2Zk_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-008-PtEdo2Zk.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 8b1969bf86f4..98f467200947 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -227,8 +227,7 @@ (name tezos_protocol_008_PtEdoTez_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-008-PtEdoTez.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index 4ae25e8fec6f..d9edfa72da29 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -233,8 +233,7 @@ (name tezos_protocol_009_PsFLoren_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-009-PsFLoren.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index e069200650ea..05ace6ff0f3c 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -243,8 +243,7 @@ (name tezos_protocol_010_PtGRANAD_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-010-PtGRANAD.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 215979b1906e..3fc4de66942c 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -264,8 +264,7 @@ (name tezos_protocol_011_PtHangz2_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-011-PtHangz2.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -51 diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 18e3ab22a4bd..4822a75c8635 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -298,8 +298,7 @@ (name tezos_protocol_012_Psithaca_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-012-Psithaca.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -51 diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index 46802dc360d8..799c5b5a5ca5 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -429,8 +429,7 @@ (name tezos_protocol_013_PtJakart_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-013-PtJakart.raw) + tezos-protocol-environment.sigs) (flags (:standard) -w -51 diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index a14172d55b10..2751c034f960 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -480,8 +480,7 @@ (name tezos_protocol_alpha_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-alpha.raw) + tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index cc1185e17d5e..c51e99c2ce6a 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -86,8 +86,7 @@ (name tezos_protocol_demo_counter_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-demo-counter.raw) + tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index d1dfb9af0a6b..1d732a8429d6 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -67,8 +67,7 @@ (name tezos_protocol_demo_noops_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-demo-noops.raw) + tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index d098d481f392..33e77372e2a1 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -69,8 +69,7 @@ (name tezos_protocol_genesis_functor) (libraries tezos-protocol-environment - tezos-protocol-environment.sigs - tezos-protocol-genesis.raw) + tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) -- GitLab From e0f087fce562b29cc2e086f24e04d1f853793682 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 12:20:52 +0200 Subject: [PATCH 3/3] Protocol: remove explicit dep on Tezos_raw_protocol_NAME --- src/lib_protocol_compiler/bin/main_embedded_packer.ml | 4 ++-- .../lib_protocol/test/integration/michelson/test_sapling.ml | 2 +- .../lib_protocol/test/integration/michelson/test_sapling.ml | 2 +- .../lib_protocol/test/integration/michelson/test_sapling.ml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib_protocol_compiler/bin/main_embedded_packer.ml b/src/lib_protocol_compiler/bin/main_embedded_packer.ml index 07fc19c44a1b..17203ec2c2ef 100644 --- a/src/lib_protocol_compiler/bin/main_embedded_packer.ml +++ b/src/lib_protocol_compiler/bin/main_embedded_packer.ml @@ -60,8 +60,8 @@ let () = {| module Registered = Tezos_protocol_updater.Registered_protocol.Register_embedded_%s - (Tezos_protocol_environment_%s.Environment) - (Tezos_raw_protocol_%s.Main) + (Tezos_protocol_%s.Protocol.Environment) + (Tezos_protocol_%s.Protocol.Main) (Source) @.|} (Protocol.module_name_of_env_version sources.expected_env) diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml b/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml index 132ee9de6234..0e4bbc8a52fd 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml @@ -760,7 +760,7 @@ module Interpreter_tests = struct List.exists (function | Environment.Ecoproto_error - (Tezos_raw_protocol_012_Psithaca.Script_tc_errors + (Tezos_protocol_012_Psithaca.Protocol.Script_tc_errors .Unexpected_forged_value _) -> true | _ -> false) diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml index f22fb8c0f059..e8bf27f8a7f6 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml +++ b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml @@ -840,7 +840,7 @@ module Interpreter_tests = struct List.exists (function | Environment.Ecoproto_error - (Tezos_raw_protocol_013_PtJakart.Script_tc_errors + (Tezos_protocol_013_PtJakart.Protocol.Script_tc_errors .Unexpected_forged_value _) -> true | _ -> false) diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml index df7bf0f1908f..134109df095b 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml @@ -848,7 +848,7 @@ module Interpreter_tests = struct List.exists (function | Environment.Ecoproto_error - (Tezos_raw_protocol_alpha.Script_tc_errors + (Tezos_protocol_alpha.Protocol.Script_tc_errors .Unexpected_forged_value _) -> true | _ -> false) -- GitLab