Rename Response::Ok to Response::Nil.
This is a better name because it signals "no data in response" rather than "Ok", which is semantically mixed with `Ok/Err` of `Result`.
This commit is contained in:
parent
5929e05e52
commit
29f901add3
|
|
@ -53,11 +53,11 @@ impl Handler {
|
||||||
use Handler::*;
|
use Handler::*;
|
||||||
let mut ignored_msg = None;
|
let mut ignored_msg = None;
|
||||||
// XXX can this be avoided?
|
// XXX can this be avoided?
|
||||||
let tmp_state = std::mem::replace(self, Finished(Ok(Response::Ok)));
|
let tmp_state = std::mem::replace(self, Finished(Ok(Response::Nil)));
|
||||||
*self = match (tmp_state, msg) {
|
*self = match (tmp_state, msg) {
|
||||||
(Ping(req_nonce), Message::Pong(rsp_nonce)) => {
|
(Ping(req_nonce), Message::Pong(rsp_nonce)) => {
|
||||||
if req_nonce == rsp_nonce {
|
if req_nonce == rsp_nonce {
|
||||||
Finished(Ok(Response::Ok))
|
Finished(Ok(Response::Nil))
|
||||||
} else {
|
} else {
|
||||||
Ping(req_nonce)
|
Ping(req_nonce)
|
||||||
}
|
}
|
||||||
|
|
@ -407,7 +407,7 @@ where
|
||||||
};
|
};
|
||||||
|
|
||||||
match rsp {
|
match rsp {
|
||||||
Response::Ok => { /* generic success, do nothing */ }
|
Response::Nil => { /* generic success, do nothing */ }
|
||||||
Response::Error => {
|
Response::Error => {
|
||||||
if let Err(e) = self.peer_tx.send(Message::from(PeerError::Rejected)).await {
|
if let Err(e) = self.peer_tx.send(Message::from(PeerError::Rejected)).await {
|
||||||
self.fail_with(e.into());
|
self.fail_with(e.into());
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@ use crate::meta_addr::MetaAddr;
|
||||||
/// A response to a network request, represented in internal format.
|
/// A response to a network request, represented in internal format.
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub enum Response {
|
pub enum Response {
|
||||||
/// Generic success.
|
/// A response with no data.
|
||||||
Ok,
|
Nil,
|
||||||
|
|
||||||
/// Generic error.
|
/// Generic error.
|
||||||
Error,
|
Error,
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ impl ConnectCmd {
|
||||||
let node = Buffer::new(
|
let node = Buffer::new(
|
||||||
service_fn(|req| async move {
|
service_fn(|req| async move {
|
||||||
info!(?req);
|
info!(?req);
|
||||||
Ok::<Response, Error>(Response::Ok)
|
Ok::<Response, Error>(Response::Nil)
|
||||||
}),
|
}),
|
||||||
1,
|
1,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ impl Service<Request> for SeedService {
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
debug!("ignoring request");
|
debug!("ignoring request");
|
||||||
Ok(Response::Ok)
|
Ok(Response::Nil)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Box::pin(futures::future::ready(response))
|
Box::pin(futures::future::ready(response))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue