added suggested error handling & rebase

ordinals · Feb 14, 2025 · a14e246 · a14e246
1 parent a242887
commit a14e246
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/docs/src/guides/api.md b/docs/src/guides/api.md
@@ -5129,8 +5129,4 @@ curl -s -H "Accept: application/json" \
 
 See [Recursion](../inscriptions/recursion.md) for an explanation of these.
 
-<<<<<<< HEAD
-{{#include ../inscriptions/recursion.md:35:3483}}
-=======
 {{#include ../inscriptions/recursion.md:35:925}}
->>>>>>> 57a17c76 (Amend)
diff --git a/src/api.rs b/src/api.rs
@@ -138,6 +138,19 @@ pub struct InscriptionRecursive {
   pub address: Option<String>,
 }
 
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct ChildInscriptionRecursive {
+  pub charms: Vec<Charm>,
+  pub fee: u64,
+  pub height: u32,
+  pub id: InscriptionId,
+  pub number: i32,
+  pub output: OutPoint,
+  pub sat: Option<ordinals::Sat>,
+  pub satpoint: SatPoint,
+  pub timestamp: i64,
+}
+
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct RelativeInscriptionRecursive {
   pub charms: Vec<Charm>,

diff --git a/src/subcommand/server/r.rs b/src/subcommand/server/r.rs
@@ -187,7 +187,7 @@ pub(super) async fn children_inscriptions_paginated(
           .flatten()
           .unwrap();
 
-        api::ChildInscriptionRecursive {
+        api::RelativeInscriptionRecursive {
           charms: Charm::charms(entry.charms),
           fee: entry.fee,
           height: entry.height,
@@ -451,7 +451,7 @@ pub async fn parent_inscriptions_recursive_paginated(
     let parents = ids
       .into_iter()
       .map(
-        |inscription_id| -> ServerResult<api::ChildInscriptionRecursive> {
+        |inscription_id| -> ServerResult<api::RelativeInscriptionRecursive> {
           let entry = index
             .get_inscription_entry(inscription_id)?
             .ok_or_not_found(|| format!("inscription {inscription_id}"))?;
@@ -460,7 +460,7 @@ pub async fn parent_inscriptions_recursive_paginated(
             .get_inscription_satpoint_by_id(inscription_id)?
             .ok_or_not_found(|| format!("satpoint for inscription {inscription_id}"))?;
 
-          Ok(api::ChildInscriptionRecursive {
+          Ok(api::RelativeInscriptionRecursive {
             charms: Charm::charms(entry.charms),
             fee: entry.fee,
             height: entry.height,