aboutsummaryrefslogtreecommitdiff
path: root/src/test/data
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-08-19 17:36:15 +0200
committerWladimir J. van der Laan <[email protected]>2015-08-19 17:37:52 +0200
commitef30389e2a4a83c2845a2cbdf3a7c2f062404077 (patch)
treeb7faa86424eb596c16bc7142d1feaed0032b8c5f /src/test/data
parentMerge pull request #6539 (diff)
parentFix spelling mistake in -> if. (diff)
downloaddiscoin-ef30389e2a4a83c2845a2cbdf3a7c2f062404077.tar.xz
discoin-ef30389e2a4a83c2845a2cbdf3a7c2f062404077.zip
Merge pull request #6544
c5c1edf Fix spelling mistake in -> if. (Mark Friedenbach) e846b2a Correct a possibly intentional pun that is nevertheless hard to read: "two times of nLockTime." What is meant is that there are two kinds, or categories of nLockTime. (Mark Friedenbach)
Diffstat (limited to 'src/test/data')
-rw-r--r--src/test/data/tx_invalid.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index 6c3cac71c..5cad5af7c 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -181,7 +181,7 @@
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP2 1"]],
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ffffff7f", "P2SH,CHECKLOCKTIMEVERIFY"],
-["6 byte non-minimally-encoded arguments are invalid even in their contents are valid"],
+["6 byte non-minimally-encoded arguments are invalid even if their contents are valid"],
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 NOP2 1"]],
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],