@@ -41,7 +41,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
41
41
{
42
42
Optional<int > getHeight () override
43
43
{
44
- LockAnnotation lock (::cs_main);
44
+ LockAssertion lock (::cs_main);
45
45
int height = ::ChainActive ().Height ();
46
46
if (height >= 0 ) {
47
47
return height;
@@ -50,7 +50,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
50
50
}
51
51
Optional<int > getBlockHeight (const uint256& hash) override
52
52
{
53
- LockAnnotation lock (::cs_main);
53
+ LockAssertion lock (::cs_main);
54
54
CBlockIndex* block = LookupBlockIndex (hash);
55
55
if (block && ::ChainActive ().Contains (block)) {
56
56
return block->nHeight ;
@@ -65,34 +65,34 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
65
65
}
66
66
uint256 getBlockHash (int height) override
67
67
{
68
- LockAnnotation lock (::cs_main);
68
+ LockAssertion lock (::cs_main);
69
69
CBlockIndex* block = ::ChainActive ()[height];
70
70
assert (block != nullptr );
71
71
return block->GetBlockHash ();
72
72
}
73
73
int64_t getBlockTime (int height) override
74
74
{
75
- LockAnnotation lock (::cs_main);
75
+ LockAssertion lock (::cs_main);
76
76
CBlockIndex* block = ::ChainActive ()[height];
77
77
assert (block != nullptr );
78
78
return block->GetBlockTime ();
79
79
}
80
80
int64_t getBlockMedianTimePast (int height) override
81
81
{
82
- LockAnnotation lock (::cs_main);
82
+ LockAssertion lock (::cs_main);
83
83
CBlockIndex* block = ::ChainActive ()[height];
84
84
assert (block != nullptr );
85
85
return block->GetMedianTimePast ();
86
86
}
87
87
bool haveBlockOnDisk (int height) override
88
88
{
89
- LockAnnotation lock (::cs_main);
89
+ LockAssertion lock (::cs_main);
90
90
CBlockIndex* block = ::ChainActive ()[height];
91
91
return block && ((block->nStatus & BLOCK_HAVE_DATA) != 0 ) && block->nTx > 0 ;
92
92
}
93
93
Optional<int > findFirstBlockWithTimeAndHeight (int64_t time, int height, uint256* hash) override
94
94
{
95
- LockAnnotation lock (::cs_main);
95
+ LockAssertion lock (::cs_main);
96
96
CBlockIndex* block = ::ChainActive ().FindEarliestAtLeast (time, height);
97
97
if (block) {
98
98
if (hash) *hash = block->GetBlockHash ();
@@ -102,7 +102,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
102
102
}
103
103
Optional<int > findPruned (int start_height, Optional<int > stop_height) override
104
104
{
105
- LockAnnotation lock (::cs_main);
105
+ LockAssertion lock (::cs_main);
106
106
if (::fPruneMode ) {
107
107
CBlockIndex* block = stop_height ? ::ChainActive ()[*stop_height] : ::ChainActive ().Tip ();
108
108
while (block && block->nHeight >= start_height) {
@@ -116,7 +116,7 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
116
116
}
117
117
Optional<int > findFork (const uint256& hash, Optional<int >* height) override
118
118
{
119
- LockAnnotation lock (::cs_main);
119
+ LockAssertion lock (::cs_main);
120
120
const CBlockIndex* block = LookupBlockIndex (hash);
121
121
const CBlockIndex* fork = block ? ::ChainActive ().FindFork (block) : nullptr ;
122
122
if (height) {
@@ -133,25 +133,25 @@ class LockImpl : public Chain::Lock, public UniqueLock<CCriticalSection>
133
133
}
134
134
CBlockLocator getTipLocator () override
135
135
{
136
- LockAnnotation lock (::cs_main);
136
+ LockAssertion lock (::cs_main);
137
137
return ::ChainActive ().GetLocator ();
138
138
}
139
139
Optional<int > findLocatorFork (const CBlockLocator& locator) override
140
140
{
141
- LockAnnotation lock (::cs_main);
141
+ LockAssertion lock (::cs_main);
142
142
if (CBlockIndex* fork = FindForkInGlobalIndex (::ChainActive (), locator)) {
143
143
return fork->nHeight ;
144
144
}
145
145
return nullopt;
146
146
}
147
147
bool checkFinalTx (const CTransaction& tx) override
148
148
{
149
- LockAnnotation lock (::cs_main);
149
+ LockAssertion lock (::cs_main);
150
150
return CheckFinalTx (tx);
151
151
}
152
152
bool submitToMemoryPool (const CTransactionRef& tx, CAmount absurd_fee, CValidationState& state) override
153
153
{
154
- LockAnnotation lock (::cs_main);
154
+ LockAssertion lock (::cs_main);
155
155
return AcceptToMemoryPool (::mempool, state, tx, nullptr /* missing inputs */ , nullptr /* txn replaced */ ,
156
156
false /* bypass limits */ , absurd_fee);
157
157
}
0 commit comments