cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Don't quote slot and epoch, for now (#1597)

Browse Source 
Fixes a breaking change to our API that was unnecessary and can wait until #1569 is merged
This commit is contained in:
Michael Sproul 2020-09-08 02:12:36 +00:00
parent 9833eca024
commit 19be7abfd2
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -5892,7 +5892,6 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"serde_utils",
"serde_yaml", "serde_yaml",
"slog", "slog",
"swap_or_not_shuffle", "swap_or_not_shuffle",

1
consensus/types/Cargo.toml
View File

@ -25,7 +25,6 @@ rand = "0.7.3"
safe_arith = { path = "../safe_arith" } safe_arith = { path = "../safe_arith" }
serde = "1.0.110" serde = "1.0.110"
serde_derive = "1.0.110" serde_derive = "1.0.110"
serde_utils = { path = "../serde_utils" }
slog = "2.5.2" slog = "2.5.2"
eth2_ssz = "0.1.2" eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1.0" eth2_ssz_derive = "0.1.0"

4
consensus/types/src/slot_epoch.rs
View File

@ -25,12 +25,12 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, Sub, SubAssi
#[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
#[derive(Eq, Clone, Copy, Default, Serialize, Deserialize)] #[derive(Eq, Clone, Copy, Default, Serialize, Deserialize)]
#[serde(transparent)] #[serde(transparent)]
pub struct Slot(#[serde(with = "serde_utils::quoted_u64")] u64); pub struct Slot(u64);
#[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))] #[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
#[derive(Eq, Clone, Copy, Default, Serialize, Deserialize)] #[derive(Eq, Clone, Copy, Default, Serialize, Deserialize)]
#[serde(transparent)] #[serde(transparent)]
pub struct Epoch(#[serde(with = "serde_utils::quoted_u64")] u64); pub struct Epoch(u64);
impl_common!(Slot); impl_common!(Slot);
impl_common!(Epoch); impl_common!(Epoch);