diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-04 08:50:42 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-04 08:51:14 +0100 |
| commit | 88776c2926061482ab551b0cf5c408fc1bc39ac3 (patch) | |
| tree | ce7b58b4c2dae462b4b206497d81db325f87bb40 /src | |
| parent | 5d32009f1a3b091299ff4a9345195b2359125f98 (diff) | |
| parent | fa3967efdb07f1d22372f4ee2e602ea1fad04a57 (diff) | |
| download | bitcoin-88776c2926061482ab551b0cf5c408fc1bc39ac3.tar.xz | |
Merge #20245: test: Run script_assets_test even if built --with-libs=no
fa3967efdb07f1d22372f4ee2e602ea1fad04a57 test: Replace ARRAYLEN with C++11 ranged for loop (MarcoFalke)
fafc5290538fde76c3780976f4b2c11dc9f24d19 test: Run AssetTest even if built --with-libs=no (MarcoFalke)
faf58ab139949ca35b33217d010b350c9a59c61d ci: Add --with-libs=no to one ci config (MarcoFalke)
Pull request description:
`script_assets_test` doesn't call libbitcoinconsensus, so it seems confusing to require it
ACKs for top commit:
fanquake:
ACK fa3967efdb07f1d22372f4ee2e602ea1fad04a57 - looks ok to me.
Tree-SHA512: 8744fef64c5d7dc19a0ef4ae9b3df5b3f356253bf000f12723064794c5e50df071824d436059985f1112d94c1b530b65cbeb6b8435114a91b195480620eafc59
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/script_tests.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 7c53bd0002..25ca171b33 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -106,18 +106,18 @@ static ScriptErrorDesc script_errors[]={ static std::string FormatScriptError(ScriptError_t err) { - for (unsigned int i=0; i<ARRAYLEN(script_errors); ++i) - if (script_errors[i].err == err) - return script_errors[i].name; + for (const auto& se : script_errors) + if (se.err == err) + return se.name; BOOST_ERROR("Unknown scripterror enumeration value, update script_errors in script_tests.cpp."); return ""; } -static ScriptError_t ParseScriptError(const std::string &name) +static ScriptError_t ParseScriptError(const std::string& name) { - for (unsigned int i=0; i<ARRAYLEN(script_errors); ++i) - if (script_errors[i].name == name) - return script_errors[i].err; + for (const auto& se : script_errors) + if (se.name == name) + return se.err; BOOST_ERROR("Unknown scripterror \"" << name << "\" in test description"); return SCRIPT_ERR_UNKNOWN_ERROR; } @@ -1470,8 +1470,6 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps) BOOST_CHECK(!script.HasValidOps()); } -#if defined(HAVE_CONSENSUS_LIB) - static CMutableTransaction TxFromHex(const std::string& str) { CMutableTransaction tx; @@ -1502,6 +1500,8 @@ static CScriptWitness ScriptWitnessFromJSON(const UniValue& univalue) return scriptwitness; } +#if defined(HAVE_CONSENSUS_LIB) + /* Test simple (successful) usage of bitcoinconsensus_verify_script */ BOOST_AUTO_TEST_CASE(bitcoinconsensus_verify_script_returns_true) { @@ -1640,6 +1640,8 @@ BOOST_AUTO_TEST_CASE(bitcoinconsensus_verify_script_invalid_flags) BOOST_CHECK_EQUAL(err, bitcoinconsensus_ERR_INVALID_FLAGS); } +#endif // defined(HAVE_CONSENSUS_LIB) + static std::vector<unsigned int> AllConsensusFlags() { std::vector<unsigned int> ret; @@ -1742,5 +1744,4 @@ BOOST_AUTO_TEST_CASE(script_assets_test) file.close(); } -#endif BOOST_AUTO_TEST_SUITE_END() |