From 8cf6b2149f9625ce41bfb9c0bec6d64300d4a0aa Mon Sep 17 00:00:00 2001
From: Nikhil Acharya <128666399+nikhil-helius@users.noreply.github.com>
Date: Thu, 13 Jul 2023 21:28:54 +0530
Subject: [PATCH] Revert "Das: Log account publickey (#87)" (#88)

This reverts commit cfe267225aa7d83343f3f119a40be78097e51fb7.
---
 nft_ingester/src/account_updates.rs           | 12 +++++-------
 nft_ingester/src/metrics.rs                   |  9 +--------
 nft_ingester/src/transaction_notifications.rs |  1 -
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/nft_ingester/src/account_updates.rs b/nft_ingester/src/account_updates.rs
index 52f1b4f5a..fd94b4aad 100644
--- a/nft_ingester/src/account_updates.rs
+++ b/nft_ingester/src/account_updates.rs
@@ -1,7 +1,10 @@
-use std::sync::Arc;
+use std::{
+    sync::Arc,
+};
 
 use crate::{
-    metric, metrics::capture_result, program_transformers::ProgramTransformer, tasks::TaskData,
+    metric, metrics::capture_result,
+    program_transformers::ProgramTransformer, tasks::TaskData,
 };
 use cadence_macros::{is_global_default_set, statsd_count, statsd_time};
 use chrono::Utc;
@@ -88,10 +91,6 @@ async fn handle_account(manager: Arc<ProgramTransformer>, item: RecvData) -> Opt
                 "stream" => ACCOUNT_STREAM
             );
         }
-        let mut account = None;
-        if let Some(pubkey) = account_update.pubkey() {
-            account = Some(bs58::encode(pubkey.0.as_slice()).into_string());
-        }
         let begin_processing = Instant::now();
         let res = manager.handle_account_update(account_update).await;
         ret_id = capture_result(
@@ -102,7 +101,6 @@ async fn handle_account(manager: Arc<ProgramTransformer>, item: RecvData) -> Opt
             res,
             begin_processing,
             None,
-            account,
         );
     }
     ret_id
diff --git a/nft_ingester/src/metrics.rs b/nft_ingester/src/metrics.rs
index 4bd83c485..df7cf70d2 100644
--- a/nft_ingester/src/metrics.rs
+++ b/nft_ingester/src/metrics.rs
@@ -48,7 +48,6 @@ pub fn capture_result(
     res: Result<(), IngesterError>,
     proc: Instant,
     txn_sig: Option<&str>,
-    account: Option<String>,
 ) -> Option<String> {
     let mut ret_id = None;
     match res {
@@ -79,8 +78,6 @@ pub fn capture_result(
             }
             if let Some(sig) = txn_sig {
                 warn!("Error deserializing txn {}: {:?}", sig, e);
-            } else if let Some(account) = account {
-                warn!("Error deserializing account {}: {:?}", account, e);
             } else {
                 warn!("{}", e);
             }
@@ -92,8 +89,6 @@ pub fn capture_result(
             }
             if let Some(sig) = txn_sig {
                 warn!("Error parsing txn {}: {:?}", sig, e);
-            } else if let Some(account) = account {
-                warn!("Error parsing account {}: {:?}", account, e);
             } else {
                 warn!("{}", e);
             }
@@ -102,10 +97,8 @@ pub fn capture_result(
         Err(err) => {
             if let Some(sig) = txn_sig {
                 error!("Error handling update for txn {}: {:?}", sig, err);
-            } else if let Some(account) = account {
-                error!("Error handling update for account {}: {:?}", account, err);
             } else {
-                error!("Error handling update: {:?}", err);
+                error!("Error handling account update: {:?}", err);
             }
             metric! {
                 statsd_count!("ingester.ingest_update_error", 1, label.0 => &label.1, "stream" => stream, "error" => "u");
diff --git a/nft_ingester/src/transaction_notifications.rs b/nft_ingester/src/transaction_notifications.rs
index 8e5f07fb3..419d72744 100644
--- a/nft_ingester/src/transaction_notifications.rs
+++ b/nft_ingester/src/transaction_notifications.rs
@@ -101,7 +101,6 @@ async fn handle_transaction(manager: Arc<ProgramTransformer>, item: RecvData) ->
             res,
             begin,
             tx.signature(),
-            None,
         );
     }
     ret_id