database: remove Order enum

* Remove `order` arg from `NostrDatabase::query`

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -130,9 +130,12 @@
 * database: remove `NostrDatabase::bulk_import` ([Yuki Kishimoto])
 * database: remove `DatabaseError::NotFound` variant ([Yuki Kishimoto])
 * database: remove `DatabaseError::Nostr` variant ([Yuki Kishimoto])
+* database: remove `Order` enum ([Yuki Kishimoto])
+* database: remove `order` arg from `NostrDatabase::query` ([Yuki Kishimoto])
 * pool: remove high latency log ([Yuki Kishimoto])
 * zapper: remove `Err` from `NostrZapper` and unnecessary variants from `ZapperError` ([Yuki Kishimoto])
 * js(nostr): remove `Keys::vanity` ([Yuki Kishimoto])
+* cli: remove `reverse` flag from `query` command
 
 ## [v0.34.0]
 

bindings/nostr-sdk-ffi/src/database/custom.rs

@@ -95,7 +95,7 @@ mod inner {
     use std::ops::Deref;
     use std::sync::Arc;
 
-    use nostr_sdk::database::{DatabaseError, NostrDatabase, Order};
+    use nostr_sdk::database::{DatabaseError, NostrDatabase};
     use nostr_sdk::prelude::*;
 
     use super::IntermediateCustomNostrDatabase;
@@ -182,11 +182,7 @@ mod inner {
             Ok(res as usize)
         }
 
-        async fn query(
-            &self,
-            filters: Vec<Filter>,
-            _order: Order,
-        ) -> Result<Vec<Event>, DatabaseError> {
+        async fn query(&self, filters: Vec<Filter>) -> Result<Vec<Event>, DatabaseError> {
             let filters = filters.into_iter().map(|f| Arc::new(f.into())).collect();
             let res = self
                 .inner

bindings/nostr-sdk-ffi/src/database/mod.rs

@@ -6,7 +6,7 @@ use std::ops::Deref;
 use std::sync::Arc;
 
 use nostr_ffi::{Event, EventId, Filter, PublicKey};
-use nostr_sdk::database::{DynNostrDatabase, IntoNostrDatabase, NostrDatabaseExt, Order};
+use nostr_sdk::database::{DynNostrDatabase, IntoNostrDatabase, NostrDatabaseExt};
 #[cfg(feature = "ndb")]
 use nostr_sdk::NdbDatabase;
 #[cfg(feature = "lmdb")]
@@ -143,7 +143,7 @@ impl NostrDatabase {
             .collect();
         Ok(self
             .inner
-            .query(filters, Order::Desc)
+            .query(filters)
             .await?
             .into_iter()
             .map(|e| Arc::new(e.into()))

bindings/nostr-sdk-js/src/database.rs

@@ -11,7 +11,7 @@ use nostr_js::event::{JsEvent, JsEventArray, JsEventId};
 use nostr_js::key::JsPublicKey;
 use nostr_js::types::JsFilter;
 use nostr_js::JsStringArray;
-use nostr_sdk::database::{DynNostrDatabase, IntoNostrDatabase, NostrDatabaseExt, Order};
+use nostr_sdk::database::{DynNostrDatabase, IntoNostrDatabase, NostrDatabaseExt};
 use nostr_sdk::WebDatabase;
 use wasm_bindgen::prelude::*;
 
@@ -105,7 +105,7 @@ impl JsNostrDatabase {
         let filters = filters.into_iter().map(|f| f.into()).collect();
         Ok(self
             .inner
-            .query(filters, Order::Desc)
+            .query(filters)
             .await
             .map_err(into_err)?
             .into_iter()

crates/nostr-cli/src/cli/mod.rs

@@ -76,9 +76,6 @@ pub enum Command {
         /// Limit
         #[clap(short, long)]
         limit: Option<usize>,
-        /// Ascending order
-        #[clap(long)]
-        reverse: bool,
         /// Query only database
         #[clap(long)]
         database: bool,

crates/nostr-cli/src/main.rs

@@ -179,7 +179,6 @@ async fn handle_command(command: Command, client: &Client) -> Result<()> {
             since,
             until,
             limit,
-            reverse,
             database,
             print,
             json,
@@ -225,9 +224,7 @@ async fn handle_command(command: Command, client: &Client) -> Result<()> {
             } else if database {
                 // Query database
                 let now = Instant::now();
-                let events = db
-                    .query(vec![filter], if reverse { Order::Asc } else { Order::Desc })
-                    .await?;
+                let events = db.query(vec![filter]).await?;
 
                 let duration = now.elapsed();
                 println!(

crates/nostr-database/examples/helper.rs

@@ -5,7 +5,7 @@
 use std::time::Duration;
 
 use nostr::prelude::*;
-use nostr_database::{DatabaseHelper, Order};
+use nostr_database::DatabaseHelper;
 use tracing_subscriber::fmt::format::FmtSpan;
 
 #[tokio::main]
@@ -59,15 +59,12 @@ async fn main() {
     }
 
     let ids = index
-        .query(
-            vec![Filter::new()
-                .kinds(vec![Kind::Metadata, Kind::Custom(123), Kind::TextNote])
-                .limit(20)
-                //.kind(Kind::Custom(123))
-                //.identifier("myid5000")
-                .author(keys_a.public_key())],
-            Order::Desc,
-        )
+        .query(vec![Filter::new()
+            .kinds(vec![Kind::Metadata, Kind::Custom(123), Kind::TextNote])
+            .limit(20)
+            //.kind(Kind::Custom(123))
+            //.identifier("myid5000")
+            .author(keys_a.public_key())])
         .await;
     println!("Got {} ids", ids.len());
 

crates/nostr-database/examples/memory.rs

@@ -7,7 +7,7 @@ use std::time::Duration;
 use nostr::prelude::*;
 use nostr::{EventBuilder, Filter, Keys, Kind, Metadata, Tag};
 use nostr_database::memory::MemoryDatabase;
-use nostr_database::{MemoryDatabaseOptions, NostrDatabase, Order};
+use nostr_database::{MemoryDatabaseOptions, NostrDatabase};
 use tracing_subscriber::fmt::format::FmtSpan;
 
 #[tokio::main]
@@ -65,15 +65,12 @@ async fn main() {
     }
 
     let events = database
-        .query(
-            vec![Filter::new()
-                .kinds(vec![Kind::Metadata, Kind::Custom(123), Kind::TextNote])
-                .limit(20)
-                //.kind(Kind::Custom(123))
-                //.identifier("myid5000")
-                .author(keys_a.public_key())],
-            Order::Desc,
-        )
+        .query(vec![Filter::new()
+            .kinds(vec![Kind::Metadata, Kind::Custom(123), Kind::TextNote])
+            .limit(20)
+            //.kind(Kind::Custom(123))
+            //.identifier("myid5000")
+            .author(keys_a.public_key())])
         .await
         .unwrap();
     println!("Got {} events", events.len());