diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index 2d6daf47a5..e0c627e2bd 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -120,12 +120,8 @@ add_library (Ripple::xrpl_core ALIAS xrpl_core) target_include_directories (xrpl_core PUBLIC $ - $ - # this one is for beast/legacy files: - $ $) - target_compile_definitions(xrpl_core PUBLIC BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT @@ -295,23 +291,23 @@ install ( if (tests) install ( FILES - src/beast/extras/beast/unit_test/amount.hpp - src/beast/extras/beast/unit_test/dstream.hpp - src/beast/extras/beast/unit_test/global_suites.hpp - src/beast/extras/beast/unit_test/match.hpp - src/beast/extras/beast/unit_test/recorder.hpp - src/beast/extras/beast/unit_test/reporter.hpp - src/beast/extras/beast/unit_test/results.hpp - src/beast/extras/beast/unit_test/runner.hpp - src/beast/extras/beast/unit_test/suite.hpp - src/beast/extras/beast/unit_test/suite_info.hpp - src/beast/extras/beast/unit_test/suite_list.hpp - src/beast/extras/beast/unit_test/thread.hpp - DESTINATION include/beast/unit_test) + src/ripple/beast/unit_test/amount.hpp + src/ripple/beast/unit_test/dstream.hpp + src/ripple/beast/unit_test/global_suites.hpp + src/ripple/beast/unit_test/match.hpp + src/ripple/beast/unit_test/recorder.hpp + src/ripple/beast/unit_test/reporter.hpp + src/ripple/beast/unit_test/results.hpp + src/ripple/beast/unit_test/runner.hpp + src/ripple/beast/unit_test/suite.hpp + src/ripple/beast/unit_test/suite_info.hpp + src/ripple/beast/unit_test/suite_list.hpp + src/ripple/beast/unit_test/thread.hpp + DESTINATION include/ripple/beast/extras/unit_test) install ( FILES - src/beast/extras/beast/unit_test/detail/const_container.hpp - DESTINATION include/beast/unit_test/detail) + src/ripple/beast/unit_test/detail/const_container.hpp + DESTINATION include/ripple/beast/unit_test/detail) endif () #tests #[===================================================================[ rippled executable diff --git a/src/beast/extras/README.md b/src/beast/extras/README.md deleted file mode 100644 index ea6ffce9d0..0000000000 --- a/src/beast/extras/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Extras - -These are not part of the official public Beast interface but they are used by the tests and some third party programs. diff --git a/src/beast/extras/beast/doc_debug.hpp b/src/beast/extras/beast/doc_debug.hpp deleted file mode 100644 index 7023c8a2cf..0000000000 --- a/src/beast/extras/beast/doc_debug.hpp +++ /dev/null @@ -1,170 +0,0 @@ -// -// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// - -#ifndef BEAST_DOC_DEBUG_HPP -#define BEAST_DOC_DEBUG_HPP - -namespace beast { - -#if BEAST_DOXYGEN - -/// doc type (documentation debug helper) -using doc_type = int; - -/// doc enum (documentation debug helper) -enum doc_enum -{ - /// One (documentation debug helper) - one, - - /// Two (documentation debug helper) - two -}; - -/// doc enum class (documentation debug helper) -enum class doc_enum_class : unsigned -{ - /// one (documentation debug helper) - one, - - /// two (documentation debug helper) - two -}; - -/// doc func (documentation debug helper) -void doc_func(); - -/// doc class (documentation debug helper) -struct doc_class -{ - /// doc class member func (documentation debug helper) - void func(); -}; - -/// (documentation debug helper) -namespace nested { - -/// doc type (documentation debug helper) -using nested_doc_type = int; - -/// doc enum (documentation debug helper) -enum nested_doc_enum -{ - /// One (documentation debug helper) - one, - - /// Two (documentation debug helper) - two -}; - -/// doc enum class (documentation debug helper) -enum class nested_doc_enum_class : unsigned -{ - /// one (documentation debug helper) - one, - - /// two (documentation debug helper) - two -}; - -/// doc func (documentation debug helper) -void nested_doc_func(); - -/// doc class (documentation debug helper) -struct nested_doc_class -{ - /// doc class member func (documentation debug helper) - void func(); -}; - -} // nested - -/** This is here to help troubleshoot doc/reference.xsl problems - - Embedded references: - - @li type @ref doc_type - - @li enum @ref doc_enum - - @li enum item @ref doc_enum::one - - @li enum_class @ref doc_enum_class - - @li enum_class item @ref doc_enum_class::one - - @li func @ref doc_func - - @li class @ref doc_class - - @li class func @ref doc_class::func - - @li nested type @ref nested::nested_doc_type - - @li nested enum @ref nested::nested_doc_enum - - @li nested enum item @ref nested::nested_doc_enum::one - - @li nested enum_class @ref nested::nested_doc_enum_class - - @li nested enum_class item @ref nested::nested_doc_enum_class::one - - @li nested func @ref nested::nested_doc_func - - @li nested class @ref nested::nested_doc_class - - @li nested class func @ref nested::nested_doc_class::func -*/ -void doc_debug(); - -namespace nested { - -/** This is here to help troubleshoot doc/reference.xsl problems - - Embedded references: - - @li type @ref doc_type - - @li enum @ref doc_enum - - @li enum item @ref doc_enum::one - - @li enum_class @ref doc_enum_class - - @li enum_class item @ref doc_enum_class::one - - @li func @ref doc_func - - @li class @ref doc_class - - @li class func @ref doc_class::func - - @li nested type @ref nested_doc_type - - @li nested enum @ref nested_doc_enum - - @li nested enum item @ref nested_doc_enum::one - - @li nested enum_class @ref nested_doc_enum_class - - @li nested enum_class item @ref nested_doc_enum_class::one - - @li nested func @ref nested_doc_func - - @li nested class @ref nested_doc_class - - @li nested class func @ref nested_doc_class::func -*/ -void nested_doc_debug(); - -} // nested - -#endif - -} // beast - -#endif diff --git a/src/ripple/app/main/GRPCServer.cpp b/src/ripple/app/main/GRPCServer.cpp index ddaea14c2a..aef2612c0e 100644 --- a/src/ripple/app/main/GRPCServer.cpp +++ b/src/ripple/app/main/GRPCServer.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace ripple { diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp index 34ec2989b6..14befa63ea 100644 --- a/src/ripple/app/main/Main.cpp +++ b/src/ripple/app/main/Main.cpp @@ -35,7 +35,7 @@ #include #ifdef ENABLE_TESTS -#include +#include #include #endif // ENABLE_TESTS diff --git a/src/ripple/basics/CountedObject.h b/src/ripple/basics/CountedObject.h index a5bccf89ec..690841fe1e 100644 --- a/src/ripple/basics/CountedObject.h +++ b/src/ripple/basics/CountedObject.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED +#include #include -#include #include #include #include diff --git a/src/beast/extras/beast/test/fail_counter.hpp b/src/ripple/beast/test/fail_counter.hpp similarity index 100% rename from src/beast/extras/beast/test/fail_counter.hpp rename to src/ripple/beast/test/fail_counter.hpp diff --git a/src/beast/extras/beast/test/fail_stream.hpp b/src/ripple/beast/test/fail_stream.hpp similarity index 100% rename from src/beast/extras/beast/test/fail_stream.hpp rename to src/ripple/beast/test/fail_stream.hpp diff --git a/src/beast/extras/beast/test/pipe_stream.hpp b/src/ripple/beast/test/pipe_stream.hpp similarity index 100% rename from src/beast/extras/beast/test/pipe_stream.hpp rename to src/ripple/beast/test/pipe_stream.hpp diff --git a/src/beast/extras/beast/test/sig_wait.hpp b/src/ripple/beast/test/sig_wait.hpp similarity index 100% rename from src/beast/extras/beast/test/sig_wait.hpp rename to src/ripple/beast/test/sig_wait.hpp diff --git a/src/beast/extras/beast/test/string_iostream.hpp b/src/ripple/beast/test/string_iostream.hpp similarity index 100% rename from src/beast/extras/beast/test/string_iostream.hpp rename to src/ripple/beast/test/string_iostream.hpp diff --git a/src/beast/extras/beast/test/string_istream.hpp b/src/ripple/beast/test/string_istream.hpp similarity index 100% rename from src/beast/extras/beast/test/string_istream.hpp rename to src/ripple/beast/test/string_istream.hpp diff --git a/src/beast/extras/beast/test/string_ostream.hpp b/src/ripple/beast/test/string_ostream.hpp similarity index 100% rename from src/beast/extras/beast/test/string_ostream.hpp rename to src/ripple/beast/test/string_ostream.hpp diff --git a/src/beast/extras/beast/test/test_allocator.hpp b/src/ripple/beast/test/test_allocator.hpp similarity index 100% rename from src/beast/extras/beast/test/test_allocator.hpp rename to src/ripple/beast/test/test_allocator.hpp diff --git a/src/beast/extras/beast/test/yield_to.hpp b/src/ripple/beast/test/yield_to.hpp similarity index 100% rename from src/beast/extras/beast/test/yield_to.hpp rename to src/ripple/beast/test/yield_to.hpp diff --git a/src/ripple/beast/unit_test.h b/src/ripple/beast/unit_test.h index 3352abb6c5..b80c188def 100644 --- a/src/ripple/beast/unit_test.h +++ b/src/ripple/beast/unit_test.h @@ -20,16 +20,16 @@ #ifndef BEAST_UNIT_TEST_H_INCLUDED #define BEAST_UNIT_TEST_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef BEAST_EXPECT #define BEAST_EXPECT_S1(x) #x diff --git a/src/beast/extras/beast/unit_test/amount.hpp b/src/ripple/beast/unit_test/amount.hpp similarity index 100% rename from src/beast/extras/beast/unit_test/amount.hpp rename to src/ripple/beast/unit_test/amount.hpp diff --git a/src/beast/extras/beast/unit_test/detail/const_container.hpp b/src/ripple/beast/unit_test/detail/const_container.hpp similarity index 100% rename from src/beast/extras/beast/unit_test/detail/const_container.hpp rename to src/ripple/beast/unit_test/detail/const_container.hpp diff --git a/src/beast/extras/beast/unit_test/dstream.hpp b/src/ripple/beast/unit_test/dstream.hpp similarity index 100% rename from src/beast/extras/beast/unit_test/dstream.hpp rename to src/ripple/beast/unit_test/dstream.hpp diff --git a/src/beast/extras/beast/unit_test/global_suites.hpp b/src/ripple/beast/unit_test/global_suites.hpp similarity index 95% rename from src/beast/extras/beast/unit_test/global_suites.hpp rename to src/ripple/beast/unit_test/global_suites.hpp index 3fbf79589f..b641ed7cb2 100644 --- a/src/beast/extras/beast/unit_test/global_suites.hpp +++ b/src/ripple/beast/unit_test/global_suites.hpp @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_HPP #define BEAST_UNIT_TEST_GLOBAL_SUITES_HPP -#include +#include namespace beast { namespace unit_test { diff --git a/src/beast/extras/beast/unit_test/main.cpp b/src/ripple/beast/unit_test/main.cpp similarity index 57% rename from src/beast/extras/beast/unit_test/main.cpp rename to src/ripple/beast/unit_test/main.cpp index 5762b51022..aa1a0f5367 100644 --- a/src/beast/extras/beast/unit_test/main.cpp +++ b/src/ripple/beast/unit_test/main.cpp @@ -5,12 +5,12 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -18,74 +18,66 @@ #include #ifdef BOOST_MSVC -# ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN -# define WIN32_LEAN_AND_MEAN -# include -# undef WIN32_LEAN_AND_MEAN -# else -# include -# endif +#ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN +#define WIN32_LEAN_AND_MEAN +#include +#undef WIN32_LEAN_AND_MEAN +#else +#include +#endif #endif namespace beast { namespace unit_test { -static -std::string +static std::string prefix(suite_info const& s) { - if(s.manual()) + if (s.manual()) return "|M| "; return " "; } -static -void +static void print(std::ostream& os, suite_list const& c) { std::size_t manual = 0; - for(auto const& s : c) + for (auto const& s : c) { os << prefix(s) << s.full_name() << '\n'; - if(s.manual()) + if (s.manual()) ++manual; } - os << - amount(c.size(), "suite") << " total, " << - amount(manual, "manual suite") << - '\n' - ; + os << amount(c.size(), "suite") << " total, " + << amount(manual, "manual suite") << '\n'; } // Print the list of suites // Used with the --print command line option -static -void +static void print(std::ostream& os) { os << "------------------------------------------\n"; print(os, global_suites()); - os << "------------------------------------------" << - std::endl; + os << "------------------------------------------" << std::endl; } -} // unit_test -} // beast +} // namespace unit_test +} // namespace beast // Simple main used to produce stand // alone executables that run unit tests. -int main(int ac, char const* av[]) +int +main(int ac, char const* av[]) { using namespace std; using namespace beast::unit_test; namespace po = boost::program_options; po::options_description desc("Options"); - desc.add_options() - ("help,h", "Produce a help message") - ("print,p", "Print the list of available test suites") - ("suites,s", po::value(), "suites to run") - ; + desc.add_options()("help,h", "Produce a help message")( + "print,p", "Print the list of available test suites")( + "suites,s", po::value(), "suites to run"); po::positional_options_description p; po::variables_map vm; @@ -95,27 +87,26 @@ int main(int ac, char const* av[]) dstream log(std::cerr); std::unitbuf(log); - if(vm.count("help")) + if (vm.count("help")) { log << desc << std::endl; } - else if(vm.count("print")) + else if (vm.count("print")) { print(log); } else { std::string suites; - if(vm.count("suites") > 0) + if (vm.count("suites") > 0) suites = vm["suites"].as(); reporter r(log); bool failed; - if(! suites.empty()) - failed = r.run_each_if(global_suites(), - match_auto(suites)); + if (!suites.empty()) + failed = r.run_each_if(global_suites(), match_auto(suites)); else failed = r.run_each(global_suites()); - if(failed) + if (failed) return EXIT_FAILURE; return EXIT_SUCCESS; } diff --git a/src/beast/extras/beast/unit_test/match.hpp b/src/ripple/beast/unit_test/match.hpp similarity index 98% rename from src/beast/extras/beast/unit_test/match.hpp rename to src/ripple/beast/unit_test/match.hpp index 7c164b7b12..859eb1f71c 100644 --- a/src/beast/extras/beast/unit_test/match.hpp +++ b/src/ripple/beast/unit_test/match.hpp @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_MATCH_HPP #define BEAST_UNIT_TEST_MATCH_HPP -#include +#include #include namespace beast { diff --git a/src/beast/extras/beast/unit_test/recorder.hpp b/src/ripple/beast/unit_test/recorder.hpp similarity index 94% rename from src/beast/extras/beast/unit_test/recorder.hpp rename to src/ripple/beast/unit_test/recorder.hpp index dd5fcbe9a2..c7c543889f 100644 --- a/src/beast/extras/beast/unit_test/recorder.hpp +++ b/src/ripple/beast/unit_test/recorder.hpp @@ -8,8 +8,8 @@ #ifndef BEAST_UNIT_TEST_RECORDER_HPP #define BEAST_UNIT_TEST_RECORDER_HPP -#include -#include +#include +#include namespace beast { namespace unit_test { diff --git a/src/beast/extras/beast/unit_test/reporter.hpp b/src/ripple/beast/unit_test/reporter.hpp similarity index 98% rename from src/beast/extras/beast/unit_test/reporter.hpp rename to src/ripple/beast/unit_test/reporter.hpp index cb2e331772..844c321a07 100644 --- a/src/beast/extras/beast/unit_test/reporter.hpp +++ b/src/ripple/beast/unit_test/reporter.hpp @@ -8,8 +8,8 @@ #ifndef BEAST_UNIT_TEST_REPORTER_HPP #define BEAST_UNIT_TEST_REPORTER_HPP -#include -#include +#include +#include #include #include #include diff --git a/src/beast/extras/beast/unit_test/results.hpp b/src/ripple/beast/unit_test/results.hpp similarity index 98% rename from src/beast/extras/beast/unit_test/results.hpp rename to src/ripple/beast/unit_test/results.hpp index 6ae014af5e..58d6e9c8a8 100644 --- a/src/beast/extras/beast/unit_test/results.hpp +++ b/src/ripple/beast/unit_test/results.hpp @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_RESULTS_HPP #define BEAST_UNIT_TEST_RESULTS_HPP -#include +#include #include #include diff --git a/src/beast/extras/beast/unit_test/runner.hpp b/src/ripple/beast/unit_test/runner.hpp similarity index 99% rename from src/beast/extras/beast/unit_test/runner.hpp rename to src/ripple/beast/unit_test/runner.hpp index 366ee3e370..17fa0b9d7d 100644 --- a/src/beast/extras/beast/unit_test/runner.hpp +++ b/src/ripple/beast/unit_test/runner.hpp @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/beast/extras/beast/unit_test/suite.hpp b/src/ripple/beast/unit_test/suite.hpp similarity index 99% rename from src/beast/extras/beast/unit_test/suite.hpp rename to src/ripple/beast/unit_test/suite.hpp index c4e0cf26c4..befc9a281d 100644 --- a/src/beast/extras/beast/unit_test/suite.hpp +++ b/src/ripple/beast/unit_test/suite.hpp @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_SUITE_HPP #define BEAST_UNIT_TEST_SUITE_HPP -#include +#include #include #include #include @@ -684,7 +684,7 @@ run(runner& r) #define BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(Class,Module,Library,Priority) #else -#include +#include #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \ BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false,0) #define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \ diff --git a/src/beast/extras/beast/unit_test/suite_info.hpp b/src/ripple/beast/unit_test/suite_info.hpp similarity index 100% rename from src/beast/extras/beast/unit_test/suite_info.hpp rename to src/ripple/beast/unit_test/suite_info.hpp diff --git a/src/beast/extras/beast/unit_test/suite_list.hpp b/src/ripple/beast/unit_test/suite_list.hpp similarity index 93% rename from src/beast/extras/beast/unit_test/suite_list.hpp rename to src/ripple/beast/unit_test/suite_list.hpp index 41526a2d05..1a7e241e98 100644 --- a/src/beast/extras/beast/unit_test/suite_list.hpp +++ b/src/ripple/beast/unit_test/suite_list.hpp @@ -8,8 +8,8 @@ #ifndef BEAST_UNIT_TEST_SUITE_LIST_HPP #define BEAST_UNIT_TEST_SUITE_LIST_HPP -#include -#include +#include +#include #include #include #include @@ -76,4 +76,3 @@ suite_list::insert( } // beast #endif - diff --git a/src/beast/extras/beast/unit_test/thread.hpp b/src/ripple/beast/unit_test/thread.hpp similarity index 98% rename from src/beast/extras/beast/unit_test/thread.hpp rename to src/ripple/beast/unit_test/thread.hpp index 8f3263af3c..9f02ba5ee2 100644 --- a/src/beast/extras/beast/unit_test/thread.hpp +++ b/src/ripple/beast/unit_test/thread.hpp @@ -8,7 +8,7 @@ #ifndef BEAST_UNIT_TEST_THREAD_HPP #define BEAST_UNIT_TEST_THREAD_HPP -#include +#include #include #include #include diff --git a/src/ripple/protocol/KnownFormats.h b/src/ripple/protocol/KnownFormats.h index aa99d2ee9f..b59742259a 100644 --- a/src/ripple/protocol/KnownFormats.h +++ b/src/ripple/protocol/KnownFormats.h @@ -21,10 +21,10 @@ #define RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED #include +#include #include #include #include -#include #include namespace ripple { diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp index c021001177..300c948527 100644 --- a/src/test/basics/DetectCrash_test.cpp +++ b/src/test/basics/DetectCrash_test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp index 6baf5b986b..9ae6a1341c 100644 --- a/src/test/beast/beast_io_latency_probe_test.cpp +++ b/src/test/beast/beast_io_latency_probe_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/test/beast/define_print.cpp b/src/test/beast/define_print.cpp index dbfb5243a6..af51aeee55 100644 --- a/src/test/beast/define_print.cpp +++ b/src/test/beast/define_print.cpp @@ -5,9 +5,9 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#include -#include -#include +#include +#include +#include #include // Include this .cpp in your project to gain access to the printing suite diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp index 8694631a0c..931ad79883 100644 --- a/src/test/nodestore/Timing_test.cpp +++ b/src/test/nodestore/Timing_test.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index c6548bc816..684532c4fc 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp index 6659301ad3..5cd69111b4 100644 --- a/src/test/unit_test/multi_runner.cpp +++ b/src/test/unit_test/multi_runner.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h index e9c1ed7653..57d6d33f9e 100644 --- a/src/test/unit_test/multi_runner.h +++ b/src/test/unit_test/multi_runner.h @@ -20,9 +20,9 @@ #ifndef TEST_UNIT_TEST_MULTI_RUNNER_H #define TEST_UNIT_TEST_MULTI_RUNNER_H +#include +#include #include -#include -#include #include #include