Merge pull request #245 from bennyhodl/benchmarks

check: fix benches with deps upgrade
p2pderivatives · Nov 5, 2024 · a9c9379 · a9c9379
2 parents 1f3fdae + a532b19
commit a9c9379
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/dlc-manager/benches/benchmarks.rs b/dlc-manager/benches/benchmarks.rs
@@ -23,7 +23,7 @@ use dlc_messages::oracle_msgs::EventDescriptor;
 use dlc_messages::oracle_msgs::OracleAnnouncement;
 use dlc_messages::oracle_msgs::OracleEvent;
 use secp256k1_zkp::{
-    global::SECP256K1, rand::thread_rng, schnorr::Signature, KeyPair, SecretKey, XOnlyPublicKey,
+    global::SECP256K1, rand::thread_rng, schnorr::Signature, Keypair, SecretKey, XOnlyPublicKey,
 };
 use std::str::FromStr;
 
@@ -131,15 +131,15 @@ fn create_contract_descriptor() -> ContractDescriptor {
 }
 
 fn get_schnorr_pubkey() -> XOnlyPublicKey {
-    XOnlyPublicKey::from_keypair(&KeyPair::new(SECP256K1, &mut thread_rng())).0
+    XOnlyPublicKey::from_keypair(&Keypair::new(SECP256K1, &mut thread_rng())).0
 }
 
 fn get_pubkey() -> secp256k1_zkp::PublicKey {
     secp256k1_zkp::PublicKey::from_secret_key(SECP256K1, &SecretKey::new(&mut thread_rng()))
 }
 
 fn get_p2wpkh_script_pubkey() -> ScriptBuf {
-    ScriptBuf::new_v0_p2wpkh(&WPubkeyHash::hash(&get_pubkey().serialize()))
+    ScriptBuf::new_p2wpkh(&WPubkeyHash::hash(&get_pubkey().serialize()))
 }
 
 fn create_oracle_announcements() -> Vec<OracleAnnouncement> {
@@ -234,7 +234,7 @@ pub fn sign_bench(c: &mut Criterion) {
                         TOTAL_COLLATERAL,
                         &seckey,
                         &dlc_transactions.funding_script_pubkey,
-                        fund_output_value,
+                        fund_output_value.to_sat(),
                         &dlc_transactions.cets,
                         0,
                     )
@@ -258,7 +258,7 @@ pub fn verify_bench(c: &mut Criterion) {
             TOTAL_COLLATERAL,
             &seckey,
             &dlc_transactions.funding_script_pubkey,
-            fund_output_value,
+            fund_output_value.to_sat(),
             &dlc_transactions.cets,
             0,
         )
@@ -272,7 +272,7 @@ pub fn verify_bench(c: &mut Criterion) {
                         SECP256K1,
                         &pubkey,
                         &dlc_transactions.funding_script_pubkey,
-                        fund_output_value,
+                        fund_output_value.to_sat(),
                         &dlc_transactions.cets,
                         adaptor_signatures,
                         0,

diff --git a/dlc/benches/benchmarks.rs b/dlc/benches/benchmarks.rs
@@ -16,7 +16,7 @@ mod benches {
     use dlc::*;
     use rayon::prelude::*;
     use secp256k1_zkp::{
-        global::SECP256K1, rand::thread_rng, rand::RngCore, KeyPair, Message, PublicKey, SecretKey,
+        global::SECP256K1, rand::thread_rng, rand::RngCore, Keypair, Message, PublicKey, SecretKey,
     };
 
     use test::{black_box, Bencher};
@@ -28,14 +28,14 @@ mod benches {
     const ALL_BASE: usize = 2;
 
     fn generate_oracle_info(nb_nonces: usize) -> OracleInfo {
-        let public_key = KeyPair::new(SECP256K1, &mut thread_rng())
+        let public_key = Keypair::new(SECP256K1, &mut thread_rng())
             .x_only_public_key()
             .0;
 
         let mut nonces = Vec::with_capacity(nb_nonces);
         for _ in 0..nb_nonces {
             nonces.push(
-                KeyPair::new(SECP256K1, &mut thread_rng())
+                Keypair::new(SECP256K1, &mut thread_rng())
                     .x_only_public_key()
                     .0,
             );
@@ -57,7 +57,7 @@ mod benches {
                     .map(|_| {
                         let mut buf = [0u8; 32];
                         thread_rng().fill_bytes(&mut buf);
-                        Message::from_slice(&buf).unwrap()
+                        Message::from_digest_slice(&buf).unwrap()
                     })
                     .collect()
             })
@@ -76,11 +76,7 @@ mod benches {
             for _ in 0..nb_oracles {
                 tmp.push(
                     cur.iter()
-                        .map(|x| {
-                            Message::from_hashed_data::<secp256k1_zkp::hashes::sha256::Hash>(&[
-                                (*x) as u8,
-                            ])
-                        })
+                        .map(|x| Message::from_digest_slice(&[(*x) as u8]).unwrap())
                         .collect(),
                 );
             }
@@ -111,9 +107,7 @@ mod benches {
         (0..base)
             .map(|i| {
                 (0..nb_nonces)
-                    .map(|_| {
-                        Message::from_hashed_data::<secp256k1_zkp::hashes::sha256::Hash>(&[i as u8])
-                    })
+                    .map(|_| Message::from_digest_slice(&[i as u8]).unwrap())
                     .collect()
             })
             .collect()
@@ -147,7 +141,7 @@ mod benches {
                     &oracle_infos,
                     &seckey,
                     &funding_script_pubkey(),
-                    cet.output[0].value,
+                    cet.output[0].value.to_sat(),
                     &generate_single_outcome_messages(SINGLE_NB_ORACLES, SINGLE_NB_NONCES),
                 )
                 .unwrap(),
@@ -170,7 +164,7 @@ mod benches {
                     adaptor_point,
                     &seckey,
                     &funding_script_pubkey(),
-                    cet.output[0].value,
+                    cet.output[0].value.to_sat(),
                 )
                 .unwrap(),
             )