From a55159449a868fdb808f565dd02ecbcce3b4076c Mon Sep 17 00:00:00 2001 From: NicolasCantu Date: Thu, 9 Jan 2025 17:30:39 +0100 Subject: [PATCH] Update to HandshakeMessage --- src/main.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 077c394..60c57e8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ use futures_util::{future, pin_mut, stream::TryStreamExt, FutureExt, StreamExt}; use log::{debug, error, warn}; use message::{broadcast_message, process_message, BroadcastType, MessageCache, MESSAGECACHE}; use scan::{check_transaction_alone, compute_partial_tweak_to_transaction}; -use sdk_common::{network::InitMessage, pcd::Member, process::{Process, CACHEDPROCESSES}, sp_client::{bitcoin::{ +use sdk_common::{network::HandshakeMessage, pcd::Member, process::{lock_processes, Process, CACHEDPROCESSES}, sp_client::{bitcoin::{ consensus::deserialize, hex::{DisplayHex, FromHex}, Amount, Network, Transaction, @@ -199,20 +199,13 @@ async fn handle_connection(raw_stream: TcpStream, addr: SocketAddr, our_sp_addre } }; - let public_lists = LISTS.get().expect("Public Lists are not initialized"); + let processes = lock_processes().unwrap().clone(); + let members = lock_members().unwrap().clone(); - let (peers_list, processes_list) = match public_lists.lock_anyhow() { - Ok(lists) => (lists.peers_list.clone(), lists.processes_list.clone()), - Err(e) => { - log::error!("{}", e); - panic!(); - } - }; - - let init_msg = InitMessage::new( + let init_msg = HandshakeMessage::new( our_sp_address.to_string(), - peers_list, - processes_list, + members, + processes, ); if let Err(e) = broadcast_message(