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

Alpha/Endorser: minor æsthetics

Browse Source
This commit is contained in:
Raphaël Proust 2018-06-14 12:47:42 +08:00 committed by Grégoire Henry
parent a78eabda37
commit 470a1e91f1
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/proto_alpha/lib_delegate/client_baking_endorsement.ml
View File

@ -206,6 +206,13 @@ let endorse_for cctxt = function
ignore errored; (* TODO: log *) ignore errored; (* TODO: log *)
return still_waiting return still_waiting
let compute_timeout time =
let delay = Time.diff time (Time.now ()) in
if delay < 0L then
None
else
Some (Lwt_unix.sleep (Int64.to_float delay))
let allowed_to_endorse cctxt state (block: Client_baking_blocks.block_info) delegate time = let allowed_to_endorse cctxt state (block: Client_baking_blocks.block_info) delegate time =
Client_keys.Public_key_hash.name cctxt delegate >>=? fun name -> Client_keys.Public_key_hash.name cctxt delegate >>=? fun name ->
lwt_log_info "Checking if allowed to endorse block %a for %s" lwt_log_info "Checking if allowed to endorse block %a for %s"
@ -220,27 +227,26 @@ let allowed_to_endorse cctxt state (block: Client_baking_blocks.block_info) dele
lwt_debug "Level %a (or higher) previously endorsed: do not endorse." lwt_debug "Level %a (or higher) previously endorsed: do not endorse."
Raw_level.pp level >>= return Raw_level.pp level >>= return
| false -> | false ->
let timeout = match compute_timeout time with
let delay = (Time.diff time (Time.now ())) in
if delay <= 0L then
Lwt.return_unit
else
Lwt_unix.sleep (Int64.to_float delay)
in
let neu = { time ; timeout ; delegate ; block; slots } in
match List.find_opt (fun { delegate = d } -> delegate = d) state.to_endorse with
| None -> | None ->
state.to_endorse <- neu :: state.to_endorse; lwt_debug "Endorsment opportunity is passed." >>= fun () ->
return () return ()
| Some old -> | Some timeout ->
if Fitness.compare old.block.fitness neu.block.fitness < 0 then begin let neu = { time ; timeout ; delegate ; block; slots } in
let without_old = match List.find_opt (fun { delegate = d } -> delegate = d) state.to_endorse with
List.filter (fun to_end -> to_end <> old) state.to_endorse in | None ->
state.to_endorse <- neu :: without_old; state.to_endorse <- neu :: state.to_endorse;
return () return ()
end else | Some old ->
lwt_debug "Block %a is not the fittest: do not endorse." if Fitness.compare old.block.fitness neu.block.fitness < 0 then begin
Block_hash.pp_short neu.block.hash >>= return let without_old =
List.filter (fun to_end -> to_end <> old) state.to_endorse in
state.to_endorse <- neu :: without_old;
return ()
end else
lwt_debug "Block %a is not the fittest: do not endorse."
Block_hash.pp_short neu.block.hash >>= fun () ->
return ()
let prepare_endorsement (cctxt : #Proto_alpha.full) ~(max_past:int64) state bi = let prepare_endorsement (cctxt : #Proto_alpha.full) ~(max_past:int64) state bi =
get_delegates cctxt state >>=? fun delegates -> get_delegates cctxt state >>=? fun delegates ->