From 51217ae4803388f6baedd3732f0075aab90921cd Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Tue, 9 Apr 2024 13:29:37 +1200
Subject: [PATCH] Pass directory into Lmdb::new()

---
 chorus-lib/src/store/lmdb/mod.rs | 10 ++++------
 chorus-lib/src/store/mod.rs      |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/chorus-lib/src/store/lmdb/mod.rs b/chorus-lib/src/store/lmdb/mod.rs
index 3a89e8f..e7f0555 100644
--- a/chorus-lib/src/store/lmdb/mod.rs
+++ b/chorus-lib/src/store/lmdb/mod.rs
@@ -1,4 +1,3 @@
-use crate::config::Config;
 use crate::error::Error;
 use crate::ip::{HashedIp, IpData};
 use crate::types::{Event, Id, Kind, Pubkey, Time};
@@ -33,7 +32,7 @@ pub struct Lmdb {
 }
 
 impl Lmdb {
-    pub fn new(config: &Config) -> Result<Lmdb, Error> {
+    pub fn new(directory: &str) -> Result<Lmdb, Error> {
         let mut builder = EnvOpenOptions::new();
         unsafe {
             builder.flags(EnvFlags::NO_TLS);
@@ -41,13 +40,12 @@ impl Lmdb {
         builder.max_dbs(32);
         builder.map_size(1048576 * 1024 * 24); // 24 GB
 
-        let dir = format!("{}/lmdb", &config.data_directory);
-        fs::create_dir_all(&dir)?;
+        fs::create_dir_all(directory)?;
 
-        let env = match builder.open(&dir) {
+        let env = match builder.open(directory) {
             Ok(env) => env,
             Err(e) => {
-                log::error!("Unable to open LMDB at {}", dir);
+                log::error!("Unable to open LMDB at {}", directory);
                 return Err(e.into());
             }
         };
diff --git a/chorus-lib/src/store/mod.rs b/chorus-lib/src/store/mod.rs
index 7ff7179..8a7c3be 100644
--- a/chorus-lib/src/store/mod.rs
+++ b/chorus-lib/src/store/mod.rs
@@ -22,7 +22,8 @@ pub struct Store {
 impl Store {
     /// Setup persistent storage
     pub fn new(config: &Config) -> Result<Store, Error> {
-        let lmdb = Lmdb::new(config)?;
+        let dir = format!("{}/lmdb", &config.data_directory);
+        let lmdb = Lmdb::new(&dir)?;
 
         let events_are_aligned = lmdb.get_if_events_are_aligned()?;