Bump univalue subtree and fix json formatting in tests #11420

maflcko · 2017-09-29T12:41:54Z

The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break.

Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now:

./contrib/devtools/git-subtree-check.sh src/univalue

fe805ea Declare single-argument (non-converting) constructors "explicit" 8a2d6f1 Merge pull request #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. dac5296 README.md: update code quotes 3e31dcf README.md: close code quote d09b842 Update README.md f1b86ed Convert README to markdown style. 1dfe464 Import UniValue class unit tests from bitcoin project. 0d3e74d operator[] takes size_t index parameter (versus unsigned int) 640158f Private findKey() method becomes size_t clean, and returns bool on failure. 7099135 Merge pull request #36 from ryanofsky/pr/end-str a31231b Version 1.0.3 4fd5444 Reject unterminated strings 81eba33 Merge pull request #26 from isle2983/pushBackHelpers 3640541 Merge PR #32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge 89bb073 Merge pull request #31 from ryanofsky/raw-literals 511008c Merge pull request #30 from ryanofsky/test-driver 77974f3 Merge pull request #34 from paveljanik/20161116_Wshadow_codepoint a38fcd3 Do not shadow member variable codepoint. fd32d1a Don't require nul-terminated string inputs 0bb1439 Support parsing raw literals in UniValue 28876d0 Merge pull request #29 from btcdrak/exportspace 839ccd7 Add test driver for JSONTestSuite 26ef3ff Remove trailing whitespace from JSON export cfa0384 Convenience wrappers for push_back-ing integer types REVERT: 16a1f7f Merge bitcoin#3: Pull upstream REVERT: daf1285 Merge pull request #2 from jgarzik/master REVERT: f32df99 Merge branch '2016_04_unicode' into bitcoin REVERT: 280b191 Merge remote-tracking branch 'jgarzik/master' into bitcoin REVERT: 2740c4f Merge branch '2015_11_escape_plan' into bitcoin git-subtree-dir: src/univalue git-subtree-split: fe805ea

This merge commit bumps the univalue subtree and also updates the whitespace for some failing tests.

laanwj · 2017-10-04T12:33:29Z

utACK faaeeb0

The whitespace fix is a nice little improvement.

fanquake · 2017-10-05T01:13:58Z

I haven't been able to verify this like the secp256k1 subtree. Is this waiting for bitcoin-core/univalue-subtree#7 to be merged?

maflcko · 2017-10-05T07:20:53Z

Jup, the commit should be merged first.

laanwj · 2017-10-11T10:14:53Z

bitcoin-core/univalue-subtree#7 is merged

fanquake · 2017-10-11T11:35:38Z

tested ACK faaeeb0

[pull/11420/local-merge f94cd2237] Merge #11420: Bump univalue subtree and fix json formatting in tests
 Date: Wed Oct 11 19:13:16 2017 +0800
#11420 Bump univalue subtree and fix json formatting in tests into master
* faaeeb0d3 Bump univalue and fix json formatting in tests (MarcoFalke) (pull/11420/head)
* 619bb0503 Squashed 'src/univalue/' changes from 16a1f7f6e..fe805ea74 (MarcoFalke)

Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.
bash-3.2$ git fetch https://github.com/bitcoin-core/univalue.git
warning: no common commits
remote: Counting objects: 565, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 565 (delta 0), reused 4 (delta 0), pack-reused 558
Receiving objects: 100% (565/565), 111.21 KiB | 77.00 KiB/s, done.
Resolving deltas: 100% (304/304), done.
From https://github.com/bitcoin-core/univalue
 * branch                HEAD       -> FETCH_HEAD
bash-3.2$ ./contrib/devtools/git-subtree-check.sh src/univalue
src/univalue in HEAD was last updated to upstream commit fe805ea74f8919382720b09a905a14e81311b3ad (tree 5d48005ff778ddf521705b5d08d19189966fc36b)
src/univalue in HEAD currently refers to tree 5d48005ff778ddf521705b5d08d19189966fc36b
GOOD

/Applications/Xcode.app/Contents/Developer/usr/bin/make  check-TESTS check-local
Running test/util/bitcoin-util-test.py...
/usr/local/bin/python3.6 ../test/util/bitcoin-util-test.py
  CC       src/tests-tests.o
  CC       src/exhaustive_tests-tests_exhaustive.o
make[5]: `libsecp256k1.la' is up to date.
  CCLD     exhaustive_tests
PASS: qt/test/test_bitcoin-qt
  CCLD     tests
/Applications/Xcode.app/Contents/Developer/usr/bin/make  check-TESTS
PASS: exhaustive_tests
PASS: tests
============================================================================
Testsuite summary for libsecp256k1 0.1
============================================================================
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
  CXX      test/test_object-object.o
  CXX      test/test_test_json-test_json.o
  CXX      test/test_unitester-unitester.o
  CXX      test/test_no_nul-no_nul.o
  CXXLD    test/no_nul
  CXXLD    test/test_json
  CXXLD    test/unitester
  CXXLD    test/object
/Applications/Xcode.app/Contents/Developer/usr/bin/make  check-TESTS
PASS: test/no_nul
PASS: test/object
PASS: test/unitester
============================================================================
Testsuite summary for univalue 1.0.3
============================================================================
# TOTAL: 3
# PASS:  3
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
PASS: test/test_bitcoin
============================================================================
Testsuite summary for Bitcoin Core 0.15.99
============================================================================
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
Making check in doc/man
make[1]: Nothing to be done for `check'.
make[1]: Nothing to be done for `check-am'.

laanwj · 2017-10-11T16:14:09Z

Thanks for testing @fanquake , looks good to me now.

Edit: I got a lot of linker errors when building this. Re-trying after cleaning my tree. Yes, that fixed it.

619bb05 Squashed 'src/univalue/' changes from 16a1f7f..fe805ea (MarcoFalke) Pull request description: The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break. Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now: ```sh ./contrib/devtools/git-subtree-check.sh src/univalue Tree-SHA512: 3009d1e52b6f41ef89ecc8a000649f08e44395538703f294995a6e913e3fbfb7813d6bd31fdb4acb6127fd4af99c095bf980a12f1f026bb27cacc66e1487cd1e

2862b56 [tests] remove redundant univalue_tests.cpp (John Newbery) Pull request description: univalue unit tests were added in #4730 , and exist at `/src/test/univalue_tests.cpp` (outside the univalue tree). That test was brought into the univalue repository in bitcoin-core/univalue-subtree#4 , which was pulled into the github repository in #11420. That means that the univalue test exists in two places: 1. `/src/test/univalue_tests.cpp` 2. `/src/univalue/test/object.cpp` (2) is a strict superset of (1). It adds some macros to work around boost not being a univalue dependency, and adds a few extra lines of test. Therefore remove `/src/test/univalue_tests.cpp` Tree-SHA512: 3747b10bbf62e9f12363905488b29945ad559ddca68c5c03d8a362de612a51f408f41a04d3712c6889bfc1632fb1a5fa0d7df0fbf02c322b3981a6d698f501b0

… tests 619bb05 Squashed 'src/univalue/' changes from 16a1f7f6e..fe805ea74 (MarcoFalke) Pull request description: The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break. Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now: ```sh ./contrib/devtools/git-subtree-check.sh src/univalue Tree-SHA512: 3009d1e52b6f41ef89ecc8a000649f08e44395538703f294995a6e913e3fbfb7813d6bd31fdb4acb6127fd4af99c095bf980a12f1f026bb27cacc66e1487cd1e

…ting in tests 619bb05 Squashed 'src/univalue/' changes from 16a1f7f..fe805ea (MarcoFalke) Pull request description: The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break. Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now: ```sh ./contrib/devtools/git-subtree-check.sh src/univalue Tree-SHA512: 3009d1e52b6f41ef89ecc8a000649f08e44395538703f294995a6e913e3fbfb7813d6bd31fdb4acb6127fd4af99c095bf980a12f1f026bb27cacc66e1487cd1e

2862b56 [tests] remove redundant univalue_tests.cpp (John Newbery) Pull request description: univalue unit tests were added in #4730 , and exist at `/src/test/univalue_tests.cpp` (outside the univalue tree). That test was brought into the univalue repository in bitcoin-core/univalue-subtree#4 , which was pulled into the github repository in bitcoin/bitcoin#11420. That means that the univalue test exists in two places: 1. `/src/test/univalue_tests.cpp` 2. `/src/univalue/test/object.cpp` (2) is a strict superset of (1). It adds some macros to work around boost not being a univalue dependency, and adds a few extra lines of test. Therefore remove `/src/test/univalue_tests.cpp` Tree-SHA512: 3747b10bbf62e9f12363905488b29945ad559ddca68c5c03d8a362de612a51f408f41a04d3712c6889bfc1632fb1a5fa0d7df0fbf02c322b3981a6d698f501b0

Summary: 2862b56 [tests] remove redundant univalue_tests.cpp (John Newbery) Pull request description: univalue unit tests were added in #4730 , and exist at `/src/test/univalue_tests.cpp` (outside the univalue tree). That test was brought into the univalue repository in bitcoin-core/univalue-subtree#4 , which was pulled into the github repository in bitcoin/bitcoin#11420. That means that the univalue test exists in two places: 1. `/src/test/univalue_tests.cpp` 2. `/src/univalue/test/object.cpp` (2) is a strict superset of (1). It adds some macros to work around boost not being a univalue dependency, and adds a few extra lines of test. Therefore remove `/src/test/univalue_tests.cpp` Tree-SHA512: 3747b10bbf62e9f12363905488b29945ad559ddca68c5c03d8a362de612a51f408f41a04d3712c6889bfc1632fb1a5fa0d7df0fbf02c322b3981a6d698f501b0 Backport of Core PR11879 bitcoin/bitcoin#11879 Test Plan: make check ninja check Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D3701

… tests 619bb05 Squashed 'src/univalue/' changes from 16a1f7f..fe805ea (MarcoFalke) Pull request description: The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break. Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now: ```sh ./contrib/devtools/git-subtree-check.sh src/univalue Tree-SHA512: 3009d1e52b6f41ef89ecc8a000649f08e44395538703f294995a6e913e3fbfb7813d6bd31fdb4acb6127fd4af99c095bf980a12f1f026bb27cacc66e1487cd1e

2862b56 [tests] remove redundant univalue_tests.cpp (John Newbery) Pull request description: univalue unit tests were added in dashpay#4730 , and exist at `/src/test/univalue_tests.cpp` (outside the univalue tree). That test was brought into the univalue repository in bitcoin-core/univalue-subtree#4 , which was pulled into the github repository in bitcoin#11420. That means that the univalue test exists in two places: 1. `/src/test/univalue_tests.cpp` 2. `/src/univalue/test/object.cpp` (2) is a strict superset of (1). It adds some macros to work around boost not being a univalue dependency, and adds a few extra lines of test. Therefore remove `/src/test/univalue_tests.cpp` Tree-SHA512: 3747b10bbf62e9f12363905488b29945ad559ddca68c5c03d8a362de612a51f408f41a04d3712c6889bfc1632fb1a5fa0d7df0fbf02c322b3981a6d698f501b0

MarcoFalke added 2 commits September 29, 2017 14:27

Bump univalue and fix json formatting in tests

faaeeb0

This merge commit bumps the univalue subtree and also updates the whitespace for some failing tests.

maflcko added Tests Upstream labels Sep 29, 2017

laanwj merged commit faaeeb0 into bitcoin:master Oct 11, 2017

sipa mentioned this pull request Oct 11, 2017

Perform a weaker subtree check in Travis #11394

Merged

maflcko mentioned this pull request Nov 10, 2017

RPC: Consistently use UniValue.pushKV instead of push_back(Pair()) #11386

Closed

maflcko deleted the Mf1709-bumpUnivalue branch November 10, 2017 18:36

jnewbery mentioned this pull request Dec 12, 2017

[tests] remove redundant univalue_tests.cpp #11879

Merged

sickpig mentioned this pull request Jan 10, 2018

Update univalue subtree BitcoinUnlimited/BitcoinUnlimited#897

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump univalue subtree and fix json formatting in tests #11420

Bump univalue subtree and fix json formatting in tests #11420

maflcko commented Sep 29, 2017

laanwj commented Oct 4, 2017

fanquake commented Oct 5, 2017

maflcko commented Oct 5, 2017

laanwj commented Oct 11, 2017

fanquake commented Oct 11, 2017

laanwj commented Oct 11, 2017 •

edited

Bump univalue subtree and fix json formatting in tests #11420

Bump univalue subtree and fix json formatting in tests #11420

Conversation

maflcko commented Sep 29, 2017

laanwj commented Oct 4, 2017

fanquake commented Oct 5, 2017

maflcko commented Oct 5, 2017

laanwj commented Oct 11, 2017

fanquake commented Oct 11, 2017

laanwj commented Oct 11, 2017 • edited

laanwj commented Oct 11, 2017 •

edited