balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alpha: rename baking_reward into block_reward

Browse Source
This commit is contained in:
Grégoire Henry 2018-03-15 15:08:41 +01:00 committed by Benjamin Canou
parent 6b53e3f578
commit 43609e2e63
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_alpha/lib_protocol/src/alpha_context.mli
View File

@ -255,7 +255,7 @@ end
module Constants : sig module Constants : sig
val proof_of_work_nonce_size: int val proof_of_work_nonce_size: int
val baking_reward: Tez.t val block_reward: Tez.t
val endorsement_reward: Tez.t val endorsement_reward: Tez.t
val nonce_length: int val nonce_length: int
val seed_nonce_revelation_tip: Tez.t val seed_nonce_revelation_tip: Tez.t

2
src/proto_alpha/lib_protocol/src/apply.ml
View File

@ -634,7 +634,7 @@ let begin_application ctxt block_header pred_timestamp =
let finalize_application ctxt protocol_data delegate bond fees rewards = let finalize_application ctxt protocol_data delegate bond fees rewards =
(* end of level (from this point nothing should fail) *) (* end of level (from this point nothing should fail) *)
Lwt.return Tez.(rewards +? Constants.baking_reward) >>=? fun rewards -> Lwt.return Tez.(rewards +? Constants.block_reward) >>=? fun rewards ->
Delegate.freeze_fees ctxt delegate fees >>=? fun ctxt -> Delegate.freeze_fees ctxt delegate fees >>=? fun ctxt ->
Delegate.freeze_rewards ctxt delegate rewards >>=? fun ctxt -> Delegate.freeze_rewards ctxt delegate rewards >>=? fun ctxt ->
begin begin

2
src/proto_alpha/lib_protocol/src/constants_repr.ml
View File

@ -29,7 +29,7 @@ let endorsement_security_deposit =
Tez_repr.(mul_exn one 64) Tez_repr.(mul_exn one 64)
(* 16 tez *) (* 16 tez *)
let baking_reward = let block_reward =
Tez_repr.(mul_exn one 16) Tez_repr.(mul_exn one 16)
(* 2 tez *) (* 2 tez *)