Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-21 09:32:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: Use string_view for json_tests

Browse Source 
This avoids a static constructor of the global std::string, and rules
out possibly expensive and implicit copies of the string completely.
This commit is contained in:
MarcoFalke 2024-09-03 10:31:13 +02:00
parent 9cb9651d92
commit fac973647d
No known key found for this signature in database
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/script/GenerateHeaderFromJson.cmake
View File

@ -5,10 +5,10 @@
file(READ ${JSON_SOURCE_PATH} hex_content HEX) file(READ ${JSON_SOURCE_PATH} hex_content HEX)
string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" bytes "${hex_content}") string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" bytes "${hex_content}")
file(WRITE ${HEADER_PATH} "#include <string>\n") file(WRITE ${HEADER_PATH} "#include <string_view>\n")
file(APPEND ${HEADER_PATH} "namespace json_tests{\n") file(APPEND ${HEADER_PATH} "namespace json_tests{\n")
get_filename_component(json_source_basename ${JSON_SOURCE_PATH} NAME_WE) get_filename_component(json_source_basename ${JSON_SOURCE_PATH} NAME_WE)
file(APPEND ${HEADER_PATH} "static const std::string ${json_source_basename}{\n") file(APPEND ${HEADER_PATH} "inline constexpr char detail_${json_source_basename}_bytes[]{\n")
set(i 0) set(i 0)
foreach(byte ${bytes}) foreach(byte ${bytes})
@ -21,4 +21,6 @@ foreach(byte ${bytes})
endif() endif()
endforeach() endforeach()
file(APPEND ${HEADER_PATH} "\n};};") file(APPEND ${HEADER_PATH} "\n};\n")
file(APPEND ${HEADER_PATH} "inline constexpr std::string_view ${json_source_basename}{std::begin(detail_${json_source_basename}_bytes), std::end(detail_${json_source_basename}_bytes)};")
file(APPEND ${HEADER_PATH} "\n}")

8
src/test/util/json.cpp
View File

@ -1,15 +1,15 @@
// Copyright (c) 2023 The Bitcoin Core developers // Copyright (c) 2023-present The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <test/util/json.h> #include <test/util/json.h>
#include <string> #include <univalue.h>
#include <util/check.h> #include <util/check.h>
#include <univalue.h> #include <string_view>
UniValue read_json(const std::string& jsondata) UniValue read_json(std::string_view jsondata)
{ {
UniValue v; UniValue v;
Assert(v.read(jsondata) && v.isArray()); Assert(v.read(jsondata) && v.isArray());

8
src/test/util/json.h
View File

@ -1,14 +1,14 @@
// Copyright (c) 2023 The Bitcoin Core developers // Copyright (c) 2023-present The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_TEST_UTIL_JSON_H #ifndef BITCOIN_TEST_UTIL_JSON_H
#define BITCOIN_TEST_UTIL_JSON_H #define BITCOIN_TEST_UTIL_JSON_H
#include <string>
#include <univalue.h> #include <univalue.h>
UniValue read_json(const std::string& jsondata); #include <string_view>
UniValue read_json(std::string_view jsondata);
#endif // BITCOIN_TEST_UTIL_JSON_H #endif // BITCOIN_TEST_UTIL_JSON_H