bob/p2p
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tidy

Browse Source
This commit is contained in:
Tiago Batista Cardoso
2026-01-25 03:25:54 +01:00
parent 9ecc944857
commit 10b77f8635
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client-gui/src/main.rs
View File

@@ -32,7 +32,7 @@ async fn main() -> eframe::Result<()> {
eframe::run_native( eframe::run_native(
"p2p-merkle client", "p2p-merkle client",
options, options,
Box::new(|cc| { Box::new(|_| {
let app = P2PClientApp::new(network_cmd_tx, network_event_rx); let app = P2PClientApp::new(network_cmd_tx, network_event_rx);
Ok(Box::new(app)) Ok(Box::new(app))
}), }),

28
client-network/src/lib.rs
View File

@@ -576,14 +576,21 @@ pub fn start_p2p_executor(
current.push(i); current.push(i);
} }
} }
let res = match event_tx.send(NetworkEvent::PeerListUpdated(peers)) {
event_tx.send(NetworkEvent::PeerListUpdated(peers)); Ok(_) => {}
Err(err) => {
println!(
"Network Event Error : {}",
err.to_string()
);
}
};
} }
Err(e) => { Err(e) => {
eprintln!("invalid UTF-8 in socket address bytes: {}", e); eprintln!("invalid UTF-8 in socket address bytes: {}", e);
} }
}, },
Err(e) => println!("error"), Err(e) => println!("error : {}", e),
} }
} }
} }
@@ -595,25 +602,10 @@ pub fn start_p2p_executor(
if let Some(sd) = shared_data.as_ref() { if let Some(sd) = shared_data.as_ref() {
let id = generate_id(); let id = generate_id();
sd.add_message(id, EventType::Ping); sd.add_message(id, EventType::Ping);
let pingrequest =
construct_message(PING, Vec::new(), id, sd.cryptopair_ref());
let peer_address = let peer_address =
get_socket_address(str.to_owned(), ip, shared_data.as_ref()).await; get_socket_address(str.to_owned(), ip, shared_data.as_ref()).await;
match peer_address { match peer_address {
Ok(addr) => { Ok(addr) => {
//if let Some(ping) = pingrequest {
// sd.senders_ref().add_message_to_retry_queue(
// ping.clone(),
// addr.to_string(),
// false,
// );
// sd.senders_ref().send_dispatch(
// ping,
// addr.to_string(),
// false,
// sd.messages_list(),
// );
//}
match event_tx.send(NetworkEvent::Success( match event_tx.send(NetworkEvent::Success(
format!( format!(
"Successfully sent ping message to {}.", "Successfully sent ping message to {}.",