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

Fixing Light context API

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-12-10 21:25:08 +01:00
parent 19ca9ad460
commit b5020d3c8d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ethcore/light/src/net/context.rs
View File

@ -43,7 +43,7 @@ pub trait IoContext {
fn protocol_version(&self, peer: PeerId) -> Option<u8>; fn protocol_version(&self, peer: PeerId) -> Option<u8>;
/// Persistent peer id /// Persistent peer id
fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId>; fn persistent_peer_id(&self, peer: &PeerId) -> Option<NodeId>;
} }
impl<'a> IoContext for NetworkContext<'a> { impl<'a> IoContext for NetworkContext<'a> {
@ -71,8 +71,8 @@ impl<'a> IoContext for NetworkContext<'a> {
self.protocol_version(self.subprotocol_name(), peer) self.protocol_version(self.subprotocol_name(), peer)
} }
fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId> { fn persistent_peer_id(&self, peer: &PeerId) -> Option<NodeId> {
self.session_info(peer).and_then(|info| info.id) self.session_info(*peer).and_then(|info| info.id)
} }
} }
@ -83,7 +83,7 @@ pub trait EventContext {
fn peer(&self) -> PeerId; fn peer(&self) -> PeerId;
/// Returns the relevant's peer persistent Id (aka NodeId). /// Returns the relevant's peer persistent Id (aka NodeId).
fn persistent_peer_id(&self) -> Option<NodeId>; fn persistent_peer_id(&self, id: &PeerId) -> Option<NodeId>;
/// Make a request from a peer. /// Make a request from a peer.
fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error>; fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error>;
@ -116,8 +116,8 @@ impl<'a> EventContext for Ctx<'a> {
self.peer self.peer
} }
fn persistent_peer_id(&self) -> Option<NodeId> { fn persistent_peer_id(&self, id: &PeerId) -> Option<NodeId> {
self.io.persistent_peer_id(self.peer) self.io.persistent_peer_id(id)
} }
fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error> { fn request_from(&self, peer: PeerId, request: Request) -> Result<ReqId, Error> {
self.proto.request_from(self.io, &peer, request) self.proto.request_from(self.io, &peer, request)