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

Validator: properly handle termination of Block_validator.

Browse Source
This commit is contained in:
Grégoire Henry 2017-11-20 04:01:06 +01:00 committed by Benjamin Canou
parent 10d1b08c85
commit 471006b2dd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/node/shell/bootstrap_pipeline.ml
View File

@ -144,11 +144,13 @@ let rec validation_worker_loop pipeline =
lwt_log_info "requesting validation for block %a from peer %a." lwt_log_info "requesting validation for block %a from peer %a."
Block_hash.pp_short hash Block_hash.pp_short hash
P2p.Peer_id.pp_short pipeline.peer_id >>= fun () -> P2p.Peer_id.pp_short pipeline.peer_id >>= fun () ->
Lwt_utils.protect ~canceler:pipeline.canceler begin fun () ->
Block_validator.validate Block_validator.validate
~canceler:pipeline.canceler ~canceler:pipeline.canceler
~notify_new_block:pipeline.notify_new_block ~notify_new_block:pipeline.notify_new_block
pipeline.block_validator pipeline.block_validator
pipeline.net_db hash header operations >>=? fun _block -> pipeline.net_db hash header operations
end >>=? fun _block ->
lwt_log_info "validated block %a from peer %a." lwt_log_info "validated block %a from peer %a."
Block_hash.pp_short hash Block_hash.pp_short hash
P2p.Peer_id.pp_short pipeline.peer_id >>= fun () -> P2p.Peer_id.pp_short pipeline.peer_id >>= fun () ->