Use redb::TableDefinition (#143)

ordinals · Feb 19, 2022 · a9da8dd · a9da8dd
1 parent 9b672ae
commit a9da8dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/index.rs b/src/index.rs
@@ -10,7 +10,8 @@ pub(crate) struct Index {
 }
 
 impl Index {
-  const OUTPOINT_TO_ORDINAL_RANGES: &'static str = "OUTPOINT_TO_ORDINAL_RANGES";
+  const OUTPOINT_TO_ORDINAL_RANGES: TableDefinition<'static, [u8], [u8]> =
+    TableDefinition::new("OUTPOINT_TO_ORDINAL_RANGES");
 
   pub(crate) fn new(options: Options) -> Result<Self> {
     let client = Client::new(
@@ -66,8 +67,7 @@ impl Index {
       log::info!("Indexing block at height {height}…");
 
       let wtx = self.database.begin_write()?;
-      let mut outpoint_to_ordinal_ranges: Table<[u8], [u8]> =
-        wtx.open_table(Self::OUTPOINT_TO_ORDINAL_RANGES)?;
+      let mut outpoint_to_ordinal_ranges = wtx.open_table(&Self::OUTPOINT_TO_ORDINAL_RANGES)?;
 
       let mut coinbase_inputs = VecDeque::new();
 
@@ -191,8 +191,7 @@ impl Index {
 
   pub(crate) fn list(&self, outpoint: OutPoint) -> Result<Vec<(u64, u64)>> {
     let rtx = self.database.begin_read()?;
-    let outpoint_to_ordinal_ranges: ReadOnlyTable<[u8], [u8]> =
-      rtx.open_table(Self::OUTPOINT_TO_ORDINAL_RANGES)?;
+    let outpoint_to_ordinal_ranges = rtx.open_table(&Self::OUTPOINT_TO_ORDINAL_RANGES)?;
 
     let mut key = Vec::new();
     outpoint.consensus_encode(&mut key)?;

diff --git a/src/main.rs b/src/main.rs
@@ -7,7 +7,7 @@ use {
   derive_more::{Display, FromStr},
   integer_cbrt::IntegerCubeRoot,
   integer_sqrt::IntegerSquareRoot,
-  redb::{Database, ReadOnlyTable, ReadableTable, Table},
+  redb::{Database, ReadableTable, TableDefinition},
   std::{
     cell::Cell,
     cmp::Ordering,