Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge #12193: RPC: Consistently use UniValue.pushKV instead of push_back(Pair()) (karel-3d) #3532

Merged
merged 2 commits into from
Jun 18, 2020
Merged

Merge #12193: RPC: Consistently use UniValue.pushKV instead of push_back(Pair()) (karel-3d) #3532

merged 2 commits into from
Jun 18, 2020

Conversation

PastaPastaPasta
Copy link
Member

based on pr4

@PastaPastaPasta PastaPastaPasta changed the base branch from master to develop June 14, 2020 16:22
@PastaPastaPasta PastaPastaPasta added this to the 17 milestone Jun 14, 2020
MarcoFalke and others added 2 commits June 16, 2020 11:28
@PastaPastaPasta
Begin Merge 12193 Squashed 'src/univalue/' changes from 07947ff..51d3ab3
7bb02e3 


51d3ab3 Merge #10: Add pushKV(key, boolean) function (replaces #5)
129bad9 [tests] test pushKV for boolean values
b3c44c9 Pushing boolean value to univalue correctly

git-subtree-dir: src/univalue
git-subtree-split: 51d3ab3
@PastaPastaPasta
scripted-diff: Use UniValue.pushKV instead of push_back(Pair()) (end b…
f7f8a35 
…itcoin#12193)

-BEGIN VERIFY SCRIPT-
git grep -l "push_back(Pair" | xargs sed -i "s/push_back(Pair(\(.*\)));/pushKV(\1);/g"
-END VERIFY SCRIPT-

Signed-off-by: pasta <pasta@dashboost.org>
@PastaPastaPasta
Copy link
Member Author

rebased, scripted diff passes :) ./contrib/devtools/commit-script-check.sh develop..HEAD

@PastaPastaPasta PastaPastaPasta marked this pull request as ready for review June 17, 2020 00:00
UdjinM6
UdjinM6 approved these changes Jun 17, 2020
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@PastaPastaPasta PastaPastaPasta changed the title Backport 12193 Merge #12193: RPC: Consistently use UniValue.pushKV instead of push_back(Pair()) (karel-3d) Jun 18, 2020
@UdjinM6 UdjinM6 merged commit 3f8a7b2 into dashpay:develop Jun 18, 2020
@PastaPastaPasta PastaPastaPasta deleted the backport-12193 branch June 18, 2020 18:17
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Feb 23, 2022
@PastaPastaPasta @gades
Merge bitcoin#12193: RPC: Consistently use UniValue.pushKV instead o…
f83ba2d 
…f push_back(Pair()) (karel-3d) (dashpay#3532)

* Begin Merge 12193 Squashed 'src/univalue/' changes from 07947ff..51d3ab3

51d3ab3 Merge dashpay#10: Add pushKV(key, boolean) function (replaces dashpay#5)
129bad9 [tests] test pushKV for boolean values
b3c44c9 Pushing boolean value to univalue correctly

git-subtree-dir: src/univalue
git-subtree-split: 51d3ab3

* scripted-diff: Use UniValue.pushKV instead of push_back(Pair()) (end bitcoin#12193)

-BEGIN VERIFY SCRIPT-
git grep -l "push_back(Pair" | xargs sed -i "s/push_back(Pair(\(.*\)));/pushKV(\1);/g"
-END VERIFY SCRIPT-

Signed-off-by: pasta <pasta@dashboost.org>

Co-authored-by: MarcoFalke <falke.marco@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17
Development

Successfully merging this pull request may close these issues.
2 participants
@PastaPastaPasta @UdjinM6