Skip to content

Commit dec99dc

Browse files
kantaikantai
committed
refactor: use log macros without importing from slog
1 parent ba81886 commit dec99dc

23 files changed

+6
-33
lines changed

‎pox-locking/src/events.rs

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ use clarity::vm::errors::Error as ClarityError;
2121
use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier, ResponseData, TupleData};
2222
use clarity::vm::Value;
2323
#[cfg(any(test, feature = "testing"))]
24-
use slog::slog_debug;
25-
use slog::slog_error;
26-
#[cfg(any(test, feature = "testing"))]
2724
use stacks_common::debug;
2825
use stacks_common::types::StacksEpochId;
2926
use stacks_common::{error, test_debug};

‎pox-locking/src/events_24.rs

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ use clarity::vm::errors::Error as ClarityError;
2020
use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier, TupleData};
2121
use clarity::vm::Value;
2222
#[cfg(any(test, feature = "testing"))]
23-
use slog::slog_debug;
24-
use slog::slog_error;
25-
#[cfg(any(test, feature = "testing"))]
2623
use stacks_common::debug;
2724
use stacks_common::{error, test_debug};
2825

‎pox-locking/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use clarity::vm::contexts::GlobalContext;
3030
use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
3131
use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
3232
use clarity::vm::Value;
33-
use slog::slog_warn;
3433
use stacks_common::types::StacksEpochId;
3534
use stacks_common::warn;
3635

‎pox-locking/src/pox_1.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
2323
use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
2424
use clarity::vm::types::PrincipalData;
2525
use clarity::vm::Value;
26-
use slog::slog_debug;
2726
use stacks_common::debug;
2827

2928
use crate::LockingError;

‎pox-locking/src/pox_2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
2323
use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
2424
use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
2525
use clarity::vm::{Environment, Value};
26-
use slog::{slog_debug, slog_error};
2726
use stacks_common::{debug, error};
2827

2928
use crate::events::synthesize_pox_event_info;

‎pox-locking/src/pox_3.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
2323
use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
2424
use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
2525
use clarity::vm::{Environment, Value};
26-
use slog::{slog_debug, slog_error};
2726
use stacks_common::{debug, error};
2827

2928
use crate::events::synthesize_pox_event_info;

‎pox-locking/src/pox_4.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use clarity::vm::errors::{Error as ClarityError, RuntimeErrorType};
2323
use clarity::vm::events::{STXEventType, STXLockEventData, StacksTransactionEvent};
2424
use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
2525
use clarity::vm::{Environment, Value};
26-
use slog::{slog_debug, slog_error};
2726
use stacks_common::{debug, error};
2827

2928
use crate::events::synthesize_pox_event_info;

‎stacks-common/src/util/log.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ macro_rules! trace {
268268
($($arg:tt)*) => ({
269269
let cur_level = $crate::util::log::get_loglevel();
270270
if slog::Level::Trace.is_at_least(cur_level) {
271-
slog_trace!($crate::util::log::LOGGER, $($arg)*)
271+
slog::slog_trace!($crate::util::log::LOGGER, $($arg)*)
272272
}
273273
})
274274
}
@@ -278,7 +278,7 @@ macro_rules! error {
278278
($($arg:tt)*) => ({
279279
let cur_level = $crate::util::log::get_loglevel();
280280
if slog::Level::Error.is_at_least(cur_level) {
281-
slog_error!($crate::util::log::LOGGER, $($arg)*)
281+
slog::slog_error!($crate::util::log::LOGGER, $($arg)*)
282282
}
283283
})
284284
}
@@ -288,7 +288,7 @@ macro_rules! warn {
288288
($($arg:tt)*) => ({
289289
let cur_level = $crate::util::log::get_loglevel();
290290
if slog::Level::Warning.is_at_least(cur_level) {
291-
slog_warn!($crate::util::log::LOGGER, $($arg)*)
291+
slog::slog_warn!($crate::util::log::LOGGER, $($arg)*)
292292
}
293293
})
294294
}
@@ -298,7 +298,7 @@ macro_rules! info {
298298
($($arg:tt)*) => ({
299299
let cur_level = $crate::util::log::get_loglevel();
300300
if slog::Level::Info.is_at_least(cur_level) {
301-
slog_info!($crate::util::log::LOGGER, $($arg)*)
301+
slog::slog_info!($crate::util::log::LOGGER, $($arg)*)
302302
}
303303
})
304304
}
@@ -308,7 +308,7 @@ macro_rules! debug {
308308
($($arg:tt)*) => ({
309309
let cur_level = $crate::util::log::get_loglevel();
310310
if slog::Level::Debug.is_at_least(cur_level) {
311-
slog_debug!($crate::util::log::LOGGER, $($arg)*)
311+
slog::slog_debug!($crate::util::log::LOGGER, $($arg)*)
312312
}
313313
})
314314
}
@@ -318,7 +318,7 @@ macro_rules! fatal {
318318
($($arg:tt)*) => ({
319319
let cur_level = $crate::util::log::get_loglevel();
320320
if slog::Level::Critical.is_at_least(cur_level) {
321-
slog_crit!($crate::util::log::LOGGER, $($arg)*)
321+
slog::slog_crit!($crate::util::log::LOGGER, $($arg)*)
322322
}
323323
})
324324
}

‎stacks-signer/src/chainstate.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use blockstack_lib::chainstate::stacks::TenureChangePayload;
2020
use blockstack_lib::net::api::getsortition::SortitionInfo;
2121
use blockstack_lib::util_lib::db::Error as DBError;
2222
use libsigner::v0::messages::RejectReason;
23-
use slog::{slog_info, slog_warn};
2423
use stacks_common::types::chainstate::{BurnchainHeaderHash, ConsensusHash, StacksPublicKey};
2524
use stacks_common::util::get_epoch_time_secs;
2625
use stacks_common::util::hash::Hash160;

‎stacks-signer/src/client/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use clarity::vm::errors::Error as ClarityError;
2525
use clarity::vm::types::serialization::SerializationError;
2626
use libsigner::RPCError;
2727
use libstackerdb::Error as StackerDBError;
28-
use slog::slog_debug;
2928
pub use stackerdb::*;
3029
pub use stacks_client::*;
3130
use stacks_common::codec::Error as CodecError;

‎stacks-signer/src/client/stackerdb.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use clarity::codec::read_next;
1919
use hashbrown::HashMap;
2020
use libsigner::{MessageSlotID, SignerMessage, SignerSession, StackerDBSession};
2121
use libstackerdb::{StackerDBChunkAckData, StackerDBChunkData};
22-
use slog::{slog_debug, slog_info, slog_warn};
2322
use stacks_common::types::chainstate::StacksPrivateKey;
2423
use stacks_common::util::hash::to_hex;
2524
use stacks_common::{debug, info, warn};

‎stacks-signer/src/client/stacks_client.rs

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use libsigner::v0::messages::PeerInfo;
4343
use reqwest::header::AUTHORIZATION;
4444
use serde::Deserialize;
4545
use serde_json::json;
46-
use slog::{slog_debug, slog_warn};
4746
use stacks_common::codec::StacksMessageCodec;
4847
use stacks_common::consts::CHAIN_ID_MAINNET;
4948
use stacks_common::types::chainstate::{

‎stacks-signer/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ use chainstate::SortitionsView;
5252
use config::GlobalConfig;
5353
use libsigner::{SignerEvent, SignerEventReceiver, SignerEventTrait, VERSION_STRING};
5454
use runloop::SignerResult;
55-
use slog::{slog_info, slog_warn};
5655
use stacks_common::{info, warn};
5756

5857
use crate::client::StacksClient;

‎stacks-signer/src/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use clarity::types::chainstate::StacksPublicKey;
3434
use clarity::util::sleep_ms;
3535
use libsigner::{SignerSession, VERSION_STRING};
3636
use libstackerdb::StackerDBChunkData;
37-
use slog::{slog_debug, slog_error};
3837
use stacks_common::util::hash::to_hex;
3938
use stacks_common::util::secp256k1::MessageSignature;
4039
use stacks_common::{debug, error};

‎stacks-signer/src/monitor_signers.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use clarity::types::StacksEpochId;
2121
use clarity::util::sleep_ms;
2222
use libsigner::v0::messages::{MessageSlotID, SignerMessage};
2323
use libsigner::SignerSession;
24-
use slog::{slog_info, slog_warn};
2524
use stacks_common::{info, warn};
2625

2726
use crate::cli::MonitorSignersArgs;

‎stacks-signer/src/monitoring/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ mod server;
2525
pub mod actions {
2626
use ::prometheus::HistogramTimer;
2727
use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
28-
use slog::slog_error;
2928
use stacks_common::error;
3029

3130
use crate::config::GlobalConfig;
@@ -121,7 +120,6 @@ pub mod actions {
121120
#[cfg(not(feature = "monitoring_prom"))]
122121
pub mod actions {
123122
use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
124-
use slog::slog_info;
125123
use stacks_common::info;
126124

127125
use crate::GlobalConfig;

‎stacks-signer/src/monitoring/server.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use std::time::Instant;
2020
use clarity::util::hash::to_hex;
2121
use clarity::util::secp256k1::Secp256k1PublicKey;
2222
use libsigner::VERSION_STRING;
23-
use slog::{slog_debug, slog_error, slog_info, slog_warn};
2423
use stacks_common::{debug, error, info, warn};
2524
use tiny_http::{Response as HttpResponse, Server as HttpServer};
2625

‎stacks-signer/src/runloop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use std::time::Duration;
2020
use clarity::codec::StacksMessageCodec;
2121
use hashbrown::HashMap;
2222
use libsigner::{SignerEntries, SignerEvent, SignerRunLoop};
23-
use slog::{slog_debug, slog_error, slog_info, slog_warn};
2423
use stacks_common::{debug, error, info, warn};
2524

2625
use crate::chainstate::SortitionsView;

‎stacks-signer/src/signerdb.rs

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use rusqlite::{
3535
params, Connection, Error as SqliteError, OpenFlags, OptionalExtension, Transaction,
3636
};
3737
use serde::{Deserialize, Serialize};
38-
use slog::{slog_debug, slog_error};
3938
use stacks_common::codec::{read_next, write_next, Error as CodecError, StacksMessageCodec};
4039
use stacks_common::types::chainstate::ConsensusHash;
4140
use stacks_common::util::get_epoch_time_secs;

‎stacks-signer/src/tests/chainstate.rs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use clarity::types::chainstate::{BurnchainHeaderHash, SortitionId};
3131
use clarity::util::vrf::VRFProof;
3232
use libsigner::v0::messages::RejectReason;
3333
use libsigner::{BlockProposal, BlockProposalData};
34-
use slog::slog_info;
3534
use stacks_common::bitvec::BitVec;
3635
use stacks_common::consts::CHAIN_ID_TESTNET;
3736
use stacks_common::info;

‎stacks-signer/src/v0/signer.rs

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ use libsigner::v0::messages::{
4040
RejectReason, RejectReasonPrefix, SignerMessage,
4141
};
4242
use libsigner::{BlockProposal, SignerEvent};
43-
use slog::{slog_debug, slog_error, slog_info, slog_warn};
4443
use stacks_common::types::chainstate::StacksAddress;
4544
use stacks_common::util::get_epoch_time_secs;
4645
use stacks_common::util::secp256k1::MessageSignature;

‎stacks-signer/src/v0/tests.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use std::sync::LazyLock;
1818
use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
1919
use libsigner::v0::messages::{BlockResponse, RejectReason};
2020
use libsigner::BlockProposal;
21-
use slog::{slog_info, slog_warn};
2221
use stacks_common::types::chainstate::StacksPublicKey;
2322
use stacks_common::util::get_epoch_time_secs;
2423
use stacks_common::util::tests::TestFlag;

‎stackslib/src/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#[macro_use]
2323
extern crate stacks_common;
2424

25-
#[macro_use(slog_debug, slog_info, slog_warn)]
2625
extern crate slog;
2726

2827
#[cfg(not(any(target_os = "macos", target_os = "windows", target_arch = "arm")))]

0 commit comments

Comments
 (0)