@@ -1347,36 +1347,6 @@ static CScript ScriptFromHex(const std::string& str)
1347
1347
return CScript (data.begin (), data.end ());
1348
1348
}
1349
1349
1350
- static CMutableTransaction TxFromHex (const std::string& str)
1351
- {
1352
- CMutableTransaction tx;
1353
- VectorReader (SER_DISK, SERIALIZE_TRANSACTION_NO_WITNESS, ParseHex (str), 0 ) >> tx;
1354
- return tx;
1355
- }
1356
-
1357
- static std::vector<CTxOut> TxOutsFromJSON (const UniValue& univalue)
1358
- {
1359
- assert (univalue.isArray ());
1360
- std::vector<CTxOut> prevouts;
1361
- for (size_t i = 0 ; i < univalue.size (); ++i) {
1362
- CTxOut txout;
1363
- VectorReader (SER_DISK, 0 , ParseHex (univalue[i].get_str ()), 0 ) >> txout;
1364
- prevouts.push_back (std::move (txout));
1365
- }
1366
- return prevouts;
1367
- }
1368
-
1369
- static CScriptWitness ScriptWitnessFromJSON (const UniValue& univalue)
1370
- {
1371
- assert (univalue.isArray ());
1372
- CScriptWitness scriptwitness;
1373
- for (size_t i = 0 ; i < univalue.size (); ++i) {
1374
- auto bytes = ParseHex (univalue[i].get_str ());
1375
- scriptwitness.stack .push_back (std::move (bytes));
1376
- }
1377
- return scriptwitness;
1378
- }
1379
-
1380
1350
BOOST_AUTO_TEST_CASE (script_FindAndDelete)
1381
1351
{
1382
1352
// Exercise the FindAndDelete functionality
@@ -1502,6 +1472,36 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps)
1502
1472
1503
1473
#if defined(HAVE_CONSENSUS_LIB)
1504
1474
1475
+ static CMutableTransaction TxFromHex (const std::string& str)
1476
+ {
1477
+ CMutableTransaction tx;
1478
+ VectorReader (SER_DISK, SERIALIZE_TRANSACTION_NO_WITNESS, ParseHex (str), 0 ) >> tx;
1479
+ return tx;
1480
+ }
1481
+
1482
+ static std::vector<CTxOut> TxOutsFromJSON (const UniValue& univalue)
1483
+ {
1484
+ assert (univalue.isArray ());
1485
+ std::vector<CTxOut> prevouts;
1486
+ for (size_t i = 0 ; i < univalue.size (); ++i) {
1487
+ CTxOut txout;
1488
+ VectorReader (SER_DISK, 0 , ParseHex (univalue[i].get_str ()), 0 ) >> txout;
1489
+ prevouts.push_back (std::move (txout));
1490
+ }
1491
+ return prevouts;
1492
+ }
1493
+
1494
+ static CScriptWitness ScriptWitnessFromJSON (const UniValue& univalue)
1495
+ {
1496
+ assert (univalue.isArray ());
1497
+ CScriptWitness scriptwitness;
1498
+ for (size_t i = 0 ; i < univalue.size (); ++i) {
1499
+ auto bytes = ParseHex (univalue[i].get_str ());
1500
+ scriptwitness.stack .push_back (std::move (bytes));
1501
+ }
1502
+ return scriptwitness;
1503
+ }
1504
+
1505
1505
/* Test simple (successful) usage of bitcoinconsensus_verify_script */
1506
1506
BOOST_AUTO_TEST_CASE (bitcoinconsensus_verify_script_returns_true)
1507
1507
{
0 commit comments