simplify sleep logic in publishers (#49)

Author: rklaehn

iroh-pkarr-naming-system/src/lib.rs

@@ -64,8 +64,8 @@ impl IPNS {
             let pkarr = self.0.pkarr.clone();
             let signed_packet: SignedPacket = Self::to_signed_packet(&secret_key, &record, 0)?;
             let publish_task = tokio::spawn(async move {
+                tokio::time::sleep(INITIAL_PUBLISH_DELAY).await;
                 loop {
-                    tokio::time::sleep(INITIAL_PUBLISH_DELAY).await;
                     let res = pkarr.publish(&signed_packet).await;
                     match res {
                         Ok(sqm) => {
@@ -75,7 +75,7 @@ impl IPNS {
                             tracing::warn!("Failed to publish record: {}", e);
                         }
                     }
-                    tokio::time::sleep(REPUBLISH_DELAY - INITIAL_PUBLISH_DELAY).await;
+                    tokio::time::sleep(REPUBLISH_DELAY).await;
                 }
             });
             let mut packets = self.0.packets.lock().unwrap();

iroh-pkarr-node-discovery/src/lib.rs

@@ -175,10 +175,10 @@ impl PkarrNodeDiscovery {
         let z32 = pkarr::PublicKey::try_from(*keypair.public().as_bytes())
             .expect("valid public key")
             .to_z32();
+        // initial delay. If the task gets aborted before this delay is over,
+        // we have not published anything to the DHT yet.
+        tokio::time::sleep(INITIAL_PUBLISH_DELAY).await;
         loop {
-            // initial delay. If the task gets aborted before this delay is over,
-            // we have not published anything to the DHT yet.
-            tokio::time::sleep(INITIAL_PUBLISH_DELAY).await;
             // publish to the DHT if enabled
             let dht_publish = async {
                 if this.0.dht {
@@ -224,7 +224,7 @@ impl PkarrNodeDiscovery {
             };
             // do both at the same time
             tokio::join!(relay_publish, dht_publish);
-            tokio::time::sleep(REPUBLISH_DELAY - INITIAL_PUBLISH_DELAY).await;
+            tokio::time::sleep(REPUBLISH_DELAY).await;
         }
     }