Skip to content

Avoid blocking and panicking where possible #89

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.

Sign up for GitHub

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

Closed
tnull wants to merge 3 commits into from
Closed

Avoid blocking and panicking where possible #89

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c803028
Don't `block_on` our runtime in `sync_wallets`
tnull May 10, 2023
0e0f6ee
Remove no-op `block_in_place`
tnull May 10, 2023
dfde1fb
Fix or replace various `unwrap`s
tnull May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove no-op block_in_place
  • Loading branch information
@tnull
tnull committed May 10, 2023
commit 0e0f6ee8efff794a947107a4f1cdc221b03645df
34 changes: 6 additions & 28 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,23 +922,12 @@ impl Node {

let con_peer_pubkey = peer_info.pubkey;
let con_peer_addr = peer_info.address;
let con_success = Arc::new(AtomicBool::new(false));
let con_success_cloned = Arc::clone(&con_success);
let con_logger = Arc::clone(&self.logger);
let con_pm = Arc::clone(&self.peer_manager);

tokio::task::block_in_place(move || {
runtime.block_on(async move {
let res =
connect_peer_if_necessary(con_peer_pubkey, con_peer_addr, con_pm, con_logger)
.await;
con_success_cloned.store(res.is_ok(), Ordering::Release);
})
});

if !con_success.load(Ordering::Acquire) {
return Err(Error::ConnectionFailed);
}
runtime.block_on(async move {
connect_peer_if_necessary(con_peer_pubkey, con_peer_addr, con_pm, con_logger).await
})?;

log_info!(self.logger, "Connected to peer {}@{}. ", peer_info.pubkey, peer_info.address,);

Expand Down Expand Up @@ -1001,23 +990,12 @@ impl Node {

let con_peer_pubkey = peer_info.pubkey;
let con_peer_addr = peer_info.address;
let con_success = Arc::new(AtomicBool::new(false));
let con_success_cloned = Arc::clone(&con_success);
let con_logger = Arc::clone(&self.logger);
let con_pm = Arc::clone(&self.peer_manager);

tokio::task::block_in_place(move || {
runtime.block_on(async move {
let res =
connect_peer_if_necessary(con_peer_pubkey, con_peer_addr, con_pm, con_logger)
.await;
con_success_cloned.store(res.is_ok(), Ordering::Release);
})
});

if !con_success.load(Ordering::Acquire) {
return Err(Error::ConnectionFailed);
}
runtime.block_on(async move {
connect_peer_if_necessary(con_peer_pubkey, con_peer_addr, con_pm, con_logger).await
})?;

let user_config = UserConfig {
channel_handshake_limits: ChannelHandshakeLimits {
Expand Down