write free function (#223)

Signed-off-by: turuslan <[email protected]>

Author: turuslan

example/02-kademlia/rendezvous_chat.cpp

@@ -11,6 +11,7 @@
 
 #include <boost/beast.hpp>
 
+#include <libp2p/basic/write_return_size.hpp>
 #include <libp2p/common/hexutil.hpp>
 #include <libp2p/injector/kademlia_injector.hpp>
 #include <libp2p/log/configurator.hpp>
@@ -43,7 +44,8 @@ class Session : public std::enable_shared_from_this<Session> {
     }
 
     stream_->readSome(
-        *incoming_, incoming_->size(),
+        *incoming_,
+        incoming_->size(),
         [self = shared_from_this()](libp2p::outcome::result<size_t> result) {
           if (not result) {
             self->close();
@@ -66,8 +68,9 @@ class Session : public std::enable_shared_from_this<Session> {
       return false;
     }
 
-    stream_->write(
-        *buffer, buffer->size(),
+    libp2p::writeReturnSize(
+        stream_,
+        *buffer,
         [self = shared_from_this(),
          buffer](libp2p::outcome::result<size_t> result) {
           if (not result) {
@@ -91,7 +94,7 @@ class Session : public std::enable_shared_from_this<Session> {
 
   bool operator<(const Session &other) {
     return stream_->remotePeerId().value()
-        < other.stream_->remotePeerId().value();
+         < other.stream_->remotePeerId().value();
   }
 
  private:
@@ -286,7 +289,8 @@ int main(int argc, char *argv[]) {
 
     std::function<void()> find_providers = [&] {
       [[maybe_unused]] auto res1 = kademlia->findProviders(
-          content_id, 0,
+          content_id,
+          0,
           [&](libp2p::outcome::result<std::vector<libp2p::peer::PeerInfo>>
                   res) {
             scheduler.schedule(std::function{find_providers},
@@ -350,7 +354,8 @@ int main(int argc, char *argv[]) {
     // same content id
     std::function<void()> read_from_console = [&] {
       in.async_read_some(boost::asio::buffer(buffer), [&](auto ec, auto size) {
-        auto i = std::find_if(buffer.begin(), buffer.begin() + size + 1,
+        auto i = std::find_if(buffer.begin(),
+                              buffer.begin() + size + 1,
                               [](auto c) { return c == '\n'; });
 
         if (i != buffer.begin() + size + 1) {

include/libp2p/basic/writer.hpp

@@ -19,21 +19,6 @@ namespace libp2p::basic {
 
     virtual ~Writer() = default;
 
-    /**
-     * @brief Write exactly {@code} in.size() {@nocode} bytes.
-     * Won't call \param cb before all are successfully written.
-     * Returns immediately.
-     * @param in data to write.
-     * @param bytes number of bytes to write
-     * @param cb callback with result of operation
-     *
-     * @note caller should maintain validity of an input buffer until callback
-     * is executed. It is usually done with either wrapping buffer as shared
-     * pointer, or having buffer as part of some class/struct, and using
-     * enable_shared_from_this()
-     */
-    virtual void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) = 0;
-
     /**
      * @brief Write up to {@code} in.size() {@nocode} bytes.
      * Calls \param cb after only some bytes has been successfully written,

include/libp2p/connection/loopback_stream.hpp

@@ -45,8 +45,6 @@ namespace libp2p::connection {
 
     void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
 
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
-
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     void deferReadCallback(outcome::result<size_t> res,

include/libp2p/layer/websocket/ssl_connection.hpp

@@ -37,7 +37,6 @@ namespace libp2p::connection {
     void deferReadCallback(outcome::result<size_t> res,
                            ReadCallbackFunc cb) override;
 
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
     void deferWriteCallback(std::error_code ec, WriteCallbackFunc cb) override;
 

include/libp2p/layer/websocket/ws_connection.hpp

@@ -75,8 +75,6 @@ namespace libp2p::connection {
     void deferReadCallback(outcome::result<size_t> res,
                            ReadCallbackFunc cb) override;
 
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
-
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     void deferWriteCallback(std::error_code ec, WriteCallbackFunc cb) override;

include/libp2p/muxer/mplex/mplex_stream.hpp

@@ -57,8 +57,6 @@ namespace libp2p::connection {
     void deferReadCallback(outcome::result<size_t> res,
                            ReadCallbackFunc cb) override;
 
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
-
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     void deferWriteCallback(std::error_code ec, WriteCallbackFunc cb) override;

include/libp2p/muxer/mplex/mplexed_connection.hpp

@@ -66,7 +66,6 @@ namespace libp2p::connection {
     /// use stream over this connection instead
     void read(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
     void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     void deferReadCallback(outcome::result<size_t> res,

include/libp2p/muxer/yamux/yamux_stream.hpp

@@ -59,8 +59,6 @@ namespace libp2p::connection {
     void deferReadCallback(outcome::result<size_t> res,
                            ReadCallbackFunc cb) override;
 
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
-
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     void deferWriteCallback(std::error_code ec, WriteCallbackFunc cb) override;

include/libp2p/muxer/yamux/yamuxed_connection.hpp

@@ -113,7 +113,6 @@ namespace libp2p::connection {
     /// use stream over this connection instead
     void read(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
     void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     /// Initiates async readSome on connection

include/libp2p/security/noise/noise_connection.hpp

@@ -53,8 +53,6 @@ namespace libp2p::connection {
     void deferReadCallback(outcome::result<size_t> res,
                            ReadCallbackFunc cb) override;
 
-    void write(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
-
     void writeSome(BytesIn in, size_t bytes, WriteCallbackFunc cb) override;
 
     void deferWriteCallback(std::error_code ec, WriteCallbackFunc cb) override;