Skip to content

Commit 06069b3

Browse files
committed
scripted-diff: Rename MainSignals to ValidationSignals
-BEGIN VERIFY SCRIPT- s() { git grep -l "$1" src | xargs sed -i "s/$1/$2/g"; } s 'CMainSignals' 'ValidationSignals' s 'MainSignalsImpl' 'ValidationSignalsImpl' -END VERIFY SCRIPT-
1 parent 0d6d2b6 commit 06069b3

12 files changed

+47
-47
lines changed

src/bitcoin-chainstate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ int main(int argc, char* argv[])
7474
// Start the lightweight task scheduler thread
7575
scheduler.m_service_thread = std::thread(util::TraceThread, "scheduler", [&] { scheduler.serviceQueue(); });
7676

77-
CMainSignals validation_signals{scheduler};
77+
ValidationSignals validation_signals{scheduler};
7878

7979
// Gather some entropy once per minute.
8080
scheduler.scheduleEvery(RandAddPeriodic, std::chrono::minutes{1});

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
11641164
}, std::chrono::minutes{5});
11651165

11661166
assert(!node.validation_signals);
1167-
node.validation_signals = std::make_unique<CMainSignals>(scheduler);
1167+
node.validation_signals = std::make_unique<ValidationSignals>(scheduler);
11681168
auto& validation_signals = *node.validation_signals;
11691169

11701170
// Create client interfaces for wallets that are supposed to be loaded

src/kernel/chainstatemanager_opts.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <optional>
1919

2020
class CChainParams;
21-
class CMainSignals;
21+
class ValidationSignals;
2222

2323
static constexpr bool DEFAULT_CHECKPOINTS_ENABLED{true};
2424
static constexpr auto DEFAULT_MAX_TIP_AGE{24h};
@@ -45,7 +45,7 @@ struct ChainstateManagerOpts {
4545
DBOptions coins_db{};
4646
CoinsViewOptions coins_view{};
4747
Notifications& notifications;
48-
CMainSignals* signals{nullptr};
48+
ValidationSignals* signals{nullptr};
4949
//! Number of script check worker threads. Zero means no parallel verification.
5050
int worker_threads_num{0};
5151
};

src/kernel/mempool_options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <cstdint>
1414
#include <optional>
1515

16-
class CMainSignals;
16+
class ValidationSignals;
1717

1818
/** Default for -maxmempool, maximum megabytes of mempool memory usage */
1919
static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE_MB{300};
@@ -59,7 +59,7 @@ struct MemPoolOptions {
5959
bool persist_v1_dat{DEFAULT_PERSIST_V1_DAT};
6060
MemPoolLimits limits{};
6161

62-
CMainSignals* signals{nullptr};
62+
ValidationSignals* signals{nullptr};
6363
};
6464
} // namespace kernel
6565

src/node/context.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class BanMan;
2020
class BaseIndex;
2121
class CBlockPolicyEstimator;
2222
class CConnman;
23-
class CMainSignals;
23+
class ValidationSignals;
2424
class CScheduler;
2525
class CTxMemPool;
2626
class ChainstateManager;
@@ -74,7 +74,7 @@ struct NodeContext {
7474
//! Issues blocking calls about sync status, errors and warnings
7575
std::unique_ptr<KernelNotifications> notifications;
7676
//! Issues calls about blocks and transactions
77-
std::unique_ptr<CMainSignals> validation_signals;
77+
std::unique_ptr<ValidationSignals> validation_signals;
7878
std::atomic<int> exit_status{EXIT_SUCCESS};
7979

8080
//! Declare default constructor and destructor that are not inline, so code

src/node/interfaces.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class NotificationsProxy : public CValidationInterface
460460
class NotificationsHandlerImpl : public Handler
461461
{
462462
public:
463-
explicit NotificationsHandlerImpl(CMainSignals& signals, std::shared_ptr<Chain::Notifications> notifications)
463+
explicit NotificationsHandlerImpl(ValidationSignals& signals, std::shared_ptr<Chain::Notifications> notifications)
464464
: m_signals{signals}, m_proxy{std::make_shared<NotificationsProxy>(std::move(notifications))}
465465
{
466466
m_signals.RegisterSharedValidationInterface(m_proxy);
@@ -473,7 +473,7 @@ class NotificationsHandlerImpl : public Handler
473473
m_proxy.reset();
474474
}
475475
}
476-
CMainSignals& m_signals;
476+
ValidationSignals& m_signals;
477477
std::shared_ptr<NotificationsProxy> m_proxy;
478478
};
479479

@@ -823,7 +823,7 @@ class ChainImpl : public Chain
823823
NodeContext* context() override { return &m_node; }
824824
ArgsManager& args() { return *Assert(m_node.args); }
825825
ChainstateManager& chainman() { return *Assert(m_node.chainman); }
826-
CMainSignals& validation_signals() { return *Assert(m_node.validation_signals); }
826+
ValidationSignals& validation_signals() { return *Assert(m_node.validation_signals); }
827827
NodeContext& m_node;
828828
};
829829
} // namespace

src/test/util/setup_common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ChainTestingSetup::ChainTestingSetup(const ChainType chainType, const std::vecto
171171
// from blocking due to queue overrun.
172172
m_node.scheduler = std::make_unique<CScheduler>();
173173
m_node.scheduler->m_service_thread = std::thread(util::TraceThread, "scheduler", [&] { m_node.scheduler->serviceQueue(); });
174-
m_node.validation_signals = std::make_unique<CMainSignals>(*m_node.scheduler);
174+
m_node.validation_signals = std::make_unique<ValidationSignals>(*m_node.scheduler);
175175

176176
m_node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(FeeestPath(*m_node.args), DEFAULT_ACCEPT_STALE_FEE_ESTIMATES);
177177
m_node.mempool = std::make_unique<CTxMemPool>(MemPoolOptionsForTest(m_node));

src/test/validationinterface_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(unregister_validation_interface_race)
5252
class TestInterface : public CValidationInterface
5353
{
5454
public:
55-
TestInterface(CMainSignals& signals, std::function<void()> on_call = nullptr, std::function<void()> on_destroy = nullptr)
55+
TestInterface(ValidationSignals& signals, std::function<void()> on_call = nullptr, std::function<void()> on_destroy = nullptr)
5656
: m_on_call(std::move(on_call)), m_on_destroy(std::move(on_destroy)), m_signals{signals}
5757
{
5858
}
@@ -72,7 +72,7 @@ class TestInterface : public CValidationInterface
7272
}
7373
std::function<void()> m_on_call;
7474
std::function<void()> m_on_destroy;
75-
CMainSignals& m_signals;
75+
ValidationSignals& m_signals;
7676
};
7777

7878
// Regression test to ensure UnregisterAllValidationInterfaces calls don't

src/txmempool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <vector>
4141

4242
class CChain;
43-
class CMainSignals;
43+
class ValidationSignals;
4444

4545
/** Fake height value used in Coin to signify they are only in the memory pool (since 0.8) */
4646
static const uint32_t MEMPOOL_HEIGHT = 0x7FFFFFFF;
@@ -448,7 +448,7 @@ class CTxMemPool
448448

449449
const Limits m_limits;
450450

451-
CMainSignals* const m_signals;
451+
ValidationSignals* const m_signals;
452452

453453
/** Create a new CTxMemPool.
454454
* Sanity checks will be off by default for performance, because otherwise

src/validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3213,7 +3213,7 @@ static bool NotifyHeaderTip(ChainstateManager& chainman) LOCKS_EXCLUDED(cs_main)
32133213
return fNotify;
32143214
}
32153215

3216-
static void LimitValidationInterfaceQueue(CMainSignals& signals) LOCKS_EXCLUDED(cs_main) {
3216+
static void LimitValidationInterfaceQueue(ValidationSignals& signals) LOCKS_EXCLUDED(cs_main) {
32173217
AssertLockNotHeld(cs_main);
32183218

32193219
if (signals.CallbacksPending() > 10) {

0 commit comments

Comments
 (0)