GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

WIP: Fix compilation after merge

Browse source
This commit is contained in:
Steven Roose 2019-05-17 16:43:38 +01:00
parent de5dc03251
commit 52f6f6905b
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
23 changed files with 102 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/txvalidationcache_tests.cpp
View file

@ -206,7 +206,6 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
// not caching invalidity (if that changes, delete this test case).
std::vector<CCheck*> scriptchecks;
BOOST_CHECK(CheckInputs(CTransaction(spend_tx), state, pcoinsTip.get(), true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_DERSIG, true, true, ptd_spend_tx, &scriptchecks));
>>>>>>> 519b0bc5dc5155b6f7e2362c2105552bb7618ad0
BOOST_CHECK_EQUAL(scriptchecks.size(), 1U);
// Test that CheckInputs returns true iff DERSIG-enforcing flags are