pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 02:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when --in-peers & --out-peers both 0 (#14598)

Browse Source
This commit is contained in:
Dmitry Markin
2023-07-20 18:19:19 +03:00
committed by GitHub
parent 14b086263e
commit 0b2e7d4df5
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/sync/src/block_request_handler.rs
+2 -1
View File
@@ -153,7 +153,8 @@ where
) -> (Self, ProtocolConfig) { ) -> (Self, ProtocolConfig) {
// Reserve enough request slots for one request per peer when we are at the maximum // Reserve enough request slots for one request per peer when we are at the maximum
// number of peers. // number of peers.
let (tx, request_receiver) = async_channel::bounded(num_peer_hint); let capacity = std::cmp::max(num_peer_hint, 1);
let (tx, request_receiver) = async_channel::bounded(capacity);
let mut protocol_config = generate_protocol_config( let mut protocol_config = generate_protocol_config(
protocol_id, protocol_id,
substrate/client/network/sync/src/state_request_handler.rs
+2 -1
View File
@@ -131,7 +131,8 @@ where
) -> (Self, ProtocolConfig) { ) -> (Self, ProtocolConfig) {
// Reserve enough request slots for one request per peer when we are at the maximum // Reserve enough request slots for one request per peer when we are at the maximum
// number of peers. // number of peers.
let (tx, request_receiver) = async_channel::bounded(num_peer_hint); let capacity = std::cmp::max(num_peer_hint, 1);
let (tx, request_receiver) = async_channel::bounded(capacity);
let mut protocol_config = generate_protocol_config( let mut protocol_config = generate_protocol_config(
protocol_id, protocol_id,
substrate/client/service/src/builder.rs
+3 -1
View File
@@ -785,12 +785,14 @@ where
}; };
let (state_request_protocol_config, state_request_protocol_name) = { let (state_request_protocol_config, state_request_protocol_name) = {
let num_peer_hint = net_config.network_config.default_peers_set_num_full as usize +
net_config.network_config.default_peers_set.reserved_nodes.len();
// Allow both outgoing and incoming requests. // Allow both outgoing and incoming requests.
let (handler, protocol_config) = StateRequestHandler::new( let (handler, protocol_config) = StateRequestHandler::new(
&protocol_id, &protocol_id,
config.chain_spec.fork_id(), config.chain_spec.fork_id(),
client.clone(), client.clone(),
net_config.network_config.default_peers_set_num_full as usize, num_peer_hint,
); );
let config_name = protocol_config.name.clone(); let config_name = protocol_config.name.clone();