Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 37 additions & 34 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ src_libbitcoin_network_la_SOURCES = \
src/messages/peer/version.cpp \
src/messages/peer/version_acknowledge.cpp \
src/messages/peer/witness_tx_id_relay.cpp \
src/messages/rpc/model.cpp \
src/net/acceptor.cpp \
src/net/broadcaster.cpp \
src/net/connector.cpp \
Expand All @@ -122,6 +121,7 @@ src_libbitcoin_network_la_SOURCES = \
src/protocols/protocol_version_70001.cpp \
src/protocols/protocol_version_70002.cpp \
src/protocols/protocol_version_70016.cpp \
src/rpc/model.cpp \
src/sessions/session.cpp \
src/sessions/session_inbound.cpp \
src/sessions/session_manual.cpp \
Expand Down Expand Up @@ -224,10 +224,6 @@ test_libbitcoin_network_test_SOURCES = \
test/messages/peer/enums/level.cpp \
test/messages/peer/enums/magic_numbers.cpp \
test/messages/peer/enums/service.cpp \
test/messages/rpc/any.cpp \
test/messages/rpc/dispatcher.cpp \
test/messages/rpc/method.cpp \
test/messages/rpc/types.cpp \
test/net/acceptor.cpp \
test/net/broadcaster.cpp \
test/net/connector.cpp \
Expand All @@ -250,6 +246,10 @@ test_libbitcoin_network_test_SOURCES = \
test/protocols/protocol_version_70001.cpp \
test/protocols/protocol_version_70002.cpp \
test/protocols/protocol_version_70016.cpp \
test/rpc/any.cpp \
test/rpc/dispatcher.cpp \
test/rpc/method.cpp \
test/rpc/types.cpp \
test/sessions/session.cpp \
test/sessions/session_html.cpp \
test/sessions/session_inbound.cpp \
Expand Down Expand Up @@ -331,9 +331,9 @@ include_bitcoin_network_impl_async_races_HEADERS = \
include/bitcoin/network/impl/async/races/race_unity.ipp \
include/bitcoin/network/impl/async/races/race_volume.ipp

include_bitcoin_network_impl_messages_rpcdir = ${includedir}/bitcoin/network/impl/messages/rpc
include_bitcoin_network_impl_messages_rpc_HEADERS = \
include/bitcoin/network/impl/messages/rpc/dispatcher.ipp
include_bitcoin_network_impl_rpcdir = ${includedir}/bitcoin/network/impl/rpc
include_bitcoin_network_impl_rpc_HEADERS = \
include/bitcoin/network/impl/rpc/dispatcher.ipp

include_bitcoin_network_logdir = ${includedir}/bitcoin/network/log
include_bitcoin_network_log_HEADERS = \
Expand All @@ -349,8 +349,11 @@ include_bitcoin_network_messages_httpdir = ${includedir}/bitcoin/network/message
include_bitcoin_network_messages_http_HEADERS = \
include/bitcoin/network/messages/http/body.hpp \
include/bitcoin/network/messages/http/fields.hpp \
include/bitcoin/network/messages/http/head.hpp \
include/bitcoin/network/messages/http/http.hpp \
include/bitcoin/network/messages/http/method.hpp \
include/bitcoin/network/messages/http/request.hpp \
include/bitcoin/network/messages/http/response.hpp \
include/bitcoin/network/messages/http/types.hpp

include_bitcoin_network_messages_http_enumsdir = ${includedir}/bitcoin/network/messages/http/enums
Expand Down Expand Up @@ -418,32 +421,6 @@ include_bitcoin_network_messages_peer_enums_HEADERS = \
include/bitcoin/network/messages/peer/enums/magic_numbers.hpp \
include/bitcoin/network/messages/peer/enums/service.hpp

include_bitcoin_network_messages_rpcdir = ${includedir}/bitcoin/network/messages/rpc
include_bitcoin_network_messages_rpc_HEADERS = \
include/bitcoin/network/messages/rpc/any.hpp \
include/bitcoin/network/messages/rpc/dispatcher.hpp \
include/bitcoin/network/messages/rpc/method.hpp \
include/bitcoin/network/messages/rpc/model.hpp \
include/bitcoin/network/messages/rpc/publish.hpp \
include/bitcoin/network/messages/rpc/rpc.hpp \
include/bitcoin/network/messages/rpc/types.hpp

include_bitcoin_network_messages_rpc_enumsdir = ${includedir}/bitcoin/network/messages/rpc/enums
include_bitcoin_network_messages_rpc_enums_HEADERS = \
include/bitcoin/network/messages/rpc/enums/grouping.hpp \
include/bitcoin/network/messages/rpc/enums/version.hpp

include_bitcoin_network_messages_rpc_interfacesdir = ${includedir}/bitcoin/network/messages/rpc/interfaces
include_bitcoin_network_messages_rpc_interfaces_HEADERS = \
include/bitcoin/network/messages/rpc/interfaces/bitcoind.hpp \
include/bitcoin/network/messages/rpc/interfaces/electrum.hpp \
include/bitcoin/network/messages/rpc/interfaces/explore.hpp \
include/bitcoin/network/messages/rpc/interfaces/http.hpp \
include/bitcoin/network/messages/rpc/interfaces/interfaces.hpp \
include/bitcoin/network/messages/rpc/interfaces/peer.hpp \
include/bitcoin/network/messages/rpc/interfaces/stratum_v1.hpp \
include/bitcoin/network/messages/rpc/interfaces/stratum_v2.hpp

include_bitcoin_network_netdir = ${includedir}/bitcoin/network/net
include_bitcoin_network_net_HEADERS = \
include/bitcoin/network/net/acceptor.hpp \
Expand Down Expand Up @@ -475,6 +452,32 @@ include_bitcoin_network_protocols_HEADERS = \
include/bitcoin/network/protocols/protocol_ws.hpp \
include/bitcoin/network/protocols/protocols.hpp

include_bitcoin_network_rpcdir = ${includedir}/bitcoin/network/rpc
include_bitcoin_network_rpc_HEADERS = \
include/bitcoin/network/rpc/any.hpp \
include/bitcoin/network/rpc/dispatcher.hpp \
include/bitcoin/network/rpc/method.hpp \
include/bitcoin/network/rpc/model.hpp \
include/bitcoin/network/rpc/publish.hpp \
include/bitcoin/network/rpc/rpc.hpp \
include/bitcoin/network/rpc/types.hpp

include_bitcoin_network_rpc_enumsdir = ${includedir}/bitcoin/network/rpc/enums
include_bitcoin_network_rpc_enums_HEADERS = \
include/bitcoin/network/rpc/enums/grouping.hpp \
include/bitcoin/network/rpc/enums/version.hpp

include_bitcoin_network_rpc_interfacesdir = ${includedir}/bitcoin/network/rpc/interfaces
include_bitcoin_network_rpc_interfaces_HEADERS = \
include/bitcoin/network/rpc/interfaces/bitcoind.hpp \
include/bitcoin/network/rpc/interfaces/electrum.hpp \
include/bitcoin/network/rpc/interfaces/explore.hpp \
include/bitcoin/network/rpc/interfaces/http.hpp \
include/bitcoin/network/rpc/interfaces/interfaces.hpp \
include/bitcoin/network/rpc/interfaces/peer.hpp \
include/bitcoin/network/rpc/interfaces/stratum_v1.hpp \
include/bitcoin/network/rpc/interfaces/stratum_v2.hpp

include_bitcoin_network_sessionsdir = ${includedir}/bitcoin/network/sessions
include_bitcoin_network_sessions_HEADERS = \
include/bitcoin/network/sessions/session.hpp \
Expand Down
10 changes: 5 additions & 5 deletions builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/messages/peer/version.cpp"
"../../src/messages/peer/version_acknowledge.cpp"
"../../src/messages/peer/witness_tx_id_relay.cpp"
"../../src/messages/rpc/model.cpp"
"../../src/net/acceptor.cpp"
"../../src/net/broadcaster.cpp"
"../../src/net/connector.cpp"
Expand All @@ -304,6 +303,7 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/protocols/protocol_version_70001.cpp"
"../../src/protocols/protocol_version_70002.cpp"
"../../src/protocols/protocol_version_70016.cpp"
"../../src/rpc/model.cpp"
"../../src/sessions/session.cpp"
"../../src/sessions/session_inbound.cpp"
"../../src/sessions/session_manual.cpp"
Expand Down Expand Up @@ -430,10 +430,6 @@ if (with-tests)
"../../test/messages/peer/enums/level.cpp"
"../../test/messages/peer/enums/magic_numbers.cpp"
"../../test/messages/peer/enums/service.cpp"
"../../test/messages/rpc/any.cpp"
"../../test/messages/rpc/dispatcher.cpp"
"../../test/messages/rpc/method.cpp"
"../../test/messages/rpc/types.cpp"
"../../test/net/acceptor.cpp"
"../../test/net/broadcaster.cpp"
"../../test/net/connector.cpp"
Expand All @@ -456,6 +452,10 @@ if (with-tests)
"../../test/protocols/protocol_version_70001.cpp"
"../../test/protocols/protocol_version_70002.cpp"
"../../test/protocols/protocol_version_70016.cpp"
"../../test/rpc/any.cpp"
"../../test/rpc/dispatcher.cpp"
"../../test/rpc/method.cpp"
"../../test/rpc/types.cpp"
"../../test/sessions/session.cpp"
"../../test/sessions/session_html.cpp"
"../../test/sessions/session_inbound.cpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,6 @@
<ClCompile Include="..\..\..\..\test\messages\peer\version.cpp" />
<ClCompile Include="..\..\..\..\test\messages\peer\version_acknowledge.cpp" />
<ClCompile Include="..\..\..\..\test\messages\peer\witness_tx_id_relay.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\any.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\dispatcher.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\method.cpp">
<ObjectFileName>$(IntDir)test_messages_rpc_method.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\types.cpp" />
<ClCompile Include="..\..\..\..\test\net.cpp" />
<ClCompile Include="..\..\..\..\test\net\acceptor.cpp" />
<ClCompile Include="..\..\..\..\test\net\broadcaster.cpp" />
Expand All @@ -245,6 +239,12 @@
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70001.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70002.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70016.cpp" />
<ClCompile Include="..\..\..\..\test\rpc\any.cpp" />
<ClCompile Include="..\..\..\..\test\rpc\dispatcher.cpp" />
<ClCompile Include="..\..\..\..\test\rpc\method.cpp">
<ObjectFileName>$(IntDir)test_rpc_method.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rpc\types.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session_html.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session_inbound.cpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\async\races">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src\channels">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000002}</UniqueIdentifier>
Expand All @@ -29,32 +29,32 @@
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\http">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\http\enums">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\json">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\peer">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\peer\enums">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000F}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\rpc">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="src\net">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<Filter Include="src\rpc">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000009}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\test\async\desubscriber.cpp">
Expand Down Expand Up @@ -297,18 +297,6 @@
<ClCompile Include="..\..\..\..\test\messages\peer\witness_tx_id_relay.cpp">
<Filter>src\messages\peer</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\any.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\dispatcher.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\method.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\types.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\net.cpp">
<Filter>src</Filter>
</ClCompile>
Expand Down Expand Up @@ -378,6 +366,18 @@
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70016.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rpc\any.cpp">
<Filter>src\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rpc\dispatcher.cpp">
<Filter>src\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rpc\method.cpp">
<Filter>src\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rpc\types.cpp">
<Filter>src\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\sessions\session.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
Expand Down
Loading
Loading