@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
62
62
63
63
LOCK2 (cs_main, pool.cs );
64
64
pool.addUnchecked (entry.FromTx (block.vtx [2 ]));
65
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [2 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 0 );
65
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [2 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 0 );
66
66
67
67
// Do a simple ShortTxIDs RT
68
68
{
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
80
80
BOOST_CHECK (!partialBlock.IsTxAvailable (1 ));
81
81
BOOST_CHECK ( partialBlock.IsTxAvailable (2 ));
82
82
83
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [2 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 1 );
83
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [2 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 1 );
84
84
85
85
size_t poolSize = pool.size ();
86
86
pool.removeRecursive (*block.vtx [2 ], MemPoolRemovalReason::REPLACED);
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
145
145
146
146
LOCK2 (cs_main, pool.cs );
147
147
pool.addUnchecked (entry.FromTx (block.vtx [2 ]));
148
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [2 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 0 );
148
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [2 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 0 );
149
149
150
150
uint256 txhash;
151
151
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
170
170
BOOST_CHECK ( partialBlock.IsTxAvailable (1 ));
171
171
BOOST_CHECK ( partialBlock.IsTxAvailable (2 ));
172
172
173
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [2 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 1 ); // +1 because of partialBlock
173
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [2 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 1 ); // +1 because of partialBlock
174
174
175
175
CBlock block2;
176
176
{
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
185
185
partialBlock.FillBlock (block2, {block.vtx [1 ]}); // Current implementation doesn't check txn here, but don't require that
186
186
partialBlock = tmp;
187
187
}
188
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [2 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 2 ); // +2 because of partialBlock and block2
188
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [2 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 2 ); // +2 because of partialBlock and block2
189
189
bool mutated;
190
190
BOOST_CHECK (block.hashMerkleRoot != BlockMerkleRoot (block2, &mutated));
191
191
@@ -196,15 +196,15 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
196
196
BOOST_CHECK_EQUAL (block.hashMerkleRoot .ToString (), BlockMerkleRoot (block3, &mutated).ToString ());
197
197
BOOST_CHECK (!mutated);
198
198
199
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [2 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 3 ); // +2 because of partialBlock and block2 and block3
199
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [2 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 3 ); // +2 because of partialBlock and block2 and block3
200
200
201
201
txhash = block.vtx [2 ]->GetHash ();
202
202
block.vtx .clear ();
203
203
block2.vtx .clear ();
204
204
block3.vtx .clear ();
205
- BOOST_CHECK_EQUAL (pool.mapTx . find (txhash)-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 1 - 1 ); // + 1 because of partialBlock; -1 because of block.
205
+ BOOST_CHECK_EQUAL (pool.get (txhash).use_count (), SHARED_TX_OFFSET + 1 - 1 ); // + 1 because of partialBlock; -1 because of block.
206
206
}
207
- BOOST_CHECK_EQUAL (pool.mapTx . find (txhash)-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET - 1 ); // -1 because of block
207
+ BOOST_CHECK_EQUAL (pool.get (txhash).use_count (), SHARED_TX_OFFSET - 1 ); // -1 because of block
208
208
}
209
209
210
210
BOOST_AUTO_TEST_CASE (SufficientPreforwardRTTest)
@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
215
215
216
216
LOCK2 (cs_main, pool.cs );
217
217
pool.addUnchecked (entry.FromTx (block.vtx [1 ]));
218
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [1 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 0 );
218
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [1 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 0 );
219
219
220
220
uint256 txhash;
221
221
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
240
240
BOOST_CHECK ( partialBlock.IsTxAvailable (1 ));
241
241
BOOST_CHECK ( partialBlock.IsTxAvailable (2 ));
242
242
243
- BOOST_CHECK_EQUAL (pool.mapTx . find (block.vtx [1 ]->GetHash ())-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 1 );
243
+ BOOST_CHECK_EQUAL (pool.get (block.vtx [1 ]->GetHash ()).use_count (), SHARED_TX_OFFSET + 1 );
244
244
245
245
CBlock block2;
246
246
PartiallyDownloadedBlock partialBlockCopy = partialBlock;
@@ -253,9 +253,9 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
253
253
txhash = block.vtx [1 ]->GetHash ();
254
254
block.vtx .clear ();
255
255
block2.vtx .clear ();
256
- BOOST_CHECK_EQUAL (pool.mapTx . find (txhash)-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET + 1 - 1 ); // + 1 because of partialBlock; -1 because of block.
256
+ BOOST_CHECK_EQUAL (pool.get (txhash).use_count (), SHARED_TX_OFFSET + 1 - 1 ); // + 1 because of partialBlock; -1 because of block.
257
257
}
258
- BOOST_CHECK_EQUAL (pool.mapTx . find (txhash)-> GetSharedTx ( ).use_count (), SHARED_TX_OFFSET - 1 ); // -1 because of block
258
+ BOOST_CHECK_EQUAL (pool.get (txhash).use_count (), SHARED_TX_OFFSET - 1 ); // -1 because of block
259
259
}
260
260
261
261
BOOST_AUTO_TEST_CASE (EmptyBlockRoundTripTest)
0 commit comments