nuke the remaining statics

Author: redsh4de

binaries/cuprated/src/commands.rs

@@ -10,7 +10,7 @@ use cuprate_helper::time::secs_to_hms;
 
 use crate::{
     logging::{self, CupratedTracingFilter},
-    statics, NodeContext,
+    NodeContext,
 };
 
 /// A command request with a response channel.
@@ -140,7 +140,7 @@ async fn handle_command(
         Command::Status => {
             let context = context_service.blockchain_context();
 
-            let uptime = statics::START_INSTANT.elapsed().unwrap_or_default();
+            let uptime = node_ctx.start_instant.elapsed().unwrap_or_default();
 
             let (h, m, s) = secs_to_hms(uptime.as_secs());
             let height = context.chain_height;

binaries/cuprated/src/lib.rs

@@ -38,7 +38,6 @@ pub mod commands;
 pub mod config;
 pub mod constants;
 pub mod logging;
-pub mod statics;
 pub mod version;
 
 mod p2p;
@@ -107,6 +106,12 @@ pub struct NodeContext {
 
     /// Sync state notifications.
     pub sync: SyncState,
+
+    /// The time this node was launched.
+    pub start_instant: std::time::SystemTime,
+
+    /// The time this node was launched as a UNIX timestamp.
+    pub start_instant_unix: u64,
 }
 
 /// An active `cuprated` node.
@@ -158,9 +163,6 @@ impl Node {
     /// Panics if the database is corrupt, critical services fail to start, or
     /// `config.target_max_memory` is unresolved.
     pub async fn launch(config: Config) -> Self {
-        // Initialize global static `LazyLock` data.
-        statics::init_lazylock_statics();
-
         let fast_sync_hashes = blockchain::get_fast_sync_hashes(config.fast_sync, config.network());
 
         // Initialize the database thread pool.
@@ -225,6 +227,7 @@ impl Node {
         let (blockchain_manager_handle, blockchain_manager_rx) = BlockchainManagerHandle::new();
 
         // Create the node context.
+        let start_instant = std::time::SystemTime::now();
         let node_ctx = NodeContext {
             network: config.network(),
             fast_sync_hashes,
@@ -234,6 +237,11 @@ impl Node {
             blockchain_context: context_svc.clone(),
             txpool_read: txpool_read_handle.clone(),
             sync: sync_state,
+            start_instant_unix: start_instant
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_secs(),
+            start_instant,
         };
 
         // Start clearnet P2P zone

binaries/cuprated/src/main.rs

@@ -36,9 +36,6 @@ fn main() {
     // Set global private permissions for created files.
     cuprate_helper::fs::set_private_global_file_permissions();
 
-    // Initialize global static `LazyLock` data.
-    cuprated::statics::init_lazylock_statics();
-
     // Parse CLI args and read config.
     let args = Args::parse();
     args.do_quick_requests();

binaries/cuprated/src/rpc/handlers/json_rpc.rs

@@ -67,7 +67,6 @@ use crate::{
         service::{address_book, blockchain, blockchain_context, blockchain_manager, txpool},
         CupratedRpcHandler,
     },
-    statics::START_INSTANT_UNIX,
 };
 
 /// Map a [`JsonRpcRequest`] to the function that will lead to a [`JsonRpcResponse`].
@@ -528,7 +527,11 @@ async fn get_info(
     )]
     let rpc_connections_count = if restricted { 0 } else { 0 };
 
-    let start_time = if restricted { 0 } else { *START_INSTANT_UNIX };
+    let start_time = if restricted {
+        0
+    } else {
+        state.node_ctx.start_instant_unix
+    };
     let synchronized = blockchain_manager::synced(todo!()).await?;
 
     let target_height = blockchain_manager::target_height(todo!()).await?;

binaries/cuprated/src/rpc/handlers/other_json.rs

@@ -59,7 +59,6 @@ use crate::{
         },
         CupratedRpcHandler,
     },
-    statics::START_INSTANT_UNIX,
     txpool::IncomingTxs,
 };
 
@@ -645,7 +644,7 @@ async fn get_net_stats(
 
     Ok(GetNetStatsResponse {
         base: helper::response_base(false),
-        start_time: *START_INSTANT_UNIX,
+        start_time: state.node_ctx.start_instant_unix,
         total_packets_in: todo!(),
         total_bytes_in: todo!(),
         total_packets_out: todo!(),