From 3664eb1b08fad51be6ae00cc32ecf2dc17976836 Mon Sep 17 00:00:00 2001
From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com>
Date: Tue, 5 Nov 2024 01:37:51 +0000
Subject: [PATCH] rename & fix default config file

---
 Cargo.lock                                                 | 7 +++----
 binaries/cuprated/Cargo.toml                               | 2 +-
 .../cuprated/src/config/{Cuprate.toml => Cuprated.toml}    | 4 ++--
 binaries/cuprated/src/config/default.rs                    | 2 +-
 binaries/cuprated/src/config/storage.rs                    | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename binaries/cuprated/src/config/{Cuprate.toml => Cuprated.toml} (97%)

diff --git a/Cargo.lock b/Cargo.lock
index a7d3d374..ed598a40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1041,7 +1041,6 @@ dependencies = [
  "cuprate-consensus",
  "cuprate-consensus-context",
  "cuprate-consensus-rules",
- "cuprate-constants",
  "cuprate-cryptonight",
  "cuprate-dandelion-tower",
  "cuprate-database",
@@ -2851,12 +2850,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
 dependencies = [
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/binaries/cuprated/Cargo.toml b/binaries/cuprated/Cargo.toml
index 5b4f6e62..cc288b41 100644
--- a/binaries/cuprated/Cargo.toml
+++ b/binaries/cuprated/Cargo.toml
@@ -24,7 +24,7 @@ cuprate-p2p-core         = { workspace = true, features = ["serde"] }
 cuprate-dandelion-tower  = { workspace = true, features = ["txpool"] }
 cuprate-async-buffer     = { workspace = true }
 cuprate-address-book     = { workspace = true, features = ["serde_config"] }
-cuprate-blockchain       = { workspace = true, features = ["service"] }
+cuprate-blockchain       = { workspace = true }
 cuprate-database-service = { workspace = true, features = ["serde"] }
 cuprate-txpool           = { workspace = true }
 cuprate-database         = { workspace = true, features = ["serde"] }
diff --git a/binaries/cuprated/src/config/Cuprate.toml b/binaries/cuprated/src/config/Cuprated.toml
similarity index 97%
rename from binaries/cuprated/src/config/Cuprate.toml
rename to binaries/cuprated/src/config/Cuprated.toml
index ecc53790..7a626834 100644
--- a/binaries/cuprated/src/config/Cuprate.toml
+++ b/binaries/cuprated/src/config/Cuprated.toml
@@ -36,7 +36,7 @@ max_white_list_length = 1_000
 ## The size of the gray peer list, which contains peers we have not made a connection to before.
 max_gray_list_length = 5_000
 ## The folder to store the address book.
-peer_store_folder = {cache}
+peer_store_directory = {cache}
 ## The amount of time between address book saves.
 peer_save_period = {{ secs = 90, nanos = 0 }}
 
@@ -65,7 +65,7 @@ path = {txpool}
 ## The database sync mode for the txpool.
 sync_mode = "Async"
 ## The maximum size of all the txs in the pool (bytes).
-max_txpool_size = 100_000_000
+max_txpool_byte_size = 100_000_000
 
 ## Blockchain storage config.
 [storage.blockchain]
diff --git a/binaries/cuprated/src/config/default.rs b/binaries/cuprated/src/config/default.rs
index 23ca77e9..6b8bb57f 100644
--- a/binaries/cuprated/src/config/default.rs
+++ b/binaries/cuprated/src/config/default.rs
@@ -45,7 +45,7 @@ fn generate_config_text() -> String {
     };
 
     format!(
-        include_str!("Cuprate.toml"),
+        include_str!("Cuprated.toml"),
         cache = toml_value_str(&CUPRATE_CACHE_DIR),
         txpool = toml_value_str(&CUPRATE_TXPOOL_DIR),
         blockchain = toml_value_str(&CUPRATE_BLOCKCHAIN_DIR)
diff --git a/binaries/cuprated/src/config/storage.rs b/binaries/cuprated/src/config/storage.rs
index 80de2656..2023139b 100644
--- a/binaries/cuprated/src/config/storage.rs
+++ b/binaries/cuprated/src/config/storage.rs
@@ -53,7 +53,7 @@ impl Default for TxpoolConfig {
                 path: CUPRATE_TXPOOL_DIR.to_path_buf(),
                 sync_mode: SyncMode::Async,
             },
-            max_txpool_size: 100_000_000,
+            max_txpool_byte_size: 100_000_000,
         }
     }
 }