From 54e5d7c1b81e1b76f5789abfa2cb1f5963cd9d72 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Wed, 28 Sep 2016 13:36:36 -0400
Subject: Add bitcoin-tx JSON tests

---
 src/test/data/txcreate2.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/test/data/txcreate2.json

(limited to 'src/test/data/txcreate2.json')

diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From da9469770847df56e67e629986129a087b5bd7a5 Mon Sep 17 00:00:00 2001
From: jnewbery <john@johnnewbery.com>
Date: Thu, 29 Sep 2016 10:13:16 -0400
Subject: bitcoin-util-test.py should fail if the output file is empty

---
 src/test/data/txcreate2.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/test/data/txcreate2.json')

diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
index e69de29bb..c56293eaf 100644
--- a/src/test/data/txcreate2.json
+++ b/src/test/data/txcreate2.json
@@ -0,0 +1,19 @@
+{
+    "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
+    "version": 1,
+    "locktime": 0,
+    "vin": [
+    ],
+    "vout": [
+        {
+            "value": 0.00,
+            "n": 0,
+            "scriptPubKey": {
+                "asm": "",
+                "hex": "",
+                "type": "nonstandard"
+            }
+        }
+    ],
+    "hex": "01000000000100000000000000000000000000"
+}
-- 
cgit v1.2.3


From 4408558843c6c2b7abeb4160f641dfdbf5be5eb4 Mon Sep 17 00:00:00 2001
From: jonnynewbs <jonnynewbs@gmail.com>
Date: Wed, 21 Sep 2016 10:52:53 -0400
Subject: Update bitcoin-tx to output witness data.

---
 src/test/data/txcreate2.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/test/data/txcreate2.json')

diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
index c56293eaf..a70c1d302 100644
--- a/src/test/data/txcreate2.json
+++ b/src/test/data/txcreate2.json
@@ -1,5 +1,6 @@
 {
     "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
+    "hash": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
     "version": 1,
     "locktime": 0,
     "vin": [
-- 
cgit v1.2.3


From c5c92c46fbe1ebc9ab411ae06d5416ff91f9f340 Mon Sep 17 00:00:00 2001
From: BtcDrak <btcdrak@gmail.com>
Date: Fri, 26 Aug 2016 23:24:23 +0100
Subject: Update python tests for default tx version=2

---
 src/test/data/txcreate2.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/test/data/txcreate2.json')

diff --git a/src/test/data/txcreate2.json b/src/test/data/txcreate2.json
index a70c1d302..fb5e177db 100644
--- a/src/test/data/txcreate2.json
+++ b/src/test/data/txcreate2.json
@@ -1,7 +1,7 @@
 {
-    "txid": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
-    "hash": "cf90229625e9eb10f6be8156bf6aa5ec2eca19a42b1e05c11f3029b560a32e13",
-    "version": 1,
+    "txid": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715",
+    "hash": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715",
+    "version": 2,
     "locktime": 0,
     "vin": [
     ],
@@ -16,5 +16,5 @@
             }
         }
     ],
-    "hex": "01000000000100000000000000000000000000"
+    "hex": "02000000000100000000000000000000000000"
 }
-- 
cgit v1.2.3