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

Alpha: rename endorsement_bond_cost into endorsement_security_deposit

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

2
src/proto_alpha/lib_baking/test/test_endorsement.ml
View File

@ -107,7 +107,7 @@ let test_endorsement_rewards block0 =
done ; done ;
return (!account, !cpt) in return (!account, !cpt) in
let bond = Tez.to_mutez Constants.endorsement_bond_cost in let bond = Tez.to_mutez Constants.endorsement_security_deposit in
(* Endorsement Rights *) (* Endorsement Rights *)
(* #1 endorse & inject in a block *) (* #1 endorse & inject in a block *)

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

@ -261,7 +261,7 @@ module Constants : sig
val seed_nonce_revelation_tip: Tez.t val seed_nonce_revelation_tip: Tez.t
val origination_burn: Tez.t val origination_burn: Tez.t
val block_security_deposit: Tez.t val block_security_deposit: Tez.t
val endorsement_bond_cost: Tez.t val endorsement_security_deposit: Tez.t
val faucet_credit: Tez.t val faucet_credit: Tez.t
val preserved_cycles: context -> int val preserved_cycles: context -> int

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

@ -140,7 +140,7 @@ let freeze_baking_bond ctxt { Block_header.priority ; _ } delegate =
return (ctxt, bond) return (ctxt, bond)
let freeze_endorsement_bond ctxt delegate = let freeze_endorsement_bond ctxt delegate =
let bond = Constants.endorsement_bond_cost in let bond = Constants.endorsement_security_deposit in
Delegate.freeze_bond ctxt delegate bond Delegate.freeze_bond ctxt delegate bond
|> trace Cannot_freeze_endorsement_bond |> trace Cannot_freeze_endorsement_bond

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

@ -44,7 +44,7 @@ val freeze_baking_bond:
(context * Tez.t) tzresult Lwt.t (context * Tez.t) tzresult Lwt.t
(** [freeze_endorsement_bond: ctxt delegate] (** [freeze_endorsement_bond: ctxt delegate]
Freeze the endorsement bond (See !Constants.endorsement_bond_cost) Freeze the endorsement bond (See !Constants.endorsement_security_deposit)
from the delegate account. from the delegate account.
Raise an error if the baker account does not have enough Raise an error if the baker account does not have enough

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

@ -25,7 +25,7 @@ let block_security_deposit =
Tez_repr.(mul_exn one 512) Tez_repr.(mul_exn one 512)
(* 64 tez *) (* 64 tez *)
let endorsement_bond_cost = let endorsement_security_deposit =
Tez_repr.(mul_exn one 64) Tez_repr.(mul_exn one 64)
(* 16 tez *) (* 16 tez *)

8
src/proto_alpha/lib_protocol/test/test_endorsement.ml
View File

@ -69,14 +69,14 @@ let test_endorsement_payment () =
result.tezos_context protocol_data root.tezos_header.shell.timestamp result.tezos_context protocol_data root.tezos_header.shell.timestamp
>>=? fun baker_pub -> >>=? fun baker_pub ->
let baker_hpub = Ed25519.Public_key.hash baker_pub in let baker_hpub = Ed25519.Public_key.hash baker_pub in
let endorsement_bond_cost = let endorsement_security_deposit =
Constants.endorsement_bond_cost in Constants.endorsement_security_deposit in
let baking = baker_hpub = contract_p.hpub && block_priority < 4 in let baking = baker_hpub = contract_p.hpub && block_priority < 4 in
let block_security_deposit = let block_security_deposit =
if baking if baking
then Constants.block_security_deposit then Constants.block_security_deposit
else Tez.zero in else Tez.zero in
let cost = Cast.tez_add endorsement_bond_cost block_security_deposit in let cost = Cast.tez_add endorsement_security_deposit block_security_deposit in
let expected_balance = Cast.tez_sub init_balance cost in let expected_balance = Cast.tez_sub init_balance cost in
Assert.equal_tez ~msg: __LOC__ expected_balance bond_balance ; Assert.equal_tez ~msg: __LOC__ expected_balance bond_balance ;
(* After one cycle, (4 blocks in test/proto_alpha/sandbox), (* After one cycle, (4 blocks in test/proto_alpha/sandbox),
@ -86,7 +86,7 @@ let test_endorsement_payment () =
get_balance_res contract_p result >>=? fun reward_balance -> get_balance_res contract_p result >>=? fun reward_balance ->
Proto_alpha.Baking.endorsement_reward ~block_priority >>=? fun reward -> Proto_alpha.Baking.endorsement_reward ~block_priority >>=? fun reward ->
let expected_balance = Cast.tez_add expected_balance reward in let expected_balance = Cast.tez_add expected_balance reward in
let expected_balance = Cast.tez_add expected_balance endorsement_bond_cost in let expected_balance = Cast.tez_add expected_balance endorsement_security_deposit in
Assert.equal_tez ~msg: __LOC__ expected_balance reward_balance ; Assert.equal_tez ~msg: __LOC__ expected_balance reward_balance ;
return () return ()
in in