From 1059f998230e6e20cfda35b496ae7e16003373ac Mon Sep 17 00:00:00 2001
From: Nathan Nichols <natenichols@cox.net>
Date: Mon, 4 Oct 2021 17:45:16 -0700
Subject: [PATCH] rebases ssl source

---
 src/etl/ETLSource.cpp    |  2 +-
 src/etl/ETLSource.h      |  4 ++--
 src/webserver/Listener.h | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/etl/ETLSource.cpp b/src/etl/ETLSource.cpp
index c4be1461..c567fabb 100644
--- a/src/etl/ETLSource.cpp
+++ b/src/etl/ETLSource.cpp
@@ -806,7 +806,7 @@ ETLSourceImpl<Derived>::getRippledForwardingStub() const
 }
 
 template <class Derived>
-boost::json::object
+std::optional<boost::json::object>
 ETLSourceImpl<Derived>::forwardToRippled(boost::json::object const& request) const
 {
     BOOST_LOG_TRIVIAL(debug) << "Attempting to forward request to tx. "
diff --git a/src/etl/ETLSource.h b/src/etl/ETLSource.h
index b652fe84..ae4f2e9f 100644
--- a/src/etl/ETLSource.h
+++ b/src/etl/ETLSource.h
@@ -53,7 +53,7 @@ public:
     virtual std::unique_ptr<org::xrpl::rpc::v1::XRPLedgerAPIService::Stub>
     getRippledForwardingStub() const = 0;
 
-    virtual boost::json::object
+    virtual std::optional<boost::json::object>
     forwardToRippled(boost::json::object const& request) const = 0;
 
     virtual
@@ -320,7 +320,7 @@ public:
     std::unique_ptr<org::xrpl::rpc::v1::XRPLedgerAPIService::Stub>
     getRippledForwardingStub() const override;
 
-    boost::json::object
+    std::optional<boost::json::object>
     forwardToRippled(boost::json::object const& request) const override;
 };
 
diff --git a/src/webserver/Listener.h b/src/webserver/Listener.h
index aea5a725..f057a864 100644
--- a/src/webserver/Listener.h
+++ b/src/webserver/Listener.h
@@ -4,11 +4,11 @@
 #include <boost/asio/dispatch.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
-#include <server/HttpSession.h>
-#include <server/PlainWsSession.h>
-#include <server/SslHttpSession.h>
-#include <server/SslWsSession.h>
-#include <server/SubscriptionManager.h>
+#include <webserver/HttpSession.h>
+#include <webserver/PlainWsSession.h>
+#include <webserver/SslHttpSession.h>
+#include <webserver/SslWsSession.h>
+#include <webserver/SubscriptionManager.h>
 
 #include <iostream>