From 702c4c123e18fec01ce583caf99b11097360db70 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Mon, 26 Jun 2023 21:13:02 -0400
Subject: [PATCH] remove unnecessary option wrapper from gbt return value

---
 backend/rust-gbt/src/gbt.rs | 6 +++---
 backend/rust-gbt/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/rust-gbt/src/gbt.rs b/backend/rust-gbt/src/gbt.rs
index 68a54fcec..896b1681b 100644
--- a/backend/rust-gbt/src/gbt.rs
+++ b/backend/rust-gbt/src/gbt.rs
@@ -55,7 +55,7 @@ impl Ord for TxPriority {
 // TODO: Make gbt smaller to fix these lints.
 #[allow(clippy::too_many_lines)]
 #[allow(clippy::cognitive_complexity)]
-pub fn gbt(mempool: &mut ThreadTransactionsMap) -> Option<GbtResult> {
+pub fn gbt(mempool: &mut ThreadTransactionsMap) -> GbtResult {
     let mut audit_pool: AuditPool = u32hashmap_with_capacity(STARTING_CAPACITY);
     let mut mempool_stack: Vec<u32> = Vec::with_capacity(STARTING_CAPACITY);
     let mut clusters: Vec<Vec<u32>> = Vec::new();
@@ -207,11 +207,11 @@ pub fn gbt(mempool: &mut ThreadTransactionsMap) -> Option<GbtResult> {
         }
     }
 
-    Some(GbtResult {
+    GbtResult {
         blocks,
         clusters,
         rates,
-    })
+    }
 }
 
 fn next_valid_from_stack<'a>(mempool_stack: &mut Vec<u32>, audit_pool: &'a AuditPool) -> Option<&'a AuditTransaction> {
diff --git a/backend/rust-gbt/src/lib.rs b/backend/rust-gbt/src/lib.rs
index 31b93d154..f70ea989f 100644
--- a/backend/rust-gbt/src/lib.rs
+++ b/backend/rust-gbt/src/lib.rs
@@ -110,7 +110,7 @@ where
             .lock()
             .map_err(|_| napi::Error::from_reason("THREAD_TRANSACTIONS Mutex poisoned"))?;
         callback(&mut map);
-        gbt::gbt(&mut map).ok_or_else(|| napi::Error::from_reason("gbt failed"))
+        Ok(gbt::gbt(&mut map))
     });
 
     handle