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

Merge 735d6b57e7 into merged_master (Bitcoin PR #16227)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:21 +00:00
commit a50b652932
38 changed files with 607 additions and 607 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/txvalidationcache_tests.cpp
View file

@ -9,8 +9,8 @@
#include <txmempool.h>
#include <script/standard.h>
#include <script/sign.h>
#include <script/signingprovider.h>
#include <test/setup_common.h>
#include <keystore.h>
#include <boost/test/unit_test.hpp>
@ -162,7 +162,7 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
CScript p2pkh_scriptPubKey = GetScriptForDestination(PKHash(coinbaseKey.GetPubKey()));
CScript p2wpkh_scriptPubKey = GetScriptForWitness(p2pkh_scriptPubKey);
CBasicKeyStore keystore;
FillableSigningProvider keystore;
BOOST_CHECK(keystore.AddKey(coinbaseKey));
BOOST_CHECK(keystore.AddCScript(p2pk_scriptPubKey));