Remove lazy_static dependency for std lib once-cell. Addl cleanup / fixes.

Author: cryptoquick

Cargo.lock

@@ -10,7 +10,6 @@ keywords = ["bitcoin", "pqc", "cryptography", "bip-360", "qubit"]
 
 [dependencies]
 hex = "0.4"
-lazy_static = "1.5.0"
 libc = "0.2"
 bitmask-enum = "2.2.5"
 

Cargo.toml

@@ -1,20 +1,24 @@
-use criterion::{criterion_group, criterion_main, Criterion};
-use lazy_static::lazy_static;
-use rand::{rng, RngCore};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::Write;
 use std::sync::Mutex;
+use std::sync::OnceLock;
 use std::time::Duration;
 
+use criterion::{criterion_group, criterion_main, Criterion};
+use rand::{rng, RngCore};
+
 use bitcoinpqc::{generate_keypair, sign, verify, Algorithm};
 
 // Set to true to enable debug output, false to disable
 const DEBUG_MODE: bool = false;
 
 // Global storage for sizes
-lazy_static! {
-    static ref SIZE_RESULTS: Mutex<HashMap<String, usize>> = Mutex::new(HashMap::new());
+static SIZE_RESULTS: OnceLock<Mutex<HashMap<String, usize>>> = OnceLock::new();
+
+// Helper function to get or initialize the size results
+fn get_size_results() -> &'static Mutex<HashMap<String, usize>> {
+    SIZE_RESULTS.get_or_init(|| Mutex::new(HashMap::new()))
 }
 
 // Conditional debug print macro
@@ -40,7 +44,8 @@ fn configure_group(group: &mut criterion::BenchmarkGroup<criterion::measurement:
 
 // Helper function to store size results
 fn store_size_result(name: &str, value: usize) {
-    let mut results = SIZE_RESULTS.lock().unwrap();
+    let results = get_size_results();
+    let mut results = results.lock().unwrap();
     results.insert(name.to_string(), value);
 }
 
@@ -295,7 +300,8 @@ fn generate_report(_c: &mut Criterion) {
     writeln!(file, "\nThis report compares the performance and size characteristics of post-quantum cryptographic algorithms with secp256k1.\n").unwrap();
 
     // Get size results
-    let size_results = SIZE_RESULTS.lock().unwrap();
+    let size_results = get_size_results();
+    let size_results = size_results.lock().unwrap();
 
     // Extract secp256k1 size values
     let secp_pubkey_size = size_results.get("secp256k1_pubkey").cloned().unwrap_or(32);

benches/sig_benchmarks.rs

@@ -10,7 +10,7 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4"
 
-[dependencies.libbitcoinpqc]
+[dependencies.bitcoinpqc]
 path = ".."
 
 # Renamed and repurposed from the original target

fuzz/Cargo.lock

@@ -2,11 +2,12 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-use bitmask_enum::bitmask;
-
 use std::error::Error;
 use std::fmt;
 use std::ptr;
+
+use bitmask_enum::bitmask;
+
 // Include the auto-generated bindings using our wrapper
 // Make it pub(crate) so doctests can access these symbols
 pub(crate) mod bindings_include;

fuzz/Cargo.toml

@@ -1,8 +1,9 @@
+use hex::decode as hex_decode;
+use rand::{rng, RngCore};
+
 use bitcoinpqc::{
     generate_keypair, public_key_size, secret_key_size, sign, signature_size, verify, Algorithm,
 };
-use hex::decode as hex_decode;
-use rand::{rng, RngCore};
 
 // Original random data generation function (commented out for deterministic tests)
 fn _get_random_bytes_original(size: usize) -> Vec<u8> {

src/lib.rs

@@ -1,7 +1,8 @@
-use bitcoinpqc::{generate_keypair, sign, verify, Algorithm, PublicKey, SecretKey, Signature};
 use hex::{decode as hex_decode, encode as hex_encode};
 use rand::{rng, RngCore};
 
+use bitcoinpqc::{generate_keypair, sign, verify, Algorithm, PublicKey, SecretKey, Signature};
+
 // Original random data generation function (commented out for deterministic tests)
 fn _get_random_bytes_original(size: usize) -> Vec<u8> {
     let mut bytes = vec![0u8; size];