Fix clippy warn on compact_filters peer::_recv()

This commit is contained in:
Steve Myers 2021-02-11 13:08:21 -08:00
parent 04348d0090
commit c90a1f70a6
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051

View File

@ -223,14 +223,14 @@ impl Peer {
)), )),
)?; )?;
let version = if let NetworkMessage::Version(version) = let version = if let NetworkMessage::Version(version) =
Self::_recv(&responses, "version", None)?.unwrap() Self::_recv(&responses, "version", None).unwrap()
{ {
version version
} else { } else {
return Err(CompactFiltersError::InvalidResponse); return Err(CompactFiltersError::InvalidResponse);
}; };
if let NetworkMessage::Verack = Self::_recv(&responses, "verack", None)?.unwrap() { if let NetworkMessage::Verack = Self::_recv(&responses, "verack", None).unwrap() {
Self::_send(&mut locked_writer, network.magic(), NetworkMessage::Verack)?; Self::_send(&mut locked_writer, network.magic(), NetworkMessage::Verack)?;
} else { } else {
return Err(CompactFiltersError::InvalidResponse); return Err(CompactFiltersError::InvalidResponse);
@ -271,7 +271,7 @@ impl Peer {
responses: &Arc<RwLock<ResponsesMap>>, responses: &Arc<RwLock<ResponsesMap>>,
wait_for: &'static str, wait_for: &'static str,
timeout: Option<Duration>, timeout: Option<Duration>,
) -> Result<Option<NetworkMessage>, CompactFiltersError> { ) -> Option<NetworkMessage> {
let message_resp = { let message_resp = {
let mut lock = responses.write().unwrap(); let mut lock = responses.write().unwrap();
let message_resp = lock.entry(wait_for).or_default(); let message_resp = lock.entry(wait_for).or_default();
@ -287,15 +287,14 @@ impl Peer {
Some(t) => { Some(t) => {
let result = cvar.wait_timeout(messages, t).unwrap(); let result = cvar.wait_timeout(messages, t).unwrap();
if result.1.timed_out() { if result.1.timed_out() {
return Ok(None); return None;
} }
messages = result.0; messages = result.0;
} }
} }
} }
Ok(messages.pop()) messages.pop()
} }
/// Return the [`VersionMessage`] sent by the peer /// Return the [`VersionMessage`] sent by the peer
@ -415,7 +414,7 @@ impl Peer {
wait_for: &'static str, wait_for: &'static str,
timeout: Option<Duration>, timeout: Option<Duration>,
) -> Result<Option<NetworkMessage>, CompactFiltersError> { ) -> Result<Option<NetworkMessage>, CompactFiltersError> {
Self::_recv(&self.responses, wait_for, timeout) Ok(Self::_recv(&self.responses, wait_for, timeout))
} }
} }