Squashed 'src/univalue/' changes from 2740c4f712..a44caf65fe

a44caf65fe Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues
135254331e Import fixes for sanitizer reported issues
d5fb86940e refactor: use c++11 range based for loop in checkObject
ff9c379304 refactor: Use nullptr (c++11) instead of NULL
08a99754d5 build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support
66d3713ce7 Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus
808d487292 ci: travis -> cirrus
c390ac375f Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration
4a5b0a1c65 build: Move source entries out to sources.mk
6c7d94b33c build: cleanup wonky gen usage
a222637c6d Merge dashpay#23: Merge changes from jgarzik/univalue@1ae6a23
98fadc0909 Merge dashpay#24: Push bool into array correctly
5f03f1f39a Push bool into array correctly
f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD
98261b1e7b Merge dashpay#22: Clamp JSON object depth to PHP limit
54c4015415 Clamp JSON object depth to PHP limit
5a58a46671 Merge dashpay#21: Remove hand-coded UniValue destructor.
b4cdfc4f47 Remove hand-coded UniValue destructor.
1ae6a231a0 Merge pull request dashpay#57 from MarcoFalke/test_fix
92bdd11f0b univalue_write: remove unneeded sstream.h include
ffb621c130 Merge pull request dashpay#56 from drodil/remove_sstream_header
f33acf9fe8 Merge commit '7890db9~' into HEAD
7fba60b5ad Merge dashpay#17: [docs] Update readme
4577454e7e Merge dashpay#13: Fix typo
66e0adec4d Remove unnecessary sstream header from univalue.h
ac7e73cda8 [docs] Update readme
7890db99d6 Merge dashpay#11: Remove deprecated std pair wrappers
88967f6586 Version 1.0.4
40e34852ac Merge dashpay#14: Cleaned up namespace imports to reduce symbol collisions
1dc113dbef Merge pull request dashpay#50 from luke-jr/pushKV_bool
72392fb227 [tests] test pushKV for boolean values
c23132bcf4 Pushing boolean value to univalue correctly
4a4964729b Fix typo
85052a4819 Remove deprecated std::pair wrappers
81faab26a1 Merge pull request dashpay#48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS
b17634ef24 Update URLs to MIT license.
51d3ab34ba Merge dashpay#10: Add pushKV(key, boolean) function (replaces dashpay#5)
129bad96d5 [tests] test pushKV for boolean values
b3c44c947f Pushing boolean value to univalue correctly
07947ff2da Merge dashpay#9: [tests] Fix BOOST_CHECK_THROW macro
ec849d9a28 [tests] Fix BOOST_CHECK_THROW macro
88ab64f6b5 Merge pull request dashpay#46 from jasonbcox/master
35ed96da31 Merge pull request dashpay#44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit
420c226290 Merge pull request dashpay#45 from MarcoFalke/Mf1710-univalue-revert-test
d208f986dd Cleaned up namespace imports to reduce symbol collisions
31bc9f5a49 Merge dashpay#8: Remove unused Homebrew workaround
fa042093d1 Remove HomeBrew workaround
a523e08ae4 Merge dashpay#7: Declare single-argument (non-converting) constructors "explicit"
a9e53b38ba Merge dashpay#4: Pull upstream
fe805ea74f Declare single-argument (non-converting) constructors "explicit"
8a2d6f1e36 Merge pull request dashpay#41 from jgarzik/get-obj-map
ba341a20d7 Add getObjMap() helper method.  Also, constify checkObject().
ceb1194137 Handle .pushKV() and .checkObject() edge cases.
107db98299 Add ::push_back(double) method for feature parity.
d415300316 Move one-line implementation of UniValue::read() to header.
52e85b35b8 Move exception-throwing get_* methods into separate implementation module.
dac5296759 README.md: update code quotes
3e31dcffbe README.md: close code quote
d09b8429da Update README.md
f1b86edb4c Convert README to markdown style.
1dfe464eff Import UniValue class unit tests from bitcoin project.
0d3e74dd1e operator[] takes size_t index parameter (versus unsigned int)
640158fa26 Private findKey() method becomes size_t clean, and returns bool on failure.
7099135857 Merge pull request dashpay#36 from ryanofsky/pr/end-str
a31231b519 Version 1.0.3
4fd5444d18 Reject unterminated strings
81eba332b7 Merge pull request dashpay#26 from isle2983/pushBackHelpers
36405413e8 Merge PR dashpay#32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge
89bb07322a Merge pull request dashpay#31 from ryanofsky/raw-literals
511008c36d Merge pull request dashpay#30 from ryanofsky/test-driver
77974f3a9f Merge pull request dashpay#34 from paveljanik/20161116_Wshadow_codepoint
a38fcd3556 Do not shadow member variable codepoint.
fd32d1ab85 Don't require nul-terminated string inputs
0bb1439d0d Support parsing raw literals in UniValue
28876d0455 Merge pull request dashpay#29 from btcdrak/exportspace
839ccd71f3 Add test driver for JSONTestSuite
26ef3fff15 Remove trailing whitespace from JSON export
16a1f7f6e9 Merge dashpay#3: Pull upstream
3f03bfd62b Merge pull request dashpay#27 from laanwj/2016_09_const_refs
5668ca397b Return const references from getKeys, getValues, get_str
cedda1473d Merge pull request dashpay#28 from MarcoFalke/patch-1
9f0b997592 [travis] Work around osx libtool issue
daf1285af6 Merge pull request dashpay#2 from jgarzik/master
cfa0384d64 Convenience wrappers for push_back-ing integer types
d9e62d3e19 Merge pull request dashpay#24 from MarcoFalke/Mf1608-cleanup
faf260f2f8 Rem unused vars and prefer prefix operator for non-primitive type
09a2693ff1 Merge pull request dashpay#22 from laanwj/2016_04_unicode
c74a04c259 Merge pull request dashpay#23 from paveljanik/20160527_Wshadow
f32df99e96 Merge branch '2016_04_unicode' into bitcoin
280b191cb1 Merge remote-tracking branch 'jgarzik/master' into bitcoin
fceb4f8e84 Do not shadow variables
c9a716c2b9 Handle UTF-8
bed8dd9258 Version 1.0.2.
5e7985a3f8 Merge pull request dashpay#14 from laanwj/2015_11_escape_plan

git-subtree-dir: src/univalue
git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3

Author: kwvg

.cirrus.yml

@@ -0,0 +1,44 @@
+env:
+  MAKEJOBS: "-j4"
+  RUN_TESTS: "true"
+  BASE_OUTDIR: "$CIRRUS_WORKING_DIR/out_dir_base"
+  DEBIAN_FRONTEND: "noninteractive"
+
+task:
+  container:
+    image: ubuntu:focal
+    cpu: 1
+    memory: 1G
+    greedy: true  # https://medium.com/cirruslabs/introducing-greedy-container-instances-29aad06dc2b4
+
+  matrix:
+    - name: "gcc"
+      env:
+        CC: "gcc"
+        CXX: "g++"
+        APT_PKGS: "gcc"
+    - name: "clang"
+      env:
+        CC: "clang"
+        CXX: "clang++"
+        APT_PKGS: "clang"
+    - name: "mingw"
+      env:
+        CC: ""
+        CXX: ""
+        UNIVALUE_CONFIG: "--host=x86_64-w64-mingw32"
+        APT_PKGS: "g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64"
+        RUN_TESTS: "false"
+
+  install_script:
+    - apt update
+    - apt install -y pkg-config build-essential libtool autotools-dev automake bsdmainutils
+    - apt install -y $APT_PKGS
+  autogen_script:
+     - ./autogen.sh
+  configure_script:
+     - ./configure --cache-file=config.cache --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib $UNIVALUE_CONFIG
+  make_script:
+     - make $MAKEJOBS V=1
+  test_script:
+     - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS distcheck; fi

.travis.yml

@@ -1,26 +1,24 @@
+include sources.mk
 ACLOCAL_AMFLAGS = -I build-aux/m4
-.PHONY: gen
+.PHONY: gen FORCE
 .INTERMEDIATE: $(GENBIN)
 
-include_HEADERS = include/univalue.h
-noinst_HEADERS = lib/univalue_escapes.h
+include_HEADERS = $(UNIVALUE_DIST_HEADERS_INT)
+noinst_HEADERS = $(UNIVALUE_LIB_HEADERS_INT)
 
 lib_LTLIBRARIES = libunivalue.la
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pc/libunivalue.pc
 
-libunivalue_la_SOURCES = \
-	lib/univalue.cpp \
-	lib/univalue_read.cpp \
-	lib/univalue_write.cpp
+libunivalue_la_SOURCES = $(UNIVALUE_LIB_SOURCES_INT)
 
 libunivalue_la_LDFLAGS = \
 	-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
 	-no-undefined
 libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include
 
-TESTS = test/unitester
+TESTS = test/object test/unitester test/no_nul
 
 GENBIN = gen/gen$(BUILD_EXEEXT)
 GEN_SRCS = gen/gen.cpp
@@ -29,60 +27,32 @@ $(GENBIN): $(GEN_SRCS)
 	@echo Building $@
 	$(AM_V_at)c++ -I$(top_srcdir)/include -o $@ $<
 
-gen: lib/univalue_escapes.h $(GENBIN)
-	@echo Updating $<
+gen: $(GENBIN) FORCE
+	@echo Updating lib/univalue_escapes.h
 	$(AM_V_at)$(GENBIN) > lib/univalue_escapes.h
 
-noinst_PROGRAMS = $(TESTS)
+noinst_PROGRAMS = $(TESTS) test/test_json
 
-TEST_DATA_DIR=test
-
-test_unitester_SOURCES = test/unitester.cpp
+test_unitester_SOURCES = $(UNIVALUE_TEST_UNITESTER_INT)
 test_unitester_LDADD = libunivalue.la
-test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
+test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(UNIVALUE_TEST_DATA_DIR_INT)\"
 test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
 
-TEST_FILES = \
-	$(TEST_DATA_DIR)/fail10.json \
-	$(TEST_DATA_DIR)/fail11.json \
-	$(TEST_DATA_DIR)/fail12.json \
-	$(TEST_DATA_DIR)/fail13.json \
-	$(TEST_DATA_DIR)/fail14.json \
-	$(TEST_DATA_DIR)/fail15.json \
-	$(TEST_DATA_DIR)/fail16.json \
-	$(TEST_DATA_DIR)/fail17.json \
-	$(TEST_DATA_DIR)/fail18.json \
-	$(TEST_DATA_DIR)/fail19.json \
-	$(TEST_DATA_DIR)/fail1.json \
-	$(TEST_DATA_DIR)/fail20.json \
-	$(TEST_DATA_DIR)/fail21.json \
-	$(TEST_DATA_DIR)/fail22.json \
-	$(TEST_DATA_DIR)/fail23.json \
-	$(TEST_DATA_DIR)/fail24.json \
-	$(TEST_DATA_DIR)/fail25.json \
-	$(TEST_DATA_DIR)/fail26.json \
-	$(TEST_DATA_DIR)/fail27.json \
-	$(TEST_DATA_DIR)/fail28.json \
-	$(TEST_DATA_DIR)/fail29.json \
-	$(TEST_DATA_DIR)/fail2.json \
-	$(TEST_DATA_DIR)/fail30.json \
-	$(TEST_DATA_DIR)/fail31.json \
-	$(TEST_DATA_DIR)/fail32.json \
-	$(TEST_DATA_DIR)/fail33.json \
-	$(TEST_DATA_DIR)/fail34.json \
-	$(TEST_DATA_DIR)/fail35.json \
-	$(TEST_DATA_DIR)/fail36.json \
-	$(TEST_DATA_DIR)/fail37.json \
-	$(TEST_DATA_DIR)/fail3.json \
-	$(TEST_DATA_DIR)/fail4.json \
-	$(TEST_DATA_DIR)/fail5.json \
-	$(TEST_DATA_DIR)/fail6.json \
-	$(TEST_DATA_DIR)/fail7.json \
-	$(TEST_DATA_DIR)/fail8.json \
-	$(TEST_DATA_DIR)/fail9.json \
-	$(TEST_DATA_DIR)/pass1.json \
-	$(TEST_DATA_DIR)/pass2.json \
-	$(TEST_DATA_DIR)/pass3.json \
-	$(TEST_DATA_DIR)/round1.json
-
-EXTRA_DIST=$(TEST_FILES) $(GEN_SRCS)
+test_test_json_SOURCES = $(UNIVALUE_TEST_JSON_INT)
+test_test_json_LDADD = libunivalue.la
+test_test_json_CXXFLAGS = -I$(top_srcdir)/include
+test_test_json_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
+
+test_no_nul_SOURCES = $(UNIVALUE_TEST_NO_NUL_INT)
+test_no_nul_LDADD = libunivalue.la
+test_no_nul_CXXFLAGS = -I$(top_srcdir)/include
+test_no_nul_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
+
+test_object_SOURCES = $(UNIVALUE_TEST_OBJECT_INT)
+test_object_LDADD = libunivalue.la
+test_object_CXXFLAGS = -I$(top_srcdir)/include
+test_object_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
+
+TEST_FILES = $(UNIVALUE_TEST_FILES_INT)
+
+EXTRA_DIST=$(UNIVALUE_TEST_FILES_INT) $(GEN_SRCS)

Makefile.am

@@ -0,0 +1,21 @@
+
+# UniValue
+
+## Summary
+
+A universal value class, with JSON encoding and decoding.
+
+UniValue is an abstract data type that may be a null, boolean, string,
+number, array container, or a key/value dictionary container, nested to
+an arbitrary depth.
+
+This class is aligned with the JSON standard, [RFC
+7159](https://tools.ietf.org/html/rfc7159.html).
+
+## Library usage
+
+This is a fork of univalue used by Bitcoin Core. It is not maintained for usage
+by other projects. Notably, the API may break in non-backward-compatible ways.
+
+Other projects looking for a maintained library should use the upstream
+univalue at https://github.com/jgarzik/univalue.