Merge branch 'master' into clippy

Conflicts: util/src/rlp/rlptraits.rs
2016-01-19 23:22:40 +01:00
parent 2a5a333fc0 98b49e0234
commit adc763325d
65 changed files with 506 additions and 4 deletions
--- a/src/sync/mod.rs
+++ b/src/sync/mod.rs
@@ -46,6 +46,7 @@ pub enum SyncMessage {
 	BlockVerified,
 }

+/// TODO [arkpar] Please document me
 pub type NetSyncMessage = NetworkIoMessage<SyncMessage>;

 /// Ethereum network protocol handler