ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflict

Browse Source
This commit is contained in:
Valentin Balaschenko
2026-02-03 18:43:28 +00:00
parent ee8cb0fd10
commit 2612f25ebb
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tests/libxrpl/CMakeLists.txt
View File

@@ -30,12 +30,12 @@ target_link_libraries(xrpl.test.json PRIVATE xrpl.imports.test)
add_dependencies(xrpl.tests xrpl.test.json)
# Network unit tests are currently not supported on Windows
if(NOT WIN32)
xrpl_add_test(net)
target_link_libraries(xrpl.test.net PRIVATE xrpl.imports.test)
add_dependencies(xrpl.tests xrpl.test.net)
endif()
if (NOT WIN32)
xrpl_add_test(net)
target_link_libraries(xrpl.test.net PRIVATE xrpl.imports.test)
add_dependencies(xrpl.tests xrpl.test.net)
endif ()
xrpl_add_test(ledger)
target_link_libraries(xrpl.test.ledger PRIVATE xrpl.imports.test)
add_dependencies(xrpl.tests xrpl.test.ledger)
add_dependencies(xrpl.tests xrpl.test.ledger)

6
src/xrpld/app/ledger/LedgerHistory.cpp
View File

@@ -8,13 +8,7 @@
namespace xrpl {
<<<<<<< HEAD
LedgerHistory::LedgerHistory(beast::insight::Collector::ptr const& collector, Application& app)
=======
// FIXME: Need to clean up ledgers by index at some point
LedgerHistory::LedgerHistory(beast::insight::Collector::ptr const& collector, Application& app)
>>>>>>> develop
: app_(app)
, collector_(collector)
, mismatch_counter_(collector->make_counter("ledger.history", "mismatch"))