Page MenuHomePhabricator
Differential D11335

Deduplicate some block-to-JSON code.
ClosedPublic
Actions

Authored by PiRK on Apr 12 2022, 13:32.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC184ba16e70b1: Deduplicate some block-to-JSON code.
Summary

Some of the logic converting blocks and block headers to JSON for
the blockchain RPC methods (getblock, getlockheader) was duplicated.
Instead of that, the blockToJSON RPC method now calls blockheaderToJSON
first, and then fills in the missing, block-specific bits explicitly.

This is a backport of core#21114

Test Plan

ninja all check-all

Diff Detail

Event Timeline

PiRK created this revision.Apr 12 2022, 13:32
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 12 2022, 13:32
PiRK requested review of this revision.Apr 12 2022, 13:32
teamcity edited the summary of this revision. (Show Details)Apr 12 2022, 13:32
Harbormaster completed remote builds in B18793: Diff 33172.Apr 12 2022, 13:48
Fabien requested changes to this revision.Apr 12 2022, 20:20
Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/rpc/blockchain.cpp
158 ↗(On Diff #33172)

This is now duplicated

This revision now requires changes to proceed.Apr 12 2022, 20:20
PiRK updated this revision to Diff 33192.Apr 13 2022, 06:43

remove duplicate result.pushKV("height", blockindex->nHeight);

Harbormaster completed remote builds in B18805: Diff 33192.Apr 13 2022, 07:23
Fabien accepted this revision.Apr 13 2022, 08:28
This revision is now accepted and ready to land.Apr 13 2022, 08:28
Closed by commit rABC184ba16e70b1: Deduplicate some block-to-JSON code. (authored by Daniel Kraft <d@domob.eu>, committed by PiRK). · Explain WhyApr 13 2022, 18:18
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC184ba16e70b1: Deduplicate some block-to-JSON code..

Revision Contents
Changeset List

PathSize
src/
rpc/
28 lines

Diff 33192

View Options

src/rpc/blockchain.cpp

Loading...