From e443ed2462b706650f51f08c8760dbf5047aa77f Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 9 May 2014 16:33:37 +0200 Subject: [PATCH] Fix transaction tests Conflict between low-s (6fd7ef2) and test updates in d3a33fc. --- src/test/transaction_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 40961cbae..feba5ee80 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -38,7 +38,7 @@ unsigned int ParseFlags(string strFlags){ mapFlagNames["NONE"] = SCRIPT_VERIFY_NONE; mapFlagNames["P2SH"] = SCRIPT_VERIFY_P2SH; mapFlagNames["STRICTENC"] = SCRIPT_VERIFY_STRICTENC; - mapFlagNames["EVEN_S"] = SCRIPT_VERIFY_EVEN_S; + mapFlagNames["LOW_S"] = SCRIPT_VERIFY_LOW_S; mapFlagNames["NULLDUMMY"] = SCRIPT_VERIFY_NULLDUMMY; }