global: improve errors

crates/brk_computer/src/chain.rs

@@ -853,19 +853,33 @@ impl Vecs {
         compute_indexes_to_tx_vany(&mut self.indexes_to_tx_v2, TxVersion::TWO)?;
         compute_indexes_to_tx_vany(&mut self.indexes_to_tx_v3, TxVersion::THREE)?;
 
+        // ---
+        // TxInIndex
+        // ---
+
+        let txindex_to_first_txoutindex = &indexer.vecs.tx.txindex_to_first_txoutindex;
+        let txindex_to_first_txoutindex_reader = txindex_to_first_txoutindex.create_reader();
         let txoutindex_to_value = &indexer.vecs.txout.txoutindex_to_value;
         let txoutindex_to_value_reader = indexer.vecs.txout.txoutindex_to_value.create_reader();
         self.txinindex_to_value.compute_transform(
             starting_indexes.txinindex,
-            &indexes.txinindex_to_txoutindex,
-            |(txinindex, txoutindex, ..)| {
-                let value = if txoutindex == TxOutIndex::COINBASE {
-                    Sats::MAX
+            &indexer.vecs.txin.txinindex_to_outpoint,
+            |(txinindex, outpoint, ..)| {
+                if unlikely(outpoint.is_coinbase()) {
+                    return (txinindex, Sats::MAX);
+                }
+                let txoutindex = txindex_to_first_txoutindex
+                    .read_unwrap(outpoint.txindex(), &txindex_to_first_txoutindex_reader)
+                    + outpoint.vout();
+
+                let value = if unlikely(txoutindex == TxOutIndex::COINBASE) {
+                    unreachable!()
                 } else {
                     txoutindex_to_value
                         .unchecked_read(txoutindex, &txoutindex_to_value_reader)
                         .unwrap()
                 };
+
                 (txinindex, value)
             },
             exit,

crates/brk_computer/src/grouped/builder_eager.rs

@@ -159,7 +159,7 @@ where
     /// Compute percentiles from sorted values (assumes values is already sorted)
     fn compute_percentiles_from_sorted(&mut self, index: usize, values: &[T]) -> Result<()> {
         if let Some(max) = self.max.as_mut() {
-            max.truncate_push_at(index, *values.last().ok_or(Error::Str("expect some"))?)?;
+            max.truncate_push_at(index, *values.last().ok_or(Error::Internal("Empty values for percentiles"))?)?;
         }
         if let Some(pct90) = self.pct90.as_mut() {
             pct90.truncate_push_at(index, get_percentile(values, 0.90))?;

crates/brk_computer/src/indexes.rs

@@ -13,8 +13,8 @@ use brk_types::{
     YearIndex,
 };
 use vecdb::{
-    Database, EagerVec, Exit, GenericStoredVec, ImportableVec, IterableCloneableVec, LazyVecFrom1,
-    PAGE_SIZE, PcoVec, TypedVecIterator, unlikely,
+    Database, EagerVec, Exit, ImportableVec, IterableCloneableVec, LazyVecFrom1, PAGE_SIZE, PcoVec,
+    TypedVecIterator,
 };
 
 const VERSION: Version = Version::ZERO;
@@ -83,7 +83,6 @@ pub struct Vecs {
     pub txindex_to_output_count: EagerVec<PcoVec<TxIndex, StoredU64>>,
     pub txindex_to_txindex: LazyVecFrom1<TxIndex, TxIndex, TxIndex, Txid>,
     pub txinindex_to_txinindex: LazyVecFrom1<TxInIndex, TxInIndex, TxInIndex, OutPoint>,
-    pub txinindex_to_txoutindex: EagerVec<PcoVec<TxInIndex, TxOutIndex>>,
     pub txoutindex_to_txoutindex: LazyVecFrom1<TxOutIndex, TxOutIndex, TxOutIndex, Sats>,
     pub unknownoutputindex_to_unknownoutputindex:
         LazyVecFrom1<UnknownOutputIndex, UnknownOutputIndex, UnknownOutputIndex, TxIndex>,
@@ -121,7 +120,6 @@ impl Vecs {
         }
 
         let this = Self {
-            txinindex_to_txoutindex: eager!("txoutindex"),
             txoutindex_to_txoutindex: lazy!("txoutindex", indexer.vecs.txout.txoutindex_to_value),
             txinindex_to_txinindex: lazy!("txinindex", indexer.vecs.txin.txinindex_to_outpoint),
             p2pk33addressindex_to_p2pk33addressindex: lazy!(
@@ -247,27 +245,6 @@ impl Vecs {
         starting_indexes: brk_indexer::Indexes,
         exit: &Exit,
     ) -> Result<Indexes> {
-        // ---
-        // TxInIndex
-        // ---
-
-        let txindex_to_first_txoutindex = &indexer.vecs.tx.txindex_to_first_txoutindex;
-        let txindex_to_first_txoutindex_reader = txindex_to_first_txoutindex.create_reader();
-        self.txinindex_to_txoutindex.compute_transform(
-            starting_indexes.txinindex,
-            &indexer.vecs.txin.txinindex_to_outpoint,
-            |(txinindex, outpoint, ..)| {
-                if unlikely(outpoint.is_coinbase()) {
-                    return (txinindex, TxOutIndex::COINBASE);
-                }
-                let txoutindex = txindex_to_first_txoutindex
-                    .read_unwrap(outpoint.txindex(), &txindex_to_first_txoutindex_reader)
-                    + outpoint.vout();
-                (txinindex, txoutindex)
-            },
-            exit,
-        )?;
-
         // ---
         // TxIndex
         // ---

crates/brk_computer/src/stateful/common/import.rs

@@ -821,7 +821,7 @@ impl Vecs {
 
             Ok(prev_height.incremented())
         } else {
-            Err(Error::Str("Unset"))
+            Err(Error::Internal("No previous height to import state from"))
         }
     }
 

crates/brk_computer/src/states/price_to_amount.rs

@@ -37,7 +37,7 @@ impl PriceToAmount {
         let (&height, path) = files
             .range(..=height)
             .next_back()
-            .ok_or(Error::Str("Not found"))?;
+            .ok_or(Error::NotFound("No price state found at or before height".into()))?;
         self.state = Some(State::deserialize(&fs::read(path)?)?);
         Ok(height)
     }