Merge pull request #57 from paritytech/fix_getheaders_max_len

Changed max number of headers in the headers message
This commit is contained in:
Nikolay Volf 2019-03-20 17:27:03 +01:00 committed by GitHub
commit b69ef3eada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions

View File

@ -3,8 +3,6 @@ use hash::H256;
use ser::{Stream, Reader};
use {Payload, MessageResult};
pub const GETHEADERS_MAX_RESPONSE_HEADERS: usize = 2_000;
#[derive(Debug, PartialEq)]
pub struct GetHeaders {
pub version: u32,

View File

@ -3,7 +3,7 @@ use chain::BlockHeader;
use ser::{Stream, Reader, Serializable, Deserializable, CompactInteger, Error as ReaderError};
use {Payload, MessageResult};
pub const HEADERS_MAX_HEADERS_LEN: usize = 2000;
pub const HEADERS_MAX_HEADERS_LEN: usize = 160;
#[derive(Debug, PartialEq)]
pub struct Headers {

View File

@ -35,7 +35,7 @@ pub use self::getaddr::GetAddr;
pub use self::getblocks::{GetBlocks, GETBLOCKS_MAX_RESPONSE_HASHES};
pub use self::getblocktxn::GetBlockTxn;
pub use self::getdata::{GetData, GETDATA_MAX_INVENTORY_LEN};
pub use self::getheaders::{GetHeaders, GETHEADERS_MAX_RESPONSE_HEADERS};
pub use self::getheaders::{GetHeaders};
pub use self::headers::{Headers, HEADERS_MAX_HEADERS_LEN};
pub use self::inv::{Inv, INV_MAX_INVENTORY_LEN};
pub use self::mempool::MemPool;

View File

@ -326,7 +326,7 @@ impl<TExecutor> ServerTaskExecutor<TExecutor> where TExecutor: TaskExecutor {
fn serve_get_headers(&self, peer_index: PeerIndex, message: types::GetHeaders, request_id: RequestId) {
if let Some(block_height) = self.locate_best_common_block(&message.hash_stop, &message.block_locator_hashes) {
let headers: Vec<_> = (block_height + 1..block_height + 1 + (types::GETHEADERS_MAX_RESPONSE_HEADERS as BlockHeight))
let headers: Vec<_> = (block_height + 1..block_height + 1 + (types::HEADERS_MAX_HEADERS_LEN as BlockHeight))
.map(|block_height| self.storage.block_hash(block_height))
.take_while(Option::is_some)
.map(Option::unwrap)