Skip to content

Commit daa95ce

Browse files
evoskuilevoskuil
authored
Merge pull request #867 from evoskuil/master
Move protocol.html from network, refactor, remove standard includes.
2 parents b5101a2 + 6ef3082 commit daa95ce

File tree

95 files changed

+524
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+524
-262
lines changed

‎Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ src_libbitcoin_node_la_SOURCES = \
6464
src/protocols/protocol_header_in_70012.cpp \
6565
src/protocols/protocol_header_out_31800.cpp \
6666
src/protocols/protocol_header_out_70012.cpp \
67+
src/protocols/protocol_html.cpp \
6768
src/protocols/protocol_observer.cpp \
6869
src/protocols/protocol_peer.cpp \
6970
src/protocols/protocol_performer.cpp \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ add_library( ${CANONICAL_LIB_NAME}
276276
"../../src/protocols/protocol_header_in_70012.cpp"
277277
"../../src/protocols/protocol_header_out_31800.cpp"
278278
"../../src/protocols/protocol_header_out_70012.cpp"
279+
"../../src/protocols/protocol_html.cpp"
279280
"../../src/protocols/protocol_observer.cpp"
280281
"../../src/protocols/protocol_peer.cpp"
281282
"../../src/protocols/protocol_performer.cpp"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_in_70012.cpp" />
150150
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_out_31800.cpp" />
151151
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_out_70012.cpp" />
152+
<ClCompile Include="..\..\..\..\src\protocols\protocol_html.cpp" />
152153
<ClCompile Include="..\..\..\..\src\protocols\protocol_observer.cpp" />
153154
<ClCompile Include="..\..\..\..\src\protocols\protocol_peer.cpp" />
154155
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp" />

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@
138138
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_out_70012.cpp">
139139
<Filter>src\protocols</Filter>
140140
</ClCompile>
141+
<ClCompile Include="..\..\..\..\src\protocols\protocol_html.cpp">
142+
<Filter>src\protocols</Filter>
143+
</ClCompile>
141144
<ClCompile Include="..\..\..\..\src\protocols\protocol_observer.cpp">
142145
<Filter>src\protocols</Filter>
143146
</ClCompile>

‎include/bitcoin/node/block_arena.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#ifndef LIBBITCOIN_NODE_BLOCK_ARENA_HPP
2020
#define LIBBITCOIN_NODE_BLOCK_ARENA_HPP
2121

22-
#include <bitcoin/system.hpp>
2322
#include <bitcoin/node/define.hpp>
2423

2524
namespace libbitcoin {

‎include/bitcoin/node/block_memory.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_NODE_BLOCK_MEMORY_HPP
2121

2222
#include <atomic>
23-
#include <bitcoin/network.hpp>
2423
#include <bitcoin/node/block_arena.hpp>
2524
#include <bitcoin/node/define.hpp>
2625

‎include/bitcoin/node/channels/channel.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_HPP
2121

2222
#include <memory>
23-
#include <bitcoin/network.hpp>
2423
#include <bitcoin/node/channels/channel.hpp>
2524
#include <bitcoin/node/configuration.hpp>
2625
#include <bitcoin/node/define.hpp>

‎include/bitcoin/node/channels/channel_http.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_HTTP_HPP
2121

2222
#include <memory>
23-
#include <bitcoin/network.hpp>
2423
#include <bitcoin/node/channels/channel.hpp>
2524
#include <bitcoin/node/configuration.hpp>
2625
#include <bitcoin/node/define.hpp>
@@ -35,7 +34,7 @@ class BCN_API channel_http
3534
{
3635
public:
3736
typedef std::shared_ptr<node::channel_http> ptr;
38-
using options_t = network::settings::http_server;
37+
using options_t = network::channel_http::options_t;
3938

4039
channel_http(const network::logger& log, const network::socket::ptr& socket,
4140
const node::configuration& config, uint64_t identifier=zero,

‎include/bitcoin/node/channels/channel_peer.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_PEER_HPP
2121

2222
#include <memory>
23-
#include <bitcoin/network.hpp>
2423
#include <bitcoin/node/channels/channel.hpp>
2524
#include <bitcoin/node/configuration.hpp>
2625
#include <bitcoin/node/define.hpp>

‎include/bitcoin/node/channels/channel_tcp.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_TCP_HPP
2121

2222
#include <memory>
23-
#include <bitcoin/network.hpp>
2423
#include <bitcoin/node/channels/channel.hpp>
2524
#include <bitcoin/node/configuration.hpp>
2625
#include <bitcoin/node/define.hpp>
@@ -35,7 +34,7 @@ class BCN_API channel_tcp
3534
{
3635
public:
3736
typedef std::shared_ptr<node::channel_tcp> ptr;
38-
using options_t = network::settings::tcp_server;
37+
using options_t = network::channel_tcp::options_t;
3938

4039
channel_tcp(const network::logger& log, const network::socket::ptr& socket,
4140
const node::configuration& config, uint64_t identifier=zero,

0 commit comments

Comments
 (0)