@@ -509,7 +509,7 @@ class ChainImpl : public Chain
509
509
std::optional<int > getHeight () override
510
510
{
511
511
LOCK (::cs_main);
512
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
512
+ const CChain& active = chainman (). ActiveChain ();
513
513
int height = active.Height ();
514
514
if (height >= 0 ) {
515
515
return height;
@@ -519,22 +519,22 @@ class ChainImpl : public Chain
519
519
uint256 getBlockHash (int height) override
520
520
{
521
521
LOCK (::cs_main);
522
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
522
+ const CChain& active = chainman (). ActiveChain ();
523
523
CBlockIndex* block = active[height];
524
524
assert (block);
525
525
return block->GetBlockHash ();
526
526
}
527
527
bool haveBlockOnDisk (int height) override
528
528
{
529
529
LOCK (::cs_main);
530
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
530
+ const CChain& active = chainman (). ActiveChain ();
531
531
CBlockIndex* block = active[height];
532
532
return block && ((block->nStatus & BLOCK_HAVE_DATA) != 0 ) && block->nTx > 0 ;
533
533
}
534
534
CBlockLocator getTipLocator () override
535
535
{
536
536
LOCK (::cs_main);
537
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
537
+ const CChain& active = chainman (). ActiveChain ();
538
538
return active.GetLocator ();
539
539
}
540
540
CBlockLocator getActiveChainLocator (const uint256& block_hash) override
@@ -547,7 +547,7 @@ class ChainImpl : public Chain
547
547
std::optional<int > findLocatorFork (const CBlockLocator& locator) override
548
548
{
549
549
LOCK (::cs_main);
550
- const CChainState& active = Assert (m_node. chainman )-> ActiveChainstate ();
550
+ const CChainState& active = chainman (). ActiveChainstate ();
551
551
if (const CBlockIndex* fork = active.FindForkInGlobalIndex (locator)) {
552
552
return fork ->nHeight ;
553
553
}
@@ -556,20 +556,20 @@ class ChainImpl : public Chain
556
556
bool findBlock (const uint256& hash, const FoundBlock& block) override
557
557
{
558
558
WAIT_LOCK (cs_main, lock);
559
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
560
- return FillBlock (m_node. chainman -> m_blockman .LookupBlockIndex (hash), block, lock, active);
559
+ const CChain& active = chainman (). ActiveChain ();
560
+ return FillBlock (chainman (). m_blockman .LookupBlockIndex (hash), block, lock, active);
561
561
}
562
562
bool findFirstBlockWithTimeAndHeight (int64_t min_time, int min_height, const FoundBlock& block) override
563
563
{
564
564
WAIT_LOCK (cs_main, lock);
565
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
565
+ const CChain& active = chainman (). ActiveChain ();
566
566
return FillBlock (active.FindEarliestAtLeast (min_time, min_height), block, lock, active);
567
567
}
568
568
bool findAncestorByHeight (const uint256& block_hash, int ancestor_height, const FoundBlock& ancestor_out) override
569
569
{
570
570
WAIT_LOCK (cs_main, lock);
571
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
572
- if (const CBlockIndex* block = m_node. chainman -> m_blockman .LookupBlockIndex (block_hash)) {
571
+ const CChain& active = chainman (). ActiveChain ();
572
+ if (const CBlockIndex* block = chainman (). m_blockman .LookupBlockIndex (block_hash)) {
573
573
if (const CBlockIndex* ancestor = block->GetAncestor (ancestor_height)) {
574
574
return FillBlock (ancestor, ancestor_out, lock, active);
575
575
}
@@ -579,18 +579,18 @@ class ChainImpl : public Chain
579
579
bool findAncestorByHash (const uint256& block_hash, const uint256& ancestor_hash, const FoundBlock& ancestor_out) override
580
580
{
581
581
WAIT_LOCK (cs_main, lock);
582
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
583
- const CBlockIndex* block = m_node. chainman -> m_blockman .LookupBlockIndex (block_hash);
584
- const CBlockIndex* ancestor = m_node. chainman -> m_blockman .LookupBlockIndex (ancestor_hash);
582
+ const CChain& active = chainman (). ActiveChain ();
583
+ const CBlockIndex* block = chainman (). m_blockman .LookupBlockIndex (block_hash);
584
+ const CBlockIndex* ancestor = chainman (). m_blockman .LookupBlockIndex (ancestor_hash);
585
585
if (block && ancestor && block->GetAncestor (ancestor->nHeight ) != ancestor) ancestor = nullptr ;
586
586
return FillBlock (ancestor, ancestor_out, lock, active);
587
587
}
588
588
bool findCommonAncestor (const uint256& block_hash1, const uint256& block_hash2, const FoundBlock& ancestor_out, const FoundBlock& block1_out, const FoundBlock& block2_out) override
589
589
{
590
590
WAIT_LOCK (cs_main, lock);
591
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
592
- const CBlockIndex* block1 = m_node. chainman -> m_blockman .LookupBlockIndex (block_hash1);
593
- const CBlockIndex* block2 = m_node. chainman -> m_blockman .LookupBlockIndex (block_hash2);
591
+ const CChain& active = chainman (). ActiveChain ();
592
+ const CBlockIndex* block1 = chainman (). m_blockman .LookupBlockIndex (block_hash1);
593
+ const CBlockIndex* block2 = chainman (). m_blockman .LookupBlockIndex (block_hash2);
594
594
const CBlockIndex* ancestor = block1 && block2 ? LastCommonAncestor (block1, block2) : nullptr ;
595
595
// Using & instead of && below to avoid short circuiting and leaving
596
596
// output uninitialized. Cast bool to int to avoid -Wbitwise-instead-of-logical
@@ -703,7 +703,7 @@ class ChainImpl : public Chain
703
703
bool havePruned () override
704
704
{
705
705
LOCK (::cs_main);
706
- return m_node. chainman -> m_blockman .m_have_pruned ;
706
+ return chainman (). m_blockman .m_have_pruned ;
707
707
}
708
708
bool isReadyToBroadcast () override { return !node::fImporting && !node::fReindex && !isInitialBlockDownload (); }
709
709
bool isInitialBlockDownload () override {
@@ -725,7 +725,7 @@ class ChainImpl : public Chain
725
725
{
726
726
if (!old_tip.IsNull ()) {
727
727
LOCK (::cs_main);
728
- const CChain& active = Assert (m_node. chainman )-> ActiveChain ();
728
+ const CChain& active = chainman (). ActiveChain ();
729
729
if (old_tip == active.Tip ()->GetBlockHash ()) return ;
730
730
}
731
731
SyncWithValidationInterfaceQueue ();
@@ -779,7 +779,7 @@ class ChainImpl : public Chain
779
779
}
780
780
bool hasAssumedValidChain () override
781
781
{
782
- return Assert (m_node. chainman )-> IsSnapshotActive ();
782
+ return chainman (). IsSnapshotActive ();
783
783
}
784
784
785
785
NodeContext* context () override { return &m_node; }
0 commit comments