From d53f0044c582ed88988bd8afada2e56edbe14d74 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 12:02:33 +0200 Subject: [PATCH 1/5] 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 c8950f83fe4f..b88f015a9020 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3079,12 +3079,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 () = @@ -3578,12 +3573,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 = @@ -3609,14 +3604,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 = @@ -3656,9 +3651,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 @@ -4280,13 +4273,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 @@ -4441,8 +4433,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 43ee337c5f19263d6e7d44799ff13148af67174f Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 12:13:05 +0200 Subject: [PATCH 2/5] 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 b88f015a9020..2143bdf8e47b 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3497,12 +3497,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 9229522ff48a1024a269d44f42c3b1ecdfc22b3a Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 23 Jun 2022 12:20:52 +0200 Subject: [PATCH 3/5] 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 From f5cc8f32b751ecbde0e96ba40d075d51ebbedd16 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Tue, 21 Jun 2022 16:12:58 +0200 Subject: [PATCH 4/5] Everywhere: Cleanup deps on protocols --- devtools/get_contracts/dune | 3 ++ manifest/main.ml | 46 +++++++++---------- src/proto_000_Ps9mPmXa/lib_protocol/dune | 9 +++- src/proto_001_PtCJ7pwo/lib_protocol/dune | 9 +++- src/proto_002_PsYLVpVv/lib_protocol/dune | 9 +++- src/proto_003_PsddFKi3/lib_protocol/dune | 9 +++- src/proto_004_Pt24m4xi/lib_protocol/dune | 9 +++- src/proto_005_PsBABY5H/lib_protocol/dune | 9 +++- src/proto_005_PsBabyM1/lib_protocol/dune | 9 +++- src/proto_006_PsCARTHA/lib_protocol/dune | 9 +++- src/proto_007_PsDELPH1/lib_protocol/dune | 9 +++- src/proto_008_PtEdo2Zk/lib_protocol/dune | 9 +++- src/proto_008_PtEdoTez/lib_protocol/dune | 9 +++- src/proto_009_PsFLoren/lib_protocol/dune | 9 +++- src/proto_010_PtGRANAD/lib_protocol/dune | 9 +++- .../lib_client_sapling/dune | 6 +-- src/proto_011_PtHangz2/lib_protocol/dune | 9 +++- .../lib_client_sapling/dune | 6 +-- src/proto_012_Psithaca/lib_delegate/test/dune | 2 - src/proto_012_Psithaca/lib_plugin/test/dune | 2 - src/proto_012_Psithaca/lib_protocol/dune | 9 +++- .../lib_protocol/test/helpers/dune | 2 - .../lib_protocol/test/unit/dune | 2 - .../lib_client_sapling/dune | 2 - src/proto_013_PtJakart/lib_delegate/test/dune | 2 - src/proto_013_PtJakart/lib_injector/dune | 2 - src/proto_013_PtJakart/lib_plugin/test/dune | 2 - src/proto_013_PtJakart/lib_protocol/dune | 9 +++- .../lib_protocol/test/helpers/dune | 2 - .../lib_protocol/test/unit/dune | 2 - src/proto_013_PtJakart/lib_tx_rollup/dune | 2 - src/proto_alpha/lib_client_sapling/dune | 2 - src/proto_alpha/lib_delegate/test/dune | 2 - src/proto_alpha/lib_injector/dune | 2 - src/proto_alpha/lib_plugin/test/dune | 2 - src/proto_alpha/lib_protocol/dune | 9 +++- .../lib_protocol/test/helpers/dune | 2 - src/proto_alpha/lib_protocol/test/unit/dune | 2 - src/proto_alpha/lib_tx_rollup/dune | 2 - src/proto_demo_counter/lib_protocol/dune | 9 +++- src/proto_demo_noops/lib_protocol/dune | 9 +++- src/proto_genesis/lib_protocol/dune | 9 +++- 42 files changed, 190 insertions(+), 87 deletions(-) diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index 67c2304355b8..3f03b09dc850 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -26,6 +26,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_protocol_012_Psithaca -open Tezos_protocol_012_Psithaca.Protocol -open Tezos_client_012_Psithaca) (modules get_contracts_012_Psithaca)) @@ -40,6 +41,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_client_013_PtJakart) (modules get_contracts_013_PtJakart)) @@ -54,6 +56,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_protocol_alpha -open Tezos_protocol_alpha.Protocol -open Tezos_client_alpha) (modules get_contracts_alpha)) diff --git a/manifest/main.ml b/manifest/main.ml index 2143bdf8e47b..31a076039b3a 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3079,10 +3079,10 @@ 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} + type t = {main : target; embedded : target} let make_tests ?test_helpers ?parameters ?plugin ?client ?benchmark - ?benchmark_type_inference ~main ~environment ~name () = + ?benchmark_type_inference ~main ~name () = let name_dash = Name.name_dash name in let number = Name.number name in let path = Name.base_path name in @@ -3257,7 +3257,6 @@ end = struct octez_protocol_environment; octez_stdlib_unix; main |> open_; - environment |> open_; test_helpers |> if_some |> open_; alcotest_lwt; octez_stdlib |> if_ N.(number >= 013) |> open_; @@ -3410,7 +3409,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end "Tezos/Protocol: %s economic-protocol definition" name_underscore | Alpha | V _ -> "Tezos/Protocol: economic-protocol definition") - ~modules:["Protocol"] + ~modules:["Protocol"; sf "Tezos_protocol_%s" name_underscore] ~flags:(Flags.standard ~nopervasives:true ~disable_warnings ()) ~deps: [ @@ -3444,6 +3443,20 @@ include Tezos_raw_protocol_%s.Main name_underscore name_underscore); ]; + targets_rule + [sf "tezos_protocol_%s.ml" name_underscore] + ~action: + [ + S "write-file"; + S "%{targets}"; + S + (sf + {| +module Environment = Tezos_protocol_environment_%s.Environment +module Protocol = Protocol +|} + name_underscore); + ]; alias_rule "runtest_compile_protocol" ~deps_dune: @@ -3568,14 +3581,12 @@ include Tezos_raw_protocol_%s.Main ]; ] in - {main; embedded; environment} + {main; embedded} end let genesis = let name = Name.other "genesis" in - let {Lib_protocol.main; embedded; environment = _} = - Lib_protocol.make ~name - in + let {Lib_protocol.main; embedded} = Lib_protocol.make ~name in let client = public_lib (sf "tezos-client-%s" (Name.name_dash name)) @@ -3599,16 +3610,12 @@ include Tezos_raw_protocol_%s.Main let demo_noops = let name = Name.other "demo-noops" in - let {Lib_protocol.main; embedded; environment = _} = - Lib_protocol.make ~name - in + let {Lib_protocol.main; embedded} = 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 = _} = - Lib_protocol.make ~name - in + let {Lib_protocol.main; embedded} = Lib_protocol.make ~name in let client = public_lib (sf "tezos-client-%s" (Name.name_dash name)) @@ -3646,7 +3653,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} = Lib_protocol.make ~name in + let {Lib_protocol.main; embedded} = Lib_protocol.make ~name in let parameters = only_if (N.(number >= 011) && not_overridden) @@ fun () -> public_lib @@ -3785,7 +3792,6 @@ include Tezos_raw_protocol_%s.Main parameters |> if_some; octez_protocol_environment; plugin |> if_some |> open_; - environment |> open_; octez_shell_services |> open_; ] in @@ -3809,7 +3815,6 @@ include Tezos_raw_protocol_%s.Main octez_stdlib_unix; octez_micheline |> open_; plugin |> open_; - environment |> open_; main |> open_ |> open_ ~m:"Protocol"; parameters |> if_some |> open_; test_helpers |> open_; @@ -3886,7 +3891,6 @@ include Tezos_raw_protocol_%s.Main client |> if_some |> open_; client_commands |> if_some |> open_; main |> open_; - environment |> open_; plugin |> if_some |> if_ N.(number >= 013) |> open_; ] ~linkall:true @@ -4035,7 +4039,6 @@ include Tezos_raw_protocol_%s.Main octez_micheline |> open_; client |> if_some |> open_; main |> open_; - environment |> open_; test_helpers |> if_ N.(number <= 011) |> open_; octez_base_test_helpers |> open_; mockup_simulator |> if_some |> open_; @@ -4135,7 +4138,6 @@ include Tezos_raw_protocol_%s.Main |> open_; octez_crypto |> open_; main |> open_; - environment |> open_; octez_micheline |> open_; client |> if_some |> open_; octez_client_base |> open_; @@ -4235,7 +4237,6 @@ include Tezos_raw_protocol_%s.Main |> open_; octez_crypto |> open_; main |> open_; - environment |> open_; client |> if_some |> open_; octez_client_commands |> open_; octez_context_encoding; @@ -4449,7 +4450,6 @@ include Tezos_raw_protocol_%s.Main ?benchmark:(Option.bind benchmark Fun.id) ?benchmark_type_inference ~main - ~environment ~name () in @@ -4696,7 +4696,7 @@ let _get_contracts = ~deps: [ octez_base |> open_ ~m:"TzPervasives"; - main |> open_ ~m:"Protocol"; + main |> open_ |> open_ ~m:"Protocol"; client |> open_; get_contracts_lib; ] diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index c1338d7d8ebb..450596f3efaa 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -46,7 +46,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_000_Ps9mPmXa)) (install (package tezos-protocol-000-Ps9mPmXa) @@ -60,6 +60,13 @@ %{targets} "module Environment = Tezos_protocol_environment_000_Ps9mPmXa.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_000_Ps9mPmXa\ninclude Tezos_raw_protocol_000_Ps9mPmXa.Main\n"))) +(rule + (targets tezos_protocol_000_Ps9mPmXa.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_000_Ps9mPmXa.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps data.ml diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index a7bf35c09b3d..bf7e454e4ca8 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -113,7 +113,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_001_PtCJ7pwo)) (install (package tezos-protocol-001-PtCJ7pwo) @@ -127,6 +127,13 @@ %{targets} "module Environment = Tezos_protocol_environment_001_PtCJ7pwo.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_001_PtCJ7pwo\ninclude Tezos_raw_protocol_001_PtCJ7pwo.Main\n"))) +(rule + (targets tezos_protocol_001_PtCJ7pwo.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_001_PtCJ7pwo.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 589857e27c80..60bfdae4f16c 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -113,7 +113,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_002_PsYLVpVv)) (install (package tezos-protocol-002-PsYLVpVv) @@ -127,6 +127,13 @@ %{targets} "module Environment = Tezos_protocol_environment_002_PsYLVpVv.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsYLVpVvgbLhAhoqAkMFUo6gudkJ9weNXhUYCiLDzcUpFpkk8Wt\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_002_PsYLVpVv\ninclude Tezos_raw_protocol_002_PsYLVpVv.Main\n"))) +(rule + (targets tezos_protocol_002_PsYLVpVv.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_002_PsYLVpVv.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index bf9381eefae0..48ab385008c0 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -114,7 +114,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_003_PsddFKi3)) (install (package tezos-protocol-003-PsddFKi3) @@ -128,6 +128,13 @@ %{targets} "module Environment = Tezos_protocol_environment_003_PsddFKi3.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_003_PsddFKi3\ninclude Tezos_raw_protocol_003_PsddFKi3.Main\n"))) +(rule + (targets tezos_protocol_003_PsddFKi3.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_003_PsddFKi3.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 126d93c741b8..c74013de56a0 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -114,7 +114,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_004_Pt24m4xi)) (install (package tezos-protocol-004-Pt24m4xi) @@ -128,6 +128,13 @@ %{targets} "module Environment = Tezos_protocol_environment_004_Pt24m4xi.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Pt24m4xiPbLDhVgVfABUjirbmda3yohdN82Sp9FeuAXJ4eV9otd\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_004_Pt24m4xi\ninclude Tezos_raw_protocol_004_Pt24m4xi.Main\n"))) +(rule + (targets tezos_protocol_004_Pt24m4xi.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_004_Pt24m4xi.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index 53de7dff548b..9b2a331a5354 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -115,7 +115,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_005_PsBABY5H)) (install (package tezos-protocol-005-PsBABY5H) @@ -129,6 +129,13 @@ %{targets} "module Environment = Tezos_protocol_environment_005_PsBABY5H.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBABY5HQTSkA4297zNHfsZNKtxULfL18y95qb3m53QJiXGmrbU\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBABY5H\ninclude Tezos_raw_protocol_005_PsBABY5H.Main\n"))) +(rule + (targets tezos_protocol_005_PsBABY5H.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_005_PsBABY5H.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 51521e781c5f..17d450716273 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -115,7 +115,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_005_PsBabyM1)) (install (package tezos-protocol-005-PsBabyM1) @@ -129,6 +129,13 @@ %{targets} "module Environment = Tezos_protocol_environment_005_PsBabyM1.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBabyM1\ninclude Tezos_raw_protocol_005_PsBabyM1.Main\n"))) +(rule + (targets tezos_protocol_005_PsBabyM1.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_005_PsBabyM1.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index 30bd6ec9285a..ad4b35569195 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -115,7 +115,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_006_PsCARTHA)) (install (package tezos-protocol-006-PsCARTHA) @@ -129,6 +129,13 @@ %{targets} "module Environment = Tezos_protocol_environment_006_PsCARTHA.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_006_PsCARTHA\ninclude Tezos_raw_protocol_006_PsCARTHA.Main\n"))) +(rule + (targets tezos_protocol_006_PsCARTHA.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_006_PsCARTHA.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index 4ba0ca7dcd66..85bac8d74a4a 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -117,7 +117,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_007_PsDELPH1)) (install (package tezos-protocol-007-PsDELPH1) @@ -131,6 +131,13 @@ %{targets} "module Environment = Tezos_protocol_environment_007_PsDELPH1.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsDELPH1Kxsxt8f9eWbxQeRxkjfbxoqM52jvs5Y5fBxWWh4ifpo\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_007_PsDELPH1\ninclude Tezos_raw_protocol_007_PsDELPH1.Main\n"))) +(rule + (targets tezos_protocol_007_PsDELPH1.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_007_PsDELPH1.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 3c11d0686c80..d8b170c73d35 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -122,7 +122,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_008_PtEdo2Zk)) (install (package tezos-protocol-008-PtEdo2Zk) @@ -136,6 +136,13 @@ %{targets} "module Environment = Tezos_protocol_environment_008_PtEdo2Zk.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdo2ZkT9oKpimTah6x2embF25oss54njMuPzkJTEi5RqfdZFA\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdo2Zk\ninclude Tezos_raw_protocol_008_PtEdo2Zk.Main\n"))) +(rule + (targets tezos_protocol_008_PtEdo2Zk.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_008_PtEdo2Zk.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 98f467200947..bd2f797bfbb0 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -122,7 +122,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_008_PtEdoTez)) (install (package tezos-protocol-008-PtEdoTez) @@ -136,6 +136,13 @@ %{targets} "module Environment = Tezos_protocol_environment_008_PtEdoTez.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdoTezd3RHSC31mpxxo1npxFjoWWcFgQtxapi51Z8TLu6v6Uq\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdoTez\ninclude Tezos_raw_protocol_008_PtEdoTez.Main\n"))) +(rule + (targets tezos_protocol_008_PtEdoTez.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_008_PtEdoTez.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index d9edfa72da29..233a3adadce2 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -125,7 +125,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_009_PsFLoren)) (install (package tezos-protocol-009-PsFLoren) @@ -139,6 +139,13 @@ %{targets} "module Environment = Tezos_protocol_environment_009_PsFLoren.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsFLorenaUUuikDWvMDr6fGBRG8kt3e3D3fHoXK1j1BFRxeSH4i\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_009_PsFLoren\ninclude Tezos_raw_protocol_009_PsFLoren.Main\n"))) +(rule + (targets tezos_protocol_009_PsFLoren.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_009_PsFLoren.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index 05ace6ff0f3c..76434f253a14 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -130,7 +130,7 @@ (:standard) -w -6-7-9-16-29-32-51-68 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_010_PtGRANAD)) (install (package tezos-protocol-010-PtGRANAD) @@ -144,6 +144,13 @@ %{targets} "module Environment = Tezos_protocol_environment_010_PtGRANAD.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_010_PtGRANAD\ninclude Tezos_raw_protocol_010_PtGRANAD.Main\n"))) +(rule + (targets tezos_protocol_010_PtGRANAD.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_010_PtGRANAD.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index 593ba47dfd00..23950c5cd2f7 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -13,8 +13,7 @@ tezos-signer-backends tezos-client-011-PtHangz2 tezos-client-011-PtHangz2.commands - tezos-protocol-011-PtHangz2 - tezos-protocol-011-PtHangz2.environment) + tezos-protocol-011-PtHangz2) (library_flags (:standard -linkall)) (flags (:standard) @@ -24,5 +23,4 @@ -open Tezos_client_base -open Tezos_client_011_PtHangz2 -open Tezos_client_011_PtHangz2_commands - -open Tezos_protocol_011_PtHangz2 - -open Tezos_protocol_environment_011_PtHangz2)) + -open Tezos_protocol_011_PtHangz2)) diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 3fc4de66942c..f385aeb36db9 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -143,7 +143,7 @@ (:standard) -w -51 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_011_PtHangz2)) (install (package tezos-protocol-011-PtHangz2) @@ -157,6 +157,13 @@ %{targets} "module Environment = Tezos_protocol_environment_011_PtHangz2.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_011_PtHangz2\ninclude Tezos_raw_protocol_011_PtHangz2.Main\n"))) +(rule + (targets tezos_protocol_011_PtHangz2.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_011_PtHangz2.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index 7af8c25abc36..dd8ecbadf7ca 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -13,8 +13,7 @@ tezos-signer-backends tezos-client-012-Psithaca tezos-client-012-Psithaca.commands - tezos-protocol-012-Psithaca - tezos-protocol-012-Psithaca.environment) + tezos-protocol-012-Psithaca) (library_flags (:standard -linkall)) (flags (:standard) @@ -24,5 +23,4 @@ -open Tezos_client_base -open Tezos_client_012_Psithaca -open Tezos_client_012_Psithaca_commands - -open Tezos_protocol_012_Psithaca - -open Tezos_protocol_environment_012_Psithaca)) + -open Tezos_protocol_012_Psithaca)) diff --git a/src/proto_012_Psithaca/lib_delegate/test/dune b/src/proto_012_Psithaca/lib_delegate/test/dune index faa3114eceba..2d6d86e63855 100644 --- a/src/proto_012_Psithaca/lib_delegate/test/dune +++ b/src/proto_012_Psithaca/lib_delegate/test/dune @@ -8,7 +8,6 @@ tezos-micheline tezos-client-012-Psithaca tezos-protocol-012-Psithaca - tezos-protocol-012-Psithaca.environment tezos-base-test-helpers tezos-baking-012-Psithaca.mockup-simulator tezos-baking-012-Psithaca @@ -23,7 +22,6 @@ -open Tezos_micheline -open Tezos_client_012_Psithaca -open Tezos_protocol_012_Psithaca - -open Tezos_protocol_environment_012_Psithaca -open Tezos_base_test_helpers -open Tezos_012_Psithaca_mockup_simulator -open Tezos_baking_012_Psithaca)) diff --git a/src/proto_012_Psithaca/lib_plugin/test/dune b/src/proto_012_Psithaca/lib_plugin/test/dune index ddd216c1640d..5ac2e496fba4 100644 --- a/src/proto_012_Psithaca/lib_plugin/test/dune +++ b/src/proto_012_Psithaca/lib_plugin/test/dune @@ -12,7 +12,6 @@ tezos-stdlib-unix tezos-micheline tezos-protocol-plugin-012-Psithaca - tezos-protocol-012-Psithaca.environment tezos-protocol-012-Psithaca tezos-protocol-012-Psithaca.parameters tezos-012-Psithaca-test-helpers) @@ -23,7 +22,6 @@ -open Tezos_base_test_helpers -open Tezos_micheline -open Tezos_protocol_plugin_012_Psithaca - -open Tezos_protocol_environment_012_Psithaca -open Tezos_protocol_012_Psithaca -open Tezos_protocol_012_Psithaca.Protocol -open Tezos_protocol_012_Psithaca_parameters diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 4822a75c8635..2e2e73168e0f 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -160,7 +160,7 @@ (:standard) -w -51 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_012_Psithaca)) (install (package tezos-protocol-012-Psithaca) @@ -174,6 +174,13 @@ %{targets} "module Environment = Tezos_protocol_environment_012_Psithaca.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_012_Psithaca\ninclude Tezos_raw_protocol_012_Psithaca.Main\n"))) +(rule + (targets tezos_protocol_012_Psithaca.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_012_Psithaca.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune index 43128051c6bd..d57be0bedaaa 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune @@ -17,7 +17,6 @@ tezos-protocol-012-Psithaca.parameters tezos-protocol-environment tezos-protocol-plugin-012-Psithaca - tezos-protocol-012-Psithaca.environment tezos-shell-services) (flags (:standard) @@ -28,5 +27,4 @@ -open Tezos_protocol_012_Psithaca -open Tezos_client_012_Psithaca -open Tezos_protocol_plugin_012_Psithaca - -open Tezos_protocol_environment_012_Psithaca -open Tezos_shell_services)) diff --git a/src/proto_012_Psithaca/lib_protocol/test/unit/dune b/src/proto_012_Psithaca/lib_protocol/test/unit/dune index e5838098e220..2b705f0b192f 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/unit/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/unit/dune @@ -13,7 +13,6 @@ tezos-protocol-environment tezos-stdlib-unix tezos-protocol-012-Psithaca - tezos-protocol-012-Psithaca.environment tezos-012-Psithaca-test-helpers alcotest-lwt) (flags @@ -24,7 +23,6 @@ -open Tezos_micheline -open Tezos_client_012_Psithaca -open Tezos_protocol_012_Psithaca - -open Tezos_protocol_environment_012_Psithaca -open Tezos_012_Psithaca_test_helpers)) (rule diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index f44d1bd7425c..affedc828da4 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -14,7 +14,6 @@ tezos-client-013-PtJakart tezos-client-013-PtJakart.commands tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-protocol-plugin-013-PtJakart) (library_flags (:standard -linkall)) (flags @@ -26,5 +25,4 @@ -open Tezos_client_013_PtJakart -open Tezos_client_013_PtJakart_commands -open Tezos_protocol_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_protocol_plugin_013_PtJakart)) diff --git a/src/proto_013_PtJakart/lib_delegate/test/dune b/src/proto_013_PtJakart/lib_delegate/test/dune index 4760ea838d82..fa43175332ca 100644 --- a/src/proto_013_PtJakart/lib_delegate/test/dune +++ b/src/proto_013_PtJakart/lib_delegate/test/dune @@ -8,7 +8,6 @@ tezos-micheline tezos-client-013-PtJakart tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-base-test-helpers tezos-baking-013-PtJakart.mockup-simulator tezos-baking-013-PtJakart @@ -23,7 +22,6 @@ -open Tezos_micheline -open Tezos_client_013_PtJakart -open Tezos_protocol_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_base_test_helpers -open Tezos_013_PtJakart_mockup_simulator -open Tezos_baking_013_PtJakart)) diff --git a/src/proto_013_PtJakart/lib_injector/dune b/src/proto_013_PtJakart/lib_injector/dune index 3d92746595bb..89e798a35dd6 100644 --- a/src/proto_013_PtJakart/lib_injector/dune +++ b/src/proto_013_PtJakart/lib_injector/dune @@ -9,7 +9,6 @@ tezos-base tezos-crypto tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-micheline tezos-client-013-PtJakart tezos-client-base @@ -25,7 +24,6 @@ -open Tezos_base -open Tezos_crypto -open Tezos_protocol_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_micheline -open Tezos_client_013_PtJakart -open Tezos_client_base diff --git a/src/proto_013_PtJakart/lib_plugin/test/dune b/src/proto_013_PtJakart/lib_plugin/test/dune index b7ed56e2ab4e..b2b2b3904dc1 100644 --- a/src/proto_013_PtJakart/lib_plugin/test/dune +++ b/src/proto_013_PtJakart/lib_plugin/test/dune @@ -13,7 +13,6 @@ tezos-stdlib-unix tezos-micheline tezos-protocol-plugin-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters tezos-013-PtJakart-test-helpers) @@ -24,7 +23,6 @@ -open Tezos_base_test_helpers -open Tezos_micheline -open Tezos_protocol_plugin_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_protocol_013_PtJakart_parameters diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index 799c5b5a5ca5..d7f1d291a687 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -225,7 +225,7 @@ (:standard) -w -51 -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_013_PtJakart)) (install (package tezos-protocol-013-PtJakart) @@ -239,6 +239,13 @@ %{targets} "module Environment = Tezos_protocol_environment_013_PtJakart.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_013_PtJakart\ninclude Tezos_raw_protocol_013_PtJakart.Main\n"))) +(rule + (targets tezos_protocol_013_PtJakart.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_013_PtJakart.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_013_PtJakart/lib_protocol/test/helpers/dune b/src/proto_013_PtJakart/lib_protocol/test/helpers/dune index 72aaee09a31e..27e9f1afd357 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/helpers/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/helpers/dune @@ -17,7 +17,6 @@ tezos-protocol-013-PtJakart.parameters tezos-protocol-environment tezos-protocol-plugin-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-shell-services) (flags (:standard) @@ -28,5 +27,4 @@ -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_protocol_plugin_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_shell_services)) diff --git a/src/proto_013_PtJakart/lib_protocol/test/unit/dune b/src/proto_013_PtJakart/lib_protocol/test/unit/dune index 5ee97703d133..830504a9979a 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/unit/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/unit/dune @@ -13,7 +13,6 @@ tezos-protocol-environment tezos-stdlib-unix tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-013-PtJakart-test-helpers alcotest-lwt tezos-stdlib) @@ -25,7 +24,6 @@ -open Tezos_micheline -open Tezos_client_013_PtJakart -open Tezos_protocol_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_013_PtJakart_test_helpers -open Tezos_stdlib)) diff --git a/src/proto_013_PtJakart/lib_tx_rollup/dune b/src/proto_013_PtJakart/lib_tx_rollup/dune index 9b80e9e2875b..babae59d36a8 100644 --- a/src/proto_013_PtJakart/lib_tx_rollup/dune +++ b/src/proto_013_PtJakart/lib_tx_rollup/dune @@ -10,7 +10,6 @@ tezos-base tezos-crypto tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart.environment tezos-client-013-PtJakart tezos-client-commands tezos-context.encoding @@ -38,7 +37,6 @@ -open Tezos_base -open Tezos_crypto -open Tezos_protocol_013_PtJakart - -open Tezos_protocol_environment_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_commands -open Tezos_baking_013_PtJakart_commands diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 5d714cd77fd8..29bac8436d1a 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -14,7 +14,6 @@ tezos-client-alpha tezos-client-alpha.commands tezos-protocol-alpha - tezos-protocol-alpha.environment tezos-protocol-plugin-alpha) (library_flags (:standard -linkall)) (flags @@ -26,5 +25,4 @@ -open Tezos_client_alpha -open Tezos_client_alpha_commands -open Tezos_protocol_alpha - -open Tezos_protocol_environment_alpha -open Tezos_protocol_plugin_alpha)) diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index aa4bcd20c7fb..e2d734e974fb 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -8,7 +8,6 @@ tezos-micheline tezos-client-alpha tezos-protocol-alpha - tezos-protocol-alpha.environment tezos-base-test-helpers tezos-baking-alpha.mockup-simulator tezos-baking-alpha @@ -23,7 +22,6 @@ -open Tezos_micheline -open Tezos_client_alpha -open Tezos_protocol_alpha - -open Tezos_protocol_environment_alpha -open Tezos_base_test_helpers -open Tezos_alpha_mockup_simulator -open Tezos_baking_alpha)) diff --git a/src/proto_alpha/lib_injector/dune b/src/proto_alpha/lib_injector/dune index 096b822a7a88..2e54e3ea214f 100644 --- a/src/proto_alpha/lib_injector/dune +++ b/src/proto_alpha/lib_injector/dune @@ -9,7 +9,6 @@ tezos-base tezos-crypto tezos-protocol-alpha - tezos-protocol-alpha.environment tezos-micheline tezos-client-alpha tezos-client-base @@ -25,7 +24,6 @@ -open Tezos_base -open Tezos_crypto -open Tezos_protocol_alpha - -open Tezos_protocol_environment_alpha -open Tezos_micheline -open Tezos_client_alpha -open Tezos_client_base diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index 234101ef4fa2..8217d9534bc0 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -13,7 +13,6 @@ tezos-stdlib-unix tezos-micheline tezos-protocol-plugin-alpha - tezos-protocol-alpha.environment tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-alpha-test-helpers) @@ -24,7 +23,6 @@ -open Tezos_base_test_helpers -open Tezos_micheline -open Tezos_protocol_plugin_alpha - -open Tezos_protocol_environment_alpha -open Tezos_protocol_alpha -open Tezos_protocol_alpha.Protocol -open Tezos_protocol_alpha_parameters diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index 2751c034f960..2df0ab942e37 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -249,7 +249,7 @@ (flags (:standard) -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_alpha)) (install (package tezos-protocol-alpha) @@ -263,6 +263,13 @@ %{targets} "module Environment = Tezos_protocol_environment_alpha.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_alpha\ninclude Tezos_raw_protocol_alpha.Main\n"))) +(rule + (targets tezos_protocol_alpha.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_alpha.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index c8393950cf91..5fa328d81a1c 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -17,7 +17,6 @@ tezos-protocol-alpha.parameters tezos-protocol-environment tezos-protocol-plugin-alpha - tezos-protocol-alpha.environment tezos-shell-services) (flags (:standard) @@ -28,5 +27,4 @@ -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_protocol_plugin_alpha - -open Tezos_protocol_environment_alpha -open Tezos_shell_services)) diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 6e3bae54db29..b840f665aa69 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -13,7 +13,6 @@ tezos-protocol-environment tezos-stdlib-unix tezos-protocol-alpha - tezos-protocol-alpha.environment tezos-alpha-test-helpers alcotest-lwt tezos-stdlib) @@ -25,7 +24,6 @@ -open Tezos_micheline -open Tezos_client_alpha -open Tezos_protocol_alpha - -open Tezos_protocol_environment_alpha -open Tezos_alpha_test_helpers -open Tezos_stdlib)) diff --git a/src/proto_alpha/lib_tx_rollup/dune b/src/proto_alpha/lib_tx_rollup/dune index eeab8dfb11f8..efe1688d8153 100644 --- a/src/proto_alpha/lib_tx_rollup/dune +++ b/src/proto_alpha/lib_tx_rollup/dune @@ -10,7 +10,6 @@ tezos-base tezos-crypto tezos-protocol-alpha - tezos-protocol-alpha.environment tezos-client-alpha tezos-client-commands tezos-context.encoding @@ -38,7 +37,6 @@ -open Tezos_base -open Tezos_crypto -open Tezos_protocol_alpha - -open Tezos_protocol_environment_alpha -open Tezos_client_alpha -open Tezos_client_commands -open Tezos_baking_alpha_commands diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index c51e99c2ce6a..db303814c414 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -53,7 +53,7 @@ (flags (:standard) -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_demo_counter)) (install (package tezos-protocol-demo-counter) @@ -67,6 +67,13 @@ %{targets} "module Environment = Tezos_protocol_environment_demo_counter.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoCounterDemoCounterDemoCounterDemoCou4LSpdT\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_demo_counter\ninclude Tezos_raw_protocol_demo_counter.Main\n"))) +(rule + (targets tezos_protocol_demo_counter.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_demo_counter.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index 1d732a8429d6..aacd81313ad3 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -44,7 +44,7 @@ (flags (:standard) -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_demo_noops)) (install (package tezos-protocol-demo-noops) @@ -58,6 +58,13 @@ %{targets} "module Environment = Tezos_protocol_environment_demo_noops.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoNoopsDemoNoopsDemoNoopsDemoNoopsDemo6XBoYp\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_demo_noops\ninclude Tezos_raw_protocol_demo_noops.Main\n"))) +(rule + (targets tezos_protocol_demo_noops.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_demo_noops.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps main.ml main.mli (:src_dir TEZOS_PROTOCOL)) diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 33e77372e2a1..a5ba757f03a1 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -44,7 +44,7 @@ (flags (:standard) -nopervasives) - (modules Protocol)) + (modules Protocol Tezos_protocol_genesis)) (install (package tezos-protocol-genesis) @@ -58,6 +58,13 @@ %{targets} "module Environment = Tezos_protocol_environment_genesis.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_genesis\ninclude Tezos_raw_protocol_genesis.Main\n"))) +(rule + (targets tezos_protocol_genesis.ml) + (action + (write-file + %{targets} + "\nmodule Environment = Tezos_protocol_environment_genesis.Environment\nmodule Protocol = Protocol\n"))) + (rule (alias runtest_compile_protocol) (deps data.ml -- GitLab From d6d18a070989d38ff358f2c3290b5c428864bd56 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 22 Jun 2022 13:03:47 +0200 Subject: [PATCH 5/5] Protocol: do not export Environment inside Protocol --- manifest/main.ml | 6 +++--- scripts/yes-wallet/yes_wallet_lib.ml | 15 ++++++++++----- .../bin/main_embedded_packer.ml | 2 +- src/lib_store/test/alpha_utils.ml | 9 ++++----- src/lib_store/test/test_utils.ml | 2 +- src/proto_000_Ps9mPmXa/lib_protocol/dune | 2 +- .../lib_client/alpha_client_context.ml | 15 +++++---------- src/proto_001_PtCJ7pwo/lib_protocol/dune | 2 +- .../lib_client/alpha_client_context.ml | 15 +++++---------- src/proto_002_PsYLVpVv/lib_protocol/dune | 2 +- .../lib_client/alpha_client_context.ml | 15 +++++---------- src/proto_003_PsddFKi3/lib_protocol/dune | 2 +- .../lib_client/alpha_client_context.ml | 15 +++++---------- src/proto_004_Pt24m4xi/lib_protocol/dune | 2 +- src/proto_005_PsBABY5H/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_005_PsBabyM1/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_006_PsCARTHA/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_007_PsDELPH1/lib_plugin/plugin.ml | 2 -- src/proto_007_PsDELPH1/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_008_PtEdo2Zk/lib_protocol/dune | 2 +- src/proto_008_PtEdoTez/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_009_PsFLoren/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_010_PtGRANAD/lib_protocol/dune | 2 +- src/proto_011_PtHangz2/lib_client/mockup.ml | 10 +++++----- .../lib_client/protocol_client_context.ml | 17 ++++++----------- src/proto_011_PtHangz2/lib_protocol/dune | 2 +- .../lib_benchmark/test/test_helpers.ml | 2 +- .../lib_benchmarks_proto/sapling_benchmarks.ml | 2 +- .../lib_benchmarks_proto/sapling_generation.ml | 11 +++++------ src/proto_012_Psithaca/lib_client/mockup.ml | 14 +++++++------- .../lib_client/protocol_client_context.ml | 17 ++++++----------- .../lib_delegate/baking_scheduling.ml | 7 +++---- src/proto_012_Psithaca/lib_protocol/dune | 2 +- .../test/helpers/error_monad_operators.ml | 2 -- .../test/helpers/script_big_map.mli | 4 ++-- .../lib_benchmark/test/test_helpers.ml | 2 +- .../lib_benchmarks_proto/sapling_benchmarks.ml | 2 +- .../lib_benchmarks_proto/sapling_generation.ml | 11 +++++------ src/proto_013_PtJakart/lib_client/mockup.ml | 14 +++++++------- .../lib_client/protocol_client_context.ml | 17 ++++++----------- .../lib_delegate/baking_scheduling.ml | 7 +++---- src/proto_013_PtJakart/lib_protocol/dune | 2 +- .../test/helpers/error_monad_operators.ml | 2 -- .../test/helpers/script_big_map.mli | 4 ++-- .../lib_protocol/test/pbt/test_bitset.ml | 4 ++-- .../test/pbt/test_tx_rollup_l2_encoding.ml | 2 +- .../lib_protocol/test/unit/test_merkle_list.ml | 1 - src/proto_013_PtJakart/lib_tx_rollup/daemon.ml | 1 - .../lib_benchmark/test/test_helpers.ml | 2 +- .../lib_benchmarks_proto/sapling_benchmarks.ml | 2 +- .../lib_benchmarks_proto/sapling_generation.ml | 10 +++++----- .../tx_rollup_benchmarks.ml | 2 +- src/proto_alpha/lib_client/mockup.ml | 15 +++++++-------- .../lib_client/protocol_client_context.ml | 17 ++++++----------- .../lib_delegate/baking_scheduling.ml | 7 +++---- src/proto_alpha/lib_plugin/plugin_errors.ml | 2 -- src/proto_alpha/lib_protocol/dune | 2 +- .../test/helpers/error_monad_operators.ml | 2 -- .../test/helpers/script_big_map.mli | 4 ++-- .../test/integration/test_sc_rollup_wasm.ml | 2 +- .../lib_protocol/test/pbt/test_bitset.ml | 4 ++-- .../test/pbt/test_tx_rollup_l2_encoding.ml | 2 +- .../lib_protocol/test/unit/test_merkle_list.ml | 1 - .../test/unit/test_sc_rollup_arith.ml | 2 +- src/proto_alpha/lib_tx_rollup/daemon.ml | 1 - .../lib_client/protocol_client_context.ml | 6 ++---- .../lib_client/protocol_client_context.mli | 3 +-- src/proto_demo_counter/lib_protocol/dune | 2 +- src/proto_demo_noops/lib_protocol/dune | 2 +- .../lib_client/protocol_client_context.ml | 2 +- src/proto_genesis/lib_protocol/dune | 2 +- 77 files changed, 194 insertions(+), 283 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 31a076039b3a..f6c7b50f12df 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3432,15 +3432,15 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end S "%{targets}"; S (sf - {|module Environment = Tezos_protocol_environment_%s.Environment + {| let hash = Tezos_crypto.Protocol_hash.of_b58check_exn "%s" -let name = Environment.Name.name +let name = Tezos_protocol_environment_%s.Environment.Name.name include Tezos_raw_protocol_%s include Tezos_raw_protocol_%s.Main |} - name_underscore tezos_protocol.hash name_underscore + name_underscore name_underscore); ]; targets_rule diff --git a/scripts/yes-wallet/yes_wallet_lib.ml b/scripts/yes-wallet/yes_wallet_lib.ml index b49196122b25..8e54148eb7f7 100644 --- a/scripts/yes-wallet/yes_wallet_lib.ml +++ b/scripts/yes-wallet/yes_wallet_lib.ml @@ -198,7 +198,8 @@ let get_delegates (proto : protocol) context let fitness = header.fitness in match proto with | Florence -> - let open Tezos_protocol_009_PsFLoren.Protocol in + let open Tezos_protocol_009_PsFLoren in + let open Protocol in let* ctxt, _ = let*! r = Alpha_context.prepare @@ -258,7 +259,8 @@ let get_delegates (proto : protocol) context (fun (_, _, x) (_, _, y) -> Alpha_context.Tez.compare y x) delegates | Granada -> - let open Tezos_protocol_010_PtGRANAD.Protocol in + let open Tezos_protocol_010_PtGRANAD in + let open Protocol in let* ctxt, _, _ = let*! r = Alpha_context.prepare @@ -318,7 +320,8 @@ let get_delegates (proto : protocol) context (fun (_, _, x) (_, _, y) -> Alpha_context.Tez.compare y x) delegates | Hangzhou -> - let open Tezos_protocol_011_PtHangz2.Protocol in + let open Tezos_protocol_011_PtHangz2 in + let open Protocol in let* ctxt, _, _ = let*! r = Alpha_context.prepare @@ -378,7 +381,8 @@ let get_delegates (proto : protocol) context (fun (_, _, x) (_, _, y) -> Alpha_context.Tez.compare y x) delegates | Ithaca -> - let open Tezos_protocol_012_Psithaca.Protocol in + let open Tezos_protocol_012_Psithaca in + let open Protocol in let* ctxt, _, _ = let*! r = Alpha_context.prepare context ~level ~predecessor_timestamp ~timestamp @@ -434,7 +438,8 @@ let get_delegates (proto : protocol) context (fun (_, _, x) (_, _, y) -> Alpha_context.Tez.compare y x) delegates | Alpha -> - let open Tezos_protocol_alpha.Protocol in + let open Tezos_protocol_alpha in + let open Protocol in let* ctxt, _, _ = let*! r = Alpha_context.prepare context ~level ~predecessor_timestamp ~timestamp diff --git a/src/lib_protocol_compiler/bin/main_embedded_packer.ml b/src/lib_protocol_compiler/bin/main_embedded_packer.ml index 17203ec2c2ef..34ebaf34963f 100644 --- a/src/lib_protocol_compiler/bin/main_embedded_packer.ml +++ b/src/lib_protocol_compiler/bin/main_embedded_packer.ml @@ -60,7 +60,7 @@ let () = {| module Registered = Tezos_protocol_updater.Registered_protocol.Register_embedded_%s - (Tezos_protocol_%s.Protocol.Environment) + (Tezos_protocol_%s.Environment) (Tezos_protocol_%s.Protocol.Main) (Source) @.|} diff --git a/src/lib_store/test/alpha_utils.ml b/src/lib_store/test/alpha_utils.ml index c886e6e65511..320f97ed6325 100644 --- a/src/lib_store/test/alpha_utils.ml +++ b/src/lib_store/test/alpha_utils.ml @@ -24,7 +24,8 @@ (*****************************************************************************) module Assert = Lib_test.Assert -open Tezos_protocol_alpha.Protocol +open Tezos_protocol_alpha +open Protocol open Alpha_context open Tezos_context open Tezos_shell_context @@ -162,7 +163,7 @@ let make_rpc_context ~chain_id ctxt block = ~timestamp in let*? value_of_key = - Tezos_protocol_alpha.Protocol.Environment.wrap_tzresult value_of_key + Tezos_protocol_alpha.Environment.wrap_tzresult value_of_key in let* ctxt = Tezos_protocol_environment.Context.load_cache @@ -171,9 +172,7 @@ let make_rpc_context ~chain_id ctxt block = `Lazy (fun key -> let*! value = value_of_key key in - let*? value = - Tezos_protocol_alpha.Protocol.Environment.wrap_tzresult value - in + let*? value = Tezos_protocol_alpha.Environment.wrap_tzresult value in return value) in return diff --git a/src/lib_store/test/test_utils.ml b/src/lib_store/test/test_utils.ml index 46475d6f80fe..8e3a12480617 100644 --- a/src/lib_store/test/test_utils.ml +++ b/src/lib_store/test/test_utils.ml @@ -181,7 +181,7 @@ let dummy_patch_context ctxt = context = Context_hash.zero; } in - let*? {context; _} = Protocol.Environment.wrap_tzresult res in + let*? {context; _} = Environment.wrap_tzresult res in return (Tezos_shell_context.Shell_context.unwrap_disk_context context) let wrap_store_init ?(patch_context = dummy_patch_context) diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index 450596f3efaa..600f2aad0816 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -58,7 +58,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_000_Ps9mPmXa.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_000_Ps9mPmXa\ninclude Tezos_raw_protocol_000_Ps9mPmXa.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P\"\nlet name = Tezos_protocol_environment_000_Ps9mPmXa.Environment.Name.name\ninclude Tezos_raw_protocol_000_Ps9mPmXa\ninclude Tezos_raw_protocol_000_Ps9mPmXa.Main\n"))) (rule (targets tezos_protocol_000_Ps9mPmXa.ml) diff --git a/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml b/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml index 40e7d5bb62bc..7c9f0a05f8ff 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml +++ b/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml @@ -32,8 +32,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -64,8 +63,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = t#call_streamed_service inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -75,13 +73,11 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end class wrap_full (t : Client_context.full) : full = @@ -89,8 +85,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index bf7e454e4ca8..5878a7dd5d9d 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -125,7 +125,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_001_PtCJ7pwo.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_001_PtCJ7pwo\ninclude Tezos_raw_protocol_001_PtCJ7pwo.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY\"\nlet name = Tezos_protocol_environment_001_PtCJ7pwo.Environment.Name.name\ninclude Tezos_raw_protocol_001_PtCJ7pwo\ninclude Tezos_raw_protocol_001_PtCJ7pwo.Main\n"))) (rule (targets tezos_protocol_001_PtCJ7pwo.ml) diff --git a/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml b/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml index 40e7d5bb62bc..7c9f0a05f8ff 100644 --- a/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml +++ b/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml @@ -32,8 +32,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -64,8 +63,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = t#call_streamed_service inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -75,13 +73,11 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end class wrap_full (t : Client_context.full) : full = @@ -89,8 +85,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 60bfdae4f16c..1dc454d7d456 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -125,7 +125,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_002_PsYLVpVv.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsYLVpVvgbLhAhoqAkMFUo6gudkJ9weNXhUYCiLDzcUpFpkk8Wt\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_002_PsYLVpVv\ninclude Tezos_raw_protocol_002_PsYLVpVv.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsYLVpVvgbLhAhoqAkMFUo6gudkJ9weNXhUYCiLDzcUpFpkk8Wt\"\nlet name = Tezos_protocol_environment_002_PsYLVpVv.Environment.Name.name\ninclude Tezos_raw_protocol_002_PsYLVpVv\ninclude Tezos_raw_protocol_002_PsYLVpVv.Main\n"))) (rule (targets tezos_protocol_002_PsYLVpVv.ml) diff --git a/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml b/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml index 40e7d5bb62bc..7c9f0a05f8ff 100644 --- a/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml +++ b/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml @@ -32,8 +32,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -64,8 +63,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = t#call_streamed_service inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -75,13 +73,11 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end class wrap_full (t : Client_context.full) : full = @@ -89,8 +85,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 48ab385008c0..3946b3af9e9a 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -126,7 +126,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_003_PsddFKi3.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_003_PsddFKi3\ninclude Tezos_raw_protocol_003_PsddFKi3.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP\"\nlet name = Tezos_protocol_environment_003_PsddFKi3.Environment.Name.name\ninclude Tezos_raw_protocol_003_PsddFKi3\ninclude Tezos_raw_protocol_003_PsddFKi3.Main\n"))) (rule (targets tezos_protocol_003_PsddFKi3.ml) diff --git a/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml b/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml index f758c005e6e1..dbd0aeb7cbab 100644 --- a/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml +++ b/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml @@ -32,8 +32,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -64,8 +63,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = t#call_streamed_service inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -75,13 +73,11 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end class wrap_full (t : Client_context.full) : full = @@ -89,8 +85,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index c74013de56a0..c9aef4a19ea0 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -126,7 +126,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_004_Pt24m4xi.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Pt24m4xiPbLDhVgVfABUjirbmda3yohdN82Sp9FeuAXJ4eV9otd\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_004_Pt24m4xi\ninclude Tezos_raw_protocol_004_Pt24m4xi.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Pt24m4xiPbLDhVgVfABUjirbmda3yohdN82Sp9FeuAXJ4eV9otd\"\nlet name = Tezos_protocol_environment_004_Pt24m4xi.Environment.Name.name\ninclude Tezos_raw_protocol_004_Pt24m4xi\ninclude Tezos_raw_protocol_004_Pt24m4xi.Main\n"))) (rule (targets tezos_protocol_004_Pt24m4xi.ml) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index 9b2a331a5354..16da9173c0df 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -127,7 +127,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_005_PsBABY5H.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBABY5HQTSkA4297zNHfsZNKtxULfL18y95qb3m53QJiXGmrbU\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBABY5H\ninclude Tezos_raw_protocol_005_PsBABY5H.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBABY5HQTSkA4297zNHfsZNKtxULfL18y95qb3m53QJiXGmrbU\"\nlet name = Tezos_protocol_environment_005_PsBABY5H.Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBABY5H\ninclude Tezos_raw_protocol_005_PsBABY5H.Main\n"))) (rule (targets tezos_protocol_005_PsBABY5H.ml) diff --git a/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml b/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml index 5be1fb146d6a..519fa90c1c8a 100644 --- a/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml +++ b/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -39,8 +39,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -71,8 +70,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = t#call_streamed_service inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -82,13 +80,11 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end class wrap_full (t : Client_context.full) : full = @@ -96,8 +92,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 17d450716273..2672d3f1c847 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -127,7 +127,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_005_PsBabyM1.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBabyM1\ninclude Tezos_raw_protocol_005_PsBabyM1.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS\"\nlet name = Tezos_protocol_environment_005_PsBabyM1.Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBabyM1\ninclude Tezos_raw_protocol_005_PsBabyM1.Main\n"))) (rule (targets tezos_protocol_005_PsBabyM1.ml) diff --git a/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml b/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml index 686667044aba..7c20976ff861 100644 --- a/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml +++ b/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -39,8 +39,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -71,8 +70,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = t#call_streamed_service inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -82,13 +80,11 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end class wrap_full (t : Client_context.full) : full = @@ -96,8 +92,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index ad4b35569195..ad66066b5a58 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -127,7 +127,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_006_PsCARTHA.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_006_PsCARTHA\ninclude Tezos_raw_protocol_006_PsCARTHA.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb\"\nlet name = Tezos_protocol_environment_006_PsCARTHA.Environment.Name.name\ninclude Tezos_raw_protocol_006_PsCARTHA\ninclude Tezos_raw_protocol_006_PsCARTHA.Main\n"))) (rule (targets tezos_protocol_006_PsCARTHA.ml) diff --git a/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml b/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml index c4cacea6bd50..b2becb8d99c5 100644 --- a/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml +++ b/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_007_PsDELPH1/lib_plugin/plugin.ml b/src/proto_007_PsDELPH1/lib_plugin/plugin.ml index cf575957c82c..9d5576906d8d 100644 --- a/src/proto_007_PsDELPH1/lib_plugin/plugin.ml +++ b/src/proto_007_PsDELPH1/lib_plugin/plugin.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Protocol - module RPC = struct let rpc_services : Environment.Updater.rpc_context RPC_directory.t = Protocol.rpc_services diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index 85bac8d74a4a..ececfa3136cf 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -129,7 +129,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_007_PsDELPH1.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsDELPH1Kxsxt8f9eWbxQeRxkjfbxoqM52jvs5Y5fBxWWh4ifpo\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_007_PsDELPH1\ninclude Tezos_raw_protocol_007_PsDELPH1.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsDELPH1Kxsxt8f9eWbxQeRxkjfbxoqM52jvs5Y5fBxWWh4ifpo\"\nlet name = Tezos_protocol_environment_007_PsDELPH1.Environment.Name.name\ninclude Tezos_raw_protocol_007_PsDELPH1\ninclude Tezos_raw_protocol_007_PsDELPH1.Main\n"))) (rule (targets tezos_protocol_007_PsDELPH1.ml) diff --git a/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml b/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml index 3624e0cae059..0b2e471b20b2 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml +++ b/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index d8b170c73d35..afd5118cd074 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -134,7 +134,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_008_PtEdo2Zk.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdo2ZkT9oKpimTah6x2embF25oss54njMuPzkJTEi5RqfdZFA\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdo2Zk\ninclude Tezos_raw_protocol_008_PtEdo2Zk.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdo2ZkT9oKpimTah6x2embF25oss54njMuPzkJTEi5RqfdZFA\"\nlet name = Tezos_protocol_environment_008_PtEdo2Zk.Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdo2Zk\ninclude Tezos_raw_protocol_008_PtEdo2Zk.Main\n"))) (rule (targets tezos_protocol_008_PtEdo2Zk.ml) diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index bd2f797bfbb0..99749c278239 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -134,7 +134,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_008_PtEdoTez.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdoTezd3RHSC31mpxxo1npxFjoWWcFgQtxapi51Z8TLu6v6Uq\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdoTez\ninclude Tezos_raw_protocol_008_PtEdoTez.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdoTezd3RHSC31mpxxo1npxFjoWWcFgQtxapi51Z8TLu6v6Uq\"\nlet name = Tezos_protocol_environment_008_PtEdoTez.Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdoTez\ninclude Tezos_raw_protocol_008_PtEdoTez.Main\n"))) (rule (targets tezos_protocol_008_PtEdoTez.ml) diff --git a/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml b/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml index 1a8add950462..53f6350e07a3 100644 --- a/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml +++ b/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index 233a3adadce2..be40efad8460 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -137,7 +137,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_009_PsFLoren.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsFLorenaUUuikDWvMDr6fGBRG8kt3e3D3fHoXK1j1BFRxeSH4i\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_009_PsFLoren\ninclude Tezos_raw_protocol_009_PsFLoren.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsFLorenaUUuikDWvMDr6fGBRG8kt3e3D3fHoXK1j1BFRxeSH4i\"\nlet name = Tezos_protocol_environment_009_PsFLoren.Environment.Name.name\ninclude Tezos_raw_protocol_009_PsFLoren\ninclude Tezos_raw_protocol_009_PsFLoren.Main\n"))) (rule (targets tezos_protocol_009_PsFLoren.ml) diff --git a/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml b/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml index 1a8add950462..53f6350e07a3 100644 --- a/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml +++ b/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index 76434f253a14..d014fc0940ba 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -142,7 +142,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_010_PtGRANAD.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_010_PtGRANAD\ninclude Tezos_raw_protocol_010_PtGRANAD.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV\"\nlet name = Tezos_protocol_environment_010_PtGRANAD.Environment.Name.name\ninclude Tezos_raw_protocol_010_PtGRANAD\ninclude Tezos_raw_protocol_010_PtGRANAD.Main\n"))) (rule (targets tezos_protocol_010_PtGRANAD.ml) diff --git a/src/proto_011_PtHangz2/lib_client/mockup.ml b/src/proto_011_PtHangz2/lib_client/mockup.ml index 2e3c535bbb13..675651e960da 100644 --- a/src/proto_011_PtHangz2/lib_client/mockup.ml +++ b/src/proto_011_PtHangz2/lib_client/mockup.ml @@ -766,7 +766,7 @@ type block = { hash : Block_hash.t; header : Block_header.t; operations : Operation.packed list; - context : Protocol.Environment.Context.t; + context : Environment.Context.t; } module Forge = struct @@ -809,7 +809,7 @@ let initial_context chain_id (header : Block_header.shell_header) add empty ["version"] (Bytes.of_string "genesis") >>= fun ctxt -> add ctxt ["protocol_parameters"] proto_params) >>= fun ctxt -> - Protocol.Main.init ctxt header >|= Protocol.Environment.wrap_tzresult + Protocol.Main.init ctxt header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let ({ timestamp = predecessor_timestamp; @@ -839,7 +839,7 @@ let initial_context chain_id (header : Block_header.shell_header) ~predecessor_fitness ~predecessor ~timestamp - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun value_of_key -> (* In the mockup mode, reactivity is important and there are @@ -851,7 +851,7 @@ let initial_context chain_id (header : Block_header.shell_header) predecessor context `Lazy - (fun key -> value_of_key key >|= Protocol.Environment.wrap_tzresult) + (fun key -> value_of_key key >|= Environment.wrap_tzresult) >>=? fun context -> return context let mem_init : @@ -957,7 +957,7 @@ let migrate : let Tezos_protocol_environment.{block_hash; context; block_header} = rpc_context in - Protocol.Main.init context block_header >|= Protocol.Environment.wrap_tzresult + Protocol.Main.init context block_header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let rpc_context = Tezos_protocol_environment.{block_hash; block_header; context} diff --git a/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml b/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml index 1a8add950462..53f6350e07a3 100644 --- a/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml +++ b/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index f385aeb36db9..93c52754f3a9 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -155,7 +155,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_011_PtHangz2.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_011_PtHangz2\ninclude Tezos_raw_protocol_011_PtHangz2.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx\"\nlet name = Tezos_protocol_environment_011_PtHangz2.Environment.Name.name\ninclude Tezos_raw_protocol_011_PtHangz2\ninclude Tezos_raw_protocol_011_PtHangz2.Main\n"))) (rule (targets tezos_protocol_011_PtHangz2.ml) diff --git a/src/proto_012_Psithaca/lib_benchmark/test/test_helpers.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_helpers.ml index 8c6c9fdd6d66..f3f8431021b4 100644 --- a/src/proto_012_Psithaca/lib_benchmark/test/test_helpers.ml +++ b/src/proto_012_Psithaca/lib_benchmark/test/test_helpers.ml @@ -77,5 +77,5 @@ let typecheck_by_tezos = ~legacy:false (Micheline.root node) bef - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun _ -> return_unit )) diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_benchmarks.ml index 5ce5c4ff0693..3f242235d02f 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_benchmarks.ml +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_benchmarks.ml @@ -95,7 +95,7 @@ module Apply_diff_bench : Benchmark.S = struct Lazy_storage_kind.Sapling_state.Id.parse_z state_id in Alpha_context.Sapling.(state_from_id ctxt external_state_id) - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (state, ctxt) -> Format.eprintf "state hash: %d@." (Hashtbl.hash state.diff) ; Format.eprintf diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_generation.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_generation.ml index b07bebe1eda6..acda81b3de27 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_generation.ml +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_generation.ml @@ -189,7 +189,7 @@ let rec add_root nb_root ctxt id vk index size diff state = add_input Protocol.Sapling_storage.empty_diff vk index size 0L state >>=? fun (diff_to_add, {position = size; _}, new_idx) -> Protocol.Sapling_storage.apply_diff ctxt id diff_to_add - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (ctxt, _) -> (* We call it nb_root -1 because one root is already present*) add_root @@ -296,7 +296,7 @@ let make_inputs to_forge local_state proving_ctx sk vk root anti_replay = to_forge let init_fresh_sapling_state ctxt = - let open Protocol.Environment.Error_monad in + let open Environment.Error_monad in Protocol.Lazy_storage_diff.fresh Protocol.Lazy_storage_kind.Sapling_state ~temporary:false @@ -323,7 +323,7 @@ let prepare_seeded_state_internal ~(nb_input : int) ~(nb_nf : int) * Protocol.Lazy_storage_kind.Sapling_state.Id.t) tzresult Lwt.t = - init_fresh_sapling_state ctxt >|= Protocol.Environment.wrap_tzresult + init_fresh_sapling_state ctxt >|= Environment.wrap_tzresult >>=? fun (ctxt, id) -> let index_start = Tezos_sapling.Core.Client.Viewing_key.default_index in let sk, vk = generate_spending_and_viewing_keys state in @@ -336,8 +336,7 @@ let prepare_seeded_state_internal ~(nb_input : int) ~(nb_nf : int) ~index:index_start state >>=? fun (diff, to_forge) -> - Protocol.Sapling_storage.apply_diff ctxt id diff - >|= Protocol.Environment.wrap_tzresult + Protocol.Sapling_storage.apply_diff ctxt id diff >|= Environment.wrap_tzresult >>=? fun (ctxt, _size) -> return (diff, to_forge, sk, vk, ctxt, id) let prepare_seeded_state @@ -556,6 +555,6 @@ let generate (save_to : string) (tx_count : int) match result with Ok txs -> save ~filename:save_to ~txs | Error _ -> () let apply_diff ctxt id diff = - let open Protocol.Environment.Error_monad in + let open Environment.Error_monad in Sapling_storage.apply_diff (alpha_to_raw ctxt) id diff >>=? fun (ctxt, size) -> return (raw_to_alpha ctxt, size) diff --git a/src/proto_012_Psithaca/lib_client/mockup.ml b/src/proto_012_Psithaca/lib_client/mockup.ml index 7932f4aa5cdf..9355426d3cee 100644 --- a/src/proto_012_Psithaca/lib_client/mockup.ml +++ b/src/proto_012_Psithaca/lib_client/mockup.ml @@ -856,7 +856,7 @@ type block = { hash : Block_hash.t; header : Block_header.t; operations : Operation.packed list; - context : Protocol.Environment.Context.t; + context : Environment.Context.t; } module Forge = struct @@ -911,8 +911,8 @@ let initial_context chain_id (header : Block_header.shell_header) add empty ["version"] (Bytes.of_string "genesis") >>= fun ctxt -> add ctxt ["protocol_parameters"] proto_params) >>= fun ctxt -> - Protocol.Environment.Updater.activate ctxt Protocol.hash >>= fun ctxt -> - Protocol.Main.init ctxt header >|= Protocol.Environment.wrap_tzresult + Environment.Updater.activate ctxt Protocol.hash >>= fun ctxt -> + Protocol.Main.init ctxt header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let ({ timestamp = predecessor_timestamp; @@ -942,7 +942,7 @@ let initial_context chain_id (header : Block_header.shell_header) ~predecessor_fitness ~predecessor ~timestamp - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun value_of_key -> (* In the mockup mode, reactivity is important and there are @@ -954,7 +954,7 @@ let initial_context chain_id (header : Block_header.shell_header) predecessor context `Lazy - (fun key -> value_of_key key >|= Protocol.Environment.wrap_tzresult) + (fun key -> value_of_key key >|= Environment.wrap_tzresult) >>=? fun context -> return context let mem_init : @@ -1106,8 +1106,8 @@ let migrate : let Tezos_protocol_environment.{block_hash; context; block_header} = rpc_context in - Protocol.Environment.Updater.activate context Protocol.hash >>= fun context -> - Protocol.Main.init context block_header >|= Protocol.Environment.wrap_tzresult + Environment.Updater.activate context Protocol.hash >>= fun context -> + Protocol.Main.init context block_header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let rpc_context = Tezos_protocol_environment.{block_hash; block_header; context} diff --git a/src/proto_012_Psithaca/lib_client/protocol_client_context.ml b/src/proto_012_Psithaca/lib_client/protocol_client_context.ml index 1731670b6716..1e683ed8f26f 100644 --- a/src/proto_012_Psithaca/lib_client/protocol_client_context.ml +++ b/src/proto_012_Psithaca/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_012_Psithaca/lib_delegate/baking_scheduling.ml b/src/proto_012_Psithaca/lib_delegate/baking_scheduling.ml index 5f5bbcd51405..a12e4d95decd 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_scheduling.ml +++ b/src/proto_012_Psithaca/lib_delegate/baking_scheduling.ml @@ -359,7 +359,7 @@ let compute_next_potential_baking_time_at_next_level state = possibly means the baker has been late. *) (if Time.Protocol.(now < min_possible_time) then ok Round.zero else - Protocol.Environment.wrap_tzresult + Environment.wrap_tzresult @@ Round.round_of_timestamp round_durations ~predecessor_timestamp @@ -582,7 +582,7 @@ let create_round_durations constants = let delay_increment_per_round = constants.parametric.delay_increment_per_round in - Protocol.Environment.wrap_tzresult + Environment.wrap_tzresult (Round.Durations.create ~first_round_duration ~delay_increment_per_round) let create_initial_state cctxt ?(synchronize = true) ~chain config @@ -683,8 +683,7 @@ let compute_bootstrap_event state = else (* Otherwise, trigger the end of round to check whether we need to propose at this level or not *) - Protocol.Environment.wrap_tzresult - @@ Round.pred state.round_state.current_round + Environment.wrap_tzresult @@ Round.pred state.round_state.current_round >>? fun ending_round -> ok @@ Baking_state.Timeout (End_of_round {ending_round}) diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 2e2e73168e0f..e4dd44af0205 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -172,7 +172,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_012_Psithaca.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_012_Psithaca\ninclude Tezos_raw_protocol_012_Psithaca.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A\"\nlet name = Tezos_protocol_environment_012_Psithaca.Environment.Name.name\ninclude Tezos_raw_protocol_012_Psithaca\ninclude Tezos_raw_protocol_012_Psithaca.Main\n"))) (rule (targets tezos_protocol_012_Psithaca.ml) diff --git a/src/proto_012_Psithaca/lib_protocol/test/helpers/error_monad_operators.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/error_monad_operators.ml index 61eb43e4020a..4069cfa71371 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/helpers/error_monad_operators.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/error_monad_operators.ml @@ -1,5 +1,3 @@ -open Protocol - let ( >>=?? ) x y = x >>= function | Ok s -> y s diff --git a/src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.mli index d3875195820a..d10ab478df61 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.mli +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.mli @@ -28,7 +28,7 @@ val update : ('key, 'value) Protocol.Script_typed_ir.big_map -> Protocol.Alpha_context.t -> (('key, 'value) Protocol.Script_typed_ir.big_map * Protocol.Alpha_context.t) - Protocol.Environment.Error_monad.tzresult + Environment.Error_monad.tzresult Lwt.t (** Convert a list to a [Script_big_map]. If the list contains duplicate keys, @@ -40,5 +40,5 @@ val of_list : ('key * 'value) list -> Protocol.Alpha_context.t -> (('key, 'value) Protocol.Script_typed_ir.big_map * Protocol.Alpha_context.t) - Protocol.Environment.Error_monad.tzresult + Environment.Error_monad.tzresult Lwt.t diff --git a/src/proto_013_PtJakart/lib_benchmark/test/test_helpers.ml b/src/proto_013_PtJakart/lib_benchmark/test/test_helpers.ml index 189147add733..3c972483b275 100644 --- a/src/proto_013_PtJakart/lib_benchmark/test/test_helpers.ml +++ b/src/proto_013_PtJakart/lib_benchmark/test/test_helpers.ml @@ -85,5 +85,5 @@ let typecheck_by_tezos = ~legacy:false (Micheline.root node) bef - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun _ -> return_unit )) diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_benchmarks.ml b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_benchmarks.ml index c1571830c6d4..791175b702c4 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_benchmarks.ml +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_benchmarks.ml @@ -96,7 +96,7 @@ module Apply_diff_bench : Benchmark.S = struct Lazy_storage_kind.Sapling_state.Id.parse_z state_id in Alpha_context.Sapling.(state_from_id ctxt external_state_id) - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (state, ctxt) -> Format.eprintf "state hash: %d@." (Hashtbl.hash state.diff) ; Format.eprintf diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_generation.ml b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_generation.ml index 15b69c5e1208..4ae2852bb4e7 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_generation.ml +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_generation.ml @@ -189,7 +189,7 @@ let rec add_root nb_root ctxt id vk index size diff state = add_input Protocol.Sapling_storage.empty_diff vk index size 0L state >>=? fun (diff_to_add, {position = size; _}, new_idx) -> Protocol.Sapling_storage.apply_diff ctxt id diff_to_add - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (ctxt, _) -> (* We call it nb_root -1 because one root is already present*) add_root @@ -296,7 +296,7 @@ let make_inputs to_forge local_state proving_ctx sk vk root anti_replay = to_forge let init_fresh_sapling_state ctxt = - let open Protocol.Environment.Error_monad in + let open Environment.Error_monad in Protocol.Lazy_storage_diff.fresh Protocol.Lazy_storage_kind.Sapling_state ~temporary:false @@ -323,7 +323,7 @@ let prepare_seeded_state_internal ~(nb_input : int) ~(nb_nf : int) * Protocol.Lazy_storage_kind.Sapling_state.Id.t) tzresult Lwt.t = - init_fresh_sapling_state ctxt >|= Protocol.Environment.wrap_tzresult + init_fresh_sapling_state ctxt >|= Environment.wrap_tzresult >>=? fun (ctxt, id) -> let index_start = Tezos_sapling.Core.Client.Viewing_key.default_index in let sk, vk = generate_spending_and_viewing_keys state in @@ -336,8 +336,7 @@ let prepare_seeded_state_internal ~(nb_input : int) ~(nb_nf : int) ~index:index_start state >>=? fun (diff, to_forge) -> - Protocol.Sapling_storage.apply_diff ctxt id diff - >|= Protocol.Environment.wrap_tzresult + Protocol.Sapling_storage.apply_diff ctxt id diff >|= Environment.wrap_tzresult >>=? fun (ctxt, _size) -> return (diff, to_forge, sk, vk, ctxt, id) let prepare_seeded_state @@ -561,6 +560,6 @@ let generate (save_to : string) (tx_count : int) match result with Ok txs -> save ~filename:save_to ~txs | Error _ -> () let apply_diff ctxt id diff = - let open Protocol.Environment.Error_monad in + let open Environment.Error_monad in Sapling_storage.apply_diff (alpha_to_raw ctxt) id diff >>=? fun (ctxt, size) -> return (raw_to_alpha ctxt, size) diff --git a/src/proto_013_PtJakart/lib_client/mockup.ml b/src/proto_013_PtJakart/lib_client/mockup.ml index bd5c848edf19..b4849201b12c 100644 --- a/src/proto_013_PtJakart/lib_client/mockup.ml +++ b/src/proto_013_PtJakart/lib_client/mockup.ml @@ -1181,7 +1181,7 @@ type block = { hash : Block_hash.t; header : Block_header.t; operations : Operation.packed list; - context : Protocol.Environment.Context.t; + context : Environment.Context.t; } module Forge = struct @@ -1236,8 +1236,8 @@ let initial_context chain_id (header : Block_header.shell_header) add empty ["version"] (Bytes.of_string "genesis") >>= fun ctxt -> add ctxt ["protocol_parameters"] proto_params) >>= fun ctxt -> - Protocol.Environment.Updater.activate ctxt Protocol.hash >>= fun ctxt -> - Protocol.Main.init ctxt header >|= Protocol.Environment.wrap_tzresult + Environment.Updater.activate ctxt Protocol.hash >>= fun ctxt -> + Protocol.Main.init ctxt header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let ({ timestamp = predecessor_timestamp; @@ -1267,7 +1267,7 @@ let initial_context chain_id (header : Block_header.shell_header) ~predecessor_fitness ~predecessor ~timestamp - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun value_of_key -> (* In the mockup mode, reactivity is important and there are @@ -1279,7 +1279,7 @@ let initial_context chain_id (header : Block_header.shell_header) predecessor context `Lazy - (fun key -> value_of_key key >|= Protocol.Environment.wrap_tzresult) + (fun key -> value_of_key key >|= Environment.wrap_tzresult) >>=? fun context -> return context let mem_init : @@ -1431,8 +1431,8 @@ let migrate : let Tezos_protocol_environment.{block_hash; context; block_header} = rpc_context in - Protocol.Environment.Updater.activate context Protocol.hash >>= fun context -> - Protocol.Main.init context block_header >|= Protocol.Environment.wrap_tzresult + Environment.Updater.activate context Protocol.hash >>= fun context -> + Protocol.Main.init context block_header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let rpc_context = Tezos_protocol_environment.{block_hash; block_header; context} diff --git a/src/proto_013_PtJakart/lib_client/protocol_client_context.ml b/src/proto_013_PtJakart/lib_client/protocol_client_context.ml index 886d256b9c0b..1c2cc7dc4a63 100644 --- a/src/proto_013_PtJakart/lib_client/protocol_client_context.ml +++ b/src/proto_013_PtJakart/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific procotol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_013_PtJakart/lib_delegate/baking_scheduling.ml b/src/proto_013_PtJakart/lib_delegate/baking_scheduling.ml index 22e097f7ce24..52472819c5c1 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_scheduling.ml +++ b/src/proto_013_PtJakart/lib_delegate/baking_scheduling.ml @@ -359,7 +359,7 @@ let compute_next_potential_baking_time_at_next_level state = possibly means the baker has been late. *) (if Time.Protocol.(now < min_possible_time) then ok Round.zero else - Protocol.Environment.wrap_tzresult + Environment.wrap_tzresult @@ Round.round_of_timestamp round_durations ~predecessor_timestamp @@ -582,7 +582,7 @@ let create_round_durations constants = let delay_increment_per_round = constants.parametric.delay_increment_per_round in - Protocol.Environment.wrap_tzresult + Environment.wrap_tzresult (Round.Durations.create ~first_round_duration ~delay_increment_per_round) let create_initial_state cctxt ?(synchronize = true) ~chain config @@ -683,8 +683,7 @@ let compute_bootstrap_event state = else (* Otherwise, trigger the end of round to check whether we need to propose at this level or not *) - Protocol.Environment.wrap_tzresult - @@ Round.pred state.round_state.current_round + Environment.wrap_tzresult @@ Round.pred state.round_state.current_round >>? fun ending_round -> ok @@ Baking_state.Timeout (End_of_round {ending_round}) diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index d7f1d291a687..81f44e87c608 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -237,7 +237,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_013_PtJakart.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_013_PtJakart\ninclude Tezos_raw_protocol_013_PtJakart.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY\"\nlet name = Tezos_protocol_environment_013_PtJakart.Environment.Name.name\ninclude Tezos_raw_protocol_013_PtJakart\ninclude Tezos_raw_protocol_013_PtJakart.Main\n"))) (rule (targets tezos_protocol_013_PtJakart.ml) diff --git a/src/proto_013_PtJakart/lib_protocol/test/helpers/error_monad_operators.ml b/src/proto_013_PtJakart/lib_protocol/test/helpers/error_monad_operators.ml index 61eb43e4020a..4069cfa71371 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/helpers/error_monad_operators.ml +++ b/src/proto_013_PtJakart/lib_protocol/test/helpers/error_monad_operators.ml @@ -1,5 +1,3 @@ -open Protocol - let ( >>=?? ) x y = x >>= function | Ok s -> y s diff --git a/src/proto_013_PtJakart/lib_protocol/test/helpers/script_big_map.mli b/src/proto_013_PtJakart/lib_protocol/test/helpers/script_big_map.mli index 29e7738520c3..0a6bcc4d51ad 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/helpers/script_big_map.mli +++ b/src/proto_013_PtJakart/lib_protocol/test/helpers/script_big_map.mli @@ -28,7 +28,7 @@ val update : ('key, 'value) Protocol.Script_typed_ir.big_map -> Protocol.Alpha_context.t -> (('key, 'value) Protocol.Script_typed_ir.big_map * Protocol.Alpha_context.t) - Protocol.Environment.Error_monad.tzresult + Environment.Error_monad.tzresult Lwt.t (** Convert a list to a [Script_big_map]. If the list contains duplicate keys, @@ -40,5 +40,5 @@ val of_list : ('key * 'value) list -> Protocol.Alpha_context.t -> (('key, 'value) Protocol.Script_typed_ir.big_map * Protocol.Alpha_context.t) - Protocol.Environment.Error_monad.tzresult + Environment.Error_monad.tzresult Lwt.t diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_bitset.ml b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_bitset.ml index 56c84b4d6944..641838f8cf9f 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_bitset.ml +++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_bitset.ml @@ -48,7 +48,7 @@ let gen_storage = | Error e -> Alcotest.failf "An unxpected error %a occurred when generating Bitset.t" - Protocol.Environment.Error_monad.pp_trace + Environment.Error_monad.pp_trace e let test_get_set (c, ofs) = @@ -65,7 +65,7 @@ let test_get_set (c, ofs) = | Error e -> Alcotest.failf "Unexpected error: %a" - Protocol.Environment.Error_monad.pp_trace + Environment.Error_monad.pp_trace e | Ok res -> res) (0 -- 63) diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml index e460ebb3469d..f566d4d55566 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml +++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml @@ -149,7 +149,7 @@ let v1_batch = tests here as the bytes length stays the same. *) let bytes = Bls12_381.G2.(to_compressed_bytes (random ())) in let aggregated_signature = - Protocol.Environment.Bls_signature.unsafe_signature_of_bytes bytes + Environment.Bls_signature.unsafe_signature_of_bytes bytes in V1.{aggregated_signature; contents} diff --git a/src/proto_013_PtJakart/lib_protocol/test/unit/test_merkle_list.ml b/src/proto_013_PtJakart/lib_protocol/test/unit/test_merkle_list.ml index ff70a153fba7..207692cf643b 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/unit/test_merkle_list.ml +++ b/src/proto_013_PtJakart/lib_protocol/test/unit/test_merkle_list.ml @@ -31,7 +31,6 @@ Subject: test the ad-hoc merkle tree structure implemented to encode lists *) -open Protocol open Merkle_list_helper let assert_invalid_pos : 'a Environment.Error_monad.tzresult -> _ = function diff --git a/src/proto_013_PtJakart/lib_tx_rollup/daemon.ml b/src/proto_013_PtJakart/lib_tx_rollup/daemon.ml index d41a8603c940..8f6ab58e4a12 100644 --- a/src/proto_013_PtJakart/lib_tx_rollup/daemon.ml +++ b/src/proto_013_PtJakart/lib_tx_rollup/daemon.ml @@ -49,7 +49,6 @@ let parse_tx_rollup_l2_address : error (Error.Tx_rollup_invalid_l2_address loc) let parse_ticketer : Script.node -> Contract.t tzresult = - let open Protocol in let open Micheline in function | Bytes (_loc, bytes) (* As unparsed with [Optimized]. *) -> diff --git a/src/proto_alpha/lib_benchmark/test/test_helpers.ml b/src/proto_alpha/lib_benchmark/test/test_helpers.ml index 5baf5e4ce0fd..27cafed55497 100644 --- a/src/proto_alpha/lib_benchmark/test/test_helpers.ml +++ b/src/proto_alpha/lib_benchmark/test/test_helpers.ml @@ -86,5 +86,5 @@ let typecheck_by_tezos = ~legacy:false (Micheline.root node) bef - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun _ -> return_unit )) diff --git a/src/proto_alpha/lib_benchmarks_proto/sapling_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/sapling_benchmarks.ml index d71f34e633ee..d5885eeebb4e 100644 --- a/src/proto_alpha/lib_benchmarks_proto/sapling_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/sapling_benchmarks.ml @@ -96,7 +96,7 @@ module Apply_diff_bench : Benchmark.S = struct Lazy_storage_kind.Sapling_state.Id.parse_z state_id in Alpha_context.Sapling.(state_from_id ctxt external_state_id) - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (state, ctxt) -> Format.eprintf "state hash: %d@." (Hashtbl.hash state.diff) ; Format.eprintf diff --git a/src/proto_alpha/lib_benchmarks_proto/sapling_generation.ml b/src/proto_alpha/lib_benchmarks_proto/sapling_generation.ml index bbcfabd52ec0..9c2766e22a2f 100644 --- a/src/proto_alpha/lib_benchmarks_proto/sapling_generation.ml +++ b/src/proto_alpha/lib_benchmarks_proto/sapling_generation.ml @@ -191,7 +191,7 @@ let rec add_root nb_root ctxt id vk index size diff state = add_input Protocol.Sapling_storage.empty_diff vk index size 0L state >>=? fun (diff_to_add, {position = size; _}, new_idx) -> Protocol.Sapling_storage.apply_diff ctxt id diff_to_add - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (ctxt, _) -> (* We call it nb_root -1 because one root is already present*) add_root @@ -298,7 +298,7 @@ let make_inputs to_forge local_state proving_ctx sk vk root anti_replay = to_forge let init_fresh_sapling_state ctxt = - let open Protocol.Environment.Error_monad in + let open Environment.Error_monad in Protocol.Lazy_storage_diff.fresh Protocol.Lazy_storage_kind.Sapling_state ~temporary:false @@ -325,7 +325,7 @@ let prepare_seeded_state_internal ~(nb_input : int) ~(nb_nf : int) * Protocol.Lazy_storage_kind.Sapling_state.Id.t) tzresult Lwt.t = - init_fresh_sapling_state ctxt >|= Protocol.Environment.wrap_tzresult + init_fresh_sapling_state ctxt >|= Environment.wrap_tzresult >>=? fun (ctxt, id) -> let index_start = Tezos_sapling.Core.Client.Viewing_key.default_index in let sk, vk = generate_spending_and_viewing_keys state in @@ -339,7 +339,7 @@ let prepare_seeded_state_internal ~(nb_input : int) ~(nb_nf : int) state >>=? fun (diff, to_forge) -> Protocol.Sapling_storage.apply_diff ctxt id (reverse diff) - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun (ctxt, _size) -> return (diff, to_forge, sk, vk, ctxt, id) let prepare_seeded_state @@ -583,6 +583,6 @@ let generate (save_to : string) (tx_count : int) match result with Ok txs -> save ~filename:save_to ~txs | Error _ -> () let apply_diff ctxt id diff = - let open Protocol.Environment.Error_monad in + let open Environment.Error_monad in Sapling_storage.apply_diff (alpha_to_raw ctxt) id diff >>=? fun (ctxt, size) -> return (raw_to_alpha ctxt, size) diff --git a/src/proto_alpha/lib_benchmarks_proto/tx_rollup_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/tx_rollup_benchmarks.ml index 6afea8f679e9..b32c2bc9d0e1 100644 --- a/src/proto_alpha/lib_benchmarks_proto/tx_rollup_benchmarks.ml +++ b/src/proto_alpha/lib_benchmarks_proto/tx_rollup_benchmarks.ml @@ -182,7 +182,7 @@ end module Irmin_context = Tezos_context_memory.Context_binary -exception Error of Protocol.Environment.Error_monad.error +exception Error of Environment.Error_monad.error module Prover_storage : Tx_rollup_l2_storage_sig.STORAGE diff --git a/src/proto_alpha/lib_client/mockup.ml b/src/proto_alpha/lib_client/mockup.ml index 77d712cb1b86..ec022f0cc1f6 100644 --- a/src/proto_alpha/lib_client/mockup.ml +++ b/src/proto_alpha/lib_client/mockup.ml @@ -1360,7 +1360,7 @@ type block = { hash : Block_hash.t; header : Block_header.t; operations : Operation.packed list; - context : Protocol.Environment.Context.t; + context : Environment.Context.t; } module Forge = struct @@ -1415,8 +1415,8 @@ let initial_context chain_id (header : Block_header.shell_header) add empty ["version"] (Bytes.of_string "genesis") >>= fun ctxt -> add ctxt ["protocol_parameters"] proto_params) >>= fun ctxt -> - Protocol.Environment.Updater.activate ctxt Protocol.hash >>= fun ctxt -> - Protocol.Main.init chain_id ctxt header >|= Protocol.Environment.wrap_tzresult + Environment.Updater.activate ctxt Protocol.hash >>= fun ctxt -> + Protocol.Main.init chain_id ctxt header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let ({ timestamp = predecessor_timestamp; @@ -1446,7 +1446,7 @@ let initial_context chain_id (header : Block_header.shell_header) ~predecessor_fitness ~predecessor ~timestamp - >|= Protocol.Environment.wrap_tzresult + >|= Environment.wrap_tzresult >>=? fun value_of_key -> (* In the mockup mode, reactivity is important and there are @@ -1458,7 +1458,7 @@ let initial_context chain_id (header : Block_header.shell_header) predecessor context `Lazy - (fun key -> value_of_key key >|= Protocol.Environment.wrap_tzresult) + (fun key -> value_of_key key >|= Environment.wrap_tzresult) >>=? fun context -> return context let mem_init : @@ -1610,9 +1610,8 @@ let migrate : let Tezos_protocol_environment.{block_hash; context; block_header} = rpc_context in - Protocol.Environment.Updater.activate context Protocol.hash >>= fun context -> - Protocol.Main.init chain context block_header - >|= Protocol.Environment.wrap_tzresult + Environment.Updater.activate context Protocol.hash >>= fun context -> + Protocol.Main.init chain context block_header >|= Environment.wrap_tzresult >>=? fun {context; _} -> let rpc_context = Tezos_protocol_environment.{block_hash; block_header; context} diff --git a/src/proto_alpha/lib_client/protocol_client_context.ml b/src/proto_alpha/lib_client/protocol_client_context.ml index e745abd0afd8..be5745a532e8 100644 --- a/src/proto_alpha/lib_client/protocol_client_context.ml +++ b/src/proto_alpha/lib_client/protocol_client_context.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end @@ -38,8 +38,7 @@ class type rpc_context = inherit RPC_context.generic inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -76,8 +75,7 @@ class wrap_rpc_context (t : RPC_context.generic) : rpc_context = (** Abstracts variables and in protocol RPCs prefixed by "/chains//blocks//...". *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end @@ -98,15 +96,13 @@ class type full = with the node. A client context is defined by mapping all RPCs protocol-generic to a specific protocol. *) inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple (** Protocol RPCs exposed through the environment (using an additional chainpath). *) inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context end (** From a [Client_context.full], the class allows to call RPCs from @@ -116,8 +112,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_alpha/lib_delegate/baking_scheduling.ml b/src/proto_alpha/lib_delegate/baking_scheduling.ml index 488d16c8457f..38d42a06cc3d 100644 --- a/src/proto_alpha/lib_delegate/baking_scheduling.ml +++ b/src/proto_alpha/lib_delegate/baking_scheduling.ml @@ -357,7 +357,7 @@ let compute_next_potential_baking_time_at_next_level state = possibly means the baker has been late. *) (if Time.Protocol.(now < min_possible_time) then ok Round.zero else - Protocol.Environment.wrap_tzresult + Environment.wrap_tzresult @@ Round.round_of_timestamp round_durations ~predecessor_timestamp @@ -580,7 +580,7 @@ let create_round_durations constants = let delay_increment_per_round = constants.parametric.delay_increment_per_round in - Protocol.Environment.wrap_tzresult + Environment.wrap_tzresult (Round.Durations.create ~first_round_duration ~delay_increment_per_round) let create_initial_state cctxt ?(synchronize = true) ~chain config @@ -681,8 +681,7 @@ let compute_bootstrap_event state = else (* Otherwise, trigger the end of round to check whether we need to propose at this level or not *) - Protocol.Environment.wrap_tzresult - @@ Round.pred state.round_state.current_round + Environment.wrap_tzresult @@ Round.pred state.round_state.current_round >>? fun ending_round -> ok @@ Baking_state.Timeout (End_of_round {ending_round}) diff --git a/src/proto_alpha/lib_plugin/plugin_errors.ml b/src/proto_alpha/lib_plugin/plugin_errors.ml index 0b8881215a28..61179616fdd3 100644 --- a/src/proto_alpha/lib_plugin/plugin_errors.ml +++ b/src/proto_alpha/lib_plugin/plugin_errors.ml @@ -25,8 +25,6 @@ (* *) (*****************************************************************************) -open Protocol - type Environment.Error_monad.error += Cannot_parse_operation (* `Branch *) type Environment.Error_monad.error += Cannot_serialize_log diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index 2df0ab942e37..07ebb2fc5bf1 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -261,7 +261,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_alpha.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_alpha\ninclude Tezos_raw_protocol_alpha.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK\"\nlet name = Tezos_protocol_environment_alpha.Environment.Name.name\ninclude Tezos_raw_protocol_alpha\ninclude Tezos_raw_protocol_alpha.Main\n"))) (rule (targets tezos_protocol_alpha.ml) diff --git a/src/proto_alpha/lib_protocol/test/helpers/error_monad_operators.ml b/src/proto_alpha/lib_protocol/test/helpers/error_monad_operators.ml index 7dd424c4c9a7..9157c0b35a25 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/error_monad_operators.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/error_monad_operators.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Protocol - let ( >>=?? ) x y = x >>= function | Ok s -> y s diff --git a/src/proto_alpha/lib_protocol/test/helpers/script_big_map.mli b/src/proto_alpha/lib_protocol/test/helpers/script_big_map.mli index 29e7738520c3..0a6bcc4d51ad 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/script_big_map.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/script_big_map.mli @@ -28,7 +28,7 @@ val update : ('key, 'value) Protocol.Script_typed_ir.big_map -> Protocol.Alpha_context.t -> (('key, 'value) Protocol.Script_typed_ir.big_map * Protocol.Alpha_context.t) - Protocol.Environment.Error_monad.tzresult + Environment.Error_monad.tzresult Lwt.t (** Convert a list to a [Script_big_map]. If the list contains duplicate keys, @@ -40,5 +40,5 @@ val of_list : ('key * 'value) list -> Protocol.Alpha_context.t -> (('key, 'value) Protocol.Script_typed_ir.big_map * Protocol.Alpha_context.t) - Protocol.Environment.Error_monad.tzresult + Environment.Error_monad.tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/test/integration/test_sc_rollup_wasm.ml b/src/proto_alpha/lib_protocol/test/integration/test_sc_rollup_wasm.ml index 6959af79539a..0a31ad4390d6 100644 --- a/src/proto_alpha/lib_protocol/test/integration/test_sc_rollup_wasm.ml +++ b/src/proto_alpha/lib_protocol/test/integration/test_sc_rollup_wasm.ml @@ -38,7 +38,7 @@ open Alpha_context module Context_binary = Tezos_context_memory.Context_binary module Tree : - Protocol.Environment.Context.TREE + Environment.Context.TREE with type t = Context_binary.t and type tree = Context_binary.tree and type key = string list diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml b/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml index 56c84b4d6944..641838f8cf9f 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml @@ -48,7 +48,7 @@ let gen_storage = | Error e -> Alcotest.failf "An unxpected error %a occurred when generating Bitset.t" - Protocol.Environment.Error_monad.pp_trace + Environment.Error_monad.pp_trace e let test_get_set (c, ofs) = @@ -65,7 +65,7 @@ let test_get_set (c, ofs) = | Error e -> Alcotest.failf "Unexpected error: %a" - Protocol.Environment.Error_monad.pp_trace + Environment.Error_monad.pp_trace e | Ok res -> res) (0 -- 63) diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml b/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml index 99e3a4eaedcd..19adadbc3a57 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml @@ -146,7 +146,7 @@ let v1_batch = tests here as the bytes length stays the same. *) let bytes = Bls12_381.G2.(to_compressed_bytes (random ())) in let aggregated_signature = - Protocol.Environment.Bls_signature.unsafe_signature_of_bytes bytes + Environment.Bls_signature.unsafe_signature_of_bytes bytes in V1.{aggregated_signature; contents} diff --git a/src/proto_alpha/lib_protocol/test/unit/test_merkle_list.ml b/src/proto_alpha/lib_protocol/test/unit/test_merkle_list.ml index ff70a153fba7..207692cf643b 100644 --- a/src/proto_alpha/lib_protocol/test/unit/test_merkle_list.ml +++ b/src/proto_alpha/lib_protocol/test/unit/test_merkle_list.ml @@ -31,7 +31,6 @@ Subject: test the ad-hoc merkle tree structure implemented to encode lists *) -open Protocol open Merkle_list_helper let assert_invalid_pos : 'a Environment.Error_monad.tzresult -> _ = function diff --git a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_arith.ml b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_arith.ml index cfaaf9e6df6c..af7ef4619671 100644 --- a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_arith.ml +++ b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_arith.ml @@ -36,7 +36,7 @@ module Context_binary = Tezos_context_memory.Context_binary (* We first instantiate an arithmetic PVM capable of generating proofs. *) module Tree : - Protocol.Environment.Context.TREE + Environment.Context.TREE with type t = Context_binary.t and type tree = Context_binary.tree and type key = string list diff --git a/src/proto_alpha/lib_tx_rollup/daemon.ml b/src/proto_alpha/lib_tx_rollup/daemon.ml index 3874d3085fd2..c06ed081dc00 100644 --- a/src/proto_alpha/lib_tx_rollup/daemon.ml +++ b/src/proto_alpha/lib_tx_rollup/daemon.ml @@ -50,7 +50,6 @@ let parse_tx_rollup_l2_address : error (Error.Tx_rollup_invalid_l2_address loc) let parse_ticketer : Script.node -> Contract.t tzresult = - let open Protocol in let open Micheline in function | Bytes (_loc, bytes) (* As unparsed with [Optimized]. *) -> diff --git a/src/proto_demo_counter/lib_client/protocol_client_context.ml b/src/proto_demo_counter/lib_client/protocol_client_context.ml index 0341e5fd8431..f3cb8228a41b 100644 --- a/src/proto_demo_counter/lib_client/protocol_client_context.ml +++ b/src/proto_demo_counter/lib_client/protocol_client_context.ml @@ -28,8 +28,7 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end @@ -38,8 +37,7 @@ class wrap_full (t : Client_context.full) : full = inherit Client_context.proxy_context t inherit - [Shell_services.chain, Shell_services.block] Protocol.Environment - .proto_rpc_context + [Shell_services.chain, Shell_services.block] Environment.proto_rpc_context (t :> RPC_context.t) Shell_services.Blocks.path end diff --git a/src/proto_demo_counter/lib_client/protocol_client_context.mli b/src/proto_demo_counter/lib_client/protocol_client_context.mli index c2e270fc137c..70b26388e57d 100644 --- a/src/proto_demo_counter/lib_client/protocol_client_context.mli +++ b/src/proto_demo_counter/lib_client/protocol_client_context.mli @@ -28,8 +28,7 @@ class type full = inherit Client_context.full inherit - [Shell_services.chain * Shell_services.block] Protocol.Environment - .RPC_context + [Shell_services.chain * Shell_services.block] Environment.RPC_context .simple end diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index db303814c414..2792a4894dd6 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -65,7 +65,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_demo_counter.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoCounterDemoCounterDemoCounterDemoCou4LSpdT\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_demo_counter\ninclude Tezos_raw_protocol_demo_counter.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoCounterDemoCounterDemoCounterDemoCou4LSpdT\"\nlet name = Tezos_protocol_environment_demo_counter.Environment.Name.name\ninclude Tezos_raw_protocol_demo_counter\ninclude Tezos_raw_protocol_demo_counter.Main\n"))) (rule (targets tezos_protocol_demo_counter.ml) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index aacd81313ad3..350476206e83 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -56,7 +56,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_demo_noops.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoNoopsDemoNoopsDemoNoopsDemoNoopsDemo6XBoYp\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_demo_noops\ninclude Tezos_raw_protocol_demo_noops.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoNoopsDemoNoopsDemoNoopsDemoNoopsDemo6XBoYp\"\nlet name = Tezos_protocol_environment_demo_noops.Environment.Name.name\ninclude Tezos_raw_protocol_demo_noops\ninclude Tezos_raw_protocol_demo_noops.Main\n"))) (rule (targets tezos_protocol_demo_noops.ml) diff --git a/src/proto_genesis/lib_client/protocol_client_context.ml b/src/proto_genesis/lib_client/protocol_client_context.ml index bb2058fddfc2..497124ef8148 100644 --- a/src/proto_genesis/lib_client/protocol_client_context.ml +++ b/src/proto_genesis/lib_client/protocol_client_context.ml @@ -26,7 +26,7 @@ module Genesis_block_services = Block_services.Make (Protocol) (Protocol) module Lifted_protocol = struct - include Protocol.Environment.Lift (Protocol) + include Environment.Lift (Protocol) let hash = Protocol.hash end diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index a5ba757f03a1..8dcdf53ca6b9 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -56,7 +56,7 @@ (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_genesis.Environment\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im\"\nlet name = Environment.Name.name\ninclude Tezos_raw_protocol_genesis\ninclude Tezos_raw_protocol_genesis.Main\n"))) + "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im\"\nlet name = Tezos_protocol_environment_genesis.Environment.Name.name\ninclude Tezos_raw_protocol_genesis\ninclude Tezos_raw_protocol_genesis.Main\n"))) (rule (targets tezos_protocol_genesis.ml) -- GitLab