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

Follow Rust std practice for RejectReason enum

This commit is contained in:
Steven Roose 2019-12-03 22:42:09 +00:00
parent 5c84e9671f
commit 83f55b7f1d
No known key found for this signature in database
GPG Key ID: 2F2A88D7F8D68E87
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/network/message_network.rs
View File

@ -26,7 +26,6 @@ use network::constants::{self, ServiceFlags};
use consensus::{Encodable, Decodable, ReadExt}; use consensus::{Encodable, Decodable, ReadExt};
use consensus::encode; use consensus::encode;
use network::message::CommandString; use network::message::CommandString;
use network::message_network::RejectReason::{MALFORMED, INVALID, OBSOLETE, DUPLICATE, NONSTANDARD, DUST, CHECKPOINT, FEE};
use hashes::sha256d; use hashes::sha256d;
/// Some simple messages /// Some simple messages
@ -90,21 +89,21 @@ impl_consensus_encoding!(VersionMessage, version, services, timestamp,
/// message rejection reason as a code /// message rejection reason as a code
pub enum RejectReason { pub enum RejectReason {
/// malformed message /// malformed message
MALFORMED = 0x01, Malformed = 0x01,
/// invalid message /// invalid message
INVALID = 0x10, Invalid = 0x10,
/// obsolete message /// obsolete message
OBSOLETE = 0x11, Obsolete = 0x11,
/// duplicate message /// duplicate message
DUPLICATE = 0x12, Duplicate = 0x12,
/// nonstandard transaction /// nonstandard transaction
NONSTANDARD = 0x40, NonStandard = 0x40,
/// an output is below dust limit /// an output is below dust limit
DUST = 0x41, Dust = 0x41,
/// insufficient fee /// insufficient fee
FEE = 0x42, Fee = 0x42,
/// checkpoint /// checkpoint
CHECKPOINT = 0x43 Checkpoint = 0x43
} }
impl Encodable for RejectReason { impl Encodable for RejectReason {
@ -117,14 +116,14 @@ impl Encodable for RejectReason {
impl Decodable for RejectReason { impl Decodable for RejectReason {
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> { fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
Ok(match d.read_u8()? { Ok(match d.read_u8()? {
0x01 => MALFORMED, 0x01 => RejectReason::Malformed,
0x10 => INVALID, 0x10 => RejectReason::Invalid,
0x11 => OBSOLETE, 0x11 => RejectReason::Obsolete,
0x12 => DUPLICATE, 0x12 => RejectReason::Duplicate,
0x40 => NONSTANDARD, 0x40 => RejectReason::NonStandard,
0x41 => DUST, 0x41 => RejectReason::Dust,
0x42 => FEE, 0x42 => RejectReason::Fee,
0x43 => CHECKPOINT, 0x43 => RejectReason::Checkpoint,
_ => return Err(encode::Error::ParseFailed("unknown reject code")) _ => return Err(encode::Error::ParseFailed("unknown reject code"))
}) })
} }