Skip to content

Commit

Permalink
refactor: chores
Browse files Browse the repository at this point in the history
Signed-off-by: 0x009922 <[email protected]>
  • Loading branch information
0x009922 committed Jun 18, 2024
1 parent 55a6eaa commit f575c53
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 31 deletions.
7 changes: 0 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 15 additions & 16 deletions core/src/sumeragi/main_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -959,24 +959,23 @@ pub(crate) fn run(
);

let span = span!(tracing::Level::TRACE, "genesis").entered();
let is_genesis_peer = if state.view().height() == 0
|| state.view().latest_block_hash().is_none()
{
if let Some(genesis) = genesis_network.genesis {
sumeragi.init_commit_genesis(genesis, &genesis_account, &state);
true
} else {
if let Err(err) =
sumeragi.init_listen_for_genesis(&genesis_account, &state, shutdown_signal)
{
info!(?err, "Sumeragi Thread is being shut down.");
return;
let is_genesis_peer =
if state.view().height() == 0 || state.view().latest_block_hash().is_none() {
if let Some(genesis) = genesis_network.genesis {
sumeragi.init_commit_genesis(genesis, &genesis_account, &state);
true
} else {
if let Err(err) =
sumeragi.init_listen_for_genesis(&genesis_account, &state, shutdown_signal)
{
info!(?err, "Sumeragi Thread is being shut down.");
return;
}
false
}
} else {
false
}
} else {
false
};
};
span.exit();

info!(
Expand Down
3 changes: 2 additions & 1 deletion core/src/sumeragi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ impl SumeragiStartArgs {

(
SumeragiHandle {
peer_id,dropped_messages_metric: dropped_messages,
peer_id,
dropped_messages_metric: dropped_messages,
control_message_sender,
message_sender,
},
Expand Down
1 change: 0 additions & 1 deletion futures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ serde_json = { workspace = true }
serde = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "signal"] }
tokio-util = { workspace = true }
thread-local-panic-hook = { version = "0.1.0" }
thiserror = { workspace = true }
futures = { workspace = true, features = ["std", "alloc"] }

Expand Down
6 changes: 0 additions & 6 deletions futures/src/supervisor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,6 @@ where
// we are okay to drop the handle; thread will continue running in a detached way
let _handle: std::thread::JoinHandle<_> = builder
.spawn(move || {
let default_hook = thread_local_panic_hook::take_hook();
thread_local_panic_hook::set_hook(Box::new(move |info| {
// TODO: need to print info in a custom way?
default_hook(info);
}));

f();

// the receiver might be dropped
Expand Down

0 comments on commit f575c53

Please sign in to comment.