Reorganize source files

src/ripple/overlay/impl/ConnectAttempt.h

@@ -28,11 +28,11 @@
 #include <ripple/overlay/Message.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/protocol/UintTypes.h>
-#include <beast/asio/placeholders.h>
-#include <beast/asio/ssl_bundle.h>
-#include <beast/asio/streambuf.h>
-#include <beast/http/message.h>
-#include <beast/http/parser.h>
+#include <beast/placeholders.hpp>
+#include <ripple/beast/asio/ssl_bundle.h>
+#include <beast/streambuf.hpp>
+#include <beast/http/message.hpp>
+#include <beast/http/parser.hpp>
 #include <ripple/beast/net/IPAddressConversion.h>
 #include <ripple/beast/utility/WrappedSink.h>
 #include <boost/asio/basic_waitable_timer.hpp>

src/ripple/overlay/impl/OverlayImpl.cpp

@@ -34,10 +34,10 @@
 #include <ripple/peerfinder/make_Manager.h>
 #include <ripple/protocol/STExchange.h>
 #include <ripple/beast/core/ByteOrder.h>
-#include <beast/crypto/base64.h>
+#include <beast/detail/base64.hpp>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/http/rfc2616.h>
-#include <beast/ci_char_traits.h>
+#include <beast/http/rfc2616.hpp>
+#include <beast/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/WrappedSink.h>
 
 #include <boost/utility/in_place_factory.hpp>
@@ -220,7 +220,7 @@ OverlayImpl::onHandoff (std::unique_ptr <beast::asio::ssl_bundle>&& ssl_bundle,
         if (std::find_if(types.begin(), types.end(),
                 [](std::string const& s)
                 {
-                    return beast::ci_equal(s, "peer");
+                    return beast::detail::ci_equal(s, "peer");
                 }) == types.end())
         {
             handoff.moved = false;
@@ -461,7 +461,7 @@ OverlayImpl::setupValidatorKeyManifests (BasicConfig const& config,
         std::string s;
         for (auto const& line : validation_manifest.lines())
             s += beast::rfc2616::trim(line);
-        s = beast::base64_decode(s);
+        s = beast::detail::base64_decode(s);
         if (auto mo = make_Manifest (std::move (s)))
         {
             manifestCache_.configManifest (
@@ -803,7 +803,7 @@ OverlayImpl::crawl()
     for_each ([&](std::shared_ptr<PeerImp>&& sp)
     {
         auto& pv = av.append(Json::Value(Json::objectValue));
-        pv[jss::public_key] = beast::base64_encode(
+        pv[jss::public_key] = beast::detail::base64_encode(
             sp->getNodePublic().data(),
                 sp->getNodePublic().size());
         pv[jss::type] = sp->slot()->inbound() ?

src/ripple/overlay/impl/OverlayImpl.h

@@ -25,6 +25,7 @@
 #include <ripple/overlay/Overlay.h>
 #include <ripple/overlay/impl/Manifest.h>
 #include <ripple/overlay/impl/TrafficCount.h>
+#include <ripple/beast/deprecated_http.h>
 #include <ripple/server/Handoff.h>
 #include <ripple/server/ServerHandler.h>
 #include <ripple/basics/Resolver.h>

src/ripple/overlay/impl/PeerImp.cpp

@@ -45,7 +45,6 @@
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/beast/core/SemanticVersion.h>
-#include <beast/streams/debug_ostream.h>
 #include <ripple/beast/utility/weak_fn.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/io_service.hpp>
@@ -241,7 +240,7 @@ PeerImp::crawl() const
     auto const iter = headers_.find("Crawl");
     if (iter == headers_.end())
         return false;
-    return beast::ci_equal(iter->second, "public");
+    return beast::detail::ci_equal(iter->second, "public");
 }
 
 std::string

src/ripple/overlay/impl/PeerImp.h

@@ -36,11 +36,11 @@
 #include <ripple/protocol/STValidation.h>
 #include <ripple/beast/core/ByteOrder.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/asio/placeholders.h>
-#include <beast/asio/streambuf.h>
-#include <beast/asio/ssl_bundle.h>
-#include <beast/http/message.h>
-#include <beast/http/parser.h>
+#include <beast/placeholders.hpp>
+#include <beast/streambuf.hpp>
+#include <ripple/beast/asio/ssl_bundle.h>
+#include <beast/http/message.hpp>
+#include <beast/http/parser.hpp>
 #include <ripple/beast/utility/WrappedSink.h>
 #include <cstdint>
 #include <deque>

src/ripple/overlay/impl/PeerSet.cpp

@@ -22,7 +22,7 @@
 #include <ripple/overlay/PeerSet.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/overlay/Overlay.h>
-#include <beast/asio/placeholders.h>
+#include <beast/placeholders.hpp>
 
 namespace ripple {
 

src/ripple/overlay/impl/TMHello.cpp

@@ -25,8 +25,8 @@
 #include <ripple/protocol/digest.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/overlay/impl/TMHello.h>
-#include <beast/crypto/base64.h>
-#include <beast/http/rfc2616.h>
+#include <beast/detail/base64.hpp>
+#include <beast/http/rfc2616.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/regex.hpp>
 #include <algorithm>
@@ -161,7 +161,7 @@ appendHello (beast::http::headers<std::allocator<char>>& h,
 
     h.insert ("Public-Key", hello.nodepublic());
 
-    h.insert ("Session-Signature", beast::base64_encode (
+    h.insert ("Session-Signature", beast::detail::base64_encode (
         hello.nodeproof()));
 
     if (hello.has_nettime())
@@ -171,11 +171,11 @@ appendHello (beast::http::headers<std::allocator<char>>& h,
         h.insert ("Ledger", std::to_string (hello.ledgerindex()));
 
     if (hello.has_ledgerclosed())
-        h.insert ("Closed-Ledger", beast::base64_encode (
+        h.insert ("Closed-Ledger", beast::detail::base64_encode (
             hello.ledgerclosed()));
 
     if (hello.has_ledgerprevious())
-        h.insert ("Previous-Ledger", beast::base64_encode (
+        h.insert ("Previous-Ledger", beast::detail::base64_encode (
             hello.ledgerprevious()));
 
     if (hello.has_local_ip())
@@ -262,7 +262,7 @@ parseHello (bool request, beast::http::headers<std::allocator<char>> const& h, b
         if (iter == h.end())
             return boost::none;
         // TODO Security Review
-        hello.set_nodeproof (beast::base64_decode (iter->second));
+        hello.set_nodeproof (beast::detail::base64_decode (iter->second));
     }
 
     {
@@ -297,13 +297,13 @@ parseHello (bool request, beast::http::headers<std::allocator<char>> const& h, b
     {
         auto const iter = h.find ("Closed-Ledger");
         if (iter != h.end())
-            hello.set_ledgerclosed (beast::base64_decode (iter->second));
+            hello.set_ledgerclosed (beast::detail::base64_decode (iter->second));
     }
 
     {
         auto const iter = h.find ("Previous-Ledger");
         if (iter != h.end())
-            hello.set_ledgerprevious (beast::base64_decode (iter->second));
+            hello.set_ledgerprevious (beast::detail::base64_decode (iter->second));
     }
 
     {

src/ripple/overlay/impl/TMHello.h

@@ -24,7 +24,8 @@
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/UintTypes.h>
-#include <beast/http/message.h>
+#include <beast/http/headers.hpp>
+#include <beast/http/message.hpp>
 #include <ripple/beast/utility/Journal.h>
 #include <utility>
 #include <boost/asio/ssl.hpp>