Skip to content

fix notifier #8

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

Open
stutxo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix notifier #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7633e30
fix notifier
stutxo Jun 16, 2024
a9f9365
update connection test
stutxo Jun 17, 2024
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
19 changes: 8 additions & 11 deletions node/connection/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ pub async fn start_listen(
loop {
// Asynchronously wait for an inbound TcpStream.
log::info!("Starting accept");
notifier.notify_one();
match listener.accept().await {
Ok((stream, peer_address)) => {
log::info!("Accepted connection from {:?}", peer_address);
Expand Down Expand Up @@ -210,7 +209,8 @@ where
if handle_received(writer, msg).await.is_err() {
return Err("Message handling failure: Closing peer connection".into());
} else {
notifier.notified();
log::debug!("Message handled");
notifier.notify_one();
}
},
Ok(msg_bytes) = send_to_all_receiver.recv() => {
Expand Down Expand Up @@ -356,29 +356,26 @@ mod tests {

let (send_to_all_tx, send_to_all_rx) = broadcast::channel::<Bytes>(32);

let notify = Arc::new(Notify::new());
let notify_listen_cloned = notify.clone();
let notify_connect_cloned = notify.clone();

tokio::spawn(async move {
start_listen(
"localhost:6680".to_string(),
"127.0.0.1:6680".to_string(),
listen_manager_cloned,
32,
send_to_all_tx,
notify_listen_cloned,
Arc::new(Notify::new()),
)
.await;
});

notify.notified().await;
let notify = Arc::new(Notify::new());
let notify_clone = notify.clone();

let _ = connect(
"localhost:6680".to_string(),
"127.0.0.1:6680".to_string(),
connect_manager_cloned,
32,
send_to_all_rx,
notify_connect_cloned,
notify_clone,
)
.await;

Expand Down