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

Merge branch 'master' of github.com:ethcore/parity into discovery

Browse Source
This commit is contained in:
arkpar
2016-02-19 13:44:57 +01:00
parent d9fec87143 1866174327
commit 1d60d82698
25 changed files with 527 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/src/network/host.rs
View File

@@ -467,7 +467,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
debug!(target: "net", "Connecting peers: {} sessions, {} pending", self.session_count(), self.handshake_count());
}
#[allow(single_match)]
#[cfg_attr(feature="dev", allow(single_match))]
fn connect_peer(&self, id: &NodeId, io: &IoContext<NetworkIoMessage<Message>>) {
if self.have_session(id)
{
@@ -502,7 +502,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
self.create_connection(socket, Some(id), io);
}
#[allow(block_in_if_condition_stmt)]
#[cfg_attr(feature="dev", allow(block_in_if_condition_stmt))]
fn create_connection(&self, socket: TcpStream, id: Option<&NodeId>, io: &IoContext<NetworkIoMessage<Message>>) {
let nonce = self.info.write().unwrap().next_nonce();
let mut handshakes = self.handshakes.write().unwrap();