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

Revert "Block packet size limit"

Browse Source 
This reverts commit 08e0747d2b.
This commit is contained in:
arkpar
2020-06-18 10:43:03 +02:00
parent 08e0747d2b
commit 850ee8b43a
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol.rs
+1 -7
View File
@@ -92,10 +92,6 @@ pub(crate) const MIN_VERSION: u32 = 3;
// Maximum allowed entries in `BlockResponse` // Maximum allowed entries in `BlockResponse`
const MAX_BLOCK_DATA_RESPONSE: u32 = 128; const MAX_BLOCK_DATA_RESPONSE: u32 = 128;
// Maximum total bytes allowed for block bodies in `BlockResponse`
// TODO: increase this to 4Mb once yamux limit is increased
const MAX_BODIES_BYTES: usize = 1 * 1024 * 1024;
/// When light node connects to the full node and the full node is behind light node /// When light node connects to the full node and the full node is behind light node
/// for at least `LIGHT_MAXIMAL_BLOCKS_DIFFERENCE` blocks, we consider it not useful /// for at least `LIGHT_MAXIMAL_BLOCKS_DIFFERENCE` blocks, we consider it not useful
/// and disconnect to free connection slot. /// and disconnect to free connection slot.
@@ -766,9 +762,8 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
let get_justification = request let get_justification = request
.fields .fields
.contains(message::BlockAttributes::JUSTIFICATION); .contains(message::BlockAttributes::JUSTIFICATION);
let mut total_size = 0;
while let Some(header) = self.context_data.chain.header(id).unwrap_or(None) { while let Some(header) = self.context_data.chain.header(id).unwrap_or(None) {
if blocks.len() >= max || total_size > MAX_BODIES_BYTES { if blocks.len() >= max {
break; break;
} }
let number = *header.number(); let number = *header.number();
@@ -799,7 +794,6 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
trace!(target: "sync", "Missing data for block request."); trace!(target: "sync", "Missing data for block request.");
break; break;
} }
total_size += block_data.body.as_ref().map_or(0, |b| b.len());
blocks.push(block_data); blocks.push(block_data);
match request.direction { match request.direction {
message::Direction::Ascending => id = BlockId::Number(number + One::one()), message::Direction::Ascending => id = BlockId::Number(number + One::one()),
substrate/client/network/src/protocol/sync.rs
+1 -2
View File
@@ -54,8 +54,7 @@ mod blocks;
mod extra_requests; mod extra_requests;
/// Maximum blocks to request in a single packet. /// Maximum blocks to request in a single packet.
/// TODO: set to 128 once yamux issue is resolved. const MAX_BLOCKS_TO_REQUEST: usize = 128;
const MAX_BLOCKS_TO_REQUEST: usize = 64;
/// Maximum blocks to store in the import queue. /// Maximum blocks to store in the import queue.
const MAX_IMPORTING_BLOCKS: usize = 2048; const MAX_IMPORTING_BLOCKS: usize = 2048;