Move Beast & fix #include paths

Builds/CMake/RippledCore.cmake

@@ -120,12 +120,8 @@ add_library (Ripple::xrpl_core ALIAS xrpl_core)
 target_include_directories (xrpl_core
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/ripple>
-    # this one is for beast/legacy files:
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/beast/extras>
     $<INSTALL_INTERFACE:include>)
 
-
 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/ripple/beast/unit_test/amount.hpp
-      src/beast/extras/beast/unit_test/dstream.hpp
+      src/ripple/beast/unit_test/dstream.hpp
-      src/beast/extras/beast/unit_test/global_suites.hpp
+      src/ripple/beast/unit_test/global_suites.hpp
-      src/beast/extras/beast/unit_test/match.hpp
+      src/ripple/beast/unit_test/match.hpp
-      src/beast/extras/beast/unit_test/recorder.hpp
+      src/ripple/beast/unit_test/recorder.hpp
-      src/beast/extras/beast/unit_test/reporter.hpp
+      src/ripple/beast/unit_test/reporter.hpp
-      src/beast/extras/beast/unit_test/results.hpp
+      src/ripple/beast/unit_test/results.hpp
-      src/beast/extras/beast/unit_test/runner.hpp
+      src/ripple/beast/unit_test/runner.hpp
-      src/beast/extras/beast/unit_test/suite.hpp
+      src/ripple/beast/unit_test/suite.hpp
-      src/beast/extras/beast/unit_test/suite_info.hpp
+      src/ripple/beast/unit_test/suite_info.hpp
-      src/beast/extras/beast/unit_test/suite_list.hpp
+      src/ripple/beast/unit_test/suite_list.hpp
-      src/beast/extras/beast/unit_test/thread.hpp
+      src/ripple/beast/unit_test/thread.hpp
-    DESTINATION include/beast/unit_test)
+    DESTINATION include/ripple/beast/extras/unit_test)
   install (
     FILES
-      src/beast/extras/beast/unit_test/detail/const_container.hpp
+      src/ripple/beast/unit_test/detail/const_container.hpp
-    DESTINATION include/beast/unit_test/detail)
+    DESTINATION include/ripple/beast/unit_test/detail)
 endif () #tests
 #[===================================================================[
    rippled executable

src/beast/extras/README.md

@@ -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.

src/beast/extras/beast/doc_debug.hpp

@@ -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

src/ripple/app/main/GRPCServer.cpp

@@ -22,7 +22,7 @@
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <ripple/resource/Fees.h>
 
-#include <beast/net/IPAddressConversion.h>
+#include <ripple/beast/net/IPAddressConversion.h>
 
 namespace ripple {
 

src/ripple/app/main/Main.cpp

@@ -35,7 +35,7 @@
 #include <ripple/rpc/RPCHandler.h>
 
 #ifdef ENABLE_TESTS
-#include <beast/unit_test/match.hpp>
+#include <ripple/beast/unit_test/match.hpp>
 #include <test/unit_test/multi_runner.h>
 #endif  // ENABLE_TESTS
 

src/ripple/basics/CountedObject.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 
+#include <ripple/beast/type_name.h>
 #include <atomic>
-#include <beast/type_name.h>
 #include <string>
 #include <utility>
 #include <vector>

src/ripple/beast/unit_test.h

@@ -20,16 +20,16 @@
 #ifndef BEAST_UNIT_TEST_H_INCLUDED
 #define BEAST_UNIT_TEST_H_INCLUDED
 
-#include <beast/unit_test/amount.hpp>
+#include <ripple/beast/unit_test/amount.hpp>
-#include <beast/unit_test/global_suites.hpp>
+#include <ripple/beast/unit_test/global_suites.hpp>
-#include <beast/unit_test/match.hpp>
+#include <ripple/beast/unit_test/match.hpp>
-#include <beast/unit_test/recorder.hpp>
+#include <ripple/beast/unit_test/recorder.hpp>
-#include <beast/unit_test/reporter.hpp>
+#include <ripple/beast/unit_test/reporter.hpp>
-#include <beast/unit_test/results.hpp>
+#include <ripple/beast/unit_test/results.hpp>
-#include <beast/unit_test/runner.hpp>
+#include <ripple/beast/unit_test/runner.hpp>
-#include <beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.hpp>
-#include <beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/suite_info.hpp>
-#include <beast/unit_test/suite_list.hpp>
+#include <ripple/beast/unit_test/suite_list.hpp>
 
 #ifndef BEAST_EXPECT
 #define BEAST_EXPECT_S1(x) #x

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 <beast/unit_test/suite_list.hpp>
+#include <ripple/beast/unit_test/suite_list.hpp>
 
 namespace beast {
 namespace unit_test {

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 <beast/unit_test/amount.hpp>
+#include <ripple/beast/unit_test/amount.hpp>
-#include <beast/unit_test/dstream.hpp>
+#include <ripple/beast/unit_test/dstream.hpp>
-#include <beast/unit_test/global_suites.hpp>
+#include <ripple/beast/unit_test/global_suites.hpp>
-#include <beast/unit_test/match.hpp>
+#include <ripple/beast/unit_test/match.hpp>
-#include <beast/unit_test/reporter.hpp>
+#include <ripple/beast/unit_test/reporter.hpp>
-#include <beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.hpp>
 #include <boost/config.hpp>
 #include <boost/program_options.hpp>
 #include <cstdlib>
@@ -18,74 +18,66 @@
 #include <vector>
 
 #ifdef BOOST_MSVC
-# ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN
+#ifndef WIN32_LEAN_AND_MEAN  // VC_EXTRALEAN
-#  define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
+#include <windows.h>
-#  undef WIN32_LEAN_AND_MEAN
+#undef WIN32_LEAN_AND_MEAN
-# else
+#else
-#  include <windows.h>
+#include <windows.h>
-# endif
+#endif
 #endif
 
 namespace beast {
 namespace unit_test {
 
-static
+static std::string
-std::string
 prefix(suite_info const& s)
 {
-    if(s.manual())
+    if (s.manual())
         return "|M| ";
     return "    ";
 }
 
-static
+static void
-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 <<
+    os << amount(c.size(), "suite") << " total, "
-        amount(c.size(), "suite") << " total, " <<
+       << amount(manual, "manual suite") << '\n';
-        amount(manual, "manual suite") <<
-        '\n'
-        ;
 }
 
 // Print the list of suites
 // Used with the --print command line option
-static
+static void
-void
 print(std::ostream& os)
 {
     os << "------------------------------------------\n";
     print(os, global_suites());
-    os << "------------------------------------------" <<
+    os << "------------------------------------------" << std::endl;
-        std::endl;
 }
 
-} // unit_test
+}  // namespace unit_test
-} // beast
+}  // 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()
+    desc.add_options()("help,h", "Produce a help message")(
-       ("help,h",  "Produce a help message")
+        "print,p", "Print the list of available test suites")(
-       ("print,p", "Print the list of available test suites")
+        "suites,s", po::value<string>(), "suites to run");
-       ("suites,s", po::value<string>(), "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<string>();
         reporter r(log);
         bool failed;
-        if(! suites.empty())
+        if (!suites.empty())
-            failed = r.run_each_if(global_suites(),
+            failed = r.run_each_if(global_suites(), match_auto(suites));
-                match_auto(suites));
         else
             failed = r.run_each(global_suites());
-        if(failed)
+        if (failed)
             return EXIT_FAILURE;
         return EXIT_SUCCESS;
     }

src/ripple/beast/unit_test/match.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_MATCH_HPP
 #define BEAST_UNIT_TEST_MATCH_HPP
 
-#include <beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/suite_info.hpp>
 #include <string>
 
 namespace beast {

src/ripple/beast/unit_test/recorder.hpp

@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_RECORDER_HPP
 #define BEAST_UNIT_TEST_RECORDER_HPP
 
-#include <beast/unit_test/results.hpp>
+#include <ripple/beast/unit_test/results.hpp>
-#include <beast/unit_test/runner.hpp>
+#include <ripple/beast/unit_test/runner.hpp>
 
 namespace beast {
 namespace unit_test {

src/ripple/beast/unit_test/reporter.hpp

@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_REPORTER_HPP
 #define BEAST_UNIT_TEST_REPORTER_HPP
 
-#include <beast/unit_test/amount.hpp>
+#include <ripple/beast/unit_test/amount.hpp>
-#include <beast/unit_test/recorder.hpp>
+#include <ripple/beast/unit_test/recorder.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 #include <algorithm>

src/ripple/beast/unit_test/results.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_RESULTS_HPP
 #define BEAST_UNIT_TEST_RESULTS_HPP
 
-#include <beast/unit_test/detail/const_container.hpp>
+#include <ripple/beast/unit_test/detail/const_container.hpp>
 
 #include <string>
 #include <vector>

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 <beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/suite_info.hpp>
 #include <boost/assert.hpp>
 #include <mutex>
 #include <ostream>

src/ripple/beast/unit_test/suite.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_SUITE_HPP
 #define BEAST_UNIT_TEST_SUITE_HPP
 
-#include <beast/unit_test/runner.hpp>
+#include <ripple/beast/unit_test/runner.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>
@@ -684,7 +684,7 @@ run(runner& r)
 #define BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(Class,Module,Library,Priority)
 
 #else
-#include <beast/unit_test/global_suites.hpp>
+#include <ripple/beast/unit_test/global_suites.hpp>
 #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \
         BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false,0)
 #define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \

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 <beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/suite_info.hpp>
-#include <beast/unit_test/detail/const_container.hpp>
+#include <ripple/beast/unit_test/detail/const_container.hpp>
 #include <boost/assert.hpp>
 #include <typeindex>
 #include <set>
@@ -76,4 +76,3 @@ suite_list::insert(
 } // beast
 
 #endif
-

src/ripple/beast/unit_test/thread.hpp

@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_THREAD_HPP
 #define BEAST_UNIT_TEST_THREAD_HPP
 
-#include <beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.hpp>
 #include <functional>
 #include <thread>
 #include <utility>

src/ripple/protocol/KnownFormats.h

@@ -21,10 +21,10 @@
 #define RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED
 
 #include <ripple/basics/contract.h>
+#include <ripple/beast/type_name.h>
 #include <ripple/protocol/SOTemplate.h>
 #include <boost/container/flat_map.hpp>
 #include <algorithm>
-#include <beast/type_name.h>
 #include <forward_list>
 
 namespace ripple {

src/test/basics/DetectCrash_test.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.hpp>
 
 #include <exception>
 

src/test/beast/beast_io_latency_probe_test.cpp

@@ -19,7 +19,7 @@
 #include <ripple/beast/asio/io_latency_probe.h>
 #include <ripple/beast/unit_test.h>
 
-#include <beast/test/yield_to.hpp>
+#include <ripple/beast/test/yield_to.hpp>
 
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/deadline_timer.hpp>

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 <beast/unit_test/amount.hpp>
+#include <ripple/beast/unit_test/amount.hpp>
-#include <beast/unit_test/global_suites.hpp>
+#include <ripple/beast/unit_test/global_suites.hpp>
-#include <beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.hpp>
 #include <string>
 
 // Include this .cpp in your project to gain access to the printing suite

src/test/nodestore/Timing_test.cpp

@@ -21,6 +21,7 @@
 #include <ripple/basics/ByteUtilities.h>
 #include <ripple/basics/safe_cast.h>
 #include <ripple/beast/unit_test.h>
+#include <ripple/beast/unit_test/thread.hpp>
 #include <ripple/beast/utility/temp_dir.h>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/nodestore/DummyScheduler.h>
@@ -28,7 +29,6 @@
 #include <ripple/unity/rocksdb.h>
 #include <boost/algorithm/string.hpp>
 #include <atomic>
-#include <beast/unit_test/thread.hpp>
 #include <chrono>
 #include <iterator>
 #include <limits>

src/test/server/ServerStatus_test.cpp

@@ -21,6 +21,7 @@
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/basics/base64.h>
+#include <ripple/beast/test/yield_to.hpp>
 #include <ripple/json/json_reader.h>
 #include <ripple/rpc/ServerHandler.h>
 #include <boost/algorithm/string/predicate.hpp>
@@ -30,7 +31,6 @@
 #include <boost/beast/http.hpp>
 #include <algorithm>
 #include <array>
-#include <beast/test/yield_to.hpp>
 #include <random>
 #include <regex>
 #include <test/jtx.h>

src/test/unit_test/multi_runner.cpp

@@ -19,7 +19,7 @@
 
 #include <test/unit_test/multi_runner.h>
 
-#include <beast/unit_test/amount.hpp>
+#include <ripple/beast/unit_test/amount.hpp>
 
 #include <boost/lexical_cast.hpp>
 

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 <ripple/beast/unit_test/global_suites.hpp>
+#include <ripple/beast/unit_test/runner.hpp>
 #include <boost/beast/core/static_string.hpp>
-#include <beast/unit_test/global_suites.hpp>
-#include <beast/unit_test/runner.hpp>
 
 #include <boost/container/static_vector.hpp>
 #include <boost/interprocess/ipc/message_queue.hpp>