Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Remove NetworkContext::io_channel() #8625

Merged
merged 2 commits into from
May 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions util/network-devp2p/src/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
self.io.channel()
}

fn disable_peer(&self, peer: PeerId) {
self.io.message(NetworkIoMessage::DisablePeer(peer))
.unwrap_or_else(|e| warn!("Error sending network IO message: {:?}", e));
Expand Down
8 changes: 0 additions & 8 deletions util/network/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ use std::str::{self, FromStr};
use std::sync::Arc;
use std::time::Duration;
use ipnetwork::{IpNetwork, IpNetworkError};
use io::IoChannel;
use ethkey::Secret;
use ethereum_types::{H256, H512};
use rlp::{Decodable, DecoderError, Rlp};
Expand Down Expand Up @@ -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.
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.
fn disable_peer(&self, peer: PeerId);

Expand Down Expand Up @@ -298,10 +294,6 @@ impl<'a, T> NetworkContext for &'a T where T: ?Sized + NetworkContext {
(**self).respond(packet_id, data)
}

fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
(**self).io_channel()
}

fn disable_peer(&self, peer: PeerId) {
(**self).disable_peer(peer)
}
Expand Down