diff --git a/.dockerignore b/.dockerignore index 53a55a7b5..fdf919702 100644 --- a/.dockerignore +++ b/.dockerignore @@ -24,16 +24,16 @@ src/client/embedded/**/_tzbuild src/client/embedded/demo/.depend -src/client/embedded/bootstrap/.depend -src/client/embedded/bootstrap/concrete_lexer.ml -src/client/embedded/bootstrap/concrete_parser.ml -src/client/embedded/bootstrap/concrete_parser.mli -src/client/embedded/bootstrap/webclient_proto_static.ml -src/client/embedded/bootstrap/main.byte -src/client/embedded/bootstrap/webclient_static/main.js -src/client/embedded/bootstrap/webclient/browser/main.byte -src/client/embedded/bootstrap/webclient/static/main.js -src/client/embedded/bootstrap/webclient/webclient_proto_static.ml +src/client/embedded/alpha/.depend +src/client/embedded/alpha/concrete_lexer.ml +src/client/embedded/alpha/concrete_parser.ml +src/client/embedded/alpha/concrete_parser.mli +src/client/embedded/alpha/webclient_proto_static.ml +src/client/embedded/alpha/main.byte +src/client/embedded/alpha/webclient_static/main.js +src/client/embedded/alpha/webclient/browser/main.byte +src/client/embedded/alpha/webclient/static/main.js +src/client/embedded/alpha/webclient/webclient_proto_static.ml test/.depend test/reports diff --git a/.gitignore b/.gitignore index 958457cad..7a1ec7ab1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,16 +22,16 @@ /src/client/embedded/demo/.depend -/src/client/embedded/bootstrap/.depend -/src/client/embedded/bootstrap/concrete_lexer.ml -/src/client/embedded/bootstrap/concrete_parser.ml -/src/client/embedded/bootstrap/concrete_parser.mli -/src/client/embedded/bootstrap/webclient_proto_static.ml -/src/client/embedded/bootstrap/main.byte -/src/client/embedded/bootstrap/webclient_static/main.js -/src/client/embedded/bootstrap/webclient/browser/main.byte -/src/client/embedded/bootstrap/webclient/static/main.js -/src/client/embedded/bootstrap/webclient/webclient_proto_static.ml +/src/client/embedded/alpha/.depend +/src/client/embedded/alpha/concrete_lexer.ml +/src/client/embedded/alpha/concrete_parser.ml +/src/client/embedded/alpha/concrete_parser.mli +/src/client/embedded/alpha/webclient_proto_static.ml +/src/client/embedded/alpha/main.byte +/src/client/embedded/alpha/webclient_static/main.js +/src/client/embedded/alpha/webclient/browser/main.byte +/src/client/embedded/alpha/webclient/static/main.js +/src/client/embedded/alpha/webclient/webclient_proto_static.ml /test/.depend /test/reports diff --git a/src/attacker/attacker_minimal.ml b/src/attacker/attacker_minimal.ml index 6936b7cc2..0b22db84f 100644 --- a/src/attacker/attacker_minimal.ml +++ b/src/attacker/attacker_minimal.ml @@ -10,7 +10,7 @@ open Format include Logging.Make(struct let name = "attacker" end) -module Proto = Client_embedded_proto_bootstrap +module Proto = Client_embedded_proto_alpha module Ed25519 = Proto.Local_environment.Environment.Ed25519 (* the genesis block and network *) diff --git a/src/client/embedded/bootstrap/.merlin b/src/client/embedded/alpha/.merlin similarity index 100% rename from src/client/embedded/bootstrap/.merlin rename to src/client/embedded/alpha/.merlin diff --git a/src/client/embedded/bootstrap/Makefile b/src/client/embedded/alpha/Makefile similarity index 99% rename from src/client/embedded/bootstrap/Makefile rename to src/client/embedded/alpha/Makefile index 349e2b4e9..a6b551e9b 100644 --- a/src/client/embedded/bootstrap/Makefile +++ b/src/client/embedded/alpha/Makefile @@ -1,5 +1,5 @@ -PROTO_VERSION := bootstrap +PROTO_VERSION := alpha CLIENT_INTFS := \ concrete_parser.mli \ diff --git a/src/client/embedded/bootstrap/baker/Makefile b/src/client/embedded/alpha/baker/Makefile similarity index 100% rename from src/client/embedded/bootstrap/baker/Makefile rename to src/client/embedded/alpha/baker/Makefile diff --git a/src/client/embedded/bootstrap/baker/client_mining_blocks.ml b/src/client/embedded/alpha/baker/client_mining_blocks.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_blocks.ml rename to src/client/embedded/alpha/baker/client_mining_blocks.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_blocks.mli b/src/client/embedded/alpha/baker/client_mining_blocks.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_blocks.mli rename to src/client/embedded/alpha/baker/client_mining_blocks.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_daemon.ml b/src/client/embedded/alpha/baker/client_mining_daemon.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_daemon.ml rename to src/client/embedded/alpha/baker/client_mining_daemon.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_daemon.mli b/src/client/embedded/alpha/baker/client_mining_daemon.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_daemon.mli rename to src/client/embedded/alpha/baker/client_mining_daemon.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_denunciation.ml b/src/client/embedded/alpha/baker/client_mining_denunciation.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_denunciation.ml rename to src/client/embedded/alpha/baker/client_mining_denunciation.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_denunciation.mli b/src/client/embedded/alpha/baker/client_mining_denunciation.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_denunciation.mli rename to src/client/embedded/alpha/baker/client_mining_denunciation.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_endorsement.ml b/src/client/embedded/alpha/baker/client_mining_endorsement.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_endorsement.ml rename to src/client/embedded/alpha/baker/client_mining_endorsement.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_endorsement.mli b/src/client/embedded/alpha/baker/client_mining_endorsement.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_endorsement.mli rename to src/client/embedded/alpha/baker/client_mining_endorsement.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_forge.ml b/src/client/embedded/alpha/baker/client_mining_forge.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_forge.ml rename to src/client/embedded/alpha/baker/client_mining_forge.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_forge.mli b/src/client/embedded/alpha/baker/client_mining_forge.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_forge.mli rename to src/client/embedded/alpha/baker/client_mining_forge.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_main.ml b/src/client/embedded/alpha/baker/client_mining_main.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_main.ml rename to src/client/embedded/alpha/baker/client_mining_main.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_main.mli b/src/client/embedded/alpha/baker/client_mining_main.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_main.mli rename to src/client/embedded/alpha/baker/client_mining_main.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_operations.ml b/src/client/embedded/alpha/baker/client_mining_operations.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_operations.ml rename to src/client/embedded/alpha/baker/client_mining_operations.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_operations.mli b/src/client/embedded/alpha/baker/client_mining_operations.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_operations.mli rename to src/client/embedded/alpha/baker/client_mining_operations.mli diff --git a/src/client/embedded/bootstrap/baker/client_mining_revelation.ml b/src/client/embedded/alpha/baker/client_mining_revelation.ml similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_revelation.ml rename to src/client/embedded/alpha/baker/client_mining_revelation.ml diff --git a/src/client/embedded/bootstrap/baker/client_mining_revelation.mli b/src/client/embedded/alpha/baker/client_mining_revelation.mli similarity index 100% rename from src/client/embedded/bootstrap/baker/client_mining_revelation.mli rename to src/client/embedded/alpha/baker/client_mining_revelation.mli diff --git a/src/client/embedded/bootstrap/client_proto_aliases.ml b/src/client/embedded/alpha/client_proto_aliases.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_aliases.ml rename to src/client/embedded/alpha/client_proto_aliases.ml diff --git a/src/client/embedded/bootstrap/client_proto_aliases.mli b/src/client/embedded/alpha/client_proto_aliases.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_aliases.mli rename to src/client/embedded/alpha/client_proto_aliases.mli diff --git a/src/client/embedded/bootstrap/client_proto_args.ml b/src/client/embedded/alpha/client_proto_args.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_args.ml rename to src/client/embedded/alpha/client_proto_args.ml diff --git a/src/client/embedded/bootstrap/client_proto_args.mli b/src/client/embedded/alpha/client_proto_args.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_args.mli rename to src/client/embedded/alpha/client_proto_args.mli diff --git a/src/client/embedded/bootstrap/client_proto_context.ml b/src/client/embedded/alpha/client_proto_context.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_context.ml rename to src/client/embedded/alpha/client_proto_context.ml diff --git a/src/client/embedded/bootstrap/client_proto_context.mli b/src/client/embedded/alpha/client_proto_context.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_context.mli rename to src/client/embedded/alpha/client_proto_context.mli diff --git a/src/client/embedded/bootstrap/client_proto_contracts.ml b/src/client/embedded/alpha/client_proto_contracts.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_contracts.ml rename to src/client/embedded/alpha/client_proto_contracts.ml diff --git a/src/client/embedded/bootstrap/client_proto_contracts.mli b/src/client/embedded/alpha/client_proto_contracts.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_contracts.mli rename to src/client/embedded/alpha/client_proto_contracts.mli diff --git a/src/client/embedded/bootstrap/client_proto_main.ml b/src/client/embedded/alpha/client_proto_main.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_main.ml rename to src/client/embedded/alpha/client_proto_main.ml diff --git a/src/client/embedded/bootstrap/client_proto_main.mli b/src/client/embedded/alpha/client_proto_main.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_main.mli rename to src/client/embedded/alpha/client_proto_main.mli diff --git a/src/client/embedded/bootstrap/client_proto_nonces.ml b/src/client/embedded/alpha/client_proto_nonces.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_nonces.ml rename to src/client/embedded/alpha/client_proto_nonces.ml diff --git a/src/client/embedded/bootstrap/client_proto_nonces.mli b/src/client/embedded/alpha/client_proto_nonces.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_nonces.mli rename to src/client/embedded/alpha/client_proto_nonces.mli diff --git a/src/client/embedded/bootstrap/client_proto_programs.ml b/src/client/embedded/alpha/client_proto_programs.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_programs.ml rename to src/client/embedded/alpha/client_proto_programs.ml diff --git a/src/client/embedded/bootstrap/client_proto_programs.mli b/src/client/embedded/alpha/client_proto_programs.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_programs.mli rename to src/client/embedded/alpha/client_proto_programs.mli diff --git a/src/client/embedded/bootstrap/client_proto_rpcs.ml b/src/client/embedded/alpha/client_proto_rpcs.ml similarity index 100% rename from src/client/embedded/bootstrap/client_proto_rpcs.ml rename to src/client/embedded/alpha/client_proto_rpcs.ml diff --git a/src/client/embedded/bootstrap/client_proto_rpcs.mli b/src/client/embedded/alpha/client_proto_rpcs.mli similarity index 100% rename from src/client/embedded/bootstrap/client_proto_rpcs.mli rename to src/client/embedded/alpha/client_proto_rpcs.mli diff --git a/src/client/embedded/bootstrap/concrete_lexer.mll b/src/client/embedded/alpha/concrete_lexer.mll similarity index 100% rename from src/client/embedded/bootstrap/concrete_lexer.mll rename to src/client/embedded/alpha/concrete_lexer.mll diff --git a/src/client/embedded/bootstrap/concrete_parser.mly b/src/client/embedded/alpha/concrete_parser.mly similarity index 100% rename from src/client/embedded/bootstrap/concrete_parser.mly rename to src/client/embedded/alpha/concrete_parser.mly diff --git a/src/client/embedded/bootstrap/local_error_monad.ml b/src/client/embedded/alpha/local_error_monad.ml similarity index 100% rename from src/client/embedded/bootstrap/local_error_monad.ml rename to src/client/embedded/alpha/local_error_monad.ml diff --git a/src/client/embedded/bootstrap/script_located_ir.ml b/src/client/embedded/alpha/script_located_ir.ml similarity index 100% rename from src/client/embedded/bootstrap/script_located_ir.ml rename to src/client/embedded/alpha/script_located_ir.ml diff --git a/src/client/embedded/bootstrap/webclient/.merlin b/src/client/embedded/alpha/webclient/.merlin similarity index 100% rename from src/client/embedded/bootstrap/webclient/.merlin rename to src/client/embedded/alpha/webclient/.merlin diff --git a/src/client/embedded/bootstrap/webclient/browser/.merlin b/src/client/embedded/alpha/webclient/browser/.merlin similarity index 100% rename from src/client/embedded/bootstrap/webclient/browser/.merlin rename to src/client/embedded/alpha/webclient/browser/.merlin diff --git a/src/client/embedded/bootstrap/webclient/browser/webclient_main.ml b/src/client/embedded/alpha/webclient/browser/webclient_main.ml similarity index 100% rename from src/client/embedded/bootstrap/webclient/browser/webclient_main.ml rename to src/client/embedded/alpha/webclient/browser/webclient_main.ml diff --git a/src/client/embedded/bootstrap/webclient/shared/.merlin b/src/client/embedded/alpha/webclient/shared/.merlin similarity index 100% rename from src/client/embedded/bootstrap/webclient/shared/.merlin rename to src/client/embedded/alpha/webclient/shared/.merlin diff --git a/src/client/embedded/bootstrap/webclient/shared/webclient_proto_services.ml b/src/client/embedded/alpha/webclient/shared/webclient_proto_services.ml similarity index 100% rename from src/client/embedded/bootstrap/webclient/shared/webclient_proto_services.ml rename to src/client/embedded/alpha/webclient/shared/webclient_proto_services.ml diff --git a/src/client/embedded/bootstrap/webclient/shared/webclient_proto_services.mli b/src/client/embedded/alpha/webclient/shared/webclient_proto_services.mli similarity index 100% rename from src/client/embedded/bootstrap/webclient/shared/webclient_proto_services.mli rename to src/client/embedded/alpha/webclient/shared/webclient_proto_services.mli diff --git a/src/client/embedded/bootstrap/webclient/static/index.html b/src/client/embedded/alpha/webclient/static/index.html similarity index 100% rename from src/client/embedded/bootstrap/webclient/static/index.html rename to src/client/embedded/alpha/webclient/static/index.html diff --git a/src/client/embedded/bootstrap/webclient/static/not_found.html b/src/client/embedded/alpha/webclient/static/not_found.html similarity index 100% rename from src/client/embedded/bootstrap/webclient/static/not_found.html rename to src/client/embedded/alpha/webclient/static/not_found.html diff --git a/src/client/embedded/bootstrap/webclient/webclient_proto_main.ml b/src/client/embedded/alpha/webclient/webclient_proto_main.ml similarity index 100% rename from src/client/embedded/bootstrap/webclient/webclient_proto_main.ml rename to src/client/embedded/alpha/webclient/webclient_proto_main.ml diff --git a/src/client/embedded/bootstrap/webclient/webclient_proto_service_directory.ml b/src/client/embedded/alpha/webclient/webclient_proto_service_directory.ml similarity index 100% rename from src/client/embedded/bootstrap/webclient/webclient_proto_service_directory.ml rename to src/client/embedded/alpha/webclient/webclient_proto_service_directory.ml diff --git a/src/client_main.ml b/src/client_main.ml index 94e5e35e3..b193b679d 100644 --- a/src/client_main.ml +++ b/src/client_main.ml @@ -50,7 +50,7 @@ let main () = | exn -> Printexc.to_string exn) >>= fun () -> cctxt.warning "Using the default protocol version." >>= fun () -> - Lwt.return Client_bootstrap.Client_proto_main.protocol) + Lwt.return Client_alpha.Client_proto_main.protocol) >>= fun version -> let commands = Client_generic_rpcs.commands @ diff --git a/src/proto/bootstrap/.merlin b/src/proto/alpha/.merlin similarity index 100% rename from src/proto/bootstrap/.merlin rename to src/proto/alpha/.merlin diff --git a/src/proto/bootstrap/TEZOS_PROTOCOL b/src/proto/alpha/TEZOS_PROTOCOL similarity index 100% rename from src/proto/bootstrap/TEZOS_PROTOCOL rename to src/proto/alpha/TEZOS_PROTOCOL diff --git a/src/proto/bootstrap/amendment.ml b/src/proto/alpha/amendment.ml similarity index 100% rename from src/proto/bootstrap/amendment.ml rename to src/proto/alpha/amendment.ml diff --git a/src/proto/bootstrap/amendment.mli b/src/proto/alpha/amendment.mli similarity index 100% rename from src/proto/bootstrap/amendment.mli rename to src/proto/alpha/amendment.mli diff --git a/src/proto/bootstrap/apply.ml b/src/proto/alpha/apply.ml similarity index 100% rename from src/proto/bootstrap/apply.ml rename to src/proto/alpha/apply.ml diff --git a/src/proto/bootstrap/asset_repr.ml b/src/proto/alpha/asset_repr.ml similarity index 100% rename from src/proto/bootstrap/asset_repr.ml rename to src/proto/alpha/asset_repr.ml diff --git a/src/proto/bootstrap/asset_repr.mli b/src/proto/alpha/asset_repr.mli similarity index 100% rename from src/proto/bootstrap/asset_repr.mli rename to src/proto/alpha/asset_repr.mli diff --git a/src/proto/bootstrap/block_repr.ml b/src/proto/alpha/block_repr.ml similarity index 100% rename from src/proto/bootstrap/block_repr.ml rename to src/proto/alpha/block_repr.ml diff --git a/src/proto/bootstrap/block_repr.mli b/src/proto/alpha/block_repr.mli similarity index 100% rename from src/proto/bootstrap/block_repr.mli rename to src/proto/alpha/block_repr.mli diff --git a/src/proto/bootstrap/bootstrap_storage.ml b/src/proto/alpha/bootstrap_storage.ml similarity index 100% rename from src/proto/bootstrap/bootstrap_storage.ml rename to src/proto/alpha/bootstrap_storage.ml diff --git a/src/proto/bootstrap/bootstrap_storage.mli b/src/proto/alpha/bootstrap_storage.mli similarity index 100% rename from src/proto/bootstrap/bootstrap_storage.mli rename to src/proto/alpha/bootstrap_storage.mli diff --git a/src/proto/bootstrap/constants_repr.ml b/src/proto/alpha/constants_repr.ml similarity index 100% rename from src/proto/bootstrap/constants_repr.ml rename to src/proto/alpha/constants_repr.ml diff --git a/src/proto/bootstrap/contract_repr.ml b/src/proto/alpha/contract_repr.ml similarity index 100% rename from src/proto/bootstrap/contract_repr.ml rename to src/proto/alpha/contract_repr.ml diff --git a/src/proto/bootstrap/contract_repr.mli b/src/proto/alpha/contract_repr.mli similarity index 100% rename from src/proto/bootstrap/contract_repr.mli rename to src/proto/alpha/contract_repr.mli diff --git a/src/proto/bootstrap/contract_storage.ml b/src/proto/alpha/contract_storage.ml similarity index 100% rename from src/proto/bootstrap/contract_storage.ml rename to src/proto/alpha/contract_storage.ml diff --git a/src/proto/bootstrap/contract_storage.mli b/src/proto/alpha/contract_storage.mli similarity index 100% rename from src/proto/bootstrap/contract_storage.mli rename to src/proto/alpha/contract_storage.mli diff --git a/src/proto/bootstrap/cycle_repr.ml b/src/proto/alpha/cycle_repr.ml similarity index 100% rename from src/proto/bootstrap/cycle_repr.ml rename to src/proto/alpha/cycle_repr.ml diff --git a/src/proto/bootstrap/cycle_repr.mli b/src/proto/alpha/cycle_repr.mli similarity index 100% rename from src/proto/bootstrap/cycle_repr.mli rename to src/proto/alpha/cycle_repr.mli diff --git a/src/proto/bootstrap/docs/json-notations.md b/src/proto/alpha/docs/json-notations.md similarity index 100% rename from src/proto/bootstrap/docs/json-notations.md rename to src/proto/alpha/docs/json-notations.md diff --git a/src/proto/bootstrap/docs/language.md b/src/proto/alpha/docs/language.md similarity index 100% rename from src/proto/bootstrap/docs/language.md rename to src/proto/alpha/docs/language.md diff --git a/src/proto/bootstrap/fitness_repr.ml b/src/proto/alpha/fitness_repr.ml similarity index 100% rename from src/proto/bootstrap/fitness_repr.ml rename to src/proto/alpha/fitness_repr.ml diff --git a/src/proto/bootstrap/fitness_storage.ml b/src/proto/alpha/fitness_storage.ml similarity index 100% rename from src/proto/bootstrap/fitness_storage.ml rename to src/proto/alpha/fitness_storage.ml diff --git a/src/proto/bootstrap/init_storage.ml b/src/proto/alpha/init_storage.ml similarity index 98% rename from src/proto/bootstrap/init_storage.ml rename to src/proto/alpha/init_storage.ml index e29bd2e39..f63637dbc 100644 --- a/src/proto/bootstrap/init_storage.ml +++ b/src/proto/alpha/init_storage.ml @@ -10,7 +10,7 @@ let version_key = ["version"] (* This key should always be populated for every version of the protocol. It's absence meaning that the context is empty. *) -let version_value = "genesis" +let version_value = "alpha" (* This is the genesis protocol: initialise the state *) let initialize (ctxt:Context.t) = diff --git a/src/proto/bootstrap/level_repr.ml b/src/proto/alpha/level_repr.ml similarity index 100% rename from src/proto/bootstrap/level_repr.ml rename to src/proto/alpha/level_repr.ml diff --git a/src/proto/bootstrap/level_repr.mli b/src/proto/alpha/level_repr.mli similarity index 100% rename from src/proto/bootstrap/level_repr.mli rename to src/proto/alpha/level_repr.mli diff --git a/src/proto/bootstrap/level_storage.ml b/src/proto/alpha/level_storage.ml similarity index 100% rename from src/proto/bootstrap/level_storage.ml rename to src/proto/alpha/level_storage.ml diff --git a/src/proto/bootstrap/level_storage.mli b/src/proto/alpha/level_storage.mli similarity index 100% rename from src/proto/bootstrap/level_storage.mli rename to src/proto/alpha/level_storage.mli diff --git a/src/proto/bootstrap/main.ml b/src/proto/alpha/main.ml similarity index 100% rename from src/proto/bootstrap/main.ml rename to src/proto/alpha/main.ml diff --git a/src/proto/bootstrap/main.mli b/src/proto/alpha/main.mli similarity index 100% rename from src/proto/bootstrap/main.mli rename to src/proto/alpha/main.mli diff --git a/src/proto/bootstrap/mining.ml b/src/proto/alpha/mining.ml similarity index 100% rename from src/proto/bootstrap/mining.ml rename to src/proto/alpha/mining.ml diff --git a/src/proto/bootstrap/mining.mli b/src/proto/alpha/mining.mli similarity index 100% rename from src/proto/bootstrap/mining.mli rename to src/proto/alpha/mining.mli diff --git a/src/proto/bootstrap/misc.ml b/src/proto/alpha/misc.ml similarity index 100% rename from src/proto/bootstrap/misc.ml rename to src/proto/alpha/misc.ml diff --git a/src/proto/bootstrap/misc.mli b/src/proto/alpha/misc.mli similarity index 100% rename from src/proto/bootstrap/misc.mli rename to src/proto/alpha/misc.mli diff --git a/src/proto/bootstrap/nonce_storage.ml b/src/proto/alpha/nonce_storage.ml similarity index 100% rename from src/proto/bootstrap/nonce_storage.ml rename to src/proto/alpha/nonce_storage.ml diff --git a/src/proto/bootstrap/nonce_storage.mli b/src/proto/alpha/nonce_storage.mli similarity index 100% rename from src/proto/bootstrap/nonce_storage.mli rename to src/proto/alpha/nonce_storage.mli diff --git a/src/proto/bootstrap/operation_repr.ml b/src/proto/alpha/operation_repr.ml similarity index 100% rename from src/proto/bootstrap/operation_repr.ml rename to src/proto/alpha/operation_repr.ml diff --git a/src/proto/bootstrap/operation_repr.mli b/src/proto/alpha/operation_repr.mli similarity index 100% rename from src/proto/bootstrap/operation_repr.mli rename to src/proto/alpha/operation_repr.mli diff --git a/src/proto/bootstrap/period_repr.ml b/src/proto/alpha/period_repr.ml similarity index 100% rename from src/proto/bootstrap/period_repr.ml rename to src/proto/alpha/period_repr.ml diff --git a/src/proto/bootstrap/period_repr.mli b/src/proto/alpha/period_repr.mli similarity index 100% rename from src/proto/bootstrap/period_repr.mli rename to src/proto/alpha/period_repr.mli diff --git a/src/proto/bootstrap/qty_repr.ml b/src/proto/alpha/qty_repr.ml similarity index 100% rename from src/proto/bootstrap/qty_repr.ml rename to src/proto/alpha/qty_repr.ml diff --git a/src/proto/bootstrap/raw_level_repr.ml b/src/proto/alpha/raw_level_repr.ml similarity index 100% rename from src/proto/bootstrap/raw_level_repr.ml rename to src/proto/alpha/raw_level_repr.ml diff --git a/src/proto/bootstrap/raw_level_repr.mli b/src/proto/alpha/raw_level_repr.mli similarity index 100% rename from src/proto/bootstrap/raw_level_repr.mli rename to src/proto/alpha/raw_level_repr.mli diff --git a/src/proto/bootstrap/reward_storage.ml b/src/proto/alpha/reward_storage.ml similarity index 100% rename from src/proto/bootstrap/reward_storage.ml rename to src/proto/alpha/reward_storage.ml diff --git a/src/proto/bootstrap/reward_storage.mli b/src/proto/alpha/reward_storage.mli similarity index 100% rename from src/proto/bootstrap/reward_storage.mli rename to src/proto/alpha/reward_storage.mli diff --git a/src/proto/bootstrap/roll_repr.ml b/src/proto/alpha/roll_repr.ml similarity index 100% rename from src/proto/bootstrap/roll_repr.ml rename to src/proto/alpha/roll_repr.ml diff --git a/src/proto/bootstrap/roll_repr.mli b/src/proto/alpha/roll_repr.mli similarity index 100% rename from src/proto/bootstrap/roll_repr.mli rename to src/proto/alpha/roll_repr.mli diff --git a/src/proto/bootstrap/roll_storage.ml b/src/proto/alpha/roll_storage.ml similarity index 100% rename from src/proto/bootstrap/roll_storage.ml rename to src/proto/alpha/roll_storage.ml diff --git a/src/proto/bootstrap/roll_storage.mli b/src/proto/alpha/roll_storage.mli similarity index 100% rename from src/proto/bootstrap/roll_storage.mli rename to src/proto/alpha/roll_storage.mli diff --git a/src/proto/bootstrap/script_int_repr.ml b/src/proto/alpha/script_int_repr.ml similarity index 100% rename from src/proto/bootstrap/script_int_repr.ml rename to src/proto/alpha/script_int_repr.ml diff --git a/src/proto/bootstrap/script_int_repr.mli b/src/proto/alpha/script_int_repr.mli similarity index 100% rename from src/proto/bootstrap/script_int_repr.mli rename to src/proto/alpha/script_int_repr.mli diff --git a/src/proto/bootstrap/script_interpreter.ml b/src/proto/alpha/script_interpreter.ml similarity index 100% rename from src/proto/bootstrap/script_interpreter.ml rename to src/proto/alpha/script_interpreter.ml diff --git a/src/proto/bootstrap/script_interpreter.mli b/src/proto/alpha/script_interpreter.mli similarity index 100% rename from src/proto/bootstrap/script_interpreter.mli rename to src/proto/alpha/script_interpreter.mli diff --git a/src/proto/bootstrap/script_ir_translator.ml b/src/proto/alpha/script_ir_translator.ml similarity index 100% rename from src/proto/bootstrap/script_ir_translator.ml rename to src/proto/alpha/script_ir_translator.ml diff --git a/src/proto/bootstrap/script_parser.mli b/src/proto/alpha/script_parser.mli similarity index 100% rename from src/proto/bootstrap/script_parser.mli rename to src/proto/alpha/script_parser.mli diff --git a/src/proto/bootstrap/script_repr.ml b/src/proto/alpha/script_repr.ml similarity index 100% rename from src/proto/bootstrap/script_repr.ml rename to src/proto/alpha/script_repr.ml diff --git a/src/proto/bootstrap/script_repr.mli b/src/proto/alpha/script_repr.mli similarity index 100% rename from src/proto/bootstrap/script_repr.mli rename to src/proto/alpha/script_repr.mli diff --git a/src/proto/bootstrap/script_typed_ir.ml b/src/proto/alpha/script_typed_ir.ml similarity index 100% rename from src/proto/bootstrap/script_typed_ir.ml rename to src/proto/alpha/script_typed_ir.ml diff --git a/src/proto/bootstrap/seed_repr.ml b/src/proto/alpha/seed_repr.ml similarity index 100% rename from src/proto/bootstrap/seed_repr.ml rename to src/proto/alpha/seed_repr.ml diff --git a/src/proto/bootstrap/seed_repr.mli b/src/proto/alpha/seed_repr.mli similarity index 100% rename from src/proto/bootstrap/seed_repr.mli rename to src/proto/alpha/seed_repr.mli diff --git a/src/proto/bootstrap/seed_storage.ml b/src/proto/alpha/seed_storage.ml similarity index 100% rename from src/proto/bootstrap/seed_storage.ml rename to src/proto/alpha/seed_storage.ml diff --git a/src/proto/bootstrap/seed_storage.mli b/src/proto/alpha/seed_storage.mli similarity index 100% rename from src/proto/bootstrap/seed_storage.mli rename to src/proto/alpha/seed_storage.mli diff --git a/src/proto/bootstrap/services.ml b/src/proto/alpha/services.ml similarity index 100% rename from src/proto/bootstrap/services.ml rename to src/proto/alpha/services.ml diff --git a/src/proto/bootstrap/services_registration.ml b/src/proto/alpha/services_registration.ml similarity index 100% rename from src/proto/bootstrap/services_registration.ml rename to src/proto/alpha/services_registration.ml diff --git a/src/proto/bootstrap/storage.ml b/src/proto/alpha/storage.ml similarity index 100% rename from src/proto/bootstrap/storage.ml rename to src/proto/alpha/storage.ml diff --git a/src/proto/bootstrap/storage.mli b/src/proto/alpha/storage.mli similarity index 100% rename from src/proto/bootstrap/storage.mli rename to src/proto/alpha/storage.mli diff --git a/src/proto/bootstrap/storage_functors.ml b/src/proto/alpha/storage_functors.ml similarity index 100% rename from src/proto/bootstrap/storage_functors.ml rename to src/proto/alpha/storage_functors.ml diff --git a/src/proto/bootstrap/storage_functors.mli b/src/proto/alpha/storage_functors.mli similarity index 100% rename from src/proto/bootstrap/storage_functors.mli rename to src/proto/alpha/storage_functors.mli diff --git a/src/proto/bootstrap/storage_helpers.mli b/src/proto/alpha/storage_helpers.mli similarity index 100% rename from src/proto/bootstrap/storage_helpers.mli rename to src/proto/alpha/storage_helpers.mli diff --git a/src/proto/bootstrap/storage_sigs.ml b/src/proto/alpha/storage_sigs.ml similarity index 100% rename from src/proto/bootstrap/storage_sigs.ml rename to src/proto/alpha/storage_sigs.ml diff --git a/src/proto/bootstrap/tez_repr.ml b/src/proto/alpha/tez_repr.ml similarity index 100% rename from src/proto/bootstrap/tez_repr.ml rename to src/proto/alpha/tez_repr.ml diff --git a/src/proto/bootstrap/tez_repr.mli b/src/proto/alpha/tez_repr.mli similarity index 100% rename from src/proto/bootstrap/tez_repr.mli rename to src/proto/alpha/tez_repr.mli diff --git a/src/proto/bootstrap/tezos_context.ml b/src/proto/alpha/tezos_context.ml similarity index 100% rename from src/proto/bootstrap/tezos_context.ml rename to src/proto/alpha/tezos_context.ml diff --git a/src/proto/bootstrap/tezos_context.mli b/src/proto/alpha/tezos_context.mli similarity index 100% rename from src/proto/bootstrap/tezos_context.mli rename to src/proto/alpha/tezos_context.mli diff --git a/src/proto/bootstrap/tezos_hash.ml b/src/proto/alpha/tezos_hash.ml similarity index 100% rename from src/proto/bootstrap/tezos_hash.ml rename to src/proto/alpha/tezos_hash.ml diff --git a/src/proto/bootstrap/time_repr.ml b/src/proto/alpha/time_repr.ml similarity index 100% rename from src/proto/bootstrap/time_repr.ml rename to src/proto/alpha/time_repr.ml diff --git a/src/proto/bootstrap/time_repr.mli b/src/proto/alpha/time_repr.mli similarity index 100% rename from src/proto/bootstrap/time_repr.mli rename to src/proto/alpha/time_repr.mli diff --git a/src/proto/bootstrap/vote_repr.ml b/src/proto/alpha/vote_repr.ml similarity index 100% rename from src/proto/bootstrap/vote_repr.ml rename to src/proto/alpha/vote_repr.ml diff --git a/src/proto/bootstrap/vote_repr.mli b/src/proto/alpha/vote_repr.mli similarity index 100% rename from src/proto/bootstrap/vote_repr.mli rename to src/proto/alpha/vote_repr.mli diff --git a/src/proto/bootstrap/vote_storage.ml b/src/proto/alpha/vote_storage.ml similarity index 100% rename from src/proto/bootstrap/vote_storage.ml rename to src/proto/alpha/vote_storage.ml diff --git a/src/proto/bootstrap/vote_storage.mli b/src/proto/alpha/vote_storage.mli similarity index 100% rename from src/proto/bootstrap/vote_storage.mli rename to src/proto/alpha/vote_storage.mli diff --git a/src/proto/bootstrap/voting_period_repr.ml b/src/proto/alpha/voting_period_repr.ml similarity index 100% rename from src/proto/bootstrap/voting_period_repr.ml rename to src/proto/alpha/voting_period_repr.ml diff --git a/src/proto/bootstrap/voting_period_repr.mli b/src/proto/alpha/voting_period_repr.mli similarity index 100% rename from src/proto/bootstrap/voting_period_repr.mli rename to src/proto/alpha/voting_period_repr.mli diff --git a/src/webclient_main.ml b/src/webclient_main.ml index 575790f8f..532644f1d 100644 --- a/src/webclient_main.ml +++ b/src/webclient_main.ml @@ -42,7 +42,7 @@ let block_protocol cctxt block = "\n\ The connection to the RPC server failed, \ using the default protocol version.\n" >>= fun () -> - Lwt.return Client_bootstrap.Client_proto_main.protocol) + Lwt.return Client_alpha.Client_proto_main.protocol) let eval_command argv = let cctxt, result = make_context () in diff --git a/test/Makefile b/test/Makefile index c035cac0e..29655a43c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -273,8 +273,8 @@ COVERAGESRCDIR= \ -I ../src \ -I ../src/client \ -I ../src/client/embedded \ - -I ../src/client/embedded/bootstrap \ - -I ../src/client/embedded/bootstrap/mining \ + -I ../src/client/embedded/alpha \ + -I ../src/client/embedded/alpha/mining \ -I ../src/compiler \ -I ../src/node \ -I ../src/node/db \ @@ -282,7 +282,7 @@ COVERAGESRCDIR= \ -I ../src/node/net \ -I ../src/node/shell \ -I ../src/proto \ - -I ../src/proto/bootstrap \ + -I ../src/proto/alpha \ -I ../src/proto/demo \ -I ../src/minutils \ -I ../src/utils diff --git a/test/test_basic.ml b/test/test_basic.ml index 7bb71518d..707398218 100644 --- a/test/test_basic.ml +++ b/test/test_basic.ml @@ -7,8 +7,8 @@ (* *) (**************************************************************************) -open Client_embedded_proto_bootstrap -open Client_bootstrap +open Client_embedded_proto_alpha +open Client_alpha open Tezos_context open Error_monad open Hash