diff --git a/Cargo.lock b/Cargo.lock index ad29c0c..d05c54f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -436,27 +436,12 @@ dependencies = [ "serde", ] -[[package]] -name = "bitcoin-private" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" - [[package]] name = "bitcoin_hashes" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" -[[package]] -name = "bitcoin_hashes" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" -dependencies = [ - "bitcoin-private", -] - [[package]] name = "bitcoin_hashes" version = "0.13.0" @@ -2462,7 +2447,6 @@ dependencies = [ "env_logger 0.10.2", "hex", "image", - "log", "nostrdb", "poll-promise", "puffin", @@ -3404,7 +3388,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "bitcoin_hashes 0.12.0", + "bitcoin_hashes 0.13.0", "rand", "secp256k1-sys", "serde", diff --git a/Cargo.toml b/Cargo.toml index 97f2900..7a8988c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,6 @@ ehttp = "0.2.0" egui-tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "ed97a57fc66b3781bc10ab644f9e1ed125d7377a" } reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] } image = { version = "0.24", features = ["jpeg", "png", "webp"] } -log = "0.4.17" poll-promise = { version = "0.3.0", features = ["tokio"] } serde_derive = "1" serde = { version = "1", features = ["derive"] } # You only need this if you want app persistence @@ -41,6 +40,7 @@ strum = "0.26" strum_macros = "0.26" bitflags = "2.5.0" egui_virtual_list = "0.3.0" +#egui_virtual_list = { path = "/home/jb55/dev/github/lucasmerlin/hello_egui/crates/egui_virtual_list" } [features] diff --git a/enostr/src/relay/message.rs b/enostr/src/relay/message.rs index 4020e43..3594539 100644 --- a/enostr/src/relay/message.rs +++ b/enostr/src/relay/message.rs @@ -161,7 +161,7 @@ mod tests { #[test] fn test_handle_valid_event() -> Result<()> { - use log::debug; + use tracing::debug; env_logger::init(); let valid_event_msg = r#"["EVENT", "random_string", {"id":"70b10f70c1318967eddf12527799411b1a9780ad9c43858f5e5fcd45486a13a5","pubkey":"379e863e8357163b5bce5d2688dc4f1dcc2d505222fb8d74db600f30535dfdfe","created_at":1612809991,"kind":1,"tags":[],"content":"test","sig":"273a9cd5d11455590f4359500bccb7a89428262b96b3ea87a756b770964472f8c3e87f5d5e64d8d2e859a71462a3f477b554565c4f2f326cb01dd7620db71502"}]"#; diff --git a/enostr/src/relay/mod.rs b/enostr/src/relay/mod.rs index 5d4f08e..6440bea 100644 --- a/enostr/src/relay/mod.rs +++ b/enostr/src/relay/mod.rs @@ -1,9 +1,9 @@ use ewebsock::{WsMessage, WsReceiver, WsSender}; use crate::{ClientMessage, Filter, Result}; -use log::info; use std::fmt; use std::hash::{Hash, Hasher}; +use tracing::info; pub mod message; pub mod pool; diff --git a/src/timeline.rs b/src/timeline.rs index 459f3c3..f0cbc3f 100644 --- a/src/timeline.rs +++ b/src/timeline.rs @@ -8,7 +8,7 @@ use nostrdb::{NoteKey, Subscription, Transaction}; use std::cmp::Ordering; use std::sync::{Arc, Mutex}; -use log::warn; +use tracing::warn; #[derive(Debug, Eq, PartialEq, Copy, Clone)] pub struct NoteRef {