1 files changed, 9 insertions, 40 deletions

diff --git a/webhook/src/handler/tests/utils.rs b/webhook/src/handler/tests/utils.rs
index f8cdac2..5e59f09 100644
--- a/webhook/src/handler/tests/utils.rs
+++ b/webhook/src/handler/tests/utils.rs
@@ -1,46 +1,15 @@
-pub fn generate_keypair() -> (
-    String,
-    [u8; libsodium_sys::crypto_sign_ed25519_SECRETKEYBYTES as usize],
-) {
-    use libsodium_sys::crypto_sign_ed25519_keypair;
-    let pk_s: String;
+use rand::rngs::OsRng;
+use ed25519_dalek::{Signer, Keypair, Signature};
 
-    let mut pk = [0; libsodium_sys::crypto_sign_ed25519_PUBLICKEYBYTES as usize];
-    let mut sk = [0; libsodium_sys::crypto_sign_ed25519_SECRETKEYBYTES as usize];
-
-    let pk_p = pk.as_mut_ptr();
-    let sk_p = sk.as_mut_ptr();
-
-    // generate keypair
-    unsafe {
-        if crypto_sign_ed25519_keypair(pk_p, sk_p) < 0 {
-            panic!("keypair generation failed!");
-        }
-    };
-
-    pk_s = hex::encode(pk);
-    return (pk_s, sk);
+pub fn generate_keypair() -> Keypair {
+    let mut csprng = OsRng{};
+     Keypair::generate(&mut csprng)
 }
 
 pub fn sign_message(
-    msg: Vec<u8>,
-    sk: [u8; libsodium_sys::crypto_sign_ed25519_SECRETKEYBYTES as usize],
+    message: Vec<u8>,
+    keypair: &Keypair,
 ) -> String {
-    use libc::c_ulonglong;
-    use libsodium_sys::crypto_sign_ed25519_detached;
-
-    let len = msg.len();
-    let mut signature_len: c_ulonglong = 0;
-    let mut str = [0; 64];
-    unsafe {
-        crypto_sign_ed25519_detached(
-            str.as_mut_ptr(),
-            &mut signature_len,
-            msg.as_ptr(),
-            len as u64,
-            sk.as_ptr(),
-        );
-    };
-
-    return hex::encode(str);
+    let signature: Signature = keypair.sign(&message);
+    return hex::encode(signature.to_bytes());
 }
\ No newline at end of file