This repository was archived by the owner on Jun 17, 2022. It is now read-only.
Pull upstream #4
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
Remove trailing whitespace from JSON export
Fixes following test failures in https://github.com/nst/JSONTestSuite: bitcoin SHOULD_HAVE_PASSED y_structure_lonely_negative_real.json bitcoin SHOULD_HAVE_PASSED y_structure_lonely_string.json bitcoin SHOULD_HAVE_PASSED y_structure_lonely_false.json bitcoin SHOULD_HAVE_PASSED y_structure_lonely_null.json bitcoin SHOULD_HAVE_PASSED y_string_space.json bitcoin SHOULD_HAVE_PASSED y_structure_string_empty.json bitcoin SHOULD_HAVE_PASSED y_structure_lonely_int.json bitcoin SHOULD_HAVE_PASSED y_structure_lonely_true.json
Avoid giving '\0' characters special treatment in JSON parsing code. This way the parser will reject input strings like "[1,2,3]\0-extra-nonsense" instead of returning a partially parsed interpretation of the input. It also allows the parser to be called with char pointers that might not be nul terminated (like the char pointers returned by std::string::data()). Fixes following test failures in https://github.com/nst/JSONTestSuite: bitcoin SHOULD_HAVE_FAILED n_multidigit_number_then_00.json
Do not shadow member variable codepoint
|
Just a note once this is merged, a couple of bitcoin-tx json tests will break due to what was fixed in 26ef3ff (some trailing white spaces). |
Add test driver for JSONTestSuite
Support parsing raw literals in UniValue
…sky/univalue into merge Conflicts: Makefile.am lib/univalue_read.cpp test/.gitignore
Convenience wrappers for push_back-ing integer types
Fixes following test failures in https://github.com/nst/JSONTestSuite: bitcoin SHOULD_HAVE_FAILED n_string_single_doublequote.json
Reject unterminated strings
Add tests for this and other push_back()'s.
pushKV: Behave properly in the face of duplicate keys. checkObject: return error, if not object. Inspired-by: Charles Yin <yinyunqiao@gmail.com> in PR #37
Add getObjMap() helper method. Also, constify checkObject().
|
utACK 8a2d6f1 |
laanwj
added a commit
that referenced
this pull request
Oct 9, 2017
ba341a2 Add getObjMap() helper method. Also, constify checkObject(). (Jeff Garzik) ceb1194 Handle .pushKV() and .checkObject() edge cases. (Jeff Garzik) 107db98 Add ::push_back(double) method for feature parity. (Jeff Garzik) d415300 Move one-line implementation of UniValue::read() to header. (Jeff Garzik) 52e85b3 Move exception-throwing get_* methods into separate implementation module. (Jeff Garzik) dac5296 README.md: update code quotes (Jeff Garzik) 3e31dcf README.md: close code quote (Jeff Garzik) d09b842 Update README.md (Jeff Garzik) f1b86ed Convert README to markdown style. (Jeff Garzik) 1dfe464 Import UniValue class unit tests from bitcoin project. (Jeff Garzik) 0d3e74d operator[] takes size_t index parameter (versus unsigned int) (kozyilmaz) 640158f Private findKey() method becomes size_t clean, and returns bool on failure. (kozyilmaz) 4fd5444 Reject unterminated strings (Russell Yanofsky) a31231b Version 1.0.3 (Jeff Garzik) cfa0384 Convenience wrappers for push_back-ing integer types (isle2983) fd32d1a Don't require nul-terminated string inputs (Russell Yanofsky) 0bb1439 Support parsing raw literals in UniValue (Russell Yanofsky) 839ccd7 Add test driver for JSONTestSuite (Russell Yanofsky) a38fcd3 Do not shadow member variable codepoint. (Pavel Janík) 26ef3ff Remove trailing whitespace from JSON export (BtcDrak) Pull request description: No rush, feel free to keep this open until upstream merged the outstanding pulls. Tree-SHA512: f25fefc0319d8a02802fc802d75bada17ad583c81d92005947d93fb16ff7cff03b5fd92d986dccfec24cbfd13d87e08afef1efd6bac42ec0d57c6901930a5f50
|
Strange, even though travis passed on this, after merging it it fails on the branch: https://travis-ci.org/bitcoin-core/univalue/builds/285615120?utm_source=email&utm_medium=notification Seems to be a Ruby version conflict? Weird. |
laanwj
added a commit
that referenced
this pull request
Oct 11, 2017
…icit" fe805ea Declare single-argument (non-converting) constructors "explicit" (practicalswift) Pull request description: Rebased on #4. Closes #6, which stripped the original author. Tree-SHA512: 4f4164fb1bbce54e5e28a5cf1327c4d7a2058e74384d1173de843acbfb71a3dc4a11e559650b86c6ac9063ea9c76c96fa371bff985d794c8dc904448f4ecd095
laanwj
added a commit
that referenced
this pull request
Nov 10, 2017
fa04209 Remove HomeBrew workaround (MarcoFalke) Pull request description: This reverts 9f0b997 For context: #4 (comment) The workaround was causing issues. Rather than working around those as well, just revert it altogether. Tree-SHA512: 1692c71fd2e1e79d9585689484eadb0fea6f75bd71c5cbbf50012fcca733ee5107ebcf6857b0065baa5f0ad73e41d0b488a1e7327196d9ea196d9e9f7c66badb
laanwj
added a commit
to bitcoin/bitcoin
that referenced
this pull request
Dec 20, 2017
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
virtload
pushed a commit
to bitcoin-atom/bitcoin-atom
that referenced
this pull request
Apr 4, 2018
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
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jul 25, 2019
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 17, 2020
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 22, 2020
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 22, 2020
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 29, 2020
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 29, 2020
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 29, 2020
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
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 31, 2020
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
malbit
pushed a commit
to malbit/raptoreum
that referenced
this pull request
Nov 5, 2021
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
gades
pushed a commit
to cosanta/cosanta-core
that referenced
this pull request
May 1, 2022
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No rush, feel free to keep this open until upstream merged the outstanding pulls.