Fix transaction tests

laanwj · laanwj · commit e443ed2462b7 · 2014-05-09T16:35:30.000+02:00
Conflict between low-s (6fd7ef2) and test updates in d3a33fc.
diff --git 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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ unsigned int ParseFlags(string strFlags){`
`38`	`38`	`mapFlagNames["NONE"] = SCRIPT_VERIFY_NONE;`
`39`	`39`	`mapFlagNames["P2SH"] = SCRIPT_VERIFY_P2SH;`
`40`	`40`	`mapFlagNames["STRICTENC"] = SCRIPT_VERIFY_STRICTENC;`
`41`		`- mapFlagNames["EVEN_S"] = SCRIPT_VERIFY_EVEN_S;`
	`41`	`+ mapFlagNames["LOW_S"] = SCRIPT_VERIFY_LOW_S;`
`42`	`42`	`mapFlagNames["NULLDUMMY"] = SCRIPT_VERIFY_NULLDUMMY;`
`43`	`43`	`}`
`44`	`44`