Apply suggestions for trace messages and help for the -trace option

nuttycom · Sep 22, 2023 · 6ad21fb · 6ad21fb
1 parent 08a1652
commit 6ad21fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -456,7 +456,8 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " +
         _("If <category> is not supplied or if <category> = 1, output all debugging information.") + " " + _("<category> can be:") + " " + debugCategories + ". " +
         _("For multiple specific categories use -debug=<category> multiple times."));
-    strUsage += HelpMessageOpt("-trace=<category>", _("Output trace-level logging information for a specific category. For multiple categories use -trace=<category> multiple times."));
+    strUsage += HelpMessageOpt("-trace=<category>", _("Output trace-level logging information for a specific category. For multiple categories use -trace=<category> multiple times. "
+        "The trace-level log output should be assumed to reveal private information."));
     strUsage += HelpMessageOpt("-experimentalfeatures", _("Enable use of experimental features"));
     if (showDebug)
         strUsage += HelpMessageOpt("-nodebug", "Turn off debugging messages, same as -debug=0");

diff --git a/src/rust/src/wallet.rs b/src/rust/src/wallet.rs
@@ -713,13 +713,13 @@ impl Wallet {
         outpoint: OutPoint,
         checkpoint_depth: usize,
     ) -> Result<OrchardSpendInfo, SpendRetrievalError> {
-        tracing::trace!("Searching for spend information for note at {:?}", outpoint);
+        tracing::trace!("Searching for spend information for Orchard note at {:?}", outpoint);
         let dnote = self
             .wallet_received_notes
             .get(&outpoint.txid)
             .and_then(|tx_notes| tx_notes.decrypted_notes.get(&outpoint.action_idx))
             .ok_or(SpendRetrievalError::DecryptedNoteNotFound(outpoint))?;
-        tracing::trace!("Wallet has decrypted note for outpoint: {:?}", outpoint);
+        tracing::trace!("Wallet has decrypted Orchard note for outpoint: {:?}", outpoint);
 
         let fvk = self
             .key_store
@@ -731,7 +731,7 @@ impl Wallet {
                     .get(ivk)
                     .ok_or_else(|| SpendRetrievalError::FvkNotFound(ivk.clone()))
             })?;
-        tracing::trace!("Wallet has FVK for note at {:?}", outpoint);
+        tracing::trace!("Wallet has FVK for Orchard note at {:?}", outpoint);
 
         let position = self
             .wallet_note_positions
@@ -1413,7 +1413,7 @@ pub extern "C" fn orchard_wallet_unspent_notes_are_spendable(wallet: *const Wall
         .all(|(outpoint, _)| match wallet.get_spend_info(*outpoint, 0) {
             Err(spend_info_error) => {
                 tracing::warn!(
-                    "Encountered an error retrieving spend information for unspent note {:?}: {:?}",
+                    "Encountered an error retrieving spend information for unspent Orchard note {:?}: {:?}",
                     outpoint,
                     spend_info_error
                 );