Merge pull request #917 from evoskuil/master

Use node::channel_ws for protocol_html.

Author: evoskuil

Makefile.am

@@ -240,7 +240,6 @@ include_bitcoin_node_protocols_HEADERS = \
     include/bitcoin/node/protocols/protocol_transaction_in_106.hpp \
     include/bitcoin/node/protocols/protocol_transaction_out_106.hpp \
     include/bitcoin/node/protocols/protocol_web.hpp \
-    include/bitcoin/node/protocols/protocol_ws.hpp \
     include/bitcoin/node/protocols/protocols.hpp
 
 include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions

builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj

@@ -225,7 +225,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_in_106.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_out_106.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_ws.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_inbound.hpp" />

builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters

@@ -371,9 +371,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp">
       <Filter>include\bitcoin\node\protocols</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_ws.hpp">
-      <Filter>include\bitcoin\node\protocols</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
       <Filter>include\bitcoin\node\protocols</Filter>
     </ClInclude>

include/bitcoin/node.hpp

@@ -78,7 +78,6 @@
 #include <bitcoin/node/protocols/protocol_transaction_in_106.hpp>
 #include <bitcoin/node/protocols/protocol_transaction_out_106.hpp>
 #include <bitcoin/node/protocols/protocol_web.hpp>
-#include <bitcoin/node/protocols/protocol_ws.hpp>
 #include <bitcoin/node/protocols/protocols.hpp>
 #include <bitcoin/node/sessions/session.hpp>
 #include <bitcoin/node/sessions/session_inbound.hpp>

include/bitcoin/node/protocols/protocol_explore.hpp

@@ -22,6 +22,7 @@
 #include <atomic>
 #include <memory>
 #include <optional>
+#include <bitcoin/node/channels/channels.hpp>
 #include <bitcoin/node/define.hpp>
 #include <bitcoin/node/interfaces/interfaces.hpp>
 #include <bitcoin/node/protocols/protocol_html.hpp>

include/bitcoin/node/protocols/protocol_html.hpp

@@ -37,9 +37,8 @@ class BCN_API protocol_html
     protected network::tracker<protocol_html>
 {
 public:
-    /// http channel, but html settings.
     using options_t = server::settings::html_server;
-    using channel_t = node::channel_http;
+    using channel_t = node::channel_ws;
 
 protected:
     inline protocol_html(const auto& session,

include/bitcoin/node/protocols/protocol_ws.hpp

@@ -44,11 +44,9 @@
 /// server
 #include <bitcoin/node/protocols/protocol_web.hpp>
 #include <bitcoin/node/protocols/protocol_explore.hpp>
-#include <bitcoin/node/protocols/protocol_ws.hpp>
 #include <bitcoin/node/protocols/protocol_bitcoind.hpp>
 #include <bitcoin/node/protocols/protocol_electrum.hpp>
 #include <bitcoin/node/protocols/protocol_stratum_v1.hpp>
 #include <bitcoin/node/protocols/protocol_stratum_v2.hpp>
-#include <bitcoin/node/protocols/protocol_ws.hpp>
 
 #endif