From 986cdbf6d8524caf9d47f141562fe59436f3f932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20G=C3=B6rtler?= <grtlr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 10:33:44 +0200
Subject: [PATCH] feat(inx): more detailed logging of INX events (#349)

* feat(inx): more detailed logging

* Fmt
---
 .../src/stardust_inx/cone_stream.rs           |  7 +++--
 .../src/stardust_inx/ledger_update_stream.rs  | 31 +++++++------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/bin/inx-chronicle/src/stardust_inx/cone_stream.rs b/bin/inx-chronicle/src/stardust_inx/cone_stream.rs
index e7ea0be16..42dcbdb50 100644
--- a/bin/inx-chronicle/src/stardust_inx/cone_stream.rs
+++ b/bin/inx-chronicle/src/stardust_inx/cone_stream.rs
@@ -75,9 +75,10 @@ impl HandleEvent<Result<inx::proto::BlockWithMetadata, Status>> for ConeStream {
         block_metadata_result: Result<inx::proto::BlockWithMetadata, Status>,
         white_flag_index: &mut Self::State,
     ) -> Result<(), Self::Error> {
-        log::trace!("Received Stardust Block Event");
-
-        let inx_block_with_metadata: inx::BlockWithMetadata = block_metadata_result?.try_into()?;
+        log::trace!("Received Stardust block event");
+        let block_metadata = block_metadata_result?;
+        log::trace!("Block data: {:?}", block_metadata);
+        let inx_block_with_metadata: inx::BlockWithMetadata = block_metadata.try_into()?;
         let BlockWithMetadata { metadata, block, raw } = inx_block_with_metadata;
 
         self.db
diff --git a/bin/inx-chronicle/src/stardust_inx/ledger_update_stream.rs b/bin/inx-chronicle/src/stardust_inx/ledger_update_stream.rs
index 60569c6eb..146f94ef4 100644
--- a/bin/inx-chronicle/src/stardust_inx/ledger_update_stream.rs
+++ b/bin/inx-chronicle/src/stardust_inx/ledger_update_stream.rs
@@ -19,17 +19,13 @@ use super::{cone_stream::ConeStream, InxError};
 #[derive(Debug)]
 pub struct LedgerUpdateStream {
     db: MongoDb,
-    inx_client: InxClient<Channel>,
+    inx: InxClient<Channel>,
     range: RangeInclusive<MilestoneIndex>,
 }
 
 impl LedgerUpdateStream {
     pub fn new(db: MongoDb, inx: InxClient<Channel>, range: RangeInclusive<MilestoneIndex>) -> Self {
-        Self {
-            db,
-            inx_client: inx,
-            range,
-        }
+        Self { db, inx, range }
     }
 }
 
@@ -40,7 +36,7 @@ impl Actor for LedgerUpdateStream {
 
     async fn init(&mut self, cx: &mut ActorContext<Self>) -> Result<Self::State, Self::Error> {
         let ledger_update_stream = self
-            .inx_client
+            .inx
             .listen_to_ledger_updates(if *self.range.end() == u32::MAX {
                 inx::proto::MilestoneRangeRequest::from(*self.range.start()..)
             } else {
@@ -103,12 +99,13 @@ impl HandleEvent<Result<inx::proto::LedgerUpdate, Status>> for LedgerUpdateStrea
 
         self.db.insert_ledger_updates(output_updates_iter).await?;
 
-        let milestone: inx::Milestone = self
-            .inx_client
-            .read_milestone(inx::proto::MilestoneRequest::from_index(ledger_update.milestone_index))
-            .await?
-            .into_inner()
-            .try_into()?;
+        let milestone_request = inx::proto::MilestoneRequest::from_index(ledger_update.milestone_index);
+
+        let milestone_proto = self.inx.read_milestone(milestone_request.clone()).await?.into_inner();
+
+        log::trace!("Received milestone: `{:?}`", milestone_proto);
+
+        let milestone: inx::Milestone = milestone_proto.try_into()?;
 
         let milestone_index = milestone.milestone_info.milestone_index.into();
         let milestone_timestamp = milestone.milestone_info.milestone_timestamp.into();
@@ -126,12 +123,8 @@ impl HandleEvent<Result<inx::proto::LedgerUpdate, Status>> for LedgerUpdateStrea
             .insert_milestone(milestone_id, milestone_index, milestone_timestamp, payload)
             .await?;
 
-        cx.spawn_child(ConeStream::new(
-            milestone_index,
-            self.inx_client.clone(),
-            self.db.clone(),
-        ))
-        .await;
+        cx.spawn_child(ConeStream::new(milestone_index, self.inx.clone(), self.db.clone()))
+            .await;
 
         Ok(())
     }