fixups

LayerTwo-Labs · Jan 2, 2025 · c7241e5 · c7241e5
1 parent 1b4c3e0
commit c7241e5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/app/app.rs b/app/app.rs
@@ -1,6 +1,9 @@
-use std::{collections::HashMap, net::SocketAddr, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    net::SocketAddr,
+    sync::Arc,
+};
 
-use eframe::egui::ahash::HashSet;
 use futures::{StreamExt, TryFutureExt, TryStreamExt as _};
 use parking_lot::RwLock;
 use rustreexo::accumulator::proof::Proof;

diff --git a/app/main.rs b/app/main.rs
@@ -104,6 +104,7 @@ fn main() -> anyhow::Result<()> {
             });
         });
     if config.headless {
+        drop(line_buffer);
         let _app = app?;
         // wait for ctrlc signal
         let (tx, rx) = mpsc::channel();

diff --git a/lib/lib.rs b/lib/lib.rs
@@ -20,5 +20,3 @@ pub use heed;
 pub fn format_deposit_address(dest: types::Address) -> String {
     format!("s{}_{}", types::THIS_SIDECHAIN, dest.to_base58ck())
 }
-
-// TODO: Add error log.
diff --git a/lib/state.rs b/lib/state.rs
@@ -48,8 +48,8 @@ struct RollBack<T>(NonEmpty<HeightStamped<T>>);
 
 impl<T> RollBack<T> {
     fn new(value: T, height: u32) -> Self {
-        let txid_stamped = HeightStamped { value, height };
-        Self(nonempty![txid_stamped])
+        let height_stamped = HeightStamped { value, height };
+        Self(nonempty![height_stamped])
     }
 
     /// Pop the most recent value
@@ -713,21 +713,20 @@ impl State {
             if let Some(bundle) =
                 self.collect_withdrawal_bundle(rwtxn, block_height)?
             {
+                let m6id = bundle.compute_m6id();
                 for (outpoint, spend_output) in bundle.spend_utxos() {
                     let utxo_hash = hash(&PointedOutput {
                         outpoint: *outpoint,
                         output: spend_output.clone(),
                     });
                     accumulator_del.insert(utxo_hash.into());
                     self.utxos.delete(rwtxn, outpoint)?;
-                    let m6id = bundle.compute_m6id();
                     let spent_output = SpentOutput {
                         output: spend_output.clone(),
                         inpoint: InPoint::Withdrawal { m6id },
                     };
                     self.stxos.put(rwtxn, outpoint, &spent_output)?;
                 }
-                let m6id = bundle.compute_m6id();
                 self.pending_withdrawal_bundle.put(
                     rwtxn,
                     &UnitKey,