Skip to content

Commit

Permalink
derived instance fixes after serde option removal
Browse files Browse the repository at this point in the history
  • Loading branch information
vkomenda committed Jun 20, 2018
1 parent a4cd6b7 commit dba94e6
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/honey_badger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,7 @@ impl<Tx, NodeUid: Ord> Batch<Tx, NodeUid> {
}

/// The content of a `HoneyBadger` message. It should be further annotated with an epoch.
#[cfg_attr(feature = "serialization-serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone)]
#[derive(Clone, Debug, Deserialize, Serialize)]
pub enum MessageContent<NodeUid> {
/// A message belonging to the common subset algorithm in the given epoch.
CommonSubset(common_subset::Message<NodeUid>),
Expand All @@ -506,8 +505,7 @@ impl<NodeUid> MessageContent<NodeUid> {
}

/// A message sent to or received from another node's Honey Badger instance.
#[cfg_attr(feature = "serialization-serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone)]
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Message<NodeUid> {
epoch: u64,
content: MessageContent<NodeUid>,
Expand Down

0 comments on commit dba94e6

Please sign in to comment.