From 6f5ea0fcbf5c27f841573752c2c488da7131ea77 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Tue, 23 Apr 2024 06:08:04 +0000 Subject: [PATCH] Fix merge conflicts --- streamer/src/nonblocking/quic.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/streamer/src/nonblocking/quic.rs b/streamer/src/nonblocking/quic.rs index f430fee6eadf55..3b766475a0bc97 100644 --- a/streamer/src/nonblocking/quic.rs +++ b/streamer/src/nonblocking/quic.rs @@ -333,19 +333,13 @@ fn handle_and_cache_new_connection( params.total_stake, ) as u64) { -<<<<<<< HEAD - connection.set_max_concurrent_uni_streams(max_uni_streams); let receive_window = compute_recieve_window( params.max_stake, params.min_stake, connection_table_l.peer_type, params.stake, ); -======= let remote_addr = connection.remote_address(); - let receive_window = - compute_recieve_window(params.max_stake, params.min_stake, params.peer_type); ->>>>>>> 2770424782 (quic: delay calling set_max_concurrent_uni_streams/set_receive_window (#904)) debug!( "Peer type: {:?}, stake {}, total stake {}, max streams {} receive_window {:?} from peer {}",