Rename ImprovPacket to RawPacket

This commit is contained in:
2024-12-18 20:14:25 +01:00
parent c61e437ef8
commit e63d279229
2 changed files with 15 additions and 15 deletions

View File

@@ -111,8 +111,8 @@ pub trait ImprovDataPacketType {
pub trait ImprovDataToPacket: ImprovDataPacketType {
fn to_bytes(&self) -> Vec<u8>;
fn to_packet(&self) -> ImprovPacket {
return ImprovPacket {
fn to_raw_packet(&self) -> RawPacket {
return RawPacket {
version: IMPROV_VERSION,
r#type: Self::packet_type,
data: self.to_bytes().to_vec(),
@@ -124,16 +124,16 @@ pub trait ImprovDataToPacket: ImprovDataPacketType {
pub trait ImprovDataFromPacket: ImprovDataPacketType + Sized {
type Error;
fn try_from_packet(improv_packet: &ImprovPacket) -> Result<Self, Self::Error>;
fn try_from_raw_packet(raw_packet: &RawPacket) -> Result<Self, Self::Error>;
}
pub struct ImprovPacket {
pub struct RawPacket {
pub version: u8,
pub r#type: PacketType,
pub data: Vec<u8>,
}
impl ImprovPacket {
impl RawPacket {
pub fn try_from_bytes(bytes: &Vec<u8>) -> Result<Self, &str> {
if bytes.len() < 11 {
return Err("Packet too small");
@@ -204,13 +204,13 @@ impl ImprovDataToPacket for CurrentStateResponse {
impl ImprovDataFromPacket for CurrentStateResponse {
type Error = &'static str;
fn try_from_packet(improv_packet: &ImprovPacket) -> Result<Self, Self::Error>{
if improv_packet.r#type != Self::packet_type {
fn try_from_raw_packet(raw_packet: &RawPacket) -> Result<Self, Self::Error>{
if raw_packet.r#type != Self::packet_type {
return Err("Packet is not CurrentStateResponse");
}
return Ok(Self {
current_state: CurrentState::try_from(&improv_packet.data[0])?,
current_state: CurrentState::try_from(&raw_packet.data[0])?,
})
}
}