From fab117096446ab63d1f38c1ef6edbc94a5d4ab52 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 9 Apr 2020 11:47:32 -0400
Subject: bench: Remove requirement that all benches use RegTestingSetup

---
 src/bench/bench.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/bench/bench.cpp')

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 55a9e0fe42..7b93ef688d 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -15,7 +15,6 @@
 #include <numeric>
 #include <regex>
 
-const RegTestingSetup* g_testing_setup = nullptr;
 const std::function<void(const std::string&)> G_TEST_LOG_FUN{};
 
 void benchmark::ConsolePrinter::header()
@@ -115,18 +114,7 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
     printer.header();
 
     for (const auto& p : benchmarks()) {
-        RegTestingSetup test{};
-        assert(g_testing_setup == nullptr);
-        g_testing_setup = &test;
-        {
-            LOCK(cs_main);
-            assert(::ChainActive().Height() == 0);
-            const bool witness_enabled{IsWitnessEnabled(::ChainActive().Tip(), Params().GetConsensus())};
-            assert(witness_enabled);
-        }
-
         if (!std::regex_match(p.first, baseMatch, reFilter)) {
-             g_testing_setup = nullptr;
             continue;
         }
 
@@ -139,7 +127,6 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
             p.second.func(state);
         }
         printer.result(state);
-        g_testing_setup = nullptr;
     }
 
     printer.footer();
-- 
cgit v1.2.3