Skip to content

Commit

Permalink
Don't quote slot and epoch, for now (#1597)
Browse files Browse the repository at this point in the history
Fixes a breaking change to our API that was unnecessary and can wait until #1569 is merged
  • Loading branch information
michaelsproul committed Sep 8, 2020
1 parent 9833eca commit 19be7ab
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion consensus/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ rand = "0.7.3"
safe_arith = { path = "../safe_arith" }
serde = "1.0.110"
serde_derive = "1.0.110"
serde_utils = { path = "../serde_utils" }
slog = "2.5.2"
eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1.0"
Expand Down
4 changes: 2 additions & 2 deletions consensus/types/src/slot_epoch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, Sub, SubAssi
#[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
#[derive(Eq, Clone, Copy, Default, Serialize, Deserialize)]
#[serde(transparent)]
pub struct Slot(#[serde(with = "serde_utils::quoted_u64")] u64);
pub struct Slot(u64);

#[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
#[derive(Eq, Clone, Copy, Default, Serialize, Deserialize)]
#[serde(transparent)]
pub struct Epoch(#[serde(with = "serde_utils::quoted_u64")] u64);
pub struct Epoch(u64);

impl_common!(Slot);
impl_common!(Epoch);
Expand Down

0 comments on commit 19be7ab

Please sign in to comment.