Differential D2499

refactor TxToJSON() and ScriptPubKeyToJSON()
ClosedPublic
Actions

Authored by nakihito on Feb 4 2019, 20:12.

Tags

None

Subscribers

Details

Reviewers

jasonbcox
deadalnix
Fabien

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

rSTAGING76c64df03947: refactor TxToJSON() and ScriptPubKeyToJSON()
rABC76c64df03947: refactor TxToJSON() and ScriptPubKeyToJSON()

Summary

This PR removes almost all of the TxToJSON() and ScriptPubKeyToJSON() code from bitcoin-rpc and places it in bitcoin-common, removing about 80 lines of duplicate code. The only part that can't be moved into bitcoin-common is parsing block contextual information (confirmations and blocktime), which are not available to bitcoin-common code.

Backports Core PR8824 https://github.com/bitcoin/bitcoin/pull/8824

Completes T500.

Test Plan

make check

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

nakihito created this revision.Feb 4 2019, 20:12

Owners added a reviewer: Restricted Owners Package.Feb 4 2019, 20:12

Herald added a reviewer: Restricted Project. · View Herald TranscriptFeb 4 2019, 20:12

Herald added a subscriber: schancel. · View Herald Transcript

nakihito added a reviewer: Fabien.Feb 4 2019, 20:15

nakihito removed a subscriber: schancel.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B4873: Diff 7170.Feb 4 2019, 20:30

deadalnix requested changes to this revision.Feb 5 2019, 00:16

deadalnix added inline comments.

src/primitives/transaction.cpp
141 ↗	(On Diff #7170)	dito
src/primitives/transaction.h
378 ↗	(On Diff #7170)	This code is related to segwit, remove.
src/rest.cpp
15 ↗	(On Diff #7170)	Remove
src/rpc/blockchain.cpp
20 ↗	(On Diff #7170)	Is that still required ?
src/rpc/rawtransaction.cpp
39 ↗	(On Diff #7170)	Remove this one from the header it's defined in.

This revision now requires changes to proceed.Feb 5 2019, 00:16

Removed segwit code and unnecessary include and function prototype lines.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster completed remote builds in B4878: Diff 7178.Feb 5 2019, 01:37

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

deadalnix accepted this revision.Feb 5 2019, 02:04

This revision is now accepted and ready to land.Feb 5 2019, 02:04

Closed by commit rABC76c64df03947: refactor TxToJSON() and ScriptPubKeyToJSON() (authored by jonnynewbs <jonnynewbs@gmail.com>, committed by nakihito). · Explain WhyFeb 5 2019, 19:08

This revision was automatically updated to reflect the committed changes.

jasonbcox mentioned this in D2546: Fix regression in getrawtransaction.Feb 13 2019, 23:57

For posterity, this backport was fubar'd. See D2546 for details.

jasonbcox mentioned this in rABC2ba3ac5b795d: Fix regression in getrawtransaction.Feb 14 2019, 01:14

nakihito mentioned this in D2589: Added tests verifying outputs for getblock rpc command.Feb 22 2019, 22:18

Diffusion mentioned this in rABC8aa43fbcd510: Added tests verifying outputs for getblock rpc command.Feb 26 2019, 01:12

markblundeberg mentioned this in D3070: Remove config argument from blockToJSON.May 19 2019, 17:26

Diffusion mentioned this in rABCe1039399e967: Remove config argument from blockToJSON.May 20 2019, 22:59

Nico Guiton <nico@bitframe.org> added a commit: rSTAGING76c64df03947: refactor TxToJSON() and ScriptPubKeyToJSON().Sep 18 2019, 22:17

jasonbcox mentioned this in rSTAGING2ba3ac5b795d: Fix regression in getrawtransaction.Sep 18 2019, 22:23

Nico Guiton <nico@bitframe.org> mentioned this in rSTAGING8aa43fbcd510: Added tests verifying outputs for getblock rpc command.Sep 18 2019, 22:31

Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com> mentioned this in rSTAGINGe1039399e967: Remove config argument from blockToJSON.Sep 18 2019, 23:38

Revision Contents
Changeset List

Path

Size

src/

2 lines

5 lines

rpc/

6 lines

rawtransaction.cpp

101 lines

2 lines

test/

util/

data/

1 line

1 line

tt-delin1-out.json

1 line

tt-delout1-out.json

1 line

tt-locktime317000-out.json

1 line

1 line

1 line

txcreatedata1.json

1 line

txcreatedata2.json

1 line

txcreatedata_seq0.json

1 line

txcreatedata_seq1.json

1 line

txcreatemultisig1.json

1 line

txcreatemultisig2.json

1 line

txcreateoutpubkey1.json

1 line

txcreatescript1.json

1 line

txcreatescript2.json

1 line

txcreatesignv1.json

1 line

Diff 7188

src/core_write.cpp

Loading...

src/rest.cpp

Loading...

src/rpc/blockchain.cpp

Loading...

src/rpc/rawtransaction.cpp

Loading...

src/rpc/tojson.h

Loading...

test/util/data/blanktxv1.json

Loading...

test/util/data/blanktxv2.json

Loading...

test/util/data/tt-delin1-out.json

Loading...

test/util/data/tt-delout1-out.json

Loading...

test/util/data/tt-locktime317000-out.json

Loading...

test/util/data/txcreate1.json

Loading...

test/util/data/txcreate2.json

Loading...

test/util/data/txcreatedata1.json

Loading...

test/util/data/txcreatedata2.json

Loading...

test/util/data/txcreatedata_seq0.json

Loading...

test/util/data/txcreatedata_seq1.json

Loading...

test/util/data/txcreatemultisig1.json

Loading...

test/util/data/txcreatemultisig2.json

Loading...

test/util/data/txcreateoutpubkey1.json

Loading...

test/util/data/txcreatescript1.json

Loading...

test/util/data/txcreatescript2.json

Loading...

test/util/data/txcreatesignv1.json

Loading...