tiny rfk in tests

Author: erhant

src/handlers/pingpong.rs

@@ -85,14 +85,14 @@ mod tests {
     use super::PingpongPayload;
 
     #[test]
-    fn test_heartbeat_payload() {
+    fn test_pingpong_payload() {
         let pk = PublicKey::parse_compressed(&hex_literal::hex!(
             "0208ef5e65a9c656a6f92fb2c770d5d5e2ecffe02a6aade19207f75110be6ae658"
         ))
         .expect("Should parse public key");
         let message = DKNMessage {
             payload: "Y2RmODcyNDlhY2U3YzQ2MDIzYzNkMzBhOTc4ZWY3NjViMWVhZDlmNWJhMDUyY2MxMmY0NzIzMjQyYjc0YmYyODFjMDA1MTdmMGYzM2VkNTgzMzk1YWUzMTY1ODQ3NWQyNDRlODAxYzAxZDE5MjYwMDM1MTRkNzEwMThmYTJkNjEwMXsidXVpZCI6ICI4MWE2M2EzNC05NmM2LTRlNWEtOTliNS02YjI3NGQ5ZGUxNzUiLCAiZGVhZGxpbmUiOiAxNzE0MTI4NzkyfQ==".to_string(),
-            topic: "heartbeat".to_string(),
+            topic: "pingpong".to_string(),
             version: "0.0.0".to_string(),
             timestamp: 1714129073557846272,
         };
@@ -106,22 +106,21 @@ mod tests {
         assert_eq!(obj.deadline, 1714128792);
     }
 
-    /// This test demonstrates the process of heartbeat & task assignment.
+    /// This test demonstrates the process of pingpong & task assignment.
     ///
     /// A heart-beat message is sent over the network by Admin Node, and compute node responds with a signature.
     #[test]
-    fn test_heartbeat_and_task_assignment() {
+    fn test_pingpong_and_task_assignment() {
         let config = DriaComputeNodeConfig::default();
 
-        // a heartbeat message is signed and sent to Admin Node over the p2p network
-        let heartbeat_message = Message::parse(&sha256hash(b"sign-me"));
-        let (heartbeat_signature, heartbeat_recid) =
-            libsecp256k1::sign(&heartbeat_message, &config.secret_key);
+        // a pingpong message is signed and sent to Admin Node over the p2p network
+        let pingpong_message = Message::parse(&sha256hash(b"sign-me"));
+        let (pingpong_signature, pingpong_recid) =
+            libsecp256k1::sign(&pingpong_message, &config.secret_key);
 
         // admin recovers the address from the signature
-        let recovered_public_key =
-            recover(&heartbeat_message, &heartbeat_signature, &heartbeat_recid)
-                .expect("Could not recover");
+        let recovered_public_key = recover(&pingpong_message, &pingpong_signature, &pingpong_recid)
+            .expect("Could not recover");
         assert_eq!(
             config.public_key, recovered_public_key,
             "Public key mismatch"

src/payloads/request.rs

@@ -1,7 +1,5 @@
-use crate::utils::{filter::TaskFilter, get_current_time_nanos};
-use fastbloom_rs::BloomFilter;
+use crate::utils::filter::TaskFilter;
 use serde::{Deserialize, Serialize};
-use uuid::Uuid;
 
 /// A generic task request, given by Dria.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -18,16 +16,3 @@ pub struct TaskRequestPayload<T> {
     /// The public key of the requester, in hexadecimals.
     pub(crate) public_key: String,
 }
-
-impl<T> TaskRequestPayload<T> {
-    #[allow(unused)]
-    pub fn new(input: T, filter: BloomFilter, time_ns: u128, public_key: Option<String>) -> Self {
-        Self {
-            task_id: Uuid::new_v4().into(),
-            deadline: get_current_time_nanos() + time_ns,
-            input,
-            filter: filter.into(),
-            public_key: public_key.unwrap_or_default(),
-        }
-    }
-}