From 7ef2803199b6ebfe6ce64e9c1d5c27463e43d7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Thu, 15 Mar 2018 15:09:42 +0100 Subject: [PATCH] Alpha: rename `max_signing_slot` into `endorsers_per_block` --- .../lib_protocol/src/alpha_context.mli | 2 +- src/proto_alpha/lib_protocol/src/baking.ml | 8 ++++---- .../lib_protocol/src/constants_repr.ml | 18 +++++++++--------- .../lib_protocol/src/constants_services.ml | 14 +++++++------- .../lib_protocol/src/constants_services.mli | 2 +- .../lib_protocol/src/constants_storage.ml | 4 ++-- .../lib_protocol/src/delegate_services.ml | 2 +- src/proto_alpha/lib_protocol/src/services.ml | 6 +++--- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/proto_alpha/lib_protocol/src/alpha_context.mli b/src/proto_alpha/lib_protocol/src/alpha_context.mli index 7a392e9f5..cd8b05fff 100644 --- a/src/proto_alpha/lib_protocol/src/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/src/alpha_context.mli @@ -271,7 +271,7 @@ module Constants : sig val voting_period_length: context -> int32 val time_between_blocks: context -> Period.t list val first_free_baking_slot: context -> int - val max_signing_slot: context -> int + val endorsers_per_block: context -> int val max_gas: context -> int val proof_of_work_threshold: context -> int64 val dictator_pubkey: context -> Ed25519.Public_key.t diff --git a/src/proto_alpha/lib_protocol/src/baking.ml b/src/proto_alpha/lib_protocol/src/baking.ml index 6bd127bd1..b7ecfbe08 100644 --- a/src/proto_alpha/lib_protocol/src/baking.ml +++ b/src/proto_alpha/lib_protocol/src/baking.ml @@ -159,8 +159,8 @@ let check_baking_rights c { Block_header.priority ; _ } let check_endorsements_rights c level slots = map_p (fun slot -> - fail_unless Compare.Int.(0 <= slot && slot <= Constants.max_signing_slot c) - (Invalid_endorsement_slot (Constants.max_signing_slot c, slot)) >>=? fun () -> + fail_unless Compare.Int.(0 <= slot && slot <= Constants.endorsers_per_block c) + (Invalid_endorsement_slot (Constants.endorsers_per_block c, slot)) >>=? fun () -> Roll.endorsement_rights_owner c level ~slot) slots >>=? function | [] -> fail Empty_endorsement @@ -220,7 +220,7 @@ let first_baking_priorities let first_endorsement_slots ctxt - ?(max_priority = Constants.max_signing_slot ctxt) + ?(max_priority = Constants.endorsers_per_block ctxt) delegate level = endorsement_priorities ctxt level >>=? fun delegate_list -> select_delegate delegate delegate_list max_priority @@ -255,7 +255,7 @@ let check_signature block key = Ed25519.Public_key.hash key)) let max_fitness_gap ctxt = - let slots = Int64.of_int (Constants.max_signing_slot ctxt + 1) in + let slots = Int64.of_int (Constants.endorsers_per_block ctxt + 1) in Int64.add slots 1L let check_fitness_gap ctxt (block : Block_header.t) = diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml index 184022394..30cdcc2ca 100644 --- a/src/proto_alpha/lib_protocol/src/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml @@ -52,7 +52,7 @@ type constants = { voting_period_length: int32 ; time_between_blocks: Period_repr.t list ; first_free_baking_slot: int ; - max_signing_slot: int ; + endorsers_per_block: int ; max_gas: int ; proof_of_work_threshold: int64 ; bootstrap_keys: Ed25519.Public_key.t list ; @@ -74,7 +74,7 @@ let default = { time_between_blocks = List.map Period_repr.of_seconds_exn [ 60L ] ; first_free_baking_slot = 16 ; - max_signing_slot = 32 ; + endorsers_per_block = 32 ; max_gas = 40_000 ; proof_of_work_threshold = Int64.(sub (shift_left 1L 56) 1L) ; @@ -134,9 +134,9 @@ let constants_encoding = and first_free_baking_slot = opt Compare.Int.(=) default.first_free_baking_slot c.first_free_baking_slot - and max_signing_slot = + and endorsers_per_block = opt Compare.Int.(=) - default.max_signing_slot c.max_signing_slot + default.endorsers_per_block c.endorsers_per_block and max_gas = opt Compare.Int.(=) default.max_gas c.max_gas @@ -169,7 +169,7 @@ let constants_encoding = voting_period_length, time_between_blocks, first_free_baking_slot, - max_signing_slot, + endorsers_per_block, max_gas), ( proof_of_work_threshold, bootstrap_keys, @@ -185,7 +185,7 @@ let constants_encoding = voting_period_length, time_between_blocks, first_free_baking_slot, - max_signing_slot, + endorsers_per_block, max_gas), ( proof_of_work_threshold, bootstrap_keys, @@ -209,8 +209,8 @@ let constants_encoding = time_between_blocks ; first_free_baking_slot = unopt default.first_free_baking_slot first_free_baking_slot ; - max_signing_slot = - unopt default.max_signing_slot max_signing_slot ; + endorsers_per_block = + unopt default.endorsers_per_block endorsers_per_block ; max_gas = unopt default.max_gas max_gas ; proof_of_work_threshold = @@ -239,7 +239,7 @@ let constants_encoding = (opt "voting_period_length" int32) (opt "time_between_blocks" (list Period_repr.encoding)) (opt "first_free_baking_slot" uint16) - (opt "max_signing_slot" uint16) + (opt "endorsers_per_block" uint16) (opt "instructions_per_transaction" int31)) (obj7 (opt "proof_of_work_threshold" int64) diff --git a/src/proto_alpha/lib_protocol/src/constants_services.ml b/src/proto_alpha/lib_protocol/src/constants_services.ml index d41af9994..656495c86 100644 --- a/src/proto_alpha/lib_protocol/src/constants_services.ml +++ b/src/proto_alpha/lib_protocol/src/constants_services.ml @@ -72,13 +72,13 @@ module S = struct ~output: (obj1 (req "first_free_baking_slot" uint16)) RPC_path.(custom_root / "first_free_baking_slot") - let max_signing_slot = + let endorsers_per_block = RPC_service.post_service ~description: "Max signing slot" ~query: RPC_query.empty ~input: empty - ~output: (obj1 (req "max_signing_slot" uint16)) - RPC_path.(custom_root / "max_signing_slot") + ~output: (obj1 (req "endorsers_per_block" uint16)) + RPC_path.(custom_root / "endorsers_per_block") let max_gas = RPC_service.post_service @@ -130,8 +130,8 @@ let () = register0 S.first_free_baking_slot begin fun ctxt () () -> return (Constants.first_free_baking_slot ctxt) end ; - register0 S.max_signing_slot begin fun ctxt () () -> - return (Constants.max_signing_slot ctxt) + register0 S.endorsers_per_block begin fun ctxt () () -> + return (Constants.endorsers_per_block ctxt) end ; register0 S.max_gas begin fun ctxt () () -> return (Constants.max_gas ctxt) @@ -157,8 +157,8 @@ let time_between_blocks ctxt block = RPC_context.make_call0 S.time_between_blocks ctxt block () () let first_free_baking_slot ctxt block = RPC_context.make_call0 S.first_free_baking_slot ctxt block () () -let max_signing_slot ctxt block = - RPC_context.make_call0 S.max_signing_slot ctxt block () () +let endorsers_per_block ctxt block = + RPC_context.make_call0 S.endorsers_per_block ctxt block () () let max_gas ctxt block = RPC_context.make_call0 S.max_gas ctxt block () () let proof_of_work_threshold ctxt block = diff --git a/src/proto_alpha/lib_protocol/src/constants_services.mli b/src/proto_alpha/lib_protocol/src/constants_services.mli index 6133d4191..17fcb61ec 100644 --- a/src/proto_alpha/lib_protocol/src/constants_services.mli +++ b/src/proto_alpha/lib_protocol/src/constants_services.mli @@ -30,7 +30,7 @@ val time_between_blocks: val first_free_baking_slot: 'a #RPC_context.simple -> 'a -> int shell_tzresult Lwt.t -val max_signing_slot: +val endorsers_per_block: 'a #RPC_context.simple -> 'a -> int shell_tzresult Lwt.t val max_gas: diff --git a/src/proto_alpha/lib_protocol/src/constants_storage.ml b/src/proto_alpha/lib_protocol/src/constants_storage.ml index f95d87511..5693e01f8 100644 --- a/src/proto_alpha/lib_protocol/src/constants_storage.ml +++ b/src/proto_alpha/lib_protocol/src/constants_storage.ml @@ -28,9 +28,9 @@ let time_between_blocks c = let first_free_baking_slot c = let constants = Raw_context.constants c in constants.first_free_baking_slot -let max_signing_slot c = +let endorsers_per_block c = let constants = Raw_context.constants c in - constants.max_signing_slot + constants.endorsers_per_block let max_gas c = let constants = Raw_context.constants c in constants.max_gas diff --git a/src/proto_alpha/lib_protocol/src/delegate_services.ml b/src/proto_alpha/lib_protocol/src/delegate_services.ml index 35c46d6b0..7e95aeac1 100644 --- a/src/proto_alpha/lib_protocol/src/delegate_services.ml +++ b/src/proto_alpha/lib_protocol/src/delegate_services.ml @@ -251,7 +251,7 @@ module Endorser = struct module I = struct let default_max_endorsement_priority ctxt arg = - let default = Constants.max_signing_slot ctxt in + let default = Constants.endorsers_per_block ctxt in match arg with | None -> default | Some m -> m diff --git a/src/proto_alpha/lib_protocol/src/services.ml b/src/proto_alpha/lib_protocol/src/services.ml index d28d10b00..d03b560fe 100644 --- a/src/proto_alpha/lib_protocol/src/services.ml +++ b/src/proto_alpha/lib_protocol/src/services.ml @@ -88,13 +88,13 @@ module Constants = struct ~output: (obj1 (req "first_free_baking_slot" uint16)) RPC_path.(custom_root / "constants" / "first_free_baking_slot") - let max_signing_slot custom_root = + let endorsers_per_block custom_root = RPC_service.post_service ~description: "Max signing slot" ~query: RPC_query.empty ~input: empty - ~output: (obj1 (req "max_signing_slot" uint16)) - RPC_path.(custom_root / "constants" / "max_signing_slot") + ~output: (obj1 (req "endorsers_per_block" uint16)) + RPC_path.(custom_root / "constants" / "endorsers_per_block") let max_gas custom_root = RPC_service.post_service