refactor: Manage dumptxoutset RAII classes with std::optional

Also removes unused error variable.
fjahr · Sep 5, 2024 · 30fb3f7 · 30fb3f7
1 parent 25358d2
commit 30fb3f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -56,6 +56,7 @@
 #include <condition_variable>
 #include <memory>
 #include <mutex>
+#include <optional>
 
 using kernel::CCoinsStats;
 using kernel::CoinStatsHashType;
@@ -2786,8 +2787,8 @@ static RPCHelpMan dumptxoutset()
 
     CConnman& connman = EnsureConnman(node);
     const CBlockIndex* invalidate_index{nullptr};
-    std::unique_ptr<NetworkDisable> disable_network;
-    std::unique_ptr<TemporaryRollback> temporary_rollback;
+    std::optional<NetworkDisable> disable_network;
+    std::optional<TemporaryRollback> temporary_rollback;
 
     // If the user wants to dump the txoutset of the current tip, we don't have
     // to roll back at all
@@ -2812,18 +2813,16 @@ static RPCHelpMan dumptxoutset()
         // automatically re-enables the network activity at the end of the
         // process which may not be what the user wants.
         if (connman.GetNetworkActive()) {
-            disable_network = std::make_unique<NetworkDisable>(connman);
+            disable_network.emplace(connman);
         }
 
         invalidate_index = WITH_LOCK(::cs_main, return node.chainman->ActiveChain().Next(target_index));
-        temporary_rollback = std::make_unique<TemporaryRollback>(*node.chainman, *invalidate_index);
+        temporary_rollback.emplace(*node.chainman, *invalidate_index);
     }
 
     Chainstate* chainstate;
     std::unique_ptr<CCoinsViewCursor> cursor;
     CCoinsStats stats;
-    UniValue result;
-    UniValue error;
     {
         // Lock the chainstate before calling PrepareUtxoSnapshot, to be able
         // to get a UTXO database cursor while the chain is pointing at the
@@ -2847,7 +2846,7 @@ static RPCHelpMan dumptxoutset()
         }
     }
 
-    result = WriteUTXOSnapshot(*chainstate, cursor.get(), &stats, tip, afile, path, temppath, node.rpc_interruption_point);
+    UniValue result = WriteUTXOSnapshot(*chainstate, cursor.get(), &stats, tip, afile, path, temppath, node.rpc_interruption_point);
     fs::rename(temppath, path);
 
     result.pushKV("path", path.utf8string());

diff --git a/test/functional/rpc_dumptxoutset.py b/test/functional/rpc_dumptxoutset.py
@@ -5,8 +5,6 @@
 """Test the generation of UTXO snapshots using `dumptxoutset`.
 """
 
-import os
-
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -63,15 +61,15 @@ def run_test(self):
             -8, 'Invalid snapshot type "bogus" specified. Please specify "rollback" or "latest"', node.dumptxoutset, 'utxos.dat', "bogus")
 
         self.log.info(f"Test that dumptxoutset failure does not leave the network activity suspended")
-        rev_file = node.chain_path / "blocks" / "rev00000.dat"
-        bogus_file = node.chain_path / "blocks" / "bogus.dat"
-        os.rename(rev_file, bogus_file)
+        rev_file = node.blocks_path / "rev00000.dat"
+        bogus_file = node.blocks_path / "bogus.dat"
+        rev_file.rename(bogus_file)
         assert_raises_rpc_error(
             -1, 'Could not roll back to requested height.', node.dumptxoutset, 'utxos.dat', rollback=99)
         assert_equal(node.getnetworkinfo()['networkactive'], True)
 
         # Cleanup
-        os.rename(bogus_file, rev_file)
+        bogus_file.rename(rev_file)
 
 if __name__ == '__main__':
     DumptxoutsetTest(__file__).main()