Read cookie file from --bitcoin-data-dir (ordinals#365)

deploy/ord.service

@@ -10,7 +10,7 @@ WorkingDirectory=/var/lib/ord
 Environment=RUST_BACKTRACE=1
 Environment=RUST_LOG=info
 ExecStart=/usr/local/bin/ord \
- --cookie-file /var/lib/bitcoind/signet/.cookie \
+ --bitcoin-data-dir /var/lib/bitcoind \
  --data-dir /var/lib/ord \
  --max-index-size 1TiB \
  --chain ${CHAIN} \

src/options.rs

@@ -12,6 +12,8 @@ pub(crate) struct Options {
  pub(crate) chain: Chain,
  #[clap(long)]
  data_dir: Option<PathBuf>,
+ #[clap(long)]
+ bitcoin_data_dir: Option<PathBuf>,
 }
 
 #[derive(ValueEnum, Copy, Clone, Debug)]
@@ -64,7 +66,9 @@ impl Options {
  return Ok(cookie_file.clone());
  }
 
- let path = if cfg!(target_os = "linux") {
+ let path = if let Some(bitcoin_data_dir) = &self.bitcoin_data_dir {
+ bitcoin_data_dir.clone()
+ } else if cfg!(target_os = "linux") {
  dirs::home_dir()
  .ok_or_else(|| anyhow!("Failed to retrieve home dir"))?
  .join(".bitcoin")
@@ -189,6 +193,22 @@ mod tests {
  }
  }
 
+ #[test]
+ fn cookie_file_defaults_to_bitcoin_data_dir() {
+ let arguments =
+ Arguments::try_parse_from(&["ord", "--bitcoin-data-dir=foo", "--chain=signet", "index"])
+ .unwrap();
+
+ let cookie_file = arguments
+ .options
+ .cookie_file()
+ .unwrap()
+ .display()
+ .to_string();
+
+ assert!(cookie_file.ends_with("foo/signet/.cookie"));
+ }
+
  #[test]
  fn mainnet_data_dir() {
  let arguments = Arguments::try_parse_from(&["ord", "index"]).unwrap();