Skip to content

Commit 39cf27f

Browse files
author
MarcoFalke
committed
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
2 parents 615f7c2 + 1bf3f33 commit 39cf27f

File tree

6 files changed

+0
-108
lines changed

6 files changed

+0
-108
lines changed

src/Makefile.bench.include

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ bench_bench_bitcoin_SOURCES = \
2525
bench/verify_script.cpp \
2626
bench/base58.cpp \
2727
bench/lockedpool.cpp \
28-
bench/perf.cpp \
29-
bench/perf.h \
3028
bench/prevector.cpp
3129

3230
nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES)

src/bench/bench.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <bench/bench.h>
6-
#include <bench/perf.h>
76

87
#include <assert.h>
98
#include <iostream>
@@ -96,7 +95,6 @@ benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction f
9695

9796
void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double scaling, const std::string& filter, bool is_list_only)
9897
{
99-
perf_init();
10098
if (!std::ratio_less_equal<benchmark::clock::period, std::micro>::value) {
10199
std::cerr << "WARNING: Clock precision is worse than microsecond - benchmarks may be less accurate!\n";
102100
}
@@ -126,8 +124,6 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
126124
}
127125

128126
printer.footer();
129-
130-
perf_fini();
131127
}
132128

133129
bool benchmark::State::UpdateTimer(const benchmark::time_point current_time)

src/bench/perf.cpp

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/bench/perf.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/interfaces/node.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,6 @@ class NodeImpl : public Node
216216
return result;
217217
}
218218
CFeeRate getDustRelayFee() override { return ::dustRelayFee; }
219-
CFeeRate getFallbackFee() override { CHECK_WALLET(return CWallet::fallbackFee); }
220-
CFeeRate getPayTxFee() override { CHECK_WALLET(return ::payTxFee); }
221-
void setPayTxFee(CFeeRate rate) override { CHECK_WALLET(::payTxFee = rate); }
222219
UniValue executeRpc(const std::string& command, const UniValue& params, const std::string& uri) override
223220
{
224221
JSONRPCRequest req;

src/interfaces/node.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,6 @@ class Node
173173
//! Get dust relay fee.
174174
virtual CFeeRate getDustRelayFee() = 0;
175175

176-
//! Get fallback fee.
177-
virtual CFeeRate getFallbackFee() = 0;
178-
179-
//! Get pay tx fee.
180-
virtual CFeeRate getPayTxFee() = 0;
181-
182-
//! Set pay tx fee.
183-
virtual void setPayTxFee(CFeeRate rate) = 0;
184-
185176
//! Execute rpc command.
186177
virtual UniValue executeRpc(const std::string& command, const UniValue& params, const std::string& uri) = 0;
187178

0 commit comments

Comments
 (0)