aboutsummaryrefslogtreecommitdiff
path: root/src/test/transaction_tests.cpp
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@bitpay.com>2014-07-30 23:17:19 -0400
committerJeff Garzik <jgarzik@bitpay.com>2014-07-30 23:17:19 -0400
commita715a643bcda579c324b2c1d2dac449a320951c9 (patch)
tree661781f5c7626ebc89be71311699b08483d4cb86 /src/test/transaction_tests.cpp
parente8cb5c30b0db15a1c6786d6575098a66320ffec4 (diff)
parentcbe39a38526a6c17619d02cc697b80ebfd57203b (diff)
Merge branch 'rawtx' into merge-rawtx
Diffstat (limited to 'src/test/transaction_tests.cpp')
-rw-r--r--src/test/transaction_tests.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 238033f407..03919e7c7d 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -9,6 +9,7 @@
#include "keystore.h"
#include "main.h"
#include "script.h"
+#include "core_io.h"
#include <map>
#include <string>
@@ -24,7 +25,6 @@ using namespace boost::algorithm;
// In script_tests.cpp
extern Array read_json(const std::string& jsondata);
-extern CScript ParseScript(string s);
unsigned int ParseFlags(string strFlags){
unsigned int flags = 0;