diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-09-10 12:51:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-09-10 12:54:03 +0200 |
| commit | fd1caa0961d9a5ceef0b8b232f278c9c27605d63 (patch) | |
| tree | c1c551df9c68b5c75d62629cd2554e661b3df113 /src/test/script_P2SH_tests.cpp | |
| parent | Merge pull request #4874 (diff) | |
| parent | Rename scriptutils.o to wallet_ismine.o (diff) | |
| download | discoin-fd1caa0961d9a5ceef0b8b232f278c9c27605d63.tar.xz discoin-fd1caa0961d9a5ceef0b8b232f278c9c27605d63.zip | |
Merge pull request #4755
c1e433b Rename scriptutils.o to wallet_ismine.o (jtimon)
8b59a3d Move CAffectedKeysVisitor to wallet.cpp (remove ExtractAffectedKeys) (jtimon)
0d2fa14 Move scriptutils.o to wallet (jtimon)
Diffstat (limited to 'src/test/script_P2SH_tests.cpp')
| -rw-r--r-- | src/test/script_P2SH_tests.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index b7e7487bb..f99002017 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -7,7 +7,10 @@ #include "main.h" #include "script/script.h" #include "script/sign.h" -#include "scriptutils.h" + +#ifdef ENABLE_WALLET +#include "wallet_ismine.h" +#endif #include <vector> @@ -95,7 +98,9 @@ BOOST_AUTO_TEST_CASE(sign) txTo[i].vin[0].prevout.n = i; txTo[i].vin[0].prevout.hash = txFrom.GetHash(); txTo[i].vout[0].nValue = 1; +#ifdef ENABLE_WALLET BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i)); +#endif } for (int i = 0; i < 8; i++) { @@ -189,7 +194,9 @@ BOOST_AUTO_TEST_CASE(set) txTo[i].vin[0].prevout.hash = txFrom.GetHash(); txTo[i].vout[0].nValue = 1*CENT; txTo[i].vout[0].scriptPubKey = inner[i]; +#ifdef ENABLE_WALLET BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i)); +#endif } for (int i = 0; i < 4; i++) { |