diff options
| author | Jeff Garzik <[email protected]> | 2014-08-01 22:45:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2014-08-01 22:45:58 -0400 |
| commit | 1045452fa5f3475337b4dcab69e81e73ea430597 (patch) | |
| tree | 0a146e7e3c66a69b5eba9d30f9187a27ff89d386 /src/test/script_tests.cpp | |
| parent | Merge branch 'merge-rawtx2' into merge-rawtx3 (diff) | |
| parent | Declare SignatureHash() in script.h (diff) | |
| download | discoin-1045452fa5f3475337b4dcab69e81e73ea430597.tar.xz discoin-1045452fa5f3475337b4dcab69e81e73ea430597.zip | |
Merge branch 'whyextern' of git://github.com/jtimon/bitcoin into merge-whyextern
Diffstat (limited to 'src/test/script_tests.cpp')
| -rw-r--r-- | src/test/script_tests.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 5e35875a8..bc9f31c07 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -10,6 +10,7 @@ #include "key.h" #include "keystore.h" #include "main.h" +#include "script.h" #include "core_io.h" #include <fstream> @@ -33,8 +34,6 @@ using namespace std; using namespace json_spirit; using namespace boost::algorithm; -extern uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); - static const unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC; Array |