Skip to content

Rename channel/protocol_websocket to _ws, drop ws handshake. #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Nov 3, 2025
Merged

Rename channel/protocol_websocket to _ws, drop ws handshake. #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ include_bitcoin_node_channels_HEADERS = \
include/bitcoin/node/channels/channel_http.hpp \
include/bitcoin/node/channels/channel_peer.hpp \
include/bitcoin/node/channels/channel_tcp.hpp \
include/bitcoin/node/channels/channel_websocket.hpp \
include/bitcoin/node/channels/channel_ws.hpp \
include/bitcoin/node/channels/channels.hpp

include_bitcoin_node_chasersdir = ${includedir}/bitcoin/node/chasers
Expand Down Expand Up @@ -222,8 +222,7 @@ 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_websocket.hpp \
include/bitcoin/node/protocols/protocol_websocket_shake.hpp \
include/bitcoin/node/protocols/protocol_ws.hpp \
include/bitcoin/node/protocols/protocols.hpp

include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions
Expand Down
5 changes: 2 additions & 3 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_http.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_websocket.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_ws.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channels.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chase.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser.hpp" />
Expand Down Expand Up @@ -215,8 +215,7 @@
<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_websocket.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_websocket_shake.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" />
Expand Down
7 changes: 2 additions & 5 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_tcp.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_websocket.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_ws.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channels.hpp">
Expand Down Expand Up @@ -332,10 +332,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_websocket.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_websocket_shake.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_ws.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
Expand Down
5 changes: 2 additions & 3 deletions include/bitcoin/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <bitcoin/node/channels/channel_http.hpp>
#include <bitcoin/node/channels/channel_peer.hpp>
#include <bitcoin/node/channels/channel_tcp.hpp>
#include <bitcoin/node/channels/channel_websocket.hpp>
#include <bitcoin/node/channels/channel_ws.hpp>
#include <bitcoin/node/channels/channels.hpp>
#include <bitcoin/node/chasers/chaser.hpp>
#include <bitcoin/node/chasers/chaser_block.hpp>
Expand Down Expand Up @@ -69,8 +69,7 @@
#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_websocket.hpp>
#include <bitcoin/node/protocols/protocol_websocket_shake.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>
Expand Down
16 changes: 8 additions & 8 deletions ...tcoin/node/channels/channel_websocket.hpp → include/bitcoin/node/channels/channel_ws.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_CHANNELS_CHANNEL_WEBSOCKET_HPP
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_WEBSOCKET_HPP
#ifndef LIBBITCOIN_NODE_CHANNELS_CHANNEL_WS_HPP
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_WS_HPP

#include <memory>
#include <bitcoin/node/channels/channel.hpp>
Expand All @@ -29,19 +29,19 @@ namespace node {

/// Abstract base websocket channel state for the node.
/// Does not inherit node::channel_http but does inherit network::channel_http.
class BCN_API channel_websocket
: public network::channel_websocket,
class BCN_API channel_ws
: public network::channel_ws,
public node::channel
{
public:
typedef std::shared_ptr<node::channel_websocket> ptr;
using options_t = network::channel_websocket::options_t;
typedef std::shared_ptr<node::channel_ws> ptr;
using options_t = network::channel_ws::options_t;

channel_websocket(const network::logger& log,
channel_ws(const network::logger& log,
const network::socket::ptr& socket,
const node::configuration& config, uint64_t identifier=zero,
const options_t& options={}) NOEXCEPT
: network::channel_websocket(log, socket, config.network, identifier,
: network::channel_ws(log, socket, config.network, identifier,
options),
node::channel(log, socket, config, identifier)
{
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/node/channels/channels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <bitcoin/node/channels/channel_peer.hpp>
#include <bitcoin/node/channels/channel_tcp.hpp>
#include <bitcoin/node/channels/channel_http.hpp>
#include <bitcoin/node/channels/channel_websocket.hpp>
#include <bitcoin/node/channels/channel_ws.hpp>

#endif

65 changes: 0 additions & 65 deletions include/bitcoin/node/protocols/protocol_websocket_shake.hpp
View file
Open in desktop

This file was deleted.

24 changes: 12 additions & 12 deletions ...oin/node/protocols/protocol_websocket.hpp → ...de/bitcoin/node/protocols/protocol_ws.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_WEBSOCKET_HPP
#define LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_WEBSOCKET_HPP
#ifndef LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_WS_HPP
#define LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_WS_HPP

#include <memory>
#include <bitcoin/node/define.hpp>
Expand All @@ -28,30 +28,30 @@ namespace node {

// TODO: make this an intermediate base class for websocket.
// TODO: and then create a distinct concrete class for deployment.
class BCN_API protocol_websocket
: public network::protocol_websocket,
class BCN_API protocol_ws
: public network::protocol_ws,
public node::protocol,
protected network::tracker<protocol_websocket>
protected network::tracker<protocol_ws>
{
public:
typedef std::shared_ptr<protocol_websocket> ptr;
typedef std::shared_ptr<protocol_ws> ptr;

// Replace base class channel_t (network::channel_websocket).
using channel_t = node::channel_websocket;
// Replace base class channel_t (network::channel_ws).
using channel_t = node::channel_ws;

protocol_websocket(const auto& session,
protocol_ws(const auto& session,
const network::channel::ptr& channel,
const options_t& options) NOEXCEPT
: network::protocol_websocket(session, channel, options),
: network::protocol_ws(session, channel, options),
node::protocol(session, channel),
network::tracker<protocol_websocket>(session->log)
network::tracker<protocol_ws>(session->log)
{
}

/// Public start is required.
void start() NOEXCEPT override
{
network::protocol_websocket::start();
network::protocol_ws::start();
}

private:
Expand Down
5 changes: 2 additions & 3 deletions include/bitcoin/node/protocols/protocols.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@
/// server
#include <bitcoin/node/protocols/protocol_web.hpp>
#include <bitcoin/node/protocols/protocol_explore.hpp>
#include <bitcoin/node/protocols/protocol_websocket.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_websocket.hpp>
#include <bitcoin/node/protocols/protocol_websocket_shake.hpp>
#include <bitcoin/node/protocols/protocol_ws.hpp>

#endif
2 changes: 1 addition & 1 deletion include/bitcoin/node/sessions/sessions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace node {
// Alias server sessions derived from session_tcp.
using session_web = session_server<protocol_web>;
using session_explore = session_server<protocol_explore>;
using session_websocket = session_server<protocol_websocket>;
using session_websocket = session_server<protocol_ws>;
using session_bitcoind = session_server<protocol_bitcoind>;
using session_electrum = session_server<protocol_electrum>;
using session_stratum_v1 = session_server<protocol_stratum_v1>;
Expand Down
Loading