nostr: add Timestamp::as_secs and deprecate Timestamp::as_u64

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

Author: yukibtc

crates/nostr-relay-builder/src/local/inner.rs

@@ -650,7 +650,7 @@ impl InnerLocalRelay {
                 let mut storage = NegentropyStorageVector::with_capacity(items.len());
                 for (id, timestamp) in items.into_iter() {
                     let id: Id = Id::from_byte_array(id.to_bytes());
-                    storage.insert(timestamp.as_u64(), id)?;
+                    storage.insert(timestamp.as_secs(), id)?;
                 }
                 storage.seal()?;
 

crates/nostr-relay-builder/src/local/session.rs

@@ -52,7 +52,7 @@ impl Nip42Session {
 
                 // Check created_at
                 let now = Timestamp::now();
-                let diff: u64 = now.as_u64().abs_diff(event.created_at.as_u64());
+                let diff: u64 = now.as_secs().abs_diff(event.created_at.as_secs());
                 if diff > 120 {
                     return Err(String::from("challenge is too old (max allowed 2 min)"));
                 }

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

@@ -469,7 +469,7 @@ impl InnerRelay {
             return false;
         }
 
-        let idle_duration_secs: u64 = Timestamp::now().as_u64() - reference_time.as_u64();
+        let idle_duration_secs: u64 = Timestamp::now().as_secs() - reference_time.as_secs();
         let idle_duration: Duration = Duration::from_secs(idle_duration_secs);
         idle_duration >= self.opts.idle_timeout
     }
@@ -2129,7 +2129,7 @@ fn prepare_negentropy_storage(
     // Add items
     for (id, timestamp) in items.into_iter() {
         let id: Id = Id::from_byte_array(id.to_bytes());
-        storage.insert(timestamp.as_u64(), id)?;
+        storage.insert(timestamp.as_secs(), id)?;
     }
 
     // Seal

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

@@ -102,7 +102,7 @@ impl RelayConnectionStats {
     /// Update last activity timestamp
     #[inline]
     pub(super) fn update_activity(&self) {
-        let now: u64 = Timestamp::now().as_u64();
+        let now: u64 = Timestamp::now().as_secs();
         self.inner.last_activity_at.store(now, Ordering::SeqCst);
     }
 
@@ -115,7 +115,7 @@ impl RelayConnectionStats {
     /// Update the wake-up timestamp
     #[inline]
     pub(super) fn just_woke_up(&self) {
-        let now: u64 = Timestamp::now().as_u64();
+        let now: u64 = Timestamp::now().as_secs();
         self.inner.woke_up_at.store(now, Ordering::SeqCst);
     }
 
@@ -142,7 +142,7 @@ impl RelayConnectionStats {
     pub(super) fn new_success(&self) {
         self.inner.success.fetch_add(1, Ordering::SeqCst);
 
-        let now: u64 = Timestamp::now().as_u64();
+        let now: u64 = Timestamp::now().as_secs();
 
         self.inner.connected_at.store(now, Ordering::SeqCst);
 
@@ -190,8 +190,8 @@ mod tests {
         assert_eq!(stats.attempts(), 1);
         assert_eq!(stats.success(), 1);
         assert_eq!(stats.success_rate(), 1.0);
-        assert!(stats.connected_at().as_u64() > 0);
-        assert!(stats.first_connection_timestamp().as_u64() > 0);
+        assert!(stats.connected_at().as_secs() > 0);
+        assert!(stats.first_connection_timestamp().as_secs() > 0);
     }
 
     #[test]

crates/nostr/CHANGELOG.md

@@ -44,6 +44,7 @@
 - Add NIP-60 support (https://github.com/rust-nostr/nostr/pull/1092)
 - Implement `ToBech32` trait for `Nip21`
 - Add `CowTag::kind` and `CowTag::content`
+- Add `Timestamp::as_secs`
 - Add `Kind::CashuNutZapInfo` (10019) and `Kind::CashuNutZap` (9321) variants
 - Add nip47 holdinvoice methods and notification (https://github.com/rust-nostr/nostr/pull/1019)
 - Add `TransactionState` to `LookupInvoiceResponse` and `PaymentNotification` (https://github.com/rust-nostr/nostr/pull/1045)
@@ -71,6 +72,7 @@
 
 ### Deprecated
 
+- Deprecate `Timestamp::as_u64`
 - Deprecate `kind` field in `CommentTarget::Coordinate` variant (https://github.com/rust-nostr/nostr/pull/1035)
 
 ### Breaking changes

crates/nostr/src/event/mod.rs

@@ -431,7 +431,7 @@ mod tests {
     #[cfg(feature = "std")]
     fn test_event_not_expired() {
         let now = Timestamp::now();
-        let expiry_date: u64 = now.as_u64() * 2;
+        let expiry_date: u64 = now.as_secs() * 2;
 
         let my_keys = Keys::generate();
         let event = EventBuilder::text_note("my content")

crates/nostr/src/nips/nip98.rs

@@ -420,12 +420,12 @@ impl TimeDelta {
     pub fn subtracting(t1: Timestamp, t2: Timestamp) -> TimeDelta {
         if t1 > t2 {
             TimeDelta {
-                delta_abs_seconds: (t1 - t2).as_u64(),
+                delta_abs_seconds: (t1 - t2).as_secs(),
                 negative: false,
             }
         } else {
             TimeDelta {
-                delta_abs_seconds: (t2 - t1).as_u64(),
+                delta_abs_seconds: (t2 - t1).as_secs(),
                 negative: true,
             }
         }

crates/nostr/src/types/time/mod.rs

@@ -120,12 +120,18 @@ impl Timestamp {
         self.0 = self.0.saturating_sub(secs);
     }
 
-    /// Get timestamp as [`u64`]
+    /// Get timestamp as seconds
     #[inline]
-    pub fn as_u64(&self) -> u64 {
+    pub const fn as_secs(&self) -> u64 {
         self.0
     }
 
+    /// Get timestamp as [`u64`]
+    #[deprecated(since = "0.44.0", note = "Use `as_secs` instead")]
+    pub fn as_u64(&self) -> u64 {
+        self.as_secs()
+    }
+
     /// Check if timestamp is `0`
     #[inline]
     pub fn is_zero(&self) -> bool {
@@ -134,7 +140,7 @@ impl Timestamp {
 
     /// Convert [`Timestamp`] to human datetime
     pub fn to_human_datetime(&self) -> String {
-        let timestamp: u64 = self.as_u64();
+        let timestamp: u64 = self.as_secs();
 
         if timestamp >= 253_402_300_800 {
             // Year 9999
@@ -241,14 +247,14 @@ impl fmt::Display for Timestamp {
 impl Add<Timestamp> for Timestamp {
     type Output = Self;
     fn add(self, rhs: Timestamp) -> Self::Output {
-        Self::from_secs(self.0.saturating_add(rhs.as_u64()))
+        Self::from_secs(self.0.saturating_add(rhs.as_secs()))
     }
 }
 
 impl Sub<Timestamp> for Timestamp {
     type Output = Self;
     fn sub(self, rhs: Timestamp) -> Self::Output {
-        Self::from_secs(self.0.saturating_sub(rhs.as_u64()))
+        Self::from_secs(self.0.saturating_sub(rhs.as_secs()))
     }
 }
 

database/nostr-database/src/flatbuffers/mod.rs

@@ -105,7 +105,7 @@ impl FlatBufferEncode for Event {
         let args = event_fbs::EventArgs {
             id: Some(&id),
             pubkey: Some(&pubkey),
-            created_at: self.created_at.as_u64(),
+            created_at: self.created_at.as_secs(),
             kind: self.kind.as_u16() as u64,
             tags: Some(fbb.create_vector(&tags)),
             content: Some(fbb.create_string(&self.content)),

database/nostr-lmdb/src/store/lmdb/index.rs

@@ -16,7 +16,7 @@ const TAG_VALUE_PAD_LEN: usize = 182;
 #[inline]
 fn reverse_and_conv_to_be64(created_at: &Timestamp) -> [u8; 8] {
     // Reverse
-    let created_at: u64 = u64::MAX - created_at.as_u64();
+    let created_at: u64 = u64::MAX - created_at.as_secs();
 
     // Convert to big-endian
     created_at.to_be_bytes()