diff --git a/docs/README.alphanet b/docs/README.alphanet index bbeac7b37..b73219220 100644 --- a/docs/README.alphanet +++ b/docs/README.alphanet @@ -281,7 +281,7 @@ the appropriate value: ``` $ ./alphanet.sh client list known identities my_identity: tz1iFY8aDskx9QGbgBy68SNAGgkc7AE2iG9H (public key known) (secret key known) -$ ./alphanet.sh client rpc call /blocks/head/proto/helpers/rights/mining/delegate/tz1iFY8aDskx9QGbgBy68SNAGgkc7AE2iG9H with '{}' +$ ./alphanet.sh client rpc call /blocks/head/proto/helpers/rights/baking/delegate/tz1iFY8aDskx9QGbgBy68SNAGgkc7AE2iG9H with '{}' { "ok": [ { "level": 1400.000000, "priority": 2.000000, "timestamp": "2017-05-19T03:21:52Z" }, diff --git a/scripts/alphanet_constants.patch b/scripts/alphanet_constants.patch index 605297ed3..ab57acc60 100644 --- a/scripts/alphanet_constants.patch +++ b/scripts/alphanet_constants.patch @@ -26,9 +26,9 @@ index 3780bec2..36f91ff6 100644 + Int64.(mul 6L 3600L) ; (* 6 hours *) slot_durations = - List.map Period_repr.of_seconds_exn [ 60L ] ; -- first_free_mining_slot = 16 ; +- first_free_baking_slot = 16 ; + List.map Period_repr.of_seconds_exn [ 60L ; 30L ; 30L ; 30L ; 10L ] ; -+ first_free_mining_slot = 4 ; ++ first_free_baking_slot = 4 ; max_signing_slot = 15 ; instructions_per_transaction = 16 * 1024 ; proof_of_work_threshold = diff --git a/scripts/client_lib.inc.sh b/scripts/client_lib.inc.sh index ece97d583..1addb1983 100644 --- a/scripts/client_lib.inc.sh +++ b/scripts/client_lib.inc.sh @@ -68,7 +68,7 @@ may_create_identity() { check_baker() { pids=$(pgrep -x tezos-client 2>/dev/null) for pid in $pids; do - if grep -- "-mining" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then + if grep -- "-baking" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then return 0 fi done @@ -81,13 +81,13 @@ run_baker() { exit 1 fi echo "Start baker..." - exec $client launch daemon -mining -max-priority 64 "$@" > "$client_dir/baker.log" + exec $client launch daemon -baking -max-priority 64 "$@" > "$client_dir/baker.log" } stop_baker() { pids=$(pgrep -x tezos-client 2>/dev/null) for pid in $pids; do - if grep -- "-mining" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then + if grep -- "-baking" "/proc/$pid/cmdline" >/dev/null 2>&1 ; then echo "Killing the baker..." kill "$pid" fi diff --git a/src/client/embedded/alpha/client_mining_blocks.ml b/src/client/embedded/alpha/client_baking_blocks.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_blocks.ml rename to src/client/embedded/alpha/client_baking_blocks.ml diff --git a/src/client/embedded/alpha/client_mining_blocks.mli b/src/client/embedded/alpha/client_baking_blocks.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_blocks.mli rename to src/client/embedded/alpha/client_baking_blocks.mli diff --git a/src/client/embedded/alpha/client_mining_daemon.ml b/src/client/embedded/alpha/client_baking_daemon.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_daemon.ml rename to src/client/embedded/alpha/client_baking_daemon.ml diff --git a/src/client/embedded/alpha/client_mining_daemon.mli b/src/client/embedded/alpha/client_baking_daemon.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_daemon.mli rename to src/client/embedded/alpha/client_baking_daemon.mli diff --git a/src/client/embedded/alpha/client_mining_denunciation.ml b/src/client/embedded/alpha/client_baking_denunciation.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_denunciation.ml rename to src/client/embedded/alpha/client_baking_denunciation.ml diff --git a/src/client/embedded/alpha/client_mining_denunciation.mli b/src/client/embedded/alpha/client_baking_denunciation.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_denunciation.mli rename to src/client/embedded/alpha/client_baking_denunciation.mli diff --git a/src/client/embedded/alpha/client_mining_endorsement.ml b/src/client/embedded/alpha/client_baking_endorsement.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_endorsement.ml rename to src/client/embedded/alpha/client_baking_endorsement.ml diff --git a/src/client/embedded/alpha/client_mining_endorsement.mli b/src/client/embedded/alpha/client_baking_endorsement.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_endorsement.mli rename to src/client/embedded/alpha/client_baking_endorsement.mli diff --git a/src/client/embedded/alpha/client_mining_forge.ml b/src/client/embedded/alpha/client_baking_forge.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_forge.ml rename to src/client/embedded/alpha/client_baking_forge.ml diff --git a/src/client/embedded/alpha/client_mining_forge.mli b/src/client/embedded/alpha/client_baking_forge.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_forge.mli rename to src/client/embedded/alpha/client_baking_forge.mli diff --git a/src/client/embedded/alpha/client_mining_main.ml b/src/client/embedded/alpha/client_baking_main.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_main.ml rename to src/client/embedded/alpha/client_baking_main.ml diff --git a/src/client/embedded/alpha/client_mining_main.mli b/src/client/embedded/alpha/client_baking_main.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_main.mli rename to src/client/embedded/alpha/client_baking_main.mli diff --git a/src/client/embedded/alpha/client_mining_operations.ml b/src/client/embedded/alpha/client_baking_operations.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_operations.ml rename to src/client/embedded/alpha/client_baking_operations.ml diff --git a/src/client/embedded/alpha/client_mining_operations.mli b/src/client/embedded/alpha/client_baking_operations.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_operations.mli rename to src/client/embedded/alpha/client_baking_operations.mli diff --git a/src/client/embedded/alpha/client_mining_revelation.ml b/src/client/embedded/alpha/client_baking_revelation.ml similarity index 100% rename from src/client/embedded/alpha/client_mining_revelation.ml rename to src/client/embedded/alpha/client_baking_revelation.ml diff --git a/src/client/embedded/alpha/client_mining_revelation.mli b/src/client/embedded/alpha/client_baking_revelation.mli similarity index 100% rename from src/client/embedded/alpha/client_mining_revelation.mli rename to src/client/embedded/alpha/client_baking_revelation.mli diff --git a/src/proto/alpha/mining.ml b/src/proto/alpha/baking.ml similarity index 100% rename from src/proto/alpha/mining.ml rename to src/proto/alpha/baking.ml diff --git a/src/proto/alpha/mining.mli b/src/proto/alpha/baking.mli similarity index 100% rename from src/proto/alpha/mining.mli rename to src/proto/alpha/baking.mli diff --git a/test/proto_alpha/proto_alpha_helpers.ml b/test/proto_alpha/proto_alpha_helpers.ml index 53a71a10d..43cec2db7 100644 --- a/test/proto_alpha/proto_alpha_helpers.ml +++ b/test/proto_alpha/proto_alpha_helpers.ml @@ -329,7 +329,7 @@ module Assert = struct let failed_to_preapply ~msg ?op f = Assert.contain_error ~msg ~f:begin function - | Client_mining_forge.Failed_to_preapply (op', err) -> + | Client_baking_forge.Failed_to_preapply (op', err) -> begin match op with | None -> true @@ -419,7 +419,7 @@ module Mining = struct | Error _ -> assert false | Ok nonce -> nonce in let seed_nonce_hash = Nonce.hash seed_nonce in - Client_mining_forge.forge_block + Client_baking_forge.forge_block !rpc_config block ~operations diff --git a/test/proto_alpha/proto_alpha_helpers.mli b/test/proto_alpha/proto_alpha_helpers.mli index fa3ebef34..36efe83ba 100644 --- a/test/proto_alpha/proto_alpha_helpers.mli +++ b/test/proto_alpha/proto_alpha_helpers.mli @@ -181,7 +181,7 @@ module Assert : sig val initial_amount_too_low : msg:string -> 'a tzresult -> unit val non_delegatable : msg:string -> 'a tzresult -> unit - (** Endorsement / mining assertions *) + (** Endorsement / baking assertions *) val wrong_delegate : msg:string -> 'a tzresult -> unit diff --git a/test/proto_alpha/sandbox-vote.json b/test/proto_alpha/sandbox-vote.json index c6fba56c8..fa751a9a1 100644 --- a/test/proto_alpha/sandbox-vote.json +++ b/test/proto_alpha/sandbox-vote.json @@ -12,5 +12,5 @@ "cycle_length" : 4, "voting_period_length" : 2, "time_before_reward" : 1, - "first_free_mining_slot" : 4 + "first_free_baking_slot" : 4 } diff --git a/test/proto_alpha/sandbox.json b/test/proto_alpha/sandbox.json index 54a3bfec8..505882b40 100644 --- a/test/proto_alpha/sandbox.json +++ b/test/proto_alpha/sandbox.json @@ -11,5 +11,5 @@ "slot_durations" : [ 1, 0 ], "cycle_length" : 4, "time_before_reward" : 1, - "first_free_mining_slot" : 4 + "first_free_baking_slot" : 4 } diff --git a/test/sandbox.json b/test/sandbox.json index 1850bb1ee..be91a4281 100644 --- a/test/sandbox.json +++ b/test/sandbox.json @@ -10,5 +10,5 @@ ], "slot_durations" : [ 1, 0 ], "cycle_length" : 128, - "first_free_mining_slot" : 4 + "first_free_baking_slot" : 4 }