Merge #13025: Dead code removal

1bf3f33 node: Removed unused wallet-related methods from the Node interface. (Thomas Snider) b382004 benchmark: Removed bench/perf.cpp (Thomas Snider) Pull request description: Not sure if these should be separate PRs. First is removal of a platform abstraction for getting cycle counters where possible. Since the benchmarking switch to counting number of iterations over a fixed window instead of counting cycles per iteration, these are unused. Second is removal of a few methods from the Node interface that seem vestigial from when the concepts of wallet/node were not as clearly separated. Tree-SHA512: de1460a7d4473ca19db4e2ca845185c63c765d12462c2685044a1f27dedab266cd908bc52235a881a7ad98bc251a4abf4eae523e5f599c169e3511e489f19a0d
bitcoin · Apr 19, 2018 · 39cf27f · 39cf27f
2 parents 615f7c2 + 1bf3f33
commit 39cf27f
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 108 deletions.
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
@@ -25,8 +25,6 @@ bench_bench_bitcoin_SOURCES = \
   bench/verify_script.cpp \
   bench/base58.cpp \
   bench/lockedpool.cpp \
-  bench/perf.cpp \
-  bench/perf.h \
   bench/prevector.cpp
 
 nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES)

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <bench/perf.h>
 
 #include <assert.h>
 #include <iostream>
@@ -96,7 +95,6 @@ benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction f
 
 void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double scaling, const std::string& filter, bool is_list_only)
 {
-    perf_init();
     if (!std::ratio_less_equal<benchmark::clock::period, std::micro>::value) {
         std::cerr << "WARNING: Clock precision is worse than microsecond - benchmarks may be less accurate!\n";
     }
@@ -126,8 +124,6 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
     }
 
     printer.footer();
-
-    perf_fini();
 }
 
 bool benchmark::State::UpdateTimer(const benchmark::time_point current_time)

diff --git a/src/bench/perf.cpp b/src/bench/perf.cpp
diff --git a/src/bench/perf.h b/src/bench/perf.h
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
@@ -216,9 +216,6 @@ class NodeImpl : public Node
         return result;
     }
     CFeeRate getDustRelayFee() override { return ::dustRelayFee; }
-    CFeeRate getFallbackFee() override { CHECK_WALLET(return CWallet::fallbackFee); }
-    CFeeRate getPayTxFee() override { CHECK_WALLET(return ::payTxFee); }
-    void setPayTxFee(CFeeRate rate) override { CHECK_WALLET(::payTxFee = rate); }
     UniValue executeRpc(const std::string& command, const UniValue& params, const std::string& uri) override
     {
         JSONRPCRequest req;

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
@@ -173,15 +173,6 @@ class Node
     //! Get dust relay fee.
     virtual CFeeRate getDustRelayFee() = 0;
 
-    //! Get fallback fee.
-    virtual CFeeRate getFallbackFee() = 0;
-
-    //! Get pay tx fee.
-    virtual CFeeRate getPayTxFee() = 0;
-
-    //! Set pay tx fee.
-    virtual void setPayTxFee(CFeeRate rate) = 0;
-
     //! Execute rpc command.
     virtual UniValue executeRpc(const std::string& command, const UniValue& params, const std::string& uri) = 0;