Return optional error from ApplyArgsManOptions

Also pass in a (for now unused) reference to the params.

Both changes are needed for the next commit.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mempool_args.h b/src/mempool_args.h
index 9a4abe6618..72d202cca2 100644
--- a/src/mempool_args.h
+++ b/src/mempool_args.h
@@ -5,18 +5,23 @@
 #ifndef BITCOIN_MEMPOOL_ARGS_H
 #define BITCOIN_MEMPOOL_ARGS_H
 
+#include <optional>
+
 class ArgsManager;
+class CChainParams;
+struct bilingual_str;
 namespace kernel {
 struct MemPoolOptions;
 };
 
 /**
  * Overlay the options set in \p argsman on top of corresponding members in \p mempool_opts.
+ * Returns an error if one was encountered.
  *
  * @param[in]  argsman The ArgsManager in which to check set options.
  * @param[in,out] mempool_opts The MemPoolOptions to modify according to \p argsman.
  */
-void ApplyArgsManOptions(const ArgsManager& argsman, kernel::MemPoolOptions& mempool_opts);
+[[nodiscard]] std::optional<bilingual_str> ApplyArgsManOptions(const ArgsManager& argsman, const CChainParams& chainparams, kernel::MemPoolOptions& mempool_opts);
 
 
 #endif // BITCOIN_MEMPOOL_ARGS_H