helper: cleanup

Cargo.toml

@@ -10,6 +10,9 @@ members = [
 	"consensus/fast-sync",
 	"consensus/rules",
 
+	# Filesystem
+	"fs",
+
 	# Net
 	"net/epee-encoding",
 	"net/levin",
@@ -51,7 +54,7 @@ members = [
 	"test-utils",
 
 	# Fuzz
-	"fuzz"
+	"fuzz",
 ]
 
 # Windows is a pain, so instead of making the fuzz tests work on windows, we just don't build the fuzz target on windows.
@@ -69,6 +72,9 @@ default-members = [
 	"consensus/fast-sync",
 	"consensus/rules",
 
+	# Filesystem
+	"fs",
+
 	# Net
 	"net/epee-encoding",
 	"net/levin",
@@ -137,6 +143,7 @@ cuprate-constants         = { path = "constants",                 default-featur
 cuprate-consensus         = { path = "consensus",                 default-features = false }
 cuprate-consensus-context = { path = "consensus/context",         default-features = false }
 cuprate-cryptonight       = { path = "cryptonight",               default-features = false }
+cuprate-fs                = { path = "fs",                        default-features = false }
 cuprate-helper            = { path = "helper",                    default-features = false }
 cuprate-epee-encoding     = { path = "net/epee-encoding",         default-features = false }
 cuprate-levin             = { path = "net/levin",                 default-features = false }
@@ -175,7 +182,6 @@ bytemuck              = { version = "1", default-features = false }
 bytes                 = { version = "1", default-features = false }
 cfg-if                = { version = "1", default-features = false }
 clap                  = { version = "4", default-features = false }
-chrono                = { version = "0.4", default-features = false }
 crypto-bigint         = { version = "0.5", default-features = false }
 crossbeam             = { version = "0.8", default-features = false }
 const_format          = { version = "0.2", default-features = false }

binaries/cuprated/Cargo.toml

@@ -23,7 +23,8 @@ cuprate-database          = { workspace = true, features = ["serde"] }
 cuprate-epee-encoding     = { workspace = true }
 cuprate-fast-sync         = { workspace = true }
 cuprate-fixed-bytes       = { workspace = true }
-cuprate-helper            = { workspace = true, features = ["std", "serde", "time", "net"] }
+cuprate-fs                = { workspace = true }
+cuprate-helper            = { workspace = true, features = ["std", "time", "net"] }
 cuprate-hex               = { workspace = true }
 cuprate-json-rpc          = { workspace = true }
 cuprate-levin             = { workspace = true }
@@ -33,7 +34,7 @@ cuprate-pruning           = { workspace = true }
 cuprate-rpc-interface     = { workspace = true, features = ["dummy"] }
 cuprate-rpc-types         = { workspace = true, features = ["from"] }
 cuprate-test-utils        = { workspace = true }
-cuprate-txpool            = { workspace = true }
+cuprate-txpool            = { workspace = true, features = ["serde"] }
 cuprate-types             = { workspace = true, features = ["json"] }
 cuprate-wire              = { workspace = true }
 
@@ -48,7 +49,6 @@ bytemuck              = { workspace = true }
 bytes                 = { workspace = true }
 cfg-if                = { workspace = true }
 clap                  = { workspace = true, features = ["cargo", "help", "wrap_help", "usage", "error-context", "suggestions"] }
-chrono                = { workspace = true }
 crypto-bigint         = { workspace = true }
 crossbeam             = { workspace = true }
 curve25519-dalek      = { workspace = true }

binaries/cuprated/src/blockchain/fast_sync.rs

@@ -1,6 +1,6 @@
 use std::slice;
 
-use cuprate_helper::network::Network;
+use cuprate_types::network::Network;
 
 /// The hashes of the compiled in fast sync file.
 ///

binaries/cuprated/src/blockchain/manager/tests.rs

@@ -9,9 +9,9 @@ use tower::BoxError;
 
 use cuprate_consensus_context::{BlockchainContext, ContextConfig};
 use cuprate_consensus_rules::{hard_forks::HFInfo, miner_tx::calculate_block_reward, HFsInfo};
-use cuprate_helper::network::Network;
 use cuprate_p2p::{block_downloader::BlockBatch, BroadcastSvc};
 use cuprate_p2p_core::handles::HandleBuilder;
+use cuprate_types::network::Network;
 use cuprate_types::{CachedVerificationState, TransactionVerificationData, TxVersion};
 
 use crate::blockchain::{

binaries/cuprated/src/config.rs

@@ -12,12 +12,10 @@ use clap::Parser;
 use serde::{Deserialize, Serialize};
 
 use cuprate_consensus::ContextConfig;
-use cuprate_helper::{
-    fs::{CUPRATE_CONFIG_DIR, DEFAULT_CONFIG_FILE_NAME},
-    network::Network,
-};
+use cuprate_fs::{CUPRATE_CONFIG_DIR, DEFAULT_CONFIG_FILE_NAME};
 use cuprate_p2p::block_downloader::BlockDownloaderConfig;
 use cuprate_p2p_core::ClearNet;
+use cuprate_types::network::Network;
 
 use crate::{
     constants::{DEFAULT_CONFIG_STARTUP_DELAY, DEFAULT_CONFIG_WARNING},

binaries/cuprated/src/config/args.rs

@@ -3,7 +3,7 @@ use std::{io::Write, path::PathBuf, process::exit};
 use clap::builder::TypedValueParser;
 use serde_json::Value;
 
-use cuprate_helper::network::Network;
+use cuprate_types::network::Network;
 
 use crate::{config::Config, version::CupratedVersionInfo};
 

binaries/cuprated/src/config/fs.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
-use cuprate_helper::fs::{CUPRATE_CACHE_DIR, CUPRATE_DATA_DIR};
+use cuprate_fs::{CUPRATE_CACHE_DIR, CUPRATE_DATA_DIR};
 
 use super::macros::config_struct;
 

binaries/cuprated/src/config/p2p.rs

@@ -7,12 +7,13 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use cuprate_helper::{fs::address_book_path, network::Network};
+use cuprate_fs::address_book_path;
 use cuprate_p2p::config::TransportConfig;
 use cuprate_p2p_core::{
     transports::{Tcp, TcpServerConfig},
     ClearNet, NetworkZone, Transport,
 };
+use cuprate_types::network::Network;
 use cuprate_wire::OnionAddr;
 
 use super::macros::config_struct;

binaries/cuprated/src/config/storage.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use cuprate_database::config::SyncMode;
 use cuprate_database_service::ReaderThreads;
-use cuprate_helper::fs::CUPRATE_DATA_DIR;
+use cuprate_fs::CUPRATE_DATA_DIR;
 
 use super::macros::config_struct;
 

binaries/cuprated/src/logging.rs

@@ -24,7 +24,7 @@ use tracing_subscriber::{
     Layer, Registry,
 };
 
-use cuprate_helper::fs::logs_path;
+use cuprate_fs::logs_path;
 
 use crate::config::Config;
 

books/architecture/src/resources/fs/paths.md

@@ -1,7 +1,7 @@
 # Index of PATHs
 This is an index of all of the filesystem PATHs Cuprate actively uses.
 
-The [`cuprate_helper::fs`](https://doc.cuprate.org/cuprate_helper/fs/index.html)
+The [`cuprate_fs`](https://doc.cuprate.org/cuprate_helper/fs/index.html)
 module defines the general locations used throughout Cuprate.
 
 [`dirs`](https://docs.rs/dirs) is used internally, which follows