aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDouglas Roark <[email protected]>2016-12-21 13:40:14 -0800
committerDouglas Roark <[email protected]>2016-12-21 13:41:47 -0800
commitb3717326c1d7a92f452eb4ba72009c4fb98539d0 (patch)
treedfe799e1f52d59705f50aa67d173c46cf7c3dfa9 /src
parentMerge #8589: Inline CTxInWitness inside CTxIn (diff)
downloaddiscoin-b3717326c1d7a92f452eb4ba72009c4fb98539d0.tar.xz
discoin-b3717326c1d7a92f452eb4ba72009c4fb98539d0.zip
Re-enable a blank v1 Tx JSON test
Diffstat (limited to 'src')
-rw-r--r--src/test/data/bitcoin-util-test.json11
-rw-r--r--src/test/data/blanktxv1.json (renamed from src/test/data/blanktx.json)0
2 files changed, 8 insertions, 3 deletions
diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json
index ab1a1385a..d001b2056 100644
--- a/src/test/data/bitcoin-util-test.json
+++ b/src/test/data/bitcoin-util-test.json
@@ -5,9 +5,9 @@
"description": "Creates a blank v1 transaction"
},
{ "exec": "./bitcoin-tx",
- "args": ["-json","-create"],
- "output_cmp": "blanktxv2.json",
- "description": "Creates a blank transaction (output in json)"
+ "args": ["-json","-create", "nversion=1"],
+ "output_cmp": "blanktxv1.json",
+ "description": "Creates a blank v1 transaction (output in json)"
},
{ "exec": "./bitcoin-tx",
"args": ["-"],
@@ -16,6 +16,11 @@
"description": "Creates a blank transaction when nothing is piped into bitcoin-tx"
},
{ "exec": "./bitcoin-tx",
+ "args": ["-json","-create"],
+ "output_cmp": "blanktxv2.json",
+ "description": "Creates a blank transaction (output in json)"
+ },
+ { "exec": "./bitcoin-tx",
"args": ["-json","-"],
"input": "blanktxv2.hex",
"output_cmp": "blanktxv2.json",
diff --git a/src/test/data/blanktx.json b/src/test/data/blanktxv1.json
index 51c25a5a9..51c25a5a9 100644
--- a/src/test/data/blanktx.json
+++ b/src/test/data/blanktxv1.json