net: Define a datastore path

bin/darkirc/darkirc_config.toml

@@ -50,6 +50,9 @@ autojoin = [
 
 # P2P network settings
 [net]
+# Path to the P2P datastore
+datastore = "~/.local/darkifi/darkirc"
+
 # Path to a configured hostlist for saving known peers
 hostlist = "~/.local/darkfi/darkirc/hostlist.tsv"
 

bin/lilith/lilith_config.toml

@@ -16,7 +16,8 @@
 #peers = []
 #version = "0.4.1"
 #localnet = false
-#hostlist ="~/.local/darkfi/lilith/darkfid_sync_hostlist.tsv"
+#hostlist ="~/.local/darkfi/lilith/darkfid_sync/hostlist.tsv"
+#datastore = "~/.local/darkfi/lilith/darkfid_sync"
 
 #[network."darkfid_consensus_v4"]
 #accept_addrs = ["tcp+tls://0.0.0.0:33023"]
@@ -24,7 +25,8 @@
 #peers = []
 #version = "0.4.1"
 #localnet = false
-#hostlist ="~/.local/darkfi/lilith/darkfid_consensus_hostlist.tsv"
+#datastore = "~/.local/darkfi/lilith/darkfid_consensus"
+#hostlist ="~/.local/darkfi/lilith/darkfid_consensus/hostlist.tsv"
 
 #[network."darkirc_v4"]
 #accept_addrs = ["tcp+tls://0.0.0.0:25551"]
@@ -32,7 +34,8 @@
 #peers = []
 #version = "0.4.1"
 #localnet = false
-#hostlist ="~/.local/darkfi/lilith/darkirc_hostlist.tsv"
+#datastore = "~/.local/darkfi/lilith/darkirc"
+#hostlist ="~/.local/darkfi/lilith/darkirc/hostlist.tsv"
 
 #[network."taud_v4"]
 #accept_addrs = ["tcp+tls://0.0.0.0:23331"]
@@ -40,4 +43,5 @@
 #peers = []
 #version = "0.4.1"
 #localnet = false
-#hostlist ="~/.local/darkfi/lilith/taud_hostlist.tsv"
+#datastore = "~/.local/darkfi/lilith/taud"
+#hostlist ="~/.local/darkfi/lilith/taud/hostlist.tsv"

src/net/settings.rs

@@ -64,6 +64,8 @@ pub struct Settings {
     pub outbound_peer_discovery_cooloff_time: u64,
     /// Time between peer discovery attempts
     pub outbound_peer_discovery_attempt_time: u64,
+    /// P2P datastore path
+    pub datastore: Option<String>,
     /// Hostlist storage path
     pub hostlist: Option<String>,
     /// Pause interval within greylist refinery process
@@ -106,6 +108,7 @@ impl Default for Settings {
             localnet: false,
             outbound_peer_discovery_cooloff_time: 30,
             outbound_peer_discovery_attempt_time: 5,
+            datastore: None,
             hostlist: None,
             greylist_refinery_interval: 15,
             white_connect_percent: 70,
@@ -196,6 +199,11 @@ pub struct SettingsOpt {
     #[structopt(skip)]
     pub outbound_peer_discovery_attempt_time: Option<u64>,
 
+    /// P2P datastore path
+    #[serde(default)]
+    #[structopt(long)]
+    pub datastore: Option<String>,
+
     /// Hosts .tsv file to use
     #[serde(default)]
     #[structopt(long)]
@@ -261,6 +269,7 @@ impl From<SettingsOpt> for Settings {
             outbound_peer_discovery_attempt_time: opt
                 .outbound_peer_discovery_attempt_time
                 .unwrap_or(def.outbound_peer_discovery_attempt_time),
+            datastore: opt.datastore,
             hostlist: opt.hostlist,
             greylist_refinery_interval: opt
                 .greylist_refinery_interval