reduce duplication with to_relative_inscription

ordinals · Feb 16, 2025 · 02ad572 · 02ad572
1 parent 34099ad
commit 02ad572
Showing 1 changed file with 26 additions and 48 deletions.
diff --git a/src/subcommand/server/r.rs b/src/subcommand/server/r.rs
@@ -175,31 +175,8 @@ pub(super) async fn children_inscriptions_paginated(
 
     let children = ids
       .into_iter()
-      .map(|inscription_id| {
-        let entry = index
-          .get_inscription_entry(inscription_id)
-          .unwrap()
-          .unwrap();
-
-        let satpoint = index
-          .get_inscription_satpoint_by_id(inscription_id)
-          .ok()
-          .flatten()
-          .unwrap();
-
-        api::RelativeInscriptionRecursive {
-          charms: Charm::charms(entry.charms),
-          fee: entry.fee,
-          height: entry.height,
-          id: inscription_id,
-          number: entry.inscription_number,
-          output: satpoint.outpoint,
-          sat: entry.sat,
-          satpoint,
-          timestamp: timestamp(entry.timestamp.into()).timestamp(),
-        }
-      })
-      .collect();
+      .map(|inscription_id| to_relative_inscription(&index, inscription_id))
+      .collect::<Result<Vec<_>, _>>()?;
 
     Ok(
       Json(api::ChildInscriptions {
@@ -450,29 +427,7 @@ pub async fn parent_inscriptions_paginated(
 
     let parents = ids
       .into_iter()
-      .map(
-        |inscription_id| -> ServerResult<api::RelativeInscriptionRecursive> {
-          let entry = index
-            .get_inscription_entry(inscription_id)?
-            .ok_or_not_found(|| format!("inscription {inscription_id}"))?;
-
-          let satpoint = index
-            .get_inscription_satpoint_by_id(inscription_id)?
-            .ok_or_not_found(|| format!("satpoint for inscription {inscription_id}"))?;
-
-          Ok(api::RelativeInscriptionRecursive {
-            charms: Charm::charms(entry.charms),
-            fee: entry.fee,
-            height: entry.height,
-            id: inscription_id,
-            number: entry.inscription_number,
-            output: satpoint.outpoint,
-            sat: entry.sat,
-            satpoint,
-            timestamp: timestamp(entry.timestamp.into()).timestamp(),
-          })
-        },
-      )
+      .map(|inscription_id| to_relative_inscription(&index, inscription_id))
       .collect::<Result<Vec<_>, _>>()?;
 
     Ok(
@@ -577,6 +532,29 @@ pub(super) async fn sat_at_index_content(
   .await
 }
 
+fn to_relative_inscription(
+  index: &Index,
+  inscription_id: InscriptionId,
+) -> ServerResult<api::RelativeInscriptionRecursive> {
+  let entry = index
+    .get_inscription_entry(inscription_id)?
+    .ok_or_not_found(|| format!("inscription {inscription_id}"))?;
+  let satpoint = index
+    .get_inscription_satpoint_by_id(inscription_id)?
+    .ok_or_not_found(|| format!("satpoint for inscription {inscription_id}"))?;
+  Ok(api::RelativeInscriptionRecursive {
+    charms: Charm::charms(entry.charms),
+    fee: entry.fee,
+    height: entry.height,
+    id: inscription_id,
+    number: entry.inscription_number,
+    output: satpoint.outpoint,
+    sat: entry.sat,
+    satpoint,
+    timestamp: timestamp(entry.timestamp.into()).timestamp(),
+  })
+}
+
 pub(super) async fn tx(
   Extension(index): Extension<Arc<Index>>,
   Path(txid): Path<Txid>,