diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-12-23 12:06:38 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-12-23 12:07:16 +0100 |
| commit | 0f921e6a0492c4e9f037a9ed91f474885032d68c (patch) | |
| tree | d7fc8e635597a0e3ad46d9c50049e2969de05e1c | |
| parent | 041331e1da23e4136fd046ed870cdcc177464176 (diff) | |
| parent | b3717326c1d7a92f452eb4ba72009c4fb98539d0 (diff) | |
| download | bitcoin-0f921e6a0492c4e9f037a9ed91f474885032d68c.tar.xz | |
Merge #9406: Re-enable a blank v1 Tx JSON test
b371732 Re-enable a blank v1 Tx JSON test (Douglas Roark)
| -rw-r--r-- | src/test/data/bitcoin-util-test.json | 11 | ||||
| -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 ab1a1385a3..d001b2056f 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 51c25a5a98..51c25a5a98 100644 --- a/src/test/data/blanktx.json +++ b/src/test/data/blanktxv1.json |