Skip to content

Fix BasisPoint struct #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VytenisNarmontas wants to merge 1 commit into
base: devnet-2
Choose a base branch
from
Open

Fix BasisPoint struct #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions lean_client/chain/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct BasisPoint(pub u64);
pub struct BasisPoint(u64);

use core::ops::Deref;

impl BasisPoint {
pub const MAX: u64 = 10_000;

pub const fn new(value: u64) -> Option<Self> {
if value <= Self::MAX { Some(BasisPoint(value)) } else { None }
if value <= Self::MAX {
Some(Self(value))
} else {
None
}
}

#[inline]
pub(crate) const fn new_unchecked(value: u64) -> Self {
Self(value)
}
}

impl Deref for BasisPoint {
type Target = u64;

#[inline]
fn deref(&self) -> &Self::Target {
&self.0
}
#[inline] pub fn get(&self) -> u64 { self.0 }
}

pub const INTERVALS_PER_SLOT: u64 = 4;
Expand All @@ -15,12 +35,12 @@ pub const SECONDS_PER_SLOT: u64 = SLOT_DURATION_MS / 1_000;
pub const SECONDS_PER_INTERVAL: u64 = SECONDS_PER_SLOT / INTERVALS_PER_SLOT;
pub const JUSTIFICATION_LOOKBACK_SLOTS: u64 = 3;

pub const PROPOSER_REORG_CUTOFF_BPS: BasisPoint = match BasisPoint::new(2_500) { Some(x) => x, None => panic!() };
pub const VOTE_DUE_BPS: BasisPoint = match BasisPoint::new(5_000) { Some(x) => x, None => panic!() };
pub const FAST_CONFIRM_DUE_BPS: BasisPoint = match BasisPoint::new(7_500) { Some(x) => x, None => panic!() };
pub const VIEW_FREEZE_CUTOFF_BPS: BasisPoint= match BasisPoint::new(7_500) { Some(x) => x, None => panic!() };
pub const PROPOSER_REORG_CUTOFF_BPS: BasisPoint = BasisPoint::new_unchecked(2_500);
pub const VOTE_DUE_BPS: BasisPoint = BasisPoint::new_unchecked(5_000);
pub const FAST_CONFIRM_DUE_BPS: BasisPoint = BasisPoint::new_unchecked(7_500);
pub const VIEW_FREEZE_CUTOFF_BPS: BasisPoint = BasisPoint::new_unchecked(7_500);

pub const HISTORICAL_ROOTS_LIMIT: u64 = 1u64 << 18;
pub const HISTORICAL_ROOTS_LIMIT: u64 = 1u64 << 18;
pub const VALIDATOR_REGISTRY_LIMIT: u64 = 1u64 << 12;

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -51,9 +71,10 @@ pub const DEVNET_CONFIG: ChainConfig = ChainConfig {
#[cfg(test)]
mod tests {
use super::*;
#[test] fn time_math_is_consistent() {
#[test]
fn time_math_is_consistent() {
assert_eq!(SLOT_DURATION_MS, 4_000);
assert_eq!(SECONDS_PER_SLOT, 4);
assert_eq!(SECONDS_PER_INTERVAL, 1);
}
}
}