From 2082672b3cdcebc3698f68fb7a683c1d5d32b6f7 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Fri, 7 Feb 2020 21:56:59 -0800 Subject: [PATCH] Remove Response::Error. Error handling is already handled by Result; we don't need an "inner" error variant duplicating the outer one. --- zebra-network/src/peer/connection.rs | 5 ----- zebra-network/src/protocol/internal/response.rs | 16 +--------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/zebra-network/src/peer/connection.rs b/zebra-network/src/peer/connection.rs index d6971ed5..39c14d9d 100644 --- a/zebra-network/src/peer/connection.rs +++ b/zebra-network/src/peer/connection.rs @@ -408,11 +408,6 @@ where match rsp { Response::Nil => { /* generic success, do nothing */ } - Response::Error => { - if let Err(e) = self.peer_tx.send(Message::from(PeerError::Rejected)).await { - self.fail_with(e.into()); - } - } Response::Peers(addrs) => { if let Err(e) = self.peer_tx.send(Message::Addr(addrs)).await { self.fail_with(e.into()); diff --git a/zebra-network/src/protocol/internal/response.rs b/zebra-network/src/protocol/internal/response.rs index 8ba36c14..6a35cee1 100644 --- a/zebra-network/src/protocol/internal/response.rs +++ b/zebra-network/src/protocol/internal/response.rs @@ -1,5 +1,3 @@ -use std::error::Error; - // XXX clean module layout of zebra_chain use zebra_chain::block::Block; @@ -11,21 +9,9 @@ pub enum Response { /// A response with no data. Nil, - /// Generic error. - Error, - /// A list of peers, used to respond to `GetPeers`. Peers(Vec), /// A list of blocks. Blocks(Vec), -} - -impl From for Response -where - E: Error, -{ - fn from(_e: E) -> Self { - Self::Error - } -} +} \ No newline at end of file