Merge pull request #619 from evoskuil/master

Remove dead code, comments.

Author: evoskuil

include/bitcoin/network/beast.hpp

@@ -72,8 +72,8 @@ using file_request_cptr = std::shared_ptr<const file_request>;
 using file_response_ptr = std::shared_ptr<file_response>;
 using file_request_ptr = std::shared_ptr<file_request>;
 
-/// HACK: must cast writer to non-const.
 /// beast::http::span_body<uint8_t>
+/// Must cast write span uint8_t* to non-const.
 using span_body = boost::beast::http::span_body<uint8_t>;
 using span_request = boost::beast::http::request<span_body>;
 using span_response = boost::beast::http::response<span_body>;
@@ -85,6 +85,7 @@ using span_response_ptr = std::shared_ptr<span_response>;
 using span_request_ptr = std::shared_ptr<span_request>;
 
 /// beast::http::buffer_body
+/// Must cast write buffer void* to non-const.
 using buffer_body = boost::beast::http::buffer_body;
 using buffer_request = boost::beast::http::request<buffer_body>;
 using buffer_response = boost::beast::http::response<buffer_body>;

include/bitcoin/network/net/proxy.hpp

@@ -112,44 +112,17 @@ class BCT_API proxy
     virtual void write(const asio::const_buffer& payload,
         count_handler&& handler) NOEXCEPT;
 
-    /// HTTP Readers.
+    /// HTTP.
     /// -----------------------------------------------------------------------
 
     /// Read full http variant request from the socket, using provided buffer.
     virtual void read(http::flat_buffer& buffer, http::request& request,
         count_handler&& handler) NOEXCEPT;
 
-    /// Read full http string request from the socket, using provided buffer.
-    virtual void read(http::flat_buffer& buffer, http::string_request& request,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Read full http json request from the socket, using provided buffer.
-    virtual void read(http::flat_buffer& buffer, http::json_request& request,
-        count_handler&& handler) NOEXCEPT;
-
-    /// HTTP Writers.
-    /// -----------------------------------------------------------------------
-
     /// Write full http variant response to the socket (json buffer in body).
     virtual void write(http::response& response,
         count_handler&& handler) NOEXCEPT;
 
-    /// Write full http string response to the socket.
-    virtual void write(http::string_response& response,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Write full http json response to the socket (serialize buffer in body).
-    virtual void write(http::json_response& response,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Write full http data response to the socket.
-    virtual void write(http::data_response& response,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Write full http file response to the socket.
-    virtual void write(http::file_response& response,
-        count_handler&& handler) NOEXCEPT;
-
 private:
     typedef std::deque<std::pair<asio::const_buffer, count_handler>> queue;
 

include/bitcoin/network/net/socket.hpp

@@ -64,7 +64,7 @@ class BCT_API socket
     /// Block on threadpool.join() to ensure termination of the connection.
     virtual void stop() NOEXCEPT;
 
-    /// TCP.
+    /// Accept/Connect.
     /// -----------------------------------------------------------------------
 
     /// Accept an incoming connection, handler posted to *acceptor* strand.
@@ -76,6 +76,9 @@ class BCT_API socket
     virtual void connect(const asio::endpoints& range,
         result_handler&& handler) NOEXCEPT;
 
+    /// TCP.
+    /// -----------------------------------------------------------------------
+
     /// Read full buffer from the socket, handler posted to socket strand.
     virtual void read(const asio::mutable_buffer& out,
         count_handler&& handler) NOEXCEPT;
@@ -84,44 +87,17 @@ class BCT_API socket
     virtual void write(const asio::const_buffer& in,
         count_handler&& handler) NOEXCEPT;
 
-    /// HTTP Readers.
+    /// HTTP.
     /// -----------------------------------------------------------------------
 
     /// Read full http variant request from the socket.
     virtual void http_read(http::flat_buffer& buffer,
         http::request& request, count_handler&& handler) NOEXCEPT;
 
-    /// Read full http string request from the socket.
-    virtual void http_read(http::flat_buffer& buffer,
-        http::string_request& request, count_handler&& handler) NOEXCEPT;
-
-    /// Read full http json request from the socket.
-    virtual void http_read(http::flat_buffer& buffer,
-        http::json_request& request, count_handler&& handler) NOEXCEPT;
-
-    /// HTTP Writers.
-    /// -----------------------------------------------------------------------
-
     /// Write full http variant response to the socket.
     virtual void http_write(http::response& response,
         count_handler&& handler) NOEXCEPT;
 
-    /// Write full http string response to the socket.
-    virtual void http_write(http::string_response& response,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Write full http json response to the socket.
-    virtual void http_write(http::json_response& response,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Write full http data response to the socket.
-    virtual void http_write(http::data_response& response,
-        count_handler&& handler) NOEXCEPT;
-
-    /// Write full http file response to the socket.
-    virtual void http_write(http::file_response& response,
-        count_handler&& handler) NOEXCEPT;
-
     /// Properties.
     /// -----------------------------------------------------------------------
 
@@ -153,44 +129,24 @@ class BCT_API socket
 private:
     void do_stop() NOEXCEPT;
 
-    // tcp
+    // accept/connect
     void do_connect(const asio::endpoints& range,
         const result_handler& handler) NOEXCEPT;
+
+    // tcp
     void do_read(const asio::mutable_buffer& out,
         const count_handler& handler) NOEXCEPT;
     void do_write(const asio::const_buffer& in,
         const count_handler& handler) NOEXCEPT;
 
-    // http readers
+    // http
     void do_http_read(
         const std::reference_wrapper<http::flat_buffer>& buffer,
         const std::reference_wrapper<http::request>& request,
         const count_handler& handler) NOEXCEPT;
-    void do_http_read_string(
-        const std::reference_wrapper<http::flat_buffer>& buffer,
-        const std::reference_wrapper<http::string_request>& request,
-        const count_handler& handler) NOEXCEPT;
-    void do_http_read_json(
-        const std::reference_wrapper<http::flat_buffer>& buffer,
-        const std::reference_wrapper<http::json_request>& request,
-        const count_handler& handler) NOEXCEPT;
-
-    // http writers
     void do_http_write(
         const std::reference_wrapper<http::response>& response,
         const count_handler& handler) NOEXCEPT;
-    void do_http_write_string(
-        const std::reference_wrapper<http::string_response>& response,
-        const count_handler& handler) NOEXCEPT;;
-    void do_http_write_json(
-        const std::reference_wrapper<http::json_response>& response,
-        const count_handler& handler) NOEXCEPT;
-    void do_http_write_data(
-        const std::reference_wrapper<http::data_response>& response,
-        const count_handler& handler) NOEXCEPT;
-    void do_http_write_file(
-        const std::reference_wrapper<http::file_response>& response,
-        const count_handler& handler) NOEXCEPT;
 
     // completion
     void handle_accept(const boost_code& ec,

src/net/proxy.cpp

@@ -170,10 +170,10 @@ void proxy::write(const asio::const_buffer& payload,
             shared_from_this(), payload, std::move(handler)));
 }
 
-// HTTP Readers.
+// HTTP.
 // ----------------------------------------------------------------------------
-// Method waiting() is invoked directly if read() is called from strand().
 
+// Method waiting() is invoked directly if read() is called from strand().
 void proxy::read(http::flat_buffer& buffer, http::request& request,
     count_handler&& handler) NOEXCEPT
 {
@@ -183,58 +183,13 @@ void proxy::read(http::flat_buffer& buffer, http::request& request,
     socket_->http_read(buffer, request, std::move(handler));
 }
 
-void proxy::read(http::flat_buffer& buffer, http::string_request& request,
-    count_handler&& handler) NOEXCEPT
-{
-    boost::asio::dispatch(strand(),
-        std::bind(&proxy::waiting, shared_from_this()));
-
-    socket_->http_read(buffer, request, std::move(handler));
-}
-
-void proxy::read(http::flat_buffer& buffer, http::json_request& request,
-    count_handler&& handler) NOEXCEPT
-{
-    boost::asio::dispatch(strand(),
-        std::bind(&proxy::waiting, shared_from_this()));
-
-    socket_->http_read(buffer, request, std::move(handler));
-}
-
-// HTTP Writers.
-// ----------------------------------------------------------------------------
 // Writes are composed but http is half duplex so there is no interleave risk.
-
 void proxy::write(http::response& response,
     count_handler&& handler) NOEXCEPT
 {
     socket_->http_write(response, std::move(handler));
 }
 
-void proxy::write(http::string_response& response,
-    count_handler&& handler) NOEXCEPT
-{
-    socket_->http_write(response, std::move(handler));
-}
-
-void proxy::write(http::json_response& response,
-    count_handler&& handler) NOEXCEPT
-{
-    socket_->http_write(response, std::move(handler));
-}
-
-void proxy::write(http::data_response& response,
-    count_handler&& handler) NOEXCEPT
-{
-    socket_->http_write(response, std::move(handler));
-}
-
-void proxy::write(http::file_response& response,
-    count_handler&& handler) NOEXCEPT
-{
-    socket_->http_write(response, std::move(handler));
-}
-
 // Send cycle (send continues until queue is empty).
 // ----------------------------------------------------------------------------
 // stackoverflow.com/questions/7754695/boost-asio-async-write-how-to-not-