core: init

crates/brk_parser/src/blk_index_to_blk_recap.rs

@@ -81,7 +81,8 @@ impl BlkIndexToBlkRecap {
             }
         }
 
-        start.unwrap()
+        // Should only be none if asking for a too high start
+        start.unwrap_or_else(|| self.tree.last_key_value().map_or(0, |(i, _)| *i))
     }
 
     pub fn export(&self) {

crates/brk_parser/src/blk_recap.rs

@@ -1,8 +1,9 @@
 use std::path::Path;
 
+use brk_core::Height;
 use serde::{Deserialize, Serialize};
 
-use crate::{Height, path_to_modified_time};
+use crate::path_to_modified_time;
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 #[repr(C)]

crates/brk_parser/src/height.rs

@@ -1,205 +0,0 @@
-use std::{
-    fmt::{self, Debug},
-    ops::{Add, AddAssign, Rem, Sub},
-};
-
-use derive_deref::{Deref, DerefMut};
-use serde::{Deserialize, Serialize};
-use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
-
-use crate::rpc::{self, RpcApi};
-
-#[derive(
-    Debug,
-    Clone,
-    Copy,
-    Deref,
-    DerefMut,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Default,
-    Serialize,
-    Deserialize,
-    FromBytes,
-    Immutable,
-    IntoBytes,
-    KnownLayout,
-)]
-pub struct Height(u32);
-
-impl Height {
-    pub const ZERO: Self = Height(0);
-    pub const MAX: Self = Height(u32::MAX);
-
-    pub fn write(&self, path: &std::path::Path) -> Result<(), std::io::Error> {
-        std::fs::write(path, self.as_bytes())
-    }
-
-    pub fn increment(&mut self) {
-        self.0 += 1;
-    }
-
-    pub fn incremented(self) -> Self {
-        Self(self.0 + 1)
-    }
-
-    pub fn decrement(&mut self) {
-        self.0 -= 1;
-    }
-
-    pub fn decremented(self) -> Self {
-        Self(self.0.checked_sub(1).unwrap_or_default())
-    }
-
-    pub fn is_zero(self) -> bool {
-        self == Self::ZERO
-    }
-}
-
-impl PartialEq<u64> for Height {
-    fn eq(&self, other: &u64) -> bool {
-        **self == *other as u32
-    }
-}
-
-impl Add<Height> for Height {
-    type Output = Height;
-
-    fn add(self, rhs: Height) -> Self::Output {
-        Self::from(self.0 + rhs.0)
-    }
-}
-
-impl Add<u32> for Height {
-    type Output = Height;
-
-    fn add(self, rhs: u32) -> Self::Output {
-        Self::from(self.0 + rhs)
-    }
-}
-
-impl Add<usize> for Height {
-    type Output = Height;
-
-    fn add(self, rhs: usize) -> Self::Output {
-        Self::from(*self + rhs as u32)
-    }
-}
-
-impl Sub<Height> for Height {
-    type Output = Height;
-    fn sub(self, rhs: Height) -> Self::Output {
-        Self::from(*self - *rhs)
-    }
-}
-
-impl Sub<i32> for Height {
-    type Output = Height;
-    fn sub(self, rhs: i32) -> Self::Output {
-        Self::from(*self - rhs as u32)
-    }
-}
-
-impl Sub<u32> for Height {
-    type Output = Height;
-    fn sub(self, rhs: u32) -> Self::Output {
-        Self::from(*self - rhs)
-    }
-}
-
-impl Sub<usize> for Height {
-    type Output = Height;
-    fn sub(self, rhs: usize) -> Self::Output {
-        Self::from(*self - rhs as u32)
-    }
-}
-
-impl AddAssign<usize> for Height {
-    fn add_assign(&mut self, rhs: usize) {
-        *self = self.add(rhs);
-    }
-}
-
-impl Rem<Height> for Height {
-    type Output = Height;
-    fn rem(self, rhs: Height) -> Self::Output {
-        Self(self.0.rem(rhs.0))
-    }
-}
-
-impl Rem<usize> for Height {
-    type Output = Height;
-    fn rem(self, rhs: usize) -> Self::Output {
-        Self(self.0.rem(Height::from(rhs).0))
-    }
-}
-
-impl fmt::Display for Height {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", **self)
-    }
-}
-
-impl From<u32> for Height {
-    fn from(value: u32) -> Self {
-        Self(value)
-    }
-}
-
-impl From<usize> for Height {
-    fn from(value: usize) -> Self {
-        Self(value as u32)
-    }
-}
-impl From<Height> for usize {
-    fn from(value: Height) -> Self {
-        value.0 as usize
-    }
-}
-
-impl From<Height> for u64 {
-    fn from(value: Height) -> Self {
-        value.0 as u64
-    }
-}
-
-impl TryFrom<&rpc::Client> for Height {
-    type Error = rpc::Error;
-    fn try_from(value: &rpc::Client) -> Result<Self, Self::Error> {
-        Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
-    }
-}
-
-impl From<bitcoin::locktime::absolute::Height> for Height {
-    fn from(value: bitcoin::locktime::absolute::Height) -> Self {
-        Self(value.to_consensus_u32())
-    }
-}
-
-impl From<Height> for bitcoin::locktime::absolute::Height {
-    fn from(value: Height) -> Self {
-        bitcoin::locktime::absolute::Height::from_consensus(*value).unwrap()
-    }
-}
-
-impl TryFrom<&std::path::Path> for Height {
-    type Error = crate::Error;
-    fn try_from(value: &std::path::Path) -> Result<Self, Self::Error> {
-        Ok(Self::read_from_bytes(std::fs::read(value)?.as_slice())?.to_owned())
-    }
-}
-
-impl TryFrom<byteview::ByteView> for Height {
-    type Error = crate::Error;
-    fn try_from(value: byteview::ByteView) -> Result<Self, Self::Error> {
-        Ok(Self::read_from_bytes(&value)?)
-    }
-}
-
-impl From<Height> for byteview::ByteView {
-    fn from(value: Height) -> Self {
-        Self::new(value.as_bytes())
-    }
-}

crates/brk_parser/src/lib.rs

@@ -11,6 +11,7 @@ use bitcoin::{Block, BlockHash};
 use bitcoincore_rpc::RpcApi;
 use blk_index_to_blk_path::*;
 use blk_recap::BlkRecap;
+use brk_core::Height;
 use crossbeam::channel::{Receiver, bounded};
 use rayon::prelude::*;
 
@@ -23,7 +24,6 @@ mod blk_metadata;
 mod blk_recap;
 mod block_state;
 mod error;
-mod height;
 mod utils;
 mod xor_bytes;
 mod xor_index;
@@ -32,7 +32,6 @@ use blk_index_to_blk_recap::*;
 use blk_metadata::*;
 use block_state::*;
 pub use error::*;
-pub use height::*;
 use utils::*;
 use xor_bytes::*;
 use xor_index::*;