@@ -140,11 +140,11 @@ BOOST_AUTO_TEST_CASE(bloom_match)
140140 BOOST_CHECK_MESSAGE (filter.IsRelevantAndUpdate (tx), " Simple Bloom filter didn't match output address" );
141141
142142 filter = CBloomFilter (10 , 0.000001 , 0 , BLOOM_UPDATE_ALL);
143- filter.insert (COutPoint ( Txid::FromHex ( " 90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" ). value () , 0 ) );
143+ filter.insert (COutPoint{ Txid{ " 90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" } , 0 } );
144144 BOOST_CHECK_MESSAGE (filter.IsRelevantAndUpdate (tx), " Simple Bloom filter didn't match COutPoint" );
145145
146146 filter = CBloomFilter (10 , 0.000001 , 0 , BLOOM_UPDATE_ALL);
147- COutPoint prevOutPoint ( Txid::FromHex ( " 90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" ). value () , 0 ) ;
147+ COutPoint prevOutPoint{ Txid{ " 90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" } , 0 } ;
148148 {
149149 std::vector<unsigned char > data (32 + sizeof (unsigned int ));
150150 memcpy (data.data (), prevOutPoint.hash .begin (), 32 );
@@ -162,11 +162,11 @@ BOOST_AUTO_TEST_CASE(bloom_match)
162162 BOOST_CHECK_MESSAGE (!filter.IsRelevantAndUpdate (tx), " Simple Bloom filter matched random address" );
163163
164164 filter = CBloomFilter (10 , 0.000001 , 0 , BLOOM_UPDATE_ALL);
165- filter.insert (COutPoint ( Txid::FromHex ( " 90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" ). value () , 1 ) );
165+ filter.insert (COutPoint{ Txid{ " 90c122d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" } , 1 } );
166166 BOOST_CHECK_MESSAGE (!filter.IsRelevantAndUpdate (tx), " Simple Bloom filter matched COutPoint for an output we didn't care about" );
167167
168168 filter = CBloomFilter (10 , 0.000001 , 0 , BLOOM_UPDATE_ALL);
169- filter.insert (COutPoint ( Txid::FromHex ( " 000000d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" ). value () , 0 ) );
169+ filter.insert (COutPoint{ Txid{ " 000000d70786e899529d71dbeba91ba216982fb6ba58f3bdaab65e73b7e9260b" } , 0 } );
170170 BOOST_CHECK_MESSAGE (!filter.IsRelevantAndUpdate (tx), " Simple Bloom filter matched COutPoint for an output we didn't care about" );
171171}
172172
@@ -426,9 +426,9 @@ BOOST_AUTO_TEST_CASE(merkle_block_4_test_p2pubkey_only)
426426 BOOST_CHECK (merkleBlock.header .GetHash () == block.GetHash ());
427427
428428 // We should match the generation outpoint
429- BOOST_CHECK (filter.contains (COutPoint ( Txid::FromHex ( " 147caa76786596590baa4e98f5d9f48b86c7765e489f7a6ff3360fe5c674360b" ). value () , 0 ) ));
429+ BOOST_CHECK (filter.contains (COutPoint{ Txid{ " 147caa76786596590baa4e98f5d9f48b86c7765e489f7a6ff3360fe5c674360b" } , 0 } ));
430430 // ... but not the 4th transaction's output (its not pay-2-pubkey)
431- BOOST_CHECK (!filter.contains (COutPoint ( Txid::FromHex ( " 02981fa052f0481dbc5868f4fc2166035a10f27a03cfd2de67326471df5bc041" ). value () , 0 ) ));
431+ BOOST_CHECK (!filter.contains (COutPoint{ Txid{ " 02981fa052f0481dbc5868f4fc2166035a10f27a03cfd2de67326471df5bc041" } , 0 } ));
432432}
433433
434434BOOST_AUTO_TEST_CASE (merkle_block_4_test_update_none)
@@ -451,8 +451,8 @@ BOOST_AUTO_TEST_CASE(merkle_block_4_test_update_none)
451451 BOOST_CHECK (merkleBlock.header .GetHash () == block.GetHash ());
452452
453453 // We shouldn't match any outpoints (UPDATE_NONE)
454- BOOST_CHECK (!filter.contains (COutPoint ( Txid::FromHex ( " 147caa76786596590baa4e98f5d9f48b86c7765e489f7a6ff3360fe5c674360b" ). value () , 0 ) ));
455- BOOST_CHECK (!filter.contains (COutPoint ( Txid::FromHex ( " 02981fa052f0481dbc5868f4fc2166035a10f27a03cfd2de67326471df5bc041" ). value () , 0 ) ));
454+ BOOST_CHECK (!filter.contains (COutPoint{ Txid{ " 147caa76786596590baa4e98f5d9f48b86c7765e489f7a6ff3360fe5c674360b" } , 0 } ));
455+ BOOST_CHECK (!filter.contains (COutPoint{ Txid{ " 02981fa052f0481dbc5868f4fc2166035a10f27a03cfd2de67326471df5bc041" } , 0 } ));
456456}
457457
458458std::vector<unsigned char > BloomTest::RandomData ()
0 commit comments