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

Mempool: filter pendinds to include endorsement only

Browse Source
This commit is contained in:
Pietro Abate 2018-11-22 17:54:36 +01:00 committed by Grégoire Henry
parent 0b98dbd472
commit 2baa6c830c
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib_shell/prevalidator.ml
View File

@ -320,6 +320,16 @@ module Make(Proto: Registered_protocol.T)(Arg: ARG): T = struct
Worker.push_request_now w Advertise ; Worker.push_request_now w Advertise ;
Lwt.return_unit) Lwt.return_unit)
let is_endorsement ( op : Prevalidation.operation ) =
Proto.acceptable_passes {
shell = op.raw.shell ;
protocol_data = op.protocol_data } = [0]
let is_endorsement_raw op =
match Prevalidation.parse op with
|Ok op -> is_endorsement op
|Error _ -> false
let handle_unprocessed w pv = let handle_unprocessed w pv =
begin match pv.validation_state with begin match pv.validation_state with
| Error err -> | Error err ->
@ -358,8 +368,9 @@ module Make(Proto: Registered_protocol.T)(Arg: ARG): T = struct
| Ok op -> | Ok op ->
Prevalidation.apply_operation state op >>= function Prevalidation.apply_operation state op >>= function
| Applied (new_acc_validation_state, _) -> | Applied (new_acc_validation_state, _) ->
if pv.applied_count <= 2000 (* this test is a quick fix while we wait for the new mempool *) if pv.applied_count <= 2000
|| Proto.acceptable_passes { shell = op.raw.shell ; protocol_data = op.protocol_data } = [0] then begin (* this test is a quick fix while we wait for the new mempool *)
|| is_endorsement op then begin
notify_operation pv `Applied op.raw ; notify_operation pv `Applied op.raw ;
let new_mempool = Mempool.{ acc_mempool with known_valid = op.hash :: acc_mempool.known_valid } in let new_mempool = Mempool.{ acc_mempool with known_valid = op.hash :: acc_mempool.known_valid } in
pv.applied <- (op.hash, op.raw) :: pv.applied ; pv.applied <- (op.hash, op.raw) :: pv.applied ;
@ -403,12 +414,19 @@ module Make(Proto: Registered_protocol.T)(Arg: ARG): T = struct
List.rev_map fst pv.applied ; List.rev_map fst pv.applied ;
pending = pending =
Operation_hash.Map.fold Operation_hash.Map.fold
(fun k _ s -> Operation_hash.Set.add k s) (fun k (op,_) s ->
if is_endorsement_raw op then
Operation_hash.Set.add k s
else s)
pv.branch_delays @@ pv.branch_delays @@
Operation_hash.Map.fold Operation_hash.Map.fold
(fun k _ s -> Operation_hash.Set.add k s) (fun k (op,_) s ->
if is_endorsement_raw op then
Operation_hash.Set.add k s
else s)
pv.branch_refusals @@ pv.branch_refusals @@
Operation_hash.Set.empty } ; Operation_hash.Set.empty
} ;
State.Current_mempool.set (Distributed_db.chain_state pv.chain_db) State.Current_mempool.set (Distributed_db.chain_state pv.chain_db)
~head:(State.Block.hash pv.predecessor) pv.mempool >>= fun () -> ~head:(State.Block.hash pv.predecessor) pv.mempool >>= fun () ->
Lwt.return_unit Lwt.return_unit