Skip to content

Commit

Permalink
TOML config file support and migration (#2221)
Browse files Browse the repository at this point in the history
* TOML config file support and migration

* Add config override support via a CLI option

* Incorporate config changes from #2214

* Remove deprecation as this currently fails to compile on CI

* Add default empty vector to read_node_config_toml

* Make sure override streams are not empty

* Adjust unit tests with changed base/override order

* Incorporate config changes from #2198 and reorder some methods

* httpcallback section, and documentation improvements

* Clarify data type for wallet account, formatting

* CI formatting

* Improved node config unit test coverage, address review feedback

* Full node and rpc config file coverage. Fix httpcallback deserialization.

* Improve toml diff test

* Use const ref in toml config, fix schema type for rpc_path

* Incorporate work watcher period from #2222

* Add work_watcher_period validation as well as unit test
  • Loading branch information
cryptocode authored Aug 23, 2019
1 parent f8c637f commit 20b52ac
Show file tree
Hide file tree
Showing 39 changed files with 2,202 additions and 353 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@
path = gtest
url = https://github.com/google/googletest.git
branch = v1.8.x
[submodule "cpptoml"]
path = cpptoml
url = https://github.com/cryptocode/cpptoml.git
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ else ()
set (BOOST_PROCESS_SUPPORTED 1)
endif ()

include_directories(cpptoml/include)
add_subdirectory(crypto/ed25519-donna)

set (UPNPC_BUILD_SHARED OFF CACHE BOOL "")
Expand Down
1 change: 1 addition & 0 deletions cpptoml
Submodule cpptoml added at 539965
1 change: 1 addition & 0 deletions nano/core_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ add_executable (core_test
${rocksdb_test}
signing.cpp
socket.cpp
toml.cpp
timer.cpp
uint256_union.cpp
utility.cpp
Expand Down
Loading

0 comments on commit 20b52ac

Please sign in to comment.