milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Add suffix to UnknownMagic error type 

By convention we always include the suffix "Error" on our error types.

Rename the error type `UnknownMagic` to `UnknownMagicError`.
This commit is contained in:
Tobin C. Harding 2023-10-04 12:29:05 +11:00
parent 5658dac024
commit f41416a0ea
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitcoin/src/p2p/mod.rs
View File

@ -245,7 +245,7 @@ impl From<Network> for Magic {
} }
impl TryFrom<Magic> for Network { impl TryFrom<Magic> for Network {
type Error = UnknownMagic; type Error = UnknownMagicError;
fn try_from(magic: Magic) -> Result<Self, Self::Error> { fn try_from(magic: Magic) -> Result<Self, Self::Error> {
match magic { match magic {
@ -254,7 +254,7 @@ impl TryFrom<Magic> for Network {
Magic::TESTNET => Ok(Network::Testnet), Magic::TESTNET => Ok(Network::Testnet),
Magic::SIGNET => Ok(Network::Signet), Magic::SIGNET => Ok(Network::Signet),
Magic::REGTEST => Ok(Network::Regtest), Magic::REGTEST => Ok(Network::Regtest),
_ => Err(UnknownMagic(magic)), _ => Err(UnknownMagicError(magic)),
} }
} }
} }
@ -343,14 +343,14 @@ impl_std_error!(ParseMagicError, error);
/// Error in creating a Network from Magic bytes. /// Error in creating a Network from Magic bytes.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct UnknownMagic(Magic); pub struct UnknownMagicError(Magic);
impl fmt::Display for UnknownMagic { impl fmt::Display for UnknownMagicError {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
write!(f, "unknown network magic {}", self.0) write!(f, "unknown network magic {}", self.0)
} }
} }
impl_std_error!(UnknownMagic); impl_std_error!(UnknownMagicError);
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {