Skip to content

Commit

Permalink
Change error name to avoid hiffy conflict
Browse files Browse the repository at this point in the history
The name `SprotError` is already used in hubris. This is technically
fine but is causing some conflicts with our other tooling. Change the
name to avoid conflicts.
  • Loading branch information
labbott committed Oct 8, 2024
1 parent 3cc953c commit 72a560b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion attest-data/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "attest-data"
version = "0.3.0"
version = "0.4.0"
edition = "2021"

[dependencies]
Expand Down
8 changes: 4 additions & 4 deletions attest-data/src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ pub enum HostToRotError {
/// Unexpected command returned
UnexpectedCommand,
/// Error return from the sprot command
SprotError(SprotError),
SprotError(RecvSprotError),
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)]
#[repr(u32)]
// Errors returned from the hubris side. This is _so many_
pub enum SprotError {
pub enum RecvSprotError {
// protocol
/// CRC check failed.
ProtocolInvalidCrc,
Expand Down Expand Up @@ -164,8 +164,8 @@ pub enum RotToHost {
RotTqSign,
}

impl From<SprotError> for RotToHost {
fn from(e: SprotError) -> Self {
impl From<RecvSprotError> for RotToHost {
fn from(e: RecvSprotError) -> Self {
RotToHost::HostToRotError(HostToRotError::SprotError(e))
}
}
Expand Down

0 comments on commit 72a560b

Please sign in to comment.