Skip to content

Commit d4ff1a3

Browse files
committed
cleanup
1 parent 58e3b7a commit d4ff1a3

File tree

5 files changed

+18
-39
lines changed

5 files changed

+18
-39
lines changed

lib/src/connection.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::errors::{Error, Result};
1+
use crate::errors::{unexpected, Error, Result};
22
use crate::messages::*;
33
use crate::version::Version;
44
use bytes::*;
@@ -35,20 +35,15 @@ impl Connection {
3535
BoltResponse::FailureMessage(msg) => {
3636
Err(Error::AuthenticationError(msg.get("message").unwrap()))
3737
}
38-
msg => Err(Error::UnexpectedMessage(format!(
39-
"unexpected response for HELLO: {:?}",
40-
msg
41-
))),
38+
39+
msg => Err(unexpected(msg, "HELLO")),
4240
}
4341
}
4442

4543
pub async fn reset(&mut self) -> Result<()> {
4644
match self.send_recv(BoltRequest::reset()).await? {
4745
BoltResponse::SuccessMessage(_) => Ok(()),
48-
msg => Err(Error::UnexpectedMessage(format!(
49-
"unexpected response for RESET: {:?}",
50-
msg
51-
))),
46+
msg => Err(unexpected(msg, "RESET")),
5247
}
5348
}
5449

lib/src/errors.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,10 @@ impl std::convert::From<deadpool::managed::PoolError<Error>> for Error {
3434
}
3535
}
3636
}
37+
38+
pub fn unexpected<T: std::fmt::Debug>(response: T, request: &str) -> Error {
39+
Error::UnexpectedMessage(format!(
40+
"unexpected response for {}: {:?}",
41+
request, response
42+
))
43+
}

lib/src/query.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,10 @@ impl Query {
3838
BoltResponse::SuccessMessage(_) => {
3939
match connection.send_recv(BoltRequest::discard()).await? {
4040
BoltResponse::SuccessMessage(_) => Ok(()),
41-
msg => Err(Error::UnexpectedMessage(format!(
42-
"unexpected response for DISCARD: {:?}",
43-
msg
44-
))),
41+
msg => Err(unexpected(msg, "DISCARD")),
4542
}
4643
}
47-
msg => Err(Error::UnexpectedMessage(format!(
48-
"unexpected response for RUN: {:?}",
49-
msg
50-
))),
44+
msg => Err(unexpected(msg, "RUN")),
5145
}
5246
}
5347

@@ -68,10 +62,7 @@ impl Query {
6862
connection.clone(),
6963
))
7064
}
71-
msg => Err(Error::UnexpectedMessage(format!(
72-
"unexpected response for RUN: {:?}",
73-
msg
74-
))),
65+
msg => Err(unexpected(msg, "RUN")),
7566
}
7667
}
7768
}

lib/src/stream.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,7 @@ impl RowStream {
7070
let row = Row::new(self.fields.clone(), record.data);
7171
self.buffer.push_back(row);
7272
}
73-
msg => {
74-
return Err(Error::UnexpectedMessage(format!(
75-
"unexpected response for PULL: {:?}",
76-
msg
77-
)))
78-
}
73+
msg => return Err(unexpected(msg, "PULL")),
7974
},
8075
State::Buffered => {
8176
if !self.buffer.is_empty() {

lib/src/txn.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ impl Txn {
2424
config,
2525
connection: Arc::new(Mutex::new(connection)),
2626
}),
27-
msg => Err(Error::UnexpectedMessage(format!(
28-
"unexpected response for BEGIN: {:?}",
29-
msg
30-
))),
27+
msg => Err(unexpected(msg, "BEGIN")),
3128
}
3229
}
3330

@@ -54,10 +51,7 @@ impl Txn {
5451
let commit = BoltRequest::commit();
5552
match self.connection.lock().await.send_recv(commit).await? {
5653
BoltResponse::SuccessMessage(_) => Ok(()),
57-
msg => Err(Error::UnexpectedMessage(format!(
58-
"unexpected response for COMMIT: {:?}",
59-
msg
60-
))),
54+
msg => Err(unexpected(msg, "COMMIT")),
6155
}
6256
}
6357

@@ -66,10 +60,7 @@ impl Txn {
6660
let rollback = BoltRequest::rollback();
6761
match self.connection.lock().await.send_recv(rollback).await? {
6862
BoltResponse::SuccessMessage(_) => Ok(()),
69-
msg => Err(Error::UnexpectedMessage(format!(
70-
"unexpected response for COMMIT: {:?}",
71-
msg
72-
))),
63+
msg => Err(unexpected(msg, "ROLLBACK")),
7364
}
7465
}
7566
}

0 commit comments

Comments
 (0)