omedusyo/minisql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(proto): start replacing anyhow with thiserror

Browse source
This commit is contained in:
Jindřich Moravec 2023-12-12 19:31:27 +01:00
parent dbd0ef3970
commit bb39d138d8
8 changed files with 57 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
proto/src/message/backend.rs
View file

@ -3,6 +3,7 @@ use crate::message::primitive::pglist::PgList;
use crate::message::primitive::pgstring::PgString;
use crate::message::proto_message::ProtoMessage;
use bincode::{Decode, Encode};
use crate::message::errors::{ProtoDeserializeError, ProtoSerializeError};
#[derive(Debug)]
pub enum BackendMessage {
@ -34,7 +35,7 @@ impl ProtoMessage for BackendMessage {
}
}
fn serialize(&self) -> anyhow::Result<Vec<u8>> {
fn serialize(&self) -> Result<Vec<u8>, ProtoSerializeError> {
match self {
BackendMessage::AuthenticationOk(data) => data.serialize(),
BackendMessage::BackendKeyData(data) => data.serialize(),
@ -49,7 +50,7 @@ impl ProtoMessage for BackendMessage {
}
}
fn deserialize(variant: u8, data: &[u8]) -> anyhow::Result<BackendMessage> {
fn deserialize(variant: u8, data: &[u8]) -> Result<BackendMessage, ProtoDeserializeError> {
match variant {
b'R' => Ok(BackendMessage::AuthenticationOk(
AuthenticationOkData::deserialize(data)?,
@ -84,7 +85,7 @@ impl ProtoMessage for BackendMessage {
let data = RowDescriptionData::deserialize(data)?;
Ok(BackendMessage::RowDescription(data))
}
v => Err(anyhow::anyhow!("Unknown backend message variant: {v}")),
v => Err(ProtoDeserializeError::InvalidVariant(v)),
}
}
}
@ -354,4 +355,13 @@ mod tests {
_ => false,
},)
}
#[test]
fn test_unknown_variant() {
let variant = 0;
let data = vec![1, 2, 3];
let message = BackendMessage::deserialize(variant, &data);
assert!(matches!(message, Err(ProtoDeserializeError::InvalidVariant(0))));
}
}