Simplify node announcement signature verification

nervosnetwork · Jan 21, 2025 · 4ca98fc · 4ca98fc
1 parent 5ecc56c
commit 4ca98fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/src/fiber/gossip.rs b/src/fiber/gossip.rs
@@ -2079,13 +2079,12 @@ fn verify_node_announcement<S: GossipMessageStore>(
             )));
         }
     }
-    let message = node_announcement.message_to_sign();
-    match node_announcement.signature {
-        Some(ref signature) if signature.verify(&node_announcement.node_id, &message) => Ok(false),
-        _ => Err(Error::InvalidParameter(format!(
-            "Node announcement message signature verification failed: {:?}",
-            &node_announcement
-        ))),
+    if !node_announcement.verify() {
+        Err(Error::InvalidParameter(
+            "Node announcement message signature verification failed".to_string(),
+        ))
+    } else {
+        Ok(false)
     }
 }
 

diff --git a/src/fiber/tests/types.rs b/src/fiber/tests/types.rs
@@ -260,22 +260,11 @@ fn test_create_and_verify_node_announcement() {
         now_timestamp_as_millis_u64(),
         0,
     );
-    let message = node_announcement.message_to_sign();
-    match node_announcement.signature {
-        Some(ref signature) => {
-            assert!(
-                signature.verify(&node_announcement.node_id, &message),
-                "Node announcement message signature verification failed: {:?}",
-                &node_announcement
-            );
-        }
-        _ => {
-            panic!(
-                "Node announcement signature is None: {:?}",
-                &node_announcement
-            );
-        }
-    }
+    assert!(
+        node_announcement.verify(),
+        "Node announcement message signature verification failed: {:?}",
+        &node_announcement
+    );
 }
 
 #[test]