Skip to content

Reorganized rpc and messages. #683

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
Dec 27, 2025
Merged

Reorganized rpc and messages. #683

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
73 changes: 37 additions & 36 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ src_libbitcoin_network_la_SOURCES = \
src/log/capture.cpp \
src/log/logger.cpp \
src/log/reporter.cpp \
src/messages/monad_body.cpp \
src/messages/rpc_body.cpp \
src/messages/http_body.cpp \
src/messages/http/fields.cpp \
src/messages/http/enums/media_type.cpp \
src/messages/http/enums/target.cpp \
Expand Down Expand Up @@ -100,6 +99,8 @@ src_libbitcoin_network_la_SOURCES = \
src/messages/peer/detail/version.cpp \
src/messages/peer/detail/version_acknowledge.cpp \
src/messages/peer/detail/witness_tx_id_relay.cpp \
src/messages/rpc/body.cpp \
src/messages/rpc/model.cpp \
src/net/acceptor.cpp \
src/net/connector.cpp \
src/net/deadline.cpp \
Expand All @@ -120,7 +121,6 @@ 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 @@ -169,12 +169,10 @@ test_libbitcoin_network_test_SOURCES = \
test/config/utilities.cpp \
test/log/timer.cpp \
test/log/tracker.cpp \
test/messages/http_body_reader.cpp \
test/messages/http_body_writer.cpp \
test/messages/json_body_reader.cpp \
test/messages/json_body_writer.cpp \
test/messages/monad_body_reader.cpp \
test/messages/monad_body_writer.cpp \
test/messages/rpc_body_reader.cpp \
test/messages/rpc_body_writer.cpp \
test/messages/http/fields.cpp \
test/messages/http/method.cpp \
test/messages/http/enums/magic_numbers.cpp \
Expand Down Expand Up @@ -225,6 +223,13 @@ 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/body_reader.cpp \
test/messages/rpc/body_writer.cpp \
test/messages/rpc/broadcaster.cpp \
test/messages/rpc/dispatcher.cpp \
test/messages/rpc/method.cpp \
test/messages/rpc/types.cpp \
test/net/acceptor.cpp \
test/net/connector.cpp \
test/net/deadline.cpp \
Expand All @@ -245,11 +250,6 @@ 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/broadcaster.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 @@ -335,10 +335,10 @@ include_bitcoin_network_impl_messagesdir = ${includedir}/bitcoin/network/impl/me
include_bitcoin_network_impl_messages_HEADERS = \
include/bitcoin/network/impl/messages/json_body.ipp

include_bitcoin_network_impl_rpcdir = ${includedir}/bitcoin/network/impl/rpc
include_bitcoin_network_impl_rpc_HEADERS = \
include/bitcoin/network/impl/rpc/broadcaster.ipp \
include/bitcoin/network/impl/rpc/dispatcher.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/broadcaster.ipp \
include/bitcoin/network/impl/messages/rpc/dispatcher.ipp

include_bitcoin_network_interfacedir = ${includedir}/bitcoin/network/interface
include_bitcoin_network_interface_HEADERS = \
Expand All @@ -359,15 +359,15 @@ include_bitcoin_network_log_HEADERS = \

include_bitcoin_network_messagesdir = ${includedir}/bitcoin/network/messages
include_bitcoin_network_messages_HEADERS = \
include/bitcoin/network/messages/http_body.hpp \
include/bitcoin/network/messages/http_method.hpp \
include/bitcoin/network/messages/json_body.hpp \
include/bitcoin/network/messages/messages.hpp \
include/bitcoin/network/messages/monad_body.hpp \
include/bitcoin/network/messages/rpc_body.hpp
include/bitcoin/network/messages/messages.hpp

include_bitcoin_network_messages_httpdir = ${includedir}/bitcoin/network/messages/http
include_bitcoin_network_messages_http_HEADERS = \
include/bitcoin/network/messages/http/fields.hpp \
include/bitcoin/network/messages/http/method.hpp
include/bitcoin/network/messages/http/http.hpp

include_bitcoin_network_messages_http_enumsdir = ${includedir}/bitcoin/network/messages/http/enums
include_bitcoin_network_messages_http_enums_HEADERS = \
Expand Down Expand Up @@ -432,6 +432,23 @@ 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/body.hpp \
include/bitcoin/network/messages/rpc/broadcaster.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_netdir = ${includedir}/bitcoin/network/net
include_bitcoin_network_net_HEADERS = \
include/bitcoin/network/net/acceptor.hpp \
Expand Down Expand Up @@ -462,22 +479,6 @@ 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/broadcaster.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_sessionsdir = ${includedir}/bitcoin/network/sessions
include_bitcoin_network_sessions_HEADERS = \
include/bitcoin/network/sessions/session.hpp \
Expand Down
24 changes: 12 additions & 12 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/log/capture.cpp"
"../../src/log/logger.cpp"
"../../src/log/reporter.cpp"
"../../src/messages/monad_body.cpp"
"../../src/messages/rpc_body.cpp"
"../../src/messages/http_body.cpp"
"../../src/messages/http/fields.cpp"
"../../src/messages/http/enums/media_type.cpp"
"../../src/messages/http/enums/target.cpp"
Expand Down Expand Up @@ -282,6 +281,8 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/messages/peer/detail/version.cpp"
"../../src/messages/peer/detail/version_acknowledge.cpp"
"../../src/messages/peer/detail/witness_tx_id_relay.cpp"
"../../src/messages/rpc/body.cpp"
"../../src/messages/rpc/model.cpp"
"../../src/net/acceptor.cpp"
"../../src/net/connector.cpp"
"../../src/net/deadline.cpp"
Expand All @@ -302,7 +303,6 @@ 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 @@ -375,12 +375,10 @@ if (with-tests)
"../../test/config/utilities.cpp"
"../../test/log/timer.cpp"
"../../test/log/tracker.cpp"
"../../test/messages/http_body_reader.cpp"
"../../test/messages/http_body_writer.cpp"
"../../test/messages/json_body_reader.cpp"
"../../test/messages/json_body_writer.cpp"
"../../test/messages/monad_body_reader.cpp"
"../../test/messages/monad_body_writer.cpp"
"../../test/messages/rpc_body_reader.cpp"
"../../test/messages/rpc_body_writer.cpp"
"../../test/messages/http/fields.cpp"
"../../test/messages/http/method.cpp"
"../../test/messages/http/enums/magic_numbers.cpp"
Expand Down Expand Up @@ -431,6 +429,13 @@ 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/body_reader.cpp"
"../../test/messages/rpc/body_writer.cpp"
"../../test/messages/rpc/broadcaster.cpp"
"../../test/messages/rpc/dispatcher.cpp"
"../../test/messages/rpc/method.cpp"
"../../test/messages/rpc/types.cpp"
"../../test/net/acceptor.cpp"
"../../test/net/connector.cpp"
"../../test/net/deadline.cpp"
Expand All @@ -451,11 +456,6 @@ 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/broadcaster.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
22 changes: 11 additions & 11 deletions builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@
<ClCompile Include="..\..\..\..\test\messages\http\method.cpp">
<ObjectFileName>$(IntDir)test_messages_http_method.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\http_body_reader.cpp" />
<ClCompile Include="..\..\..\..\test\messages\http_body_writer.cpp" />
<ClCompile Include="..\..\..\..\test\messages\json_body_reader.cpp" />
<ClCompile Include="..\..\..\..\test\messages\json_body_writer.cpp" />
<ClCompile Include="..\..\..\..\test\messages\monad_body_reader.cpp" />
<ClCompile Include="..\..\..\..\test\messages\monad_body_writer.cpp" />
<ClCompile Include="..\..\..\..\test\messages\peer\detail\address.cpp">
<ObjectFileName>$(IntDir)test_messages_peer_detail_address.obj</ObjectFileName>
</ClCompile>
Expand Down Expand Up @@ -208,8 +208,15 @@
<ClCompile Include="..\..\..\..\test\messages\peer\enums\service.cpp" />
<ClCompile Include="..\..\..\..\test\messages\peer\heading.cpp" />
<ClCompile Include="..\..\..\..\test\messages\peer\message.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc_body_reader.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc_body_writer.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\any.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\body_reader.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\body_writer.cpp" />
<ClCompile Include="..\..\..\..\test\messages\rpc\broadcaster.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\connector.cpp" />
Expand All @@ -231,13 +238,6 @@
<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\broadcaster.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
60 changes: 30 additions & 30 deletions builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj.filters
View file
Open in desktop
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-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="src\channels">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000002}</UniqueIdentifier>
Expand All @@ -29,31 +29,31 @@
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\http">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\http\enums">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\peer">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages\peer\detail">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000E}</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-00000000000C}</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\rpc">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000008}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -150,16 +150,16 @@
<ClCompile Include="..\..\..\..\test\messages\http\method.cpp">
<Filter>src\messages\http</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\json_body_reader.cpp">
<ClCompile Include="..\..\..\..\test\messages\http_body_reader.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\json_body_writer.cpp">
<ClCompile Include="..\..\..\..\test\messages\http_body_writer.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\monad_body_reader.cpp">
<ClCompile Include="..\..\..\..\test\messages\json_body_reader.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\monad_body_writer.cpp">
<ClCompile Include="..\..\..\..\test\messages\json_body_writer.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\peer\detail\address.cpp">
Expand Down Expand Up @@ -297,11 +297,26 @@
<ClCompile Include="..\..\..\..\test\messages\peer\message.cpp">
<Filter>src\messages\peer</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc_body_reader.cpp">
<Filter>src\messages</Filter>
<ClCompile Include="..\..\..\..\test\messages\rpc\any.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc_body_writer.cpp">
<Filter>src\messages</Filter>
<ClCompile Include="..\..\..\..\test\messages\rpc\body_reader.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\body_writer.cpp">
<Filter>src\messages\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\rpc\broadcaster.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>
Expand Down Expand Up @@ -366,21 +381,6 @@
<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\broadcaster.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