From f58aaac1aed5555d745174116638171215c30045 Mon Sep 17 00:00:00 2001
From: Henry de Valence <hdevalence@hdevalence.ca>
Date: Wed, 27 Nov 2019 11:46:26 -0800
Subject: [PATCH] Privately re-export ErrorSlot, ClientRequest in peer.

This means that all sub-modules of `peer` can import everything they need from
the `peer` module itself, without having to be aware of the internal structure
of their sibling modules.
---
 zebra-network/src/peer.rs           | 3 +++
 zebra-network/src/peer/client.rs    | 2 +-
 zebra-network/src/peer/handshake.rs | 2 +-
 zebra-network/src/peer/server.rs    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/zebra-network/src/peer.rs b/zebra-network/src/peer.rs
index 434efb24..4387349d 100644
--- a/zebra-network/src/peer.rs
+++ b/zebra-network/src/peer.rs
@@ -11,6 +11,9 @@ mod handshake;
 /// Handles inbound requests from the network to our node.
 mod server;
 
+use error::ErrorSlot;
+use client::ClientRequest;
+
 pub use client::Client;
 pub use connector::Connector;
 pub use error::{HandshakeError, PeerError, SharedPeerError};
diff --git a/zebra-network/src/peer/client.rs b/zebra-network/src/peer/client.rs
index 4c448118..2f8c42c2 100644
--- a/zebra-network/src/peer/client.rs
+++ b/zebra-network/src/peer/client.rs
@@ -12,7 +12,7 @@ use tower::Service;
 
 use crate::protocol::internal::{Request, Response};
 
-use super::{error::ErrorSlot, SharedPeerError};
+use super::{ErrorSlot, SharedPeerError};
 
 /// The "client" duplex half of a peer connection.
 pub struct Client {
diff --git a/zebra-network/src/peer/handshake.rs b/zebra-network/src/peer/handshake.rs
index 6d3ef842..a41398e4 100644
--- a/zebra-network/src/peer/handshake.rs
+++ b/zebra-network/src/peer/handshake.rs
@@ -25,7 +25,7 @@ use crate::{
     BoxedStdError, Config,
 };
 
-use super::{error::ErrorSlot, HandshakeError, Client, Server};
+use super::{ErrorSlot, HandshakeError, Client, Server};
 
 /// A [`Service`] that handshakes with a remote peer and constructs a
 /// client/server pair.
diff --git a/zebra-network/src/peer/server.rs b/zebra-network/src/peer/server.rs
index bc4d6ebe..7b3dc886 100644
--- a/zebra-network/src/peer/server.rs
+++ b/zebra-network/src/peer/server.rs
@@ -22,7 +22,7 @@ use crate::{
     BoxedStdError,
 };
 
-use super::{client::ClientRequest, error::ErrorSlot, PeerError, SharedPeerError};
+use super::{ClientRequest, ErrorSlot, PeerError, SharedPeerError};
 
 pub(super) enum State {
     /// Awaiting a client request or a peer message.