database: remove NostrDatabase::has_coordinate_been_deleted

Pull-Request: #917
Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -34,6 +34,7 @@
 - nostr: update `RelayInformationDocument::get` signature ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/913)
 - connect: remove `NostrConnect::get_relays` ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/894)
 - database: merge traits into `NostrDatabase` ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/916)
+- database: remove `NostrDatabase::has_coordinate_been_deleted` ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/917)
 
 ### Changed
 

crates/nostr-database/src/lib.rs

@@ -160,14 +160,6 @@ pub trait NostrDatabase: Debug + Send + Sync {
         event_id: &'a EventId,
     ) -> BoxedFuture<'a, Result<DatabaseEventStatus, DatabaseError>>;
 
-    // TODO: rename to `check_coordinate`?
-    /// Check if [`Coordinate`] has been deleted before a certain [`Timestamp`]
-    fn has_coordinate_been_deleted<'a>(
-        &'a self,
-        coordinate: &'a CoordinateBorrow<'a>,
-        timestamp: &'a Timestamp,
-    ) -> BoxedFuture<'a, Result<bool, DatabaseError>>;
-
     /// Get [`Event`] by [`EventId`]
     fn event_by_id<'a>(
         &'a self,

crates/nostr-database/src/memory.rs

@@ -157,21 +157,6 @@ impl NostrDatabase for MemoryDatabase {
         })
     }
 
-    fn has_coordinate_been_deleted<'a>(
-        &'a self,
-        coordinate: &'a CoordinateBorrow<'a>,
-        timestamp: &'a Timestamp,
-    ) -> BoxedFuture<'a, Result<bool, DatabaseError>> {
-        Box::pin(async move {
-            match &self.inner {
-                InnerMemoryDatabase::Tracker(..) => Ok(false),
-                InnerMemoryDatabase::Full(helper) => Ok(helper
-                    .has_coordinate_been_deleted(coordinate, timestamp)
-                    .await),
-            }
-        })
-    }
-
     fn event_by_id<'a>(
         &'a self,
         event_id: &'a EventId,

crates/nostr-indexeddb/src/lib.rs

@@ -350,19 +350,6 @@ impl NostrDatabase for WebDatabase {
         })
     }
 
-    fn has_coordinate_been_deleted<'a>(
-        &'a self,
-        coordinate: &'a CoordinateBorrow<'a>,
-        timestamp: &'a Timestamp,
-    ) -> BoxedFuture<'a, Result<bool, DatabaseError>> {
-        Box::pin(async move {
-            Ok(self
-                .helper
-                .has_coordinate_been_deleted(coordinate, timestamp)
-                .await)
-        })
-    }
-
     fn event_by_id<'a>(
         &'a self,
         event_id: &'a EventId,

crates/nostr-lmdb/src/lib.rs

@@ -78,24 +78,6 @@ impl NostrDatabase for NostrLMDB {
         })
     }
 
-    fn has_coordinate_been_deleted<'a>(
-        &'a self,
-        coordinate: &'a CoordinateBorrow<'a>,
-        timestamp: &'a Timestamp,
-    ) -> BoxedFuture<'a, Result<bool, DatabaseError>> {
-        Box::pin(async move {
-            if let Some(t) = self
-                .db
-                .when_is_coordinate_deleted(coordinate)
-                .map_err(DatabaseError::backend)?
-            {
-                Ok(&t >= timestamp)
-            } else {
-                Ok(false)
-            }
-        })
-    }
-
     fn event_by_id<'a>(
         &'a self,
         event_id: &'a EventId,

crates/nostr-lmdb/src/store/mod.rs

@@ -91,17 +91,6 @@ impl Store {
         Ok(deleted)
     }
 
-    #[inline]
-    pub fn when_is_coordinate_deleted<'a>(
-        &self,
-        coordinate: &'a CoordinateBorrow<'a>,
-    ) -> Result<Option<Timestamp>, Error> {
-        let txn = self.db.read_txn()?;
-        let when = self.db.when_is_coordinate_deleted(&txn, coordinate)?;
-        txn.commit()?;
-        Ok(when)
-    }
-
     pub fn count(&self, filter: Filter) -> Result<usize, Error> {
         let txn = self.db.read_txn()?;
         let output = self.db.query(&txn, filter)?;

crates/nostr-ndb/src/lib.rs

@@ -104,14 +104,6 @@ impl NostrDatabase for NdbDatabase {
         })
     }
 
-    fn has_coordinate_been_deleted<'a>(
-        &'a self,
-        _coordinate: &'a CoordinateBorrow<'a>,
-        _timestamp: &'a Timestamp,
-    ) -> BoxedFuture<'a, Result<bool, DatabaseError>> {
-        Box::pin(async move { Ok(false) })
-    }
-
     fn event_by_id<'a>(
         &'a self,
         event_id: &'a EventId,

crates/nostr-relay-pool/src/relay/inner.rs

@@ -1092,70 +1092,55 @@ impl InnerRelay {
             }
         }
 
-        // Check if event status
-        let status: DatabaseEventStatus = self.state.database().check_id(&event.id).await?;
-
-        // Event deleted
-        if let DatabaseEventStatus::Deleted = status {
-            return Ok(None);
-        }
-
-        // Check if coordinate has been deleted
-        // TODO: remove this since it's checked also later?
-        if let Some(coordinate) = event.coordinate() {
-            if self
-                .state
-                .database()
-                .has_coordinate_been_deleted(&coordinate, &event.created_at)
-                .await?
-            {
-                return Ok(None);
-            }
-        }
+        // Check the event status
+        match self.state.database().check_id(&event.id).await? {
+            // Already saved, continue with code execution
+            DatabaseEventStatus::Saved => {}
+            // Deleted, immediately return
+            DatabaseEventStatus::Deleted => return Ok(None),
+            // Not existent, verify the event and try to save it to the database
+            DatabaseEventStatus::NotExistent => {
+                // Check if the event was already verified.
+                //
+                // This is useful if someone continues to send the same invalid event:
+                // since invalid events aren't stored in the database,
+                // skipping this check would result in the re-verification of the event.
+                // This may also be useful to avoid double verification if the event is received at the exact same time by many different Relay instances.
+                //
+                // This is important since event signature verification is a heavy job!
+                if !self.state.verified(&event.id)? {
+                    event.verify()?;
+                }
 
-        // TODO: check if filter match
-
-        // Check if the event exists
-        if let DatabaseEventStatus::NotExistent = status {
-            // Check if the event was already verified.
-            //
-            // This is useful if someone continues to send the same invalid event:
-            // since invalid events aren't stored in the database,
-            // skipping this check would result in the re-verification of the event.
-            // This may also be useful to avoid double verification if the event is received at the exact same time by many different Relay instances.
-            //
-            // This is important since event signature verification is a heavy job!
-            if !self.state.verified(&event.id)? {
-                event.verify()?;
-            }
+                // Save into the database
+                let send_notification: bool = match self.state.database().save_event(&event).await?
+                {
+                    SaveEventStatus::Success => true,
+                    SaveEventStatus::Rejected(reason) => match reason {
+                        RejectedReason::Ephemeral => true,
+                        RejectedReason::Duplicate => true,
+                        RejectedReason::Deleted => false,
+                        RejectedReason::Expired => false,
+                        RejectedReason::Replaced => false,
+                        RejectedReason::InvalidDelete => false,
+                        RejectedReason::Other => true,
+                    },
+                };
 
-            // Save into the database
-            let send_notification: bool = match self.state.database().save_event(&event).await? {
-                SaveEventStatus::Success => true,
-                SaveEventStatus::Rejected(reason) => match reason {
-                    RejectedReason::Ephemeral => true,
-                    RejectedReason::Duplicate => true,
-                    RejectedReason::Deleted => false,
-                    RejectedReason::Expired => false,
-                    RejectedReason::Replaced => false,
-                    RejectedReason::InvalidDelete => false,
-                    RejectedReason::Other => true,
-                },
-            };
+                // If the notification should NOT be sent, immediately return.
+                if !send_notification {
+                    return Ok(None);
+                }
 
-            // If the notification should NOT be sent, immediately return.
-            if !send_notification {
-                return Ok(None);
+                // Send notification
+                self.send_notification(
+                    RelayNotification::Event {
+                        subscription_id: subscription_id.clone(),
+                        event: Box::new(event.clone()),
+                    },
+                    true,
+                );
             }
-
-            // Send notification
-            self.send_notification(
-                RelayNotification::Event {
-                    subscription_id: subscription_id.clone(),
-                    event: Box::new(event.clone()),
-                },
-                true,
-            );
         }
 
         Ok(Some(RelayMessage::Event {