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

Update a few parity-common dependencies (#9663)

Browse Source 
* Update a few parity-common dependencies

* cleanup

* cleanup

* revert update of ethereum/tests

* better reporting of network rlp errors

* Use rlp 0.3.0-beta.1

* fix util function get_dummy_blocks

* Already a Vec

* encode_list returns vec already

* Address grumble

* No need for betas

* Fix double spaces
This commit is contained in:
David
2018-10-09 22:07:25 +02:00
committed by Marek Kotewicz
parent 73db5dda8c
commit c313039526
78 changed files with 365 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/sync/src/api.rs
View File

@@ -544,7 +544,7 @@ struct TxRelay(Arc<BlockChainClient>);
impl LightHandler for TxRelay {
fn on_transactions(&self, ctx: &EventContext, relay: &[::transaction::UnverifiedTransaction]) {
trace!(target: "pip", "Relaying {} transactions from peer {}", relay.len(), ctx.peer());
self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).into_vec()).collect(), ctx.peer())
self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx)).collect(), ctx.peer())
}
}

2
ethcore/sync/src/block_sync.rs
View File

@@ -795,7 +795,7 @@ mod tests {
for i in 0..4 {
// Construct the block body
let mut uncles = if i > 0 {
encode_list(&[dummy_header(i - 1, H256::random())]).into_vec()
encode_list(&[dummy_header(i - 1, H256::random())])
} else {
::rlp::EMPTY_LIST_RLP.to_vec()
};

4
ethcore/sync/src/chain/handler.rs
View File

@@ -772,9 +772,7 @@ mod tests {
let block = Rlp::new(&block_data);
let result = SyncHandler::on_peer_new_block(&mut sync, &mut io, 0, &block);
assert!(result.is_ok());
SyncHandler::on_peer_new_block(&mut sync, &mut io, 0, &block).expect("result to be ok");
}
#[test]

2
ethcore/sync/src/chain/mod.rs
View File

@@ -1203,7 +1203,7 @@ pub mod tests {
}
pub fn get_dummy_blocks(order: u32, parent_hash: H256) -> Bytes {
let mut rlp = RlpStream::new_list(1);
let mut rlp = RlpStream::new_list(2);
rlp.append_raw(&get_dummy_block(order, parent_hash), 1);
let difficulty: U256 = (100 * order).into();
rlp.append(&difficulty);

8
ethcore/sync/src/light_sync/response.rs
View File

@@ -179,7 +179,7 @@ mod tests {
parent_hash = Some(header.hash());
encoded::Header::new(::rlp::encode(&header).into_vec())
encoded::Header::new(::rlp::encode(&header))
}).collect();
assert!(verify(&headers, &request).is_ok());
@@ -205,7 +205,7 @@ mod tests {
parent_hash = Some(header.hash());
encoded::Header::new(::rlp::encode(&header).into_vec())
encoded::Header::new(::rlp::encode(&header))
}).collect();
assert!(verify(&headers, &request).is_ok());
@@ -231,7 +231,7 @@ mod tests {
parent_hash = Some(header.hash());
encoded::Header::new(::rlp::encode(&header).into_vec())
encoded::Header::new(::rlp::encode(&header))
}).collect();
assert_eq!(verify(&headers, &request), Err(BasicError::TooManyHeaders(20, 25)));
@@ -250,7 +250,7 @@ mod tests {
let mut header = Header::default();
header.set_number(x);
encoded::Header::new(::rlp::encode(&header).into_vec())
encoded::Header::new(::rlp::encode(&header))
}).collect();
assert_eq!(verify(&headers, &request), Err(BasicError::WrongSkip(5, Some(2))));