grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #512 from ethcore/fix-block-inclusive

Browse Source 
fix issue with starting requested block number was not included itself
This commit is contained in:
Nikolay Volf 2016-02-25 02:09:28 +03:00
commit 53af2d7dfb
1 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sync/src/chain.rs
View File

@ -927,19 +927,19 @@ impl ChainSync {
if reverse { if reverse {
number = min(last, number); number = min(last, number);
} else { } else {
number = max(1, number); number = max(0, number);
} }
let max_count = min(MAX_HEADERS_TO_SEND, max_headers); let max_count = min(MAX_HEADERS_TO_SEND, max_headers);
let mut count = 0; let mut count = 0;
let mut data = Bytes::new(); let mut data = Bytes::new();
let inc = (skip + 1) as BlockNumber; let inc = (skip + 1) as BlockNumber;
while number <= last && number > 0 && count < max_count { while number <= last && count < max_count {
if let Some(mut hdr) = io.chain().block_header(BlockId::Number(number)) { if let Some(mut hdr) = io.chain().block_header(BlockId::Number(number)) {
data.append(&mut hdr); data.append(&mut hdr);
count += 1; count += 1;
} }
if reverse { if reverse {
if number <= inc { if number <= inc || number == 0 {
break; break;
} }
number -= inc; number -= inc;
@ -1542,4 +1542,53 @@ mod tests {
let result = sync.on_peer_new_block(&mut io, 0, &UntrustedRlp::new(&data)); let result = sync.on_peer_new_block(&mut io, 0, &UntrustedRlp::new(&data));
assert!(result.is_ok()); assert!(result.is_ok());
} }
#[test]
fn returns_requested_block_headers() {
let mut client = TestBlockChainClient::new();
client.add_blocks(100, false);
let mut queue = VecDeque::new();
let io = TestIo::new(&mut client, &mut queue, None);
let mut rlp = RlpStream::new_list(4);
rlp.append(&0u64);
rlp.append(&10u64);
rlp.append(&0u64);
rlp.append(&0u64);
let data = rlp.out();
let response = ChainSync::return_block_headers(&io, &UntrustedRlp::new(&data));
assert!(response.is_ok());
let (_, rlp_stream) = response.unwrap().unwrap();
let response_data = rlp_stream.out();
let rlp = UntrustedRlp::new(&response_data);
assert!(rlp.at(0).is_ok());
assert!(rlp.at(9).is_ok());
}
#[test]
fn returns_requested_block_headers_reverse() {
let mut client = TestBlockChainClient::new();
client.add_blocks(100, false);
let mut queue = VecDeque::new();
let io = TestIo::new(&mut client, &mut queue, None);
let mut rlp = RlpStream::new_list(4);
rlp.append(&15u64);
rlp.append(&15u64);
rlp.append(&0u64);
rlp.append(&1u64);
let data = rlp.out();
let response = ChainSync::return_block_headers(&io, &UntrustedRlp::new(&data));
assert!(response.is_ok());
let (_, rlp_stream) = response.unwrap().unwrap();
let response_data = rlp_stream.out();
let rlp = UntrustedRlp::new(&response_data);
assert!(rlp.at(0).is_ok());
assert!(rlp.at(14).is_ok());
assert!(!rlp.at(15).is_ok());
}
} }