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

Shell: fix propagation of error in inject_block

Browse Source
This commit is contained in:
Grégoire Henry 2017-02-26 02:03:06 +01:00
parent 05ed4e7557
commit eb89877d58
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/node/shell/validator.ml
View File

@ -183,7 +183,8 @@ module Validation_scheduler = struct
set_context hash error >>= fun () -> set_context hash error >>= fun () ->
lwt_warn "Failed to validate block %a." lwt_warn "Failed to validate block %a."
Block_hash.pp_short hash >>= fun () -> Block_hash.pp_short hash >>= fun () ->
lwt_debug "%a" Error_monad.pp_print_error exns lwt_debug "%a" Error_monad.pp_print_error exns >>= fun () ->
Lwt.return_unit
| Ok new_context -> | Ok new_context ->
(* The sanity check `set_context` detects differences (* The sanity check `set_context` detects differences
between the computed fitness and the fitness announced between the computed fitness and the fitness announced
@ -290,7 +291,7 @@ module Context_db = struct
(fun () -> (fun () ->
data >>= fun data -> data >>= fun data ->
let state = `Inited data in let state = `Inited data in
Block_hash.Table.add tbl hash { validator ; state ; wakener } ; Block_hash.Table.replace tbl hash { validator ; state ; wakener } ;
worker_trigger () ; worker_trigger () ;
Lwt.return_unit) ; Lwt.return_unit) ;
waiter waiter
@ -328,18 +329,28 @@ module Context_db = struct
match data with match data with
| Ok data -> | Ok data ->
Distributed_db.Block_header.commit vstate.db hash >>= fun () -> Distributed_db.Block_header.commit vstate.db hash >>= fun () ->
State.Valid_block.store state hash data >>= fun block -> begin
Lwt.return (block <> Ok None) State.Valid_block.store state hash data >>=? function
| None ->
State.Valid_block.read state hash >>=? fun block ->
return (Ok block, false)
| Some block ->
return (Ok block, true)
end
| Error err -> | Error err ->
State.Block_header.mark_invalid state hash err State.Block_header.mark_invalid state hash err >>= fun changed ->
end >>= fun changed -> return (Error err, changed)
try end >>= function
State.Valid_block.read state hash >>= fun block -> | Ok (block, changed) ->
let wakener = (Block_hash.Table.find tbl hash).wakener in let wakener = (Block_hash.Table.find tbl hash).wakener in
Block_hash.Table.remove tbl hash; Block_hash.Table.remove tbl hash;
Lwt.wakeup wakener block ; Lwt.wakeup wakener block ;
Lwt.return changed Lwt.return changed
with Not_found -> Lwt.return changed | Error _ as err ->
let wakener = (Block_hash.Table.find tbl hash).wakener in
Block_hash.Table.remove tbl hash;
Lwt.wakeup wakener err ;
Lwt.return false
let create vstate = let create vstate =
let tbl = Block_hash.Table.create 50 in let tbl = Block_hash.Table.create 50 in
@ -456,9 +467,7 @@ let rec create_validator ?parent worker state db net =
Lwt.return_unit Lwt.return_unit
and fetch_block hash = and fetch_block hash =
Context_db.fetch proxy v hash >>=? fun _context -> Context_db.fetch proxy v hash
State.Valid_block.read_exn net hash >>= fun block ->
return block
and create_child block = and create_child block =
begin begin