From 43609e2e63bc77ff20f4724e952cc646c1a77e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Thu, 15 Mar 2018 15:08:41 +0100
Subject: [PATCH] Alpha: rename `baking_reward` into `block_reward`

---
 src/proto_alpha/lib_protocol/src/alpha_context.mli | 2 +-
 src/proto_alpha/lib_protocol/src/apply.ml          | 2 +-
 src/proto_alpha/lib_protocol/src/constants_repr.ml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/src/alpha_context.mli b/src/proto_alpha/lib_protocol/src/alpha_context.mli
index 4d7e57937..7a392e9f5 100644
--- a/src/proto_alpha/lib_protocol/src/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/src/alpha_context.mli
@@ -255,7 +255,7 @@ end
 module Constants : sig
 
   val proof_of_work_nonce_size: int
-  val baking_reward: Tez.t
+  val block_reward: Tez.t
   val endorsement_reward: Tez.t
   val nonce_length: int
   val seed_nonce_revelation_tip: Tez.t
diff --git a/src/proto_alpha/lib_protocol/src/apply.ml b/src/proto_alpha/lib_protocol/src/apply.ml
index 0afd66881..edebb5579 100644
--- a/src/proto_alpha/lib_protocol/src/apply.ml
+++ b/src/proto_alpha/lib_protocol/src/apply.ml
@@ -634,7 +634,7 @@ let begin_application ctxt block_header pred_timestamp =
 
 let finalize_application ctxt protocol_data delegate bond fees rewards =
   (* 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_rewards ctxt delegate rewards >>=? fun ctxt ->
   begin
diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml
index ef04cebf0..184022394 100644
--- a/src/proto_alpha/lib_protocol/src/constants_repr.ml
+++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml
@@ -29,7 +29,7 @@ let endorsement_security_deposit =
   Tez_repr.(mul_exn one 64)
 
 (* 16 tez *)
-let baking_reward =
+let block_reward =
   Tez_repr.(mul_exn one 16)
 
 (* 2 tez *)