WIP: json header using _hex

Author: fjahr

cmake/script/GenerateHeaderFromJson.cmake

@@ -5,18 +5,21 @@
 cmake_path(GET JSON_SOURCE_PATH STEM json_source_basename)
 
 file(READ ${JSON_SOURCE_PATH} hex_content HEX)
-string(REGEX REPLACE "................" "\\0\n" formatted_bytes "${hex_content}")
-string(REGEX REPLACE "[^\n][^\n]" "'\\\\x\\0'," formatted_bytes "${formatted_bytes}")
+string(STRIP "${hex_content}" hex_content)
 
 set(header_content
-"#include <string_view>
+"#include <util/strencodings.h>
+
+#include <string_view>
+#include <cstddef>
+
+using namespace util::hex_literals;
 
 namespace json_tests {
-inline constexpr char detail_${json_source_basename}_bytes[] {
-${formatted_bytes}
-};
+inline auto detail_${json_source_basename}_bytes = \"${hex_content}\"_hex;
 
-inline constexpr std::string_view ${json_source_basename}{std::begin(detail_${json_source_basename}_bytes), std::end(detail_${json_source_basename}_bytes)};
+inline std::string_view ${json_source_basename}{reinterpret_cast<const char*>(detail_${json_source_basename}_bytes.data()), detail_${json_source_basename}_bytes.size()};
 }
 ")
+
 file(WRITE ${HEADER_PATH} "${header_content}")

src/univalue/test/unitester.cpp

@@ -97,7 +97,7 @@ static void runtest(std::string filename, const std::string& jdata)
 }
 
 #define TEST_FILE(name) {#name, json_tests::name}
-inline constexpr std::array tests{std::to_array<std::tuple<std::string_view, std::string_view>>({
+inline std::array tests{std::to_array<std::tuple<std::string_view, std::string_view>>({
     TEST_FILE(fail1),
     TEST_FILE(fail10),
     TEST_FILE(fail11),