Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Failwith on bootstrap clean #1475

Merged
merged 3 commits into from Jan 18, 2019
Merged

Failwith on bootstrap clean #1475

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b9ffa0
Failwith on bootstrap clean
bkase Jan 18, 2019
3e1faac
Builds
bkase Jan 18, 2019
546e923
Merge branch 'master' into failwith-bootstap
bkase Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/lib/transition_router/transition_router.ml
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ module Make (Inputs : Inputs_intf) :
let create_bufferred_pipe () =
Strict_pipe.create (Buffered (`Capacity 10, `Overflow Drop_head))

let kill reader writer =
let _kill reader writer =
Strict_pipe.Reader.clear reader ;
Strict_pipe.Writer.close writer

Expand Down Expand Up @@ -114,7 +114,7 @@ module Make (Inputs : Inputs_intf) :
let get {var; _} = var
end

let set_bootstrap_phase ~controller_type root_state
let _set_bootstrap_phase ~controller_type root_state
bootstrap_controller_writer =
assert (not @@ is_bootstrapping (Broadcaster.get controller_type)) ;
Broadcaster.broadcast controller_type
Expand All @@ -126,13 +126,15 @@ module Make (Inputs : Inputs_intf) :
Broadcaster.broadcast controller_type
(`Transition_frontier_controller (new_frontier, reader, writer))

let run ~logger ~network ~time_controller ~frontier_mvar ~ledger_db
let run ~logger ~network ~time_controller ~frontier_mvar ~ledger_db:_
~network_transition_reader ~proposer_transition_reader =
let clean_transition_frontier_controller_and_start_bootstrap
~controller_type ~clear_writer ~transition_frontier_controller_reader
~transition_frontier_controller_writer ~old_frontier
(`Transition incoming_transition, `Time_received tm) =
kill transition_frontier_controller_reader
~controller_type:_ ~clear_writer:_
~transition_frontier_controller_reader:_
~transition_frontier_controller_writer:_ ~old_frontier:_
(`Transition _incoming_transition, `Time_received _tm) =
failwith "Bootstrap is disabled as there this an infinite loop here"
(* kill transition_frontier_controller_reader
transition_frontier_controller_writer ;
Strict_pipe.Writer.write clear_writer `Clear |> don't_wait_for ;
let bootstrap_controller_reader, bootstrap_controller_writer =
Expand All @@ -152,7 +154,7 @@ module Make (Inputs : Inputs_intf) :
~transition_reader:bootstrap_controller_reader
in
kill bootstrap_controller_reader bootstrap_controller_writer ;
new_frontier
new_frontier *)
in
let start_transition_frontier_controller ~verified_transition_writer
~clear_reader frontier =
Expand Down