Skip to content

Commit f63e423

Browse files
Merge #7179: refactor: remove unused spork.h usages all over codebase
0a2a27d refactor: remove unused spork.h from multiple files (Konstantin Akimov) a84dd0d refactor: cleanup spork from evo_deterministicmns unit test (Konstantin Akimov) Pull request description: ## What was done? See commits. Removed stub or useless spork includes and initialization. ## How Has This Been Tested? Run unit & functional tests ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 0a2a27d Tree-SHA512: 17f5fa68169548d6dcc72669bffa07d85a6290799eefa87f84957a034513039daedc57cf5c97c70de597213bdd73f03a3aa6044108e429aaf9a84dbed8d9391e
2 parents c679cc6 + 0a2a27d commit f63e423

File tree

8 files changed

+0
-14
lines changed

8 files changed

+0
-14
lines changed

src/node/miner.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include <llmq/options.h>
4242
#include <llmq/snapshot.h>
4343
#include <masternode/payments.h>
44-
#include <spork.h>
4544

4645
#include <algorithm>
4746
#include <utility>

src/qt/walletmodel.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#include <wallet/coincontrol.h>
3131
#include <wallet/wallet.h> // for CRecipient
3232

33-
#include <spork.h>
34-
3533
#include <stdint.h>
3634
#include <functional>
3735

src/rpc/mining.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <script/script.h>
3232
#include <script/sign.h>
3333
#include <shutdown.h>
34-
#include <spork.h>
3534
#include <txmempool.h>
3635
#include <univalue.h>
3736
#include <util/check.h>

src/test/blockfilter_index_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <node/miner.h>
1111
#include <pow.h>
1212
#include <script/standard.h>
13-
#include <spork.h>
1413
#include <test/util/blockfilter.h>
1514
#include <test/util/index.h>
1615
#include <test/util/setup_common.h>

src/test/evo_deterministicmns_tests.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <script/sign.h>
2121
#include <script/signingprovider.h>
2222
#include <script/standard.h>
23-
#include <spork.h>
2423
#include <test/util/txmempool.h>
2524
#include <txmempool.h>
2625
#include <validation.h>
@@ -425,11 +424,6 @@ void FuncDIP3Protx(TestChainSetup& setup)
425424
auto& chainman = *Assert(setup.m_node.chainman.get());
426425
auto& dmnman = *Assert(setup.m_node.dmnman);
427426

428-
CKey sporkKey;
429-
sporkKey.MakeNewKey(false);
430-
setup.m_node.sporkman->SetSporkAddress(EncodeDestination(PKHash(sporkKey.GetPubKey())));
431-
setup.m_node.sporkman->SetPrivKey(EncodeSecret(sporkKey));
432-
433427
auto utxos = BuildSimpleUtxoMap(setup.m_coinbase_txns);
434428

435429
const CScript coinbase_pk = GetScriptForRawPubKey(setup.coinbaseKey.GetPubKey());

src/test/miner_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <instantsend/instantsend.h>
2525
#include <llmq/blockprocessor.h>
2626
#include <llmq/context.h>
27-
#include <spork.h>
2827

2928
#include <test/util/setup_common.h>
3029

src/test/util/mining.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <node/miner.h>
1313
#include <pow.h>
1414
#include <script/standard.h>
15-
#include <spork.h>
1615
#include <test/util/script.h>
1716
#include <util/check.h>
1817
#include <validation.h>

src/test/validation_chainstatemanager_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <evo/evodb.h>
2121
#include <llmq/blockprocessor.h>
2222
#include <llmq/signing.h>
23-
#include <spork.h>
2423

2524
#include <tinyformat.h>
2625

0 commit comments

Comments
 (0)