Use frame_support::logs APIs (#1326)

* Remove doubled log in execute_block * Use logs APIs at pallet-balanced-currency-swap-bridges-initializer * Use logs APIs at pallet-humanode-session * Use logs APIs at pallet-erc20-support * Use logs APIs at pallet-bioauth * Use logs APIs at pallet-currency-swap-proxy * Remove unused dep at humanode-runtime * Use log explicitly * Improve info message at pallet-humanode-session Co-authored-by: MOZGIII <mike-n@narod.ru> --------- Co-authored-by: MOZGIII <mike-n@narod.ru>
humanode-network · Nov 7, 2024 · 5f19a8c · 5f19a8c
1 parent dc7f3eb
commit 5f19a8c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/humanode-runtime/Cargo.toml b/crates/humanode-runtime/Cargo.toml
@@ -93,7 +93,6 @@ sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 sp-staking = { workspace = true }
 sp-std = { workspace = true }
-sp-tracing = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 static_assertions = { workspace = true }
@@ -224,7 +223,6 @@ std = [
   "sp-session/std",
   "sp-staking/std",
   "sp-std/std",
-  "sp-tracing/std",
   "sp-transaction-pool/std",
   "sp-version/std",
   "substrate-wasm-builder",

diff --git a/crates/humanode-runtime/src/lib.rs b/crates/humanode-runtime/src/lib.rs
@@ -1597,14 +1597,6 @@ impl_runtime_apis! {
             signature_check: bool,
             select: frame_try_runtime::TryStateSelect
         ) -> Weight {
-            sp_tracing::info!(
-                target: "humanode-runtime",
-                "try-runtime: executing block {:?} / root checks: {:?} / signature check: {:?} / try-state-select: {:?}",
-                block.header.hash(),
-                state_root_check,
-                signature_check,
-                select,
-            );
             // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
             // have a backtrace here.
             Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()

diff --git a/crates/pallet-balanced-currency-swap-bridges-initializer/Cargo.toml b/crates/pallet-balanced-currency-swap-bridges-initializer/Cargo.toml
@@ -10,7 +10,6 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 scale-info = { workspace = true, features = ["derive"] }
 sp-std = { workspace = true }
-sp-tracing = { workspace = true }
 
 [dev-dependencies]
 pallet-pot = { path = "../pallet-pot", default-features = false }
@@ -29,7 +28,6 @@ std = [
   "scale-info/std",
   "sp-core/std",
   "sp-std/std",
-  "sp-tracing/std",
 ]
 try-runtime = [
   "frame-support/try-runtime",

diff --git a/crates/pallet-balanced-currency-swap-bridges-initializer/src/upgrade_init.rs b/crates/pallet-balanced-currency-swap-bridges-initializer/src/upgrade_init.rs
@@ -1,6 +1,6 @@
 //! Initialization of the bridge pot accounts on runtime upgrade.
 
-use frame_support::pallet_prelude::*;
+use frame_support::{log, pallet_prelude::*};
 #[cfg(feature = "try-runtime")]
 use sp_std::vec::Vec;
 
@@ -23,7 +23,7 @@ pub fn on_runtime_upgrade<T: Config>() -> Weight {
     if is_version_mismatch || is_forced {
         match Pallet::<T>::initialize() {
             Ok(w) => weight.saturating_accrue(w),
-            Err(err) => sp_tracing::error!("error during bridges initialization: {err:?}"),
+            Err(err) => log::error!("error during bridges initialization: {err:?}"),
         }
 
         <LastInitializerVersion<T>>::put(CURRENT_BRIDGES_INITIALIZER_VERSION);

diff --git a/crates/pallet-bioauth/src/lib.rs b/crates/pallet-bioauth/src/lib.rs
@@ -188,7 +188,7 @@ impl<BeforeHookData> AfterAuthHook<BeforeHookData> for () {
 #[frame_support::pallet]
 pub mod pallet {
     use codec::MaxEncodedLen;
-    use frame_support::{pallet_prelude::*, sp_tracing, storage::types::ValueQuery, BoundedVec};
+    use frame_support::{log, pallet_prelude::*, storage::types::ValueQuery, BoundedVec};
     use frame_system::pallet_prelude::*;
     use sp_runtime::{
         app_crypto::MaybeHash,
@@ -625,7 +625,7 @@ pub mod pallet {
 
             let auth_ticket =
                 Self::extract_auth_ticket_checked(transaction.clone()).map_err(|error| {
-                    sp_tracing::error!(message = "Auth Ticket could not be extracted", ?error);
+                    log::error!("Auth Ticket could not be extracted: {error:?}");
                     // Use bad proof error code, as the extraction.
                     TransactionValidityError::Invalid(match error {
                         AuthTicketExtractionError::UnableToValidateSignature
@@ -647,7 +647,7 @@ pub mod pallet {
                 &auth_ticket,
             )
             .map_err(|err| {
-                sp_tracing::error!(message = "Authentication attemption failed", error = ?err);
+                log::error!("Authentication attemption failed: {err:?}");
 
                 TransactionValidityError::Invalid(match err {
                     AuthenticationAttemptValidationError::NonceConflict => {

diff --git a/crates/pallet-erc20-support/src/migrations/v1.rs b/crates/pallet-erc20-support/src/migrations/v1.rs
@@ -1,6 +1,6 @@
 //! Migration to Version 1.
 
-use frame_support::{sp_tracing::info, traits::Get, weights::Weight};
+use frame_support::{log::info, traits::Get, weights::Weight};
 
 use crate::BalanceOf;
 use crate::{Approvals, Config};

diff --git a/crates/pallet-humanode-session/src/migrations/v1.rs b/crates/pallet-humanode-session/src/migrations/v1.rs
@@ -2,7 +2,7 @@
 
 use frame_support::pallet_prelude::*;
 use frame_support::storage_alias;
-use frame_support::{dispatch::GetStorageVersion, sp_tracing::info, traits::Get, weights::Weight};
+use frame_support::{dispatch::GetStorageVersion, log::info, traits::Get, weights::Weight};
 #[cfg(feature = "try-runtime")]
 use sp_std::{vec, vec::Vec};
 
@@ -27,10 +27,10 @@ pub fn migrate<T: Config>() -> Weight {
     // Read the onchain version.
     let mut weight: Weight = T::DbWeight::get().reads(1);
 
-    info!(message = "Running migration to v1", from = ?onchain);
+    info!("Running migration to v1 from {onchain:?}");
 
     if onchain == 1 {
-        info!(message = "Already at version 1, nothing to do");
+        info!("Already at version 1, nothing to do");
         return weight;
     }
 

diff --git a/crates/primitives-currency-swap-proxy/src/lib.rs b/crates/primitives-currency-swap-proxy/src/lib.rs
@@ -62,10 +62,7 @@ where
                 incoming_imbalance,
             }) => {
                 let error: frame_support::sp_runtime::DispatchError = error.into();
-                frame_support::sp_tracing::error!(
-                    message = "unable to route the funds through the swap",
-                    ?error
-                );
+                frame_support::log::error!("unable to route the funds through the swap: {error:?}");
                 Fallback::on_unbalanceds(sp_std::iter::once(incoming_imbalance));
                 return;
             }