replace lazy_static! with once_cell::sync::Lazy

serai-dex · Nov 6, 2023 · bd3272a · bd3272a
1 parent de41be6
commit bd3272a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/message-queue/Cargo.toml b/message-queue/Cargo.toml
@@ -15,7 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 # Macros
-lazy_static = { version = "1", default-features = false }
+once_cell = { version = "1", default-features = false }
 serde = { version = "1", default-features = false, features = ["std", "derive"] }
 
 # Encoders

diff --git a/message-queue/src/main.rs b/message-queue/src/main.rs
@@ -28,12 +28,11 @@ mod binaries {
   #[allow(clippy::type_complexity)]
   mod clippy {
     use super::*;
-    lazy_static::lazy_static! {
-      pub(crate) static ref KEYS: Arc<RwLock<HashMap<Service, <Ristretto as Ciphersuite>::G>>> =
-        Arc::new(RwLock::new(HashMap::new()));
-      pub(crate) static ref QUEUES: Arc<RwLock<HashMap<(Service, Service), RwLock<Queue<Db>>>>> =
-        Arc::new(RwLock::new(HashMap::new()));
-    }
+    use once_cell::sync::Lazy;
+    pub(crate) static KEYS: Lazy<Arc<RwLock<HashMap<Service, <Ristretto as Ciphersuite>::G>>>> =
+      Lazy::new(|| Arc::new(RwLock::new(HashMap::new())));
+    pub(crate) static QUEUES: Lazy<Arc<RwLock<HashMap<(Service, Service), RwLock<Queue<Db>>>>>> =
+      Lazy::new(|| Arc::new(RwLock::new(HashMap::new())));
   }
   pub(crate) use self::clippy::*;
 

diff --git a/processor/Cargo.toml b/processor/Cargo.toml
@@ -16,7 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 # Macros
 async-trait = { version = "0.1", default-features = false }
-lazy_static = { version = "1", default-features = false }
+once_cell = { version = "1", default-features = false }
 zeroize = { version = "1", default-features = false, features = ["std"] }
 thiserror = { version = "1", default-features = false }
 serde = { version = "1", default-features = false, features = ["std", "derive"] }

diff --git a/processor/src/networks/bitcoin.rs b/processor/src/networks/bitcoin.rs
@@ -53,6 +53,8 @@ use crate::{
   Payment,
 };
 
+use once_cell::sync::Lazy;
+
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct OutputId(pub [u8; 36]);
 impl Default for OutputId {
@@ -259,10 +261,8 @@ impl BlockTrait<Bitcoin> for Block {
 }
 
 const KEY_DST: &[u8] = b"Serai Bitcoin Output Offset";
-lazy_static::lazy_static! {
-  static ref BRANCH_OFFSET: Scalar = Secp256k1::hash_to_F(KEY_DST, b"branch");
-  static ref CHANGE_OFFSET: Scalar = Secp256k1::hash_to_F(KEY_DST, b"change");
-}
+static BRANCH_OFFSET: Lazy<Scalar> = Lazy::new(|| Secp256k1::hash_to_F(KEY_DST, b"branch"));
+static CHANGE_OFFSET: Lazy<Scalar> = Lazy::new(|| Secp256k1::hash_to_F(KEY_DST, b"change"));
 
 // Always construct the full scanner in order to ensure there's no collisions
 fn scanner(

diff --git a/processor/src/tests/mod.rs b/processor/src/tests/mod.rs
@@ -16,9 +16,7 @@ mod addresses;
 pub(crate) use addresses::test_addresses;
 
 // Effective Once
-lazy_static::lazy_static! {
-  static ref INIT_LOGGER: () = env_logger::init();
-}
+static INIT_LOGGER: once_cell::sync::Lazy<()> = once_cell::sync::Lazy::new(env_logger::init);
 
 #[macro_export]
 macro_rules! test_network {