Add missing tx type to TxToUniv (#3069)

UdjinM6 · web-flow · commit 0e94e97cc53c · 2019-08-28T10:54:44.000+03:00
* Add missing tx `type` to `TxToUniv`

* Adjust the expected output in unit test testcases accordingly
diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -164,6 +164,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
     uint256 txid = tx.GetHash();
     entry.pushKV("txid", txid.GetHex());
     entry.pushKV("version", tx.nVersion);
+    entry.pushKV("type", tx.nType);
     entry.pushKV("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION));
     entry.pushKV("locktime", (int64_t)tx.nLockTime);
 
diff --git a/test/util/data/blanktxv1.json b/test/util/data/blanktxv1.json
@@ -1,6 +1,7 @@
 {
     "txid": "d21633ba23f70118185227be58a63527675641ad37967e2aa461559f577aec43",
     "version": 1,
+    "type": 0,
     "size": 10,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/blanktxv2.json b/test/util/data/blanktxv2.json
@@ -1,6 +1,7 @@
 {
     "txid": "4ebd325a4b394cff8c57e8317ccf5a8d0e2bdf1b8526f8aad6c8e43d8240621a",
     "version": 2,
+    "type": 0,
     "size": 10,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/tt-delin1-out.json b/test/util/data/tt-delin1-out.json
@@ -1,6 +1,7 @@
 {
     "txid": "81b2035be1da1abe745c6141174a73d151009ec17b3d5ebffa2e177408c50dfd",
     "version": 1,
+    "type": 0,
     "size": 3040,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/tt-delout1-out.json b/test/util/data/tt-delout1-out.json
@@ -1,6 +1,7 @@
 {
     "txid": "c46ccd75b5050e942b2e86a3648f843f525fe6fc000bf0534ba5973063354493",
     "version": 1,
+    "type": 0,
     "size": 3155,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/tt-locktime317000-out.json b/test/util/data/tt-locktime317000-out.json
@@ -1,6 +1,7 @@
 {
     "txid": "aded538f642c17e15f4d3306b8be7e1a4d1ae0c4616d641ab51ea09ba65e5cb5",
     "version": 1,
+    "type": 0,
     "size": 3189,
     "locktime": 317000,
     "vin": [
diff --git a/test/util/data/txcreate1.json b/test/util/data/txcreate1.json
@@ -1,6 +1,7 @@
 {
     "txid": "fe7d174f42dce0cffa7a527e9bc8368956057619ec817648f6138b98f2533e8f",
     "version": 2,
+    "type": 0,
     "size": 201,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreate2.json b/test/util/data/txcreate2.json
@@ -1,6 +1,7 @@
 {
     "txid": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715",
     "version": 2,
+    "type": 0,
     "size": 19,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatedata1.json b/test/util/data/txcreatedata1.json
@@ -1,6 +1,7 @@
 {
     "txid": "07894b4d12fe7853dd911402db1620920d261b9627c447f931417d330c25f06e",
     "version": 1,
+    "type": 0,
     "size": 176,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatedata2.json b/test/util/data/txcreatedata2.json
@@ -1,6 +1,7 @@
 {
     "txid": "c14b007fa3a6c1e7765919c1d14c1cfc2b8642c3a5d3be4b1fa8c4ccfec98bb0",
     "version": 2,
+    "type": 0,
     "size": 176,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatedata_seq0.json b/test/util/data/txcreatedata_seq0.json
@@ -1,6 +1,7 @@
 {
     "txid": "8df6ed527472542dd5e137c242a7c5a9f337ac34f7b257ae4af886aeaebb51b0",
     "version": 2,
+    "type": 0,
     "size": 85,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatedata_seq1.json b/test/util/data/txcreatedata_seq1.json
@@ -1,6 +1,7 @@
 {
     "txid": "c4dea671b0d7b48f8ab10bc46650e8329d3c5766931f548f513847a19f5ba75b",
     "version": 1,
+    "type": 0,
     "size": 126,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatemultisig1.json b/test/util/data/txcreatemultisig1.json
@@ -1,6 +1,7 @@
 {
     "txid": "0d1d4edfc217d9db3ab6a9298f26a52eae3c52f55a6cb8ccbc14f7c727572894",
     "version": 1,
+    "type": 0,
     "size": 124,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatemultisig2.json b/test/util/data/txcreatemultisig2.json
@@ -1,6 +1,7 @@
 {
     "txid": "0d861f278a3b7bce7cb5a88d71e6e6a903336f95ad5a2c29b295b63835b6eee3",
     "version": 1,
+    "type": 0,
     "size": 42,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreateoutpubkey1.json b/test/util/data/txcreateoutpubkey1.json
@@ -1,6 +1,7 @@
 {
     "txid": "f42b38ac12e3fafc96ba1a9ba70cbfe326744aef75df5fb9db5d6e2855ca415f",
     "version": 1,
+    "type": 0,
     "size": 54,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatescript1.json b/test/util/data/txcreatescript1.json
@@ -1,6 +1,7 @@
 {
     "txid": "f0851b68202f736b792649cfc960259c2374badcb644ab20cac726b5f72f61c9",
     "version": 1,
+    "type": 0,
     "size": 20,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatescript2.json b/test/util/data/txcreatescript2.json
@@ -1,6 +1,7 @@
 {
     "txid": "6e07a7cc075e0703f32ee8c4e5373fe654bfbc315148fda364e1be286ff290d0",
     "version": 1,
+    "type": 0,
     "size": 42,
     "locktime": 0,
     "vin": [
diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json
@@ -1,6 +1,7 @@
 {
     "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
     "version": 1,
+    "type": 0,
     "size": 224,
     "locktime": 0,
     "vin": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "d21633ba23f70118185227be58a63527675641ad37967e2aa461559f577aec43",`
`3`	`3`	`"version": 1,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 10,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "4ebd325a4b394cff8c57e8317ccf5a8d0e2bdf1b8526f8aad6c8e43d8240621a",`
`3`	`3`	`"version": 2,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 10,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "81b2035be1da1abe745c6141174a73d151009ec17b3d5ebffa2e177408c50dfd",`
`3`	`3`	`"version": 1,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 3040,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "c46ccd75b5050e942b2e86a3648f843f525fe6fc000bf0534ba5973063354493",`
`3`	`3`	`"version": 1,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 3155,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "aded538f642c17e15f4d3306b8be7e1a4d1ae0c4616d641ab51ea09ba65e5cb5",`
`3`	`3`	`"version": 1,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 3189,`
`5`	`6`	`"locktime": 317000,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "fe7d174f42dce0cffa7a527e9bc8368956057619ec817648f6138b98f2533e8f",`
`3`	`3`	`"version": 2,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 201,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "0481afb29931341d0d7861d8a2f6f26456fa042abf54a23e96440ed7946e0715",`
`3`	`3`	`"version": 2,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 19,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "07894b4d12fe7853dd911402db1620920d261b9627c447f931417d330c25f06e",`
`3`	`3`	`"version": 1,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 176,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"txid": "c14b007fa3a6c1e7765919c1d14c1cfc2b8642c3a5d3be4b1fa8c4ccfec98bb0",`
`3`	`3`	`"version": 2,`
	`4`	`+ "type": 0,`
`4`	`5`	`"size": 176,`
`5`	`6`	`"locktime": 0,`
`6`	`7`	`"vin": [`