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

typo: froze -> freeze

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-10-26 17:02:10 +02:00 committed by Grégoire Henry
parent 668ebd7c5f
commit 96b55369e4
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/proto/bootstrap/amendment.ml
View File

@ -54,12 +54,12 @@ let start_new_voting_cycle ctxt =
Vote.clear_listings ctxt >>=? fun ctxt -> Vote.clear_listings ctxt >>=? fun ctxt ->
match select_winning_proposal proposals with match select_winning_proposal proposals with
| None -> | None ->
Vote.froze_listings ctxt >>=? fun ctxt -> Vote.freeze_listings ctxt >>=? fun ctxt ->
Vote.clear_current_proposal ctxt >>=? fun ctxt -> Vote.clear_current_proposal ctxt >>=? fun ctxt ->
return ctxt return ctxt
| Some proposal -> | Some proposal ->
Vote.set_current_proposal ctxt proposal >>=? fun ctxt -> Vote.set_current_proposal ctxt proposal >>=? fun ctxt ->
Vote.froze_listings ctxt >>=? fun ctxt -> Vote.freeze_listings ctxt >>=? fun ctxt ->
Vote.set_current_period_kind ctxt Testing_vote >>=? fun ctxt -> Vote.set_current_period_kind ctxt Testing_vote >>=? fun ctxt ->
return ctxt return ctxt
end end
@ -75,11 +75,11 @@ let start_new_voting_cycle ctxt =
return ctxt return ctxt
else else
Vote.clear_current_proposal ctxt >>=? fun ctxt -> Vote.clear_current_proposal ctxt >>=? fun ctxt ->
Vote.froze_listings ctxt >>=? fun ctxt -> Vote.freeze_listings ctxt >>=? fun ctxt ->
Vote.set_current_period_kind ctxt Proposal >>=? fun ctxt -> Vote.set_current_period_kind ctxt Proposal >>=? fun ctxt ->
return ctxt return ctxt
| Testing -> | Testing ->
Vote.froze_listings ctxt >>=? fun ctxt -> Vote.freeze_listings ctxt >>=? fun ctxt ->
Vote.set_current_period_kind ctxt Promotion_vote >>=? fun ctxt -> Vote.set_current_period_kind ctxt Promotion_vote >>=? fun ctxt ->
return ctxt return ctxt
| Promotion_vote -> | Promotion_vote ->
@ -95,7 +95,7 @@ let start_new_voting_cycle ctxt =
Vote.clear_ballots ctxt >>= fun ctxt -> Vote.clear_ballots ctxt >>= fun ctxt ->
Vote.clear_listings ctxt >>=? fun ctxt -> Vote.clear_listings ctxt >>=? fun ctxt ->
Vote.clear_current_proposal ctxt >>=? fun ctxt -> Vote.clear_current_proposal ctxt >>=? fun ctxt ->
Vote.froze_listings ctxt >>=? fun ctxt -> Vote.freeze_listings ctxt >>=? fun ctxt ->
Vote.set_current_period_kind ctxt Proposal >>=? fun ctxt -> Vote.set_current_period_kind ctxt Proposal >>=? fun ctxt ->
return ctxt return ctxt

2
src/proto/bootstrap/apply.ml
View File

@ -184,7 +184,7 @@ let may_start_new_cycle ctxt =
Seed.clear_cycle ctxt last_cycle >>=? fun ctxt -> Seed.clear_cycle ctxt last_cycle >>=? fun ctxt ->
Seed.compute_for_cycle ctxt (Cycle.succ new_cycle) >>=? fun ctxt -> Seed.compute_for_cycle ctxt (Cycle.succ new_cycle) >>=? fun ctxt ->
Roll.clear_cycle ctxt last_cycle >>=? fun ctxt -> Roll.clear_cycle ctxt last_cycle >>=? fun ctxt ->
Roll.froze_rolls_for_cycle ctxt (Cycle.succ new_cycle) >>=? fun ctxt -> Roll.freeze_rolls_for_cycle ctxt (Cycle.succ new_cycle) >>=? fun ctxt ->
Timestamp.get_current ctxt >>=? fun timestamp -> Timestamp.get_current ctxt >>=? fun timestamp ->
Lwt.return (Timestamp.(timestamp +? (Constants.time_before_reward ctxt))) Lwt.return (Timestamp.(timestamp +? (Constants.time_before_reward ctxt)))
>>=? fun reward_date -> >>=? fun reward_date ->

4
src/proto/bootstrap/init_storage.ml
View File

@ -25,9 +25,9 @@ let initialize (ctxt:Context.t) =
Contract_storage.init store >>=? fun store -> Contract_storage.init store >>=? fun store ->
Reward_storage.init store >>=? fun store -> Reward_storage.init store >>=? fun store ->
Bootstrap_storage.init store >>=? fun store -> Bootstrap_storage.init store >>=? fun store ->
Roll_storage.froze_rolls_for_cycle Roll_storage.freeze_rolls_for_cycle
store Cycle_repr.root >>=? fun store -> store Cycle_repr.root >>=? fun store ->
Roll_storage.froze_rolls_for_cycle Roll_storage.freeze_rolls_for_cycle
store Cycle_repr.(succ root) >>=? fun store -> store Cycle_repr.(succ root) >>=? fun store ->
Vote_storage.init store >>=? fun store -> Vote_storage.init store >>=? fun store ->
return store return store

2
src/proto/bootstrap/roll_storage.ml
View File

@ -42,7 +42,7 @@ let fold ctxt ~f init =
loop ctxt (Roll_repr.succ roll) (f roll contract acc) in loop ctxt (Roll_repr.succ roll) (f roll contract acc) in
loop ctxt Roll_repr.first (return init) loop ctxt Roll_repr.first (return init)
let froze_rolls_for_cycle ctxt cycle = let freeze_rolls_for_cycle ctxt cycle =
fold ctxt (ctxt, Roll_repr.first) fold ctxt (ctxt, Roll_repr.first)
~f:(fun roll contract (ctxt, promoted_roll as acc) -> ~f:(fun roll contract (ctxt, promoted_roll as acc) ->
get_contract_delegate ctxt contract >>=? function get_contract_delegate ctxt contract >>=? function

2
src/proto/bootstrap/roll_storage.mli
View File

@ -28,7 +28,7 @@ val fold :
f:(Roll_repr.roll -> Contract_repr.t -> 'a -> 'a tzresult Lwt.t) -> f:(Roll_repr.roll -> Contract_repr.t -> 'a -> 'a tzresult Lwt.t) ->
'a -> 'a tzresult Lwt.t 'a -> 'a tzresult Lwt.t
val froze_rolls_for_cycle : val freeze_rolls_for_cycle :
Storage.t -> Cycle_repr.t -> Storage.t tzresult Lwt.t Storage.t -> Cycle_repr.t -> Storage.t tzresult Lwt.t
val clear_cycle : val clear_cycle :

4
src/proto/bootstrap/tezos_context.mli
View File

@ -397,7 +397,7 @@ module Vote : sig
context -> int32 Protocol_hash_map.t tzresult Lwt.t context -> int32 Protocol_hash_map.t tzresult Lwt.t
val clear_proposals: context -> context tzresult Lwt.t val clear_proposals: context -> context tzresult Lwt.t
val froze_listings: context -> context tzresult Lwt.t val freeze_listings: context -> context tzresult Lwt.t
val clear_listings: context -> context tzresult Lwt.t val clear_listings: context -> context tzresult Lwt.t
val listing_size: context -> int32 tzresult Lwt.t val listing_size: context -> int32 tzresult Lwt.t
val in_listings: context -> public_key_hash -> bool Lwt.t val in_listings: context -> public_key_hash -> bool Lwt.t
@ -554,7 +554,7 @@ end
module Roll : sig module Roll : sig
val froze_rolls_for_cycle: context -> Cycle.t -> context tzresult Lwt.t val freeze_rolls_for_cycle: context -> Cycle.t -> context tzresult Lwt.t
val clear_cycle: context -> Cycle.t -> context tzresult Lwt.t val clear_cycle: context -> Cycle.t -> context tzresult Lwt.t
val mining_rights_owner: val mining_rights_owner:

2
src/proto/bootstrap/vote_storage.ml
View File

@ -45,7 +45,7 @@ let get_ballots ctxt =
let clear_ballots = Storage.Vote.Ballots.clear let clear_ballots = Storage.Vote.Ballots.clear
let froze_listings ctxt = let freeze_listings ctxt =
Roll_storage.fold ctxt (ctxt, 0l) Roll_storage.fold ctxt (ctxt, 0l)
~f:(fun _roll contract (ctxt, total as acc) -> ~f:(fun _roll contract (ctxt, total as acc) ->
Contract_storage.get_delegate_opt ctxt contract >>=? function Contract_storage.get_delegate_opt ctxt contract >>=? function

2
src/proto/bootstrap/vote_storage.mli
View File

@ -28,7 +28,7 @@ val record_ballot:
val get_ballots: Storage.t -> ballots tzresult Lwt.t val get_ballots: Storage.t -> ballots tzresult Lwt.t
val clear_ballots: Storage.t -> Storage.t Lwt.t val clear_ballots: Storage.t -> Storage.t Lwt.t
val froze_listings: Storage.t -> Storage.t tzresult Lwt.t val freeze_listings: Storage.t -> Storage.t tzresult Lwt.t
val clear_listings: Storage.t -> Storage.t tzresult Lwt.t val clear_listings: Storage.t -> Storage.t tzresult Lwt.t
val listing_size: Storage.t -> int32 tzresult Lwt.t val listing_size: Storage.t -> int32 tzresult Lwt.t