From fe5de96312dc8d57f982c060d4b9b045c2194163 Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Thu, 11 Aug 2022 15:07:32 +0200
Subject: [PATCH] Shorten the paths to the dummy datadirs in the unit tests

It failed CI on MacOS because of overflowing SUN_PATH_LEN.
---
 src/jsonrpc/server.rs |  2 +-
 src/testutils.rs      | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/jsonrpc/server.rs b/src/jsonrpc/server.rs
index d2933e99..ce18f94a 100644
--- a/src/jsonrpc/server.rs
+++ b/src/jsonrpc/server.rs
@@ -401,7 +401,7 @@ mod tests {
         let ms = DummyMinisafe::new();
         let socket_path: path::PathBuf = [
             ms.tmp_dir.as_path(),
-            path::Path::new("datadir"),
+            path::Path::new("d"),
             path::Path::new("bitcoin"),
             path::Path::new("minisafed_rpc"),
         ]
diff --git a/src/testutils.rs b/src/testutils.rs
index ff61a6d9..f38d73b3 100644
--- a/src/testutils.rs
+++ b/src/testutils.rs
@@ -92,13 +92,9 @@ fn uid() -> usize {
 
 pub fn tmp_dir() -> path::PathBuf {
     env::temp_dir().join(format!(
-        "minisafed-unit-tests-{}-{:?}-{}-{}",
+        "minisafed-{}-{:?}-{}",
         process::id(),
         thread::current().id(),
-        time::SystemTime::now()
-            .duration_since(time::UNIX_EPOCH)
-            .unwrap()
-            .subsec_nanos(),
         uid(),
     ))
 }
@@ -107,9 +103,8 @@ impl DummyMinisafe {
     pub fn new() -> DummyMinisafe {
         let tmp_dir = tmp_dir();
         fs::create_dir_all(&tmp_dir).unwrap();
-        let data_dir: path::PathBuf = [tmp_dir.as_path(), path::Path::new("datadir")]
-            .iter()
-            .collect();
+        // Use a shorthand for 'datadir', to avoid overflowing SUN_LEN on MacOS.
+        let data_dir: path::PathBuf = [tmp_dir.as_path(), path::Path::new("d")].iter().collect();
 
         let network = bitcoin::Network::Bitcoin;
         let bitcoin_config = BitcoinConfig {