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

Remove NetworkContext::io_channel() (#8625)

Browse Source 
* Remove io_channel()

* Fix warning
This commit is contained in:
Pierre Krieger 2018-05-15 17:03:09 +02:00 committed by Afri Schoedon
parent 0c4d2fbc70
commit 8e078b1d83
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,10 +153,6 @@ impl<'s> NetworkContextTrait for NetworkContext<'s> {
self.session_id.map_or_else(|| Err(ErrorKind::Expired.into()), |id| self.send(id, packet_id, data)) self.session_id.map_or_else(|| Err(ErrorKind::Expired.into()), |id| self.send(id, packet_id, data))
} }
fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
self.io.channel()
}
fn disable_peer(&self, peer: PeerId) { fn disable_peer(&self, peer: PeerId) {
self.io.message(NetworkIoMessage::DisablePeer(peer)) self.io.message(NetworkIoMessage::DisablePeer(peer))
.unwrap_or_else(|e| warn!("Error sending network IO message: {:?}", e)); .unwrap_or_else(|e| warn!("Error sending network IO message: {:?}", e));

8
util/network/src/lib.rs
View File

@ -39,7 +39,6 @@ use std::str::{self, FromStr};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use ipnetwork::{IpNetwork, IpNetworkError}; use ipnetwork::{IpNetwork, IpNetworkError};
use io::IoChannel;
use ethkey::Secret; use ethkey::Secret;
use ethereum_types::{H256, H512}; use ethereum_types::{H256, H512};
use rlp::{Decodable, DecoderError, Rlp}; use rlp::{Decodable, DecoderError, Rlp};
@ -257,9 +256,6 @@ pub trait NetworkContext {
/// Respond to a current network message. Panics if no there is no packet in the context. If the session is expired returns nothing. /// Respond to a current network message. Panics if no there is no packet in the context. If the session is expired returns nothing.
fn respond(&self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>; fn respond(&self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
/// Get an IoChannel.
fn io_channel(&self) -> IoChannel<NetworkIoMessage>;
/// Disconnect a peer and prevent it from connecting again. /// Disconnect a peer and prevent it from connecting again.
fn disable_peer(&self, peer: PeerId); fn disable_peer(&self, peer: PeerId);
@ -298,10 +294,6 @@ impl<'a, T> NetworkContext for &'a T where T: ?Sized + NetworkContext {
(**self).respond(packet_id, data) (**self).respond(packet_id, data)
} }
fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
(**self).io_channel()
}
fn disable_peer(&self, peer: PeerId) { fn disable_peer(&self, peer: PeerId) {
(**self).disable_peer(peer) (**self).disable_peer(peer)
} }