From 38377002671d038aadb01e1521ea95c97838cedc Mon Sep 17 00:00:00 2001
From: Carl Dong <contact@carldong.me>
Date: Wed, 13 Jul 2022 14:15:11 -0400
Subject: [PATCH] Move ChainstateManagerOpts into kernel:: namespace

It should have been there in the first place.
---
 src/kernel/chainstatemanager_opts.h | 4 ++++
 src/validation.h                    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/kernel/chainstatemanager_opts.h b/src/kernel/chainstatemanager_opts.h
index 575d94e2e9..510a1f9edc 100644
--- a/src/kernel/chainstatemanager_opts.h
+++ b/src/kernel/chainstatemanager_opts.h
@@ -10,6 +10,8 @@
 
 class CChainParams;
 
+namespace kernel {
+
 /**
  * An options struct for `ChainstateManager`, more ergonomically referred to as
  * `ChainstateManager::Options` due to the using-declaration in
@@ -20,4 +22,6 @@ struct ChainstateManagerOpts {
     const std::function<int64_t()> adjusted_time_callback{nullptr};
 };
 
+} // namespace kernel
+
 #endif // BITCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H
diff --git a/src/validation.h b/src/validation.h
index 0e27e117fa..aa9fcf9f2d 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -834,7 +834,7 @@ private:
     friend CChainState;
 
 public:
-    using Options = ChainstateManagerOpts;
+    using Options = kernel::ChainstateManagerOpts;
 
     explicit ChainstateManager(const Options& opts)
         : m_chainparams{opts.chainparams},