Merge branch 'add_defer_functor_util' into 'master'

util: Refactor the Defer class to a header to be reusable

See merge request bitcoin-cash-node/bitcoin-cash-node!1183

src/Makefile.am

@@ -227,6 +227,7 @@ BITCOIN_CORE_H = \
   ui_interface.h \
   undo.h \
   util/bitmanip.h \
+  util/defer.h \
   util/moneystr.h \
   util/saltedhashers.h \
   util/system.h \

src/test/rpc_server_tests.cpp

@@ -8,13 +8,13 @@
 #include <chainparams.h>
 #include <config.h>
 #include <software_outdated.h>
+#include <util/defer.h>
 #include <util/system.h>
 
 #include <test/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
-#include <functional>
 #include <string>
 
 BOOST_FIXTURE_TEST_SUITE(rpc_server_tests, TestingSetup)
@@ -38,13 +38,6 @@ static bool isRpcDisabled(const JSONRPCError &u) {
     return u.code == RPC_DISABLED;
 }
 
-struct Defer {
-    const std::function<void()> func;
-    template <typename F>
-    Defer(F && f) : func(f) {}
-    ~Defer() { func(); }
-};
-
 BOOST_AUTO_TEST_CASE(rpc_server_execute_command) {
     DummyConfig config;
     RPCServer rpcServer;

src/util/defer.h

@@ -0,0 +1,19 @@
+// Copyright (c) 2021 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_UTIL_DEFER_H
+#define BITCOIN_UTIL_DEFER_H
+
+#include <utility>
+
+/// Leverage RAII to run a functor at scope end
+template <typename Func>
+struct Defer {
+    Func func;
+    Defer(Func && f) : func(std::move(f)) {}
+    ~Defer() { func(); }
+};
+
+
+#endif // BITCOIN_UTIL_DEFER_H

src/validation.cpp

@@ -44,6 +44,7 @@
 #include <txmempool.h>
 #include <ui_interface.h>
 #include <undo.h>
+#include <util/defer.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/system.h>
@@ -3178,16 +3179,6 @@ bool PreciousBlock(const Config &config, CValidationState &state,
     return g_chainstate.PreciousBlock(config, state, pindex);
 }
 
-namespace {
-// Leverage RAII to run a functor at scope end
-template <typename Func>
-struct Defer {
-    Func func;
-    Defer(Func && f) : func(std::move(f)) {}
-    ~Defer() { func(); }
-};
-} // namespace
-
 bool CChainState::UnwindBlock(const Config &config, CValidationState &state,
                               CBlockIndex *pindex, bool invalidate) {
     CBlockIndex *to_mark_failed_or_parked = pindex;