From d29f09adfaed0abeff0243509cdd49e4f52ebf9a Mon Sep 17 00:00:00 2001
From: Carl Dong <contact@carldong.me>
Date: Sat, 23 Oct 2021 00:05:02 -0400
Subject: [PATCH] CDBWrapper: Pass in -forcecompactdb via ::Options

This removes all references to gArgs from src/dbwrapper.cpp
---
 src/dbwrapper.cpp | 2 +-
 src/dbwrapper.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 1905b0ff31a46..76f3c20237dfc 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -157,7 +157,7 @@ CDBWrapper::CDBWrapper(const Options& opts)
     dbwrapper_private::HandleError(status);
     LogPrintf("Opened LevelDB successfully\n");
 
-    if (gArgs.GetBoolArg("-forcecompactdb", false)) {
+    if (opts.do_compact) {
         LogPrintf("Starting database compaction of %s\n", fs::PathToString(opts.db_path));
         pdb->CompactRange(nullptr, nullptr);
         LogPrintf("Finished database compaction of %s\n", fs::PathToString(opts.db_path));
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 40ec958936937..4afa9ab43d9a0 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -227,6 +227,7 @@ class CDBWrapper
         bool in_memory = false;
         bool wipe_existing = false;
         bool obfuscate_data = false;
+        bool do_compact = false;
     };
 
     CDBWrapper(const fs::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool obfuscate = false)
@@ -236,6 +237,7 @@ class CDBWrapper
                 .in_memory = fMemory,
                 .wipe_existing = fWipe,
                 .obfuscate_data = obfuscate,
+                .do_compact = gArgs.GetBoolArg("-forcecompactdb", false),
             }} {}
     CDBWrapper(const Options& opts);
     ~CDBWrapper();