Shell: simplify operation injecion error handling

This commit is contained in:
Benjamin Canou 2018-03-01 09:15:17 +01:00
parent 249e4564d3
commit 8a6deca8a0
3 changed files with 7 additions and 7 deletions

View File

@ -370,8 +370,7 @@ let on_request
on_notify w pv peer mempool ;
return ()
| Request.Inject op ->
on_inject pv op >>= fun tzresult ->
return tzresult
on_inject pv op
| Request.Arrived (oph, op) ->
on_operation_arrived pv oph op ;
return ()
@ -427,7 +426,9 @@ let on_launch w _ (limits, chain_db) =
let on_error w r st errs =
Worker.record_event w (Event.Request (r, st, Some errs)) ;
Lwt.return (Error errs)
match r with
| Request.(View (Inject _)) -> return ()
| _ -> Lwt.return (Error errs)
let on_completion w r _ st =
Worker.record_event w (Event.Request (Request.view r, st, None )) ;
@ -485,8 +486,7 @@ let context w =
Prevalidation.end_prevalidation validation_state
let inject_operation w op =
Worker.push_request_and_wait w (Inject op) >>=? fun result ->
Lwt.return result
Worker.push_request_and_wait w (Inject op)
let status = Worker.status

View File

@ -11,7 +11,7 @@ module Request = struct
type 'a t =
| Flush : Block_hash.t -> unit t
| Notify : P2p_peer.Id.t * Mempool.t -> unit t
| Inject : Operation.t -> unit tzresult t
| Inject : Operation.t -> unit t
| Arrived : Operation_hash.t * Operation.t -> unit t
| Advertise : unit t
type view = View : _ t -> view

View File

@ -11,7 +11,7 @@ module Request : sig
type 'a t =
| Flush : Block_hash.t -> unit t
| Notify : P2p_peer.Id.t * Mempool.t -> unit t
| Inject : Operation.t -> unit tzresult t
| Inject : Operation.t -> unit t
| Arrived : Operation_hash.t * Operation.t -> unit t
| Advertise : unit t
type view = View : _ t -> view