Add async-trait to workspace

rust-nostr · Oct 27, 2023 · 9d4e4e9 · 9d4e4e9
1 parent bff4404
commit 9d4e4e9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,7 @@ license = "MIT"
 rust-version = "1.64.0"
 
 [workspace.dependencies]
+async-trait = "0.1"
 nostr = { version = "0.24", path = "./crates/nostr", default-features = false }
 once_cell = "1.18"
 thiserror = "1.0"

diff --git a/crates/nostr-sdk-db/Cargo.toml b/crates/nostr-sdk-db/Cargo.toml
@@ -12,7 +12,7 @@ rust-version.workspace = true
 keywords = ["nostr", "sdk", "db"]
 
 [dependencies]
-async-trait = "0.1"
+async-trait = { workspace = true }
 nostr = { workspace = true, features = ["std"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }

diff --git a/crates/nostr-sdk-db/src/lib.rs b/crates/nostr-sdk-db/src/lib.rs
@@ -9,7 +9,7 @@
 
 use std::collections::HashSet;
 
-use async_trait::async_trait;
+pub use async_trait::async_trait;
 use nostr::{Event, EventId, Filter, Timestamp, Url};
 
 mod error;

diff --git a/crates/nostr-sdk-rocksdb/Cargo.toml b/crates/nostr-sdk-rocksdb/Cargo.toml
@@ -12,6 +12,7 @@ rust-version.workspace = true
 keywords = ["nostr", "sdk", "db", "redb"]
 
 [dependencies]
+async-trait = { workspace = true }
 nostr = { workspace = true, features = ["std"] }
 nostr-sdk-db = { version = "0.1", path = "../nostr-sdk-db" }
 nostr-sdk-fbs = { version = "0.1", path = "../nostr-sdk-fbs" }

diff --git a/crates/nostr-sdk-rocksdb/examples/rocksdb.rs b/crates/nostr-sdk-rocksdb/examples/rocksdb.rs
@@ -1,7 +1,7 @@
 // Copyright (c) 2022-2023 Yuki Kishimoto
 // Distributed under the MIT software license
 
-use std::time::{Duration, Instant};
+// use std::time::{Duration, Instant};
 
 use nostr::prelude::*;
 use nostr_sdk_db::NostrDatabase;

diff --git a/crates/nostr-sdk-rocksdb/src/lib.rs b/crates/nostr-sdk-rocksdb/src/lib.rs
@@ -5,9 +5,9 @@ use std::collections::HashSet;
 use std::path::Path;
 use std::sync::Arc;
 
-use nostr::FiltersMatchEvent;
-use nostr_sdk_db::nostr::{Event, EventId, Filter, Timestamp, Url};
-use nostr_sdk_db::{async_trait, Backend, DatabaseError, DatabaseOptions, NostrDatabase};
+use async_trait::async_trait;
+use nostr::{Event, EventId, Filter, Timestamp, Url};
+use nostr_sdk_db::{Backend, DatabaseError, DatabaseOptions, NostrDatabase};
 use nostr_sdk_fbs::{FlatBufferBuilder, FlatBufferUtils};
 use rocksdb::{
     BoundColumnFamily, ColumnFamilyDescriptor, DBCompactionStyle, DBCompressionType,