Refactor: Regroup protocols

2018-01-22 18:43:58 +01:00 · 2018-01-22 18:43:58 +01:00 · 1f3c68cbd8
commit 1f3c68cbd8
parent a3d0ee644a
175 changed files with 12 additions and 12 deletions
--- a/scripts/alphanet_constants.patch
+++ b/scripts/alphanet_constants.patch
@ -1,7 +1,7 @@
-diff --git a/src/lib_embedded_protocol_alpha/src/constants_repr.ml b/src/lib_embedded_protocol_alpha/src/constants_repr.ml
+diff --git a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
 index 61e79c8a..f91ce282 100644
--- a/src/lib_embedded_protocol_alpha/src/constants_repr.ml
-+++ b/src/lib_embedded_protocol_alpha/src/constants_repr.ml
+--- a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
@@ -49,15 +49,14 @@ let read_public_key s =
   Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s))
 
--- a/src/lib_embedded_protocol_alpha/jbuild
+++ b/src/lib_embedded_protocol_alpha/jbuild
@ -1 +0,0 @@
-../lib_protocol_compiler/jbuild_protocol_template
--- a/src/lib_embedded_protocol_alpha/src/jbuild
+++ b/src/lib_embedded_protocol_alpha/src/jbuild
@ -1 +0,0 @@
-../../lib_protocol_compiler/jbuild_embedded_protocol_template
--- a/src/lib_embedded_protocol_demo/jbuild
+++ b/src/lib_embedded_protocol_demo/jbuild
@ -1 +0,0 @@
-../lib_protocol_compiler/jbuild_protocol_template
--- a/src/lib_embedded_protocol_demo/src/jbuild
+++ b/src/lib_embedded_protocol_demo/src/jbuild
@ -1 +0,0 @@
-../../lib_protocol_compiler/jbuild_embedded_protocol_template
--- a/src/lib_embedded_protocol_genesis/jbuild
+++ b/src/lib_embedded_protocol_genesis/jbuild
@ -1 +0,0 @@
-../lib_protocol_compiler/jbuild_protocol_template
--- a/src/lib_embedded_protocol_genesis/src/jbuild
+++ b/src/lib_embedded_protocol_genesis/src/jbuild
@ -1 +0,0 @@
-../../lib_protocol_compiler/jbuild_embedded_protocol_template
--- a/src/lib_protocol_compiler/jbuild_embedded_protocol_template
+++ b/src/lib_protocol_compiler/jbuild_embedded_protocol_template
@ -1,6 +1,6 @@
 (* -*- tuareg -*- *)

-let prefix = "lib_embedded_protocol_"
+let prefix = "lib_protocol_"
 let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd ()

 let predefined_version = None (* to be substituted in opam packages *)
--- a/src/lib_protocol_compiler/jbuild_protocol_template
+++ b/src/lib_protocol_compiler/jbuild_protocol_template
@ -11,7 +11,7 @@

 #require "unix"

-let prefix = "lib_embedded_protocol_"
+let prefix = "lib_protocol_"
 let dirname = Filename.basename @@ Sys.getcwd ()

 let predefined_version = None (* to be substituted in opam packages *)
@ -28,7 +28,7 @@ let version =

 let path =
  match predefined_version with
-  | None -> "src/lib_embedded_protocol_" ^ version
+  | None -> "src/proto_" ^ version ^ "/lib_protocol_" ^ version
  | Some _ -> "."

 let sources =
--- a/src/proto_alpha/lib_client_alpha/alpha.ml
+++ b/src/proto_alpha/lib_client_alpha/alpha.ml
--- a/src/proto_alpha/lib_client_alpha/alpha.mli
+++ b/src/proto_alpha/lib_client_alpha/alpha.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_blocks.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_blocks.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_blocks.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_blocks.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_daemon.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_daemon.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_daemon.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_daemon.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_denunciation.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_denunciation.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_denunciation.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_denunciation.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_endorsement.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_endorsement.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_endorsement.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_endorsement.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_forge.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_forge.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_forge.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_forge.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_lib.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_lib.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_lib.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_lib.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_main.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_main.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_main.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_main.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_operations.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_operations.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_operations.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_operations.mli
--- a/src/proto_alpha/lib_client_alpha/client_baking_revelation.ml
+++ b/src/proto_alpha/lib_client_alpha/client_baking_revelation.ml
--- a/src/proto_alpha/lib_client_alpha/client_baking_revelation.mli
+++ b/src/proto_alpha/lib_client_alpha/client_baking_revelation.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_args.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_args.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_args.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_args.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_context.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_context.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_context.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_context.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_context_commands.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_context_commands.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_contracts.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_contracts.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_contracts.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_contracts.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_contracts_commands.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_contracts_commands.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_main.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_main.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_main.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_main.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_nonces.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_nonces.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_nonces.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_nonces.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_programs.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_programs.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_programs.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_programs.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.mli
--- a/src/proto_alpha/lib_client_alpha/client_proto_rpcs.ml
+++ b/src/proto_alpha/lib_client_alpha/client_proto_rpcs.ml
--- a/src/proto_alpha/lib_client_alpha/client_proto_rpcs.mli
+++ b/src/proto_alpha/lib_client_alpha/client_proto_rpcs.mli
--- a/src/proto_alpha/lib_client_alpha/jbuild
+++ b/src/proto_alpha/lib_client_alpha/jbuild
--- a/src/proto_alpha/lib_client_alpha/michelson_macros.ml
+++ b/src/proto_alpha/lib_client_alpha/michelson_macros.ml
--- a/src/proto_alpha/lib_client_alpha/michelson_macros.mli
+++ b/src/proto_alpha/lib_client_alpha/michelson_macros.mli
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.ml
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.ml
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.mli
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.mli
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.ml
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.ml
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.mli
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.mli
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_parser.ml
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_parser.ml
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_parser.mli
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_parser.mli
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_printer.ml
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_printer.ml
--- a/src/proto_alpha/lib_client_alpha/michelson_v1_printer.mli
+++ b/src/proto_alpha/lib_client_alpha/michelson_v1_printer.mli
--- a/src/proto_alpha/lib_client_alpha/tezos-embedded-client-alpha.opam
+++ b/src/proto_alpha/lib_client_alpha/tezos-embedded-client-alpha.opam
--- a/src/proto_alpha/lib_protocol_alpha/jbuild
+++ b/src/proto_alpha/lib_protocol_alpha/jbuild
@ -0,0 +1 @@
+../../lib_protocol_compiler/jbuild_protocol_template
--- a/src/proto_alpha/lib_protocol_alpha/src/TEZOS_PROTOCOL
+++ b/src/proto_alpha/lib_protocol_alpha/src/TEZOS_PROTOCOL
--- a/src/proto_alpha/lib_protocol_alpha/src/amendment.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/amendment.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/amendment.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/amendment.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/apply.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/apply.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/baking.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/baking.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/baking.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/baking.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/contract_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/contract_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/contract_repr.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/contract_repr.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/contract_storage.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/contract_storage.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/contract_storage.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/contract_storage.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/fitness_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/fitness_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/fitness_storage.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/fitness_storage.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/gas.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/gas.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/gas.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/gas.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/init_storage.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/init_storage.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/jbuild
+++ b/src/proto_alpha/lib_protocol_alpha/src/jbuild
@ -0,0 +1 @@
+../../../lib_protocol_compiler/jbuild_embedded_protocol_template
--- a/src/proto_alpha/lib_protocol_alpha/src/level_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/level_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/level_repr.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/level_repr.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/level_storage.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/level_storage.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/level_storage.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/level_storage.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/main.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/main.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/main.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/main.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/manager_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/manager_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/manager_repr.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/manager_repr.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/misc.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/misc.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/misc.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/misc.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/operation_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/operation_repr.ml
--- a/src/proto_alpha/lib_protocol_alpha/src/operation_repr.mli
+++ b/src/proto_alpha/lib_protocol_alpha/src/operation_repr.mli
--- a/src/proto_alpha/lib_protocol_alpha/src/period_repr.ml
+++ b/src/proto_alpha/lib_protocol_alpha/src/period_repr.ml
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`../lib_protocol_compiler/jbuild_protocol_template`
				`@ -1 +0,0 @@`
				`../../lib_protocol_compiler/jbuild_embedded_protocol_template`
				`@ -0,0 +1 @@`
				`../../lib_protocol_compiler/jbuild_protocol_template`
				`@ -0,0 +1 @@`
				`../../../lib_protocol_compiler/jbuild_embedded_protocol_template`