From 6d435d038f125069eed586ed30d42b880c7f0684 Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 20 Jun 2016 01:26:40 +0200 Subject: [PATCH 1/2] Fixed empty block body composition --- sync/src/blocks.rs | 2 +- sync/src/chain.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sync/src/blocks.rs b/sync/src/blocks.rs index c1c6becde..feb9b0066 100644 --- a/sync/src/blocks.rs +++ b/sync/src/blocks.rs @@ -265,7 +265,7 @@ impl BlockCollection { if header_id.transactions_root == rlp::SHA3_NULL_RLP && header_id.uncles == rlp::SHA3_EMPTY_LIST_RLP { // empty body, just mark as downloaded let mut body_stream = RlpStream::new_list(2); - body_stream.append_raw(&rlp::NULL_RLP, 1); + body_stream.append_raw(&rlp::EMPTY_LIST_RLP, 1); body_stream.append_raw(&rlp::EMPTY_LIST_RLP, 1); block.body = Some(body_stream.out()); } diff --git a/sync/src/chain.rs b/sync/src/chain.rs index caed95e0c..767c84786 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -361,12 +361,12 @@ impl ChainSync { trace!(target: "sync", "New peer {} (protocol: {}, network: {:?}, difficulty: {:?}, latest:{}, genesis:{})", peer_id, peer.protocol_version, peer.network_id, peer.difficulty, peer.latest_hash, peer.genesis); if io.is_expired() { - trace!("Status packet from expired session {}:{}", peer_id, io.peer_info(peer_id)); + trace!(target: "sync", "Status packet from expired session {}:{}", peer_id, io.peer_info(peer_id)); return Ok(()); } if self.peers.contains_key(&peer_id) { - warn!("Unexpected status packet from {}:{}", peer_id, io.peer_info(peer_id)); + debug!(target: "sync", "Unexpected status packet from {}:{}", peer_id, io.peer_info(peer_id)); return Ok(()); } let chain_info = io.chain().chain_info(); @@ -1243,7 +1243,7 @@ impl ChainSync { /// propagates latest block to lagging peers fn propagate_blocks(&mut self, chain_info: &BlockChainInfo, io: &mut SyncIo) -> usize { let lucky_peers = self.select_lagging_peers(chain_info, io); - trace!("Sending NewBlocks to {:?}", lucky_peers); + trace!(target: "sync", "Sending NewBlocks to {:?}", lucky_peers); let mut sent = 0; for (peer_id, _) in lucky_peers { let rlp = ChainSync::create_latest_block_rlp(io.chain()); @@ -1258,7 +1258,7 @@ impl ChainSync { /// propagates new known hashes to all peers fn propagate_new_hashes(&mut self, chain_info: &BlockChainInfo, io: &mut SyncIo) -> usize { let lucky_peers = self.select_lagging_peers(chain_info, io); - trace!("Sending NewHashes to {:?}", lucky_peers); + trace!(target: "sync", "Sending NewHashes to {:?}", lucky_peers); let mut sent = 0; let last_parent = HeaderView::new(&io.chain().block_header(BlockID::Hash(chain_info.best_block_hash.clone())).unwrap()).parent_hash(); for (peer_id, peer_number) in lucky_peers { From 1dd87a39f556f79602aaa7ce45407187fdfc690b Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 20 Jun 2016 10:44:15 +0200 Subject: [PATCH 2/2] Fixed tests --- ethcore/src/client/test_client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs index f1a7a6674..a9f7f6300 100644 --- a/ethcore/src/client/test_client.rs +++ b/ethcore/src/client/test_client.rs @@ -187,7 +187,7 @@ impl TestBlockChainClient { txs.append(&signed_tx); txs.out() }, - _ => rlp::NULL_RLP.to_vec() + _ => rlp::EMPTY_LIST_RLP.to_vec() }; let mut rlp = RlpStream::new_list(3);