[RPC] Update univalue and unify JSON obj pushes #1869
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fuzzbawls
force-pushed
the
2020_univalue-update
branch
from
1d3472b
to
28522af
Compare
random-zebra
previously approved these changes
Sep 24, 2020
There was a problem hiding this comment.
ACK 28522af
Would merge this sooner rather than later, to minimize the need for multiple rebases (being it a sweeping change) and be sure that open PRs do not introduce code with the outdated push_back(Pair()).
random-zebra
dismissed
their stale review
Whoops, nevermind... looks like it already has a conflict
98261b1 Merge PIVX-Project#22: Clamp JSON object depth to PHP limit 54c4015 Clamp JSON object depth to PHP limit 5a58a46 Merge PIVX-Project#21: Remove hand-coded UniValue destructor. b4cdfc4 Remove hand-coded UniValue destructor. 7fba60b Merge PIVX-Project#17: [docs] Update readme 4577454 Merge PIVX-Project#13: Fix typo ac7e73c [docs] Update readme 7890db9 Merge PIVX-Project#11: Remove deprecated std pair wrappers 40e3485 Merge PIVX-Project#14: Cleaned up namespace imports to reduce symbol collisions 4a49647 Fix typo 85052a4 Remove deprecated std::pair wrappers 51d3ab3 Merge PIVX-Project#10: Add pushKV(key, boolean) function (replaces PIVX-Project#5) 129bad9 [tests] test pushKV for boolean values b3c44c9 Pushing boolean value to univalue correctly 07947ff Merge PIVX-Project#9: [tests] Fix BOOST_CHECK_THROW macro ec849d9 [tests] Fix BOOST_CHECK_THROW macro d208f98 Cleaned up namespace imports to reduce symbol collisions 31bc9f5 Merge PIVX-Project#8: Remove unused Homebrew workaround fa04209 Remove HomeBrew workaround a523e08 Merge PIVX-Project#7: Declare single-argument (non-converting) constructors "explicit" a9e53b3 Merge PIVX-Project#4: Pull upstream fe805ea Declare single-argument (non-converting) constructors "explicit" 8a2d6f1 Merge pull request PIVX-Project#41 from jgarzik/get-obj-map ba341a2 Add getObjMap() helper method. Also, constify checkObject(). ceb1194 Handle .pushKV() and .checkObject() edge cases. 107db98 Add ::push_back(double) method for feature parity. d415300 Move one-line implementation of UniValue::read() to header. 52e85b3 Move exception-throwing get_* methods into separate implementation module. 16a1f7f Merge PIVX-Project#3: Pull upstream daf1285 Merge pull request PIVX-Project#2 from jgarzik/master f32df99 Merge branch '2016_04_unicode' into bitcoin 280b191 Merge remote-tracking branch 'jgarzik/master' into bitcoin 2740c4f Merge branch '2015_11_escape_plan' into bitcoin git-subtree-dir: src/univalue git-subtree-split: 98261b1
-BEGIN VERIFY SCRIPT- git grep -l "push_back(Pair" | xargs sed -i "s/push_back(Pair(\(.*\)));/pushKV(\1);/g" -END VERIFY SCRIPT-
3 remaining instances of `push_back(Pair())` due to multiline code.
Fuzzbawls
force-pushed
the
2020_univalue-update
branch
from
28522af
to
7723a0a
Compare
|
Updated to resolve conflicts. and yes, would be good to merge this sooner rather than later as rebasing isn't possible with subtree updates, need to manually redo the process. |
furszy
approved these changes
Sep 25, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The pervious usage of
push_back(Pair())was needed for compatibility with the old json spirit library, which we transitioned away from quite a while ago in favor of Univalue.Univalue provides a more convenient method for pushing key/value pairs into a JSON object or array in the form of
pushKV(), which is easier to read and leads to shorter code segments.This PR first updates our univalue subtree with upstream, which has removed the now-unneeded declaration methods for
push_back(Pair()), as well as patch a bug withpushKV()being supplied with a boolean instead of an integer argument.92c8273 handles the majority of the work to replace usages of
push_back(Pair())withpushKV()with a reproducible shell command.b401d55 takes care of 3 instances that were not picked up in the previous commit due to multiline code
7723a0a finally, this commit adds the scripted-diff verification linter to TravisCI for future use.
Note: Depending on merge order, existing open PRs may "leak" new or conflicting introductions of
push_back(Pair())