Skip to content

Commit c2f044d

Browse files
evoskuilevoskuil
authored
Merge pull request #675 from evoskuil/master
Refactor to clean up include cycle, add rpc to monad.
2 parents 04d0a53 + 3249cf1 commit c2f044d

File tree

84 files changed

+325
-569
lines changed

Some content is hidden

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

84 files changed

+325
-569
lines changed

‎Makefile.am‎

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ src_libbitcoin_network_la_SOURCES = \
5353
src/log/capture.cpp \
5454
src/log/logger.cpp \
5555
src/log/reporter.cpp \
56+
src/messages/monad_body.cpp \
57+
src/messages/rpc_body.cpp \
5658
src/messages/http/fields.cpp \
5759
src/messages/http/enums/media_type.cpp \
5860
src/messages/http/enums/target.cpp \
59-
src/messages/monad/body.cpp \
6061
src/messages/peer/message.cpp \
6162
src/messages/peer/detail/address.cpp \
6263
src/messages/peer/detail/address_item.cpp \
@@ -98,7 +99,6 @@ src_libbitcoin_network_la_SOURCES = \
9899
src/messages/peer/detail/version.cpp \
99100
src/messages/peer/detail/version_acknowledge.cpp \
100101
src/messages/peer/detail/witness_tx_id_relay.cpp \
101-
src/messages/rpc/body.cpp \
102102
src/net/acceptor.cpp \
103103
src/net/connector.cpp \
104104
src/net/deadline.cpp \
@@ -167,15 +167,17 @@ test_libbitcoin_network_test_SOURCES = \
167167
test/config/utilities.cpp \
168168
test/log/timer.cpp \
169169
test/log/tracker.cpp \
170+
test/messages/json_body_reader.cpp \
171+
test/messages/json_body_writer.cpp \
172+
test/messages/monad_body_reader.cpp \
173+
test/messages/monad_body_writer.cpp \
174+
test/messages/rpc_body_reader.cpp \
175+
test/messages/rpc_body_writer.cpp \
170176
test/messages/http/fields.cpp \
177+
test/messages/http/method.cpp \
171178
test/messages/http/enums/magic_numbers.cpp \
172179
test/messages/http/enums/media_type.cpp \
173180
test/messages/http/enums/target.cpp \
174-
test/messages/json/body_reader.cpp \
175-
test/messages/json/body_writer.cpp \
176-
test/messages/monad/body_reader.cpp \
177-
test/messages/monad/body_writer.cpp \
178-
test/messages/monad/method.cpp \
179181
test/messages/peer/heading.cpp \
180182
test/messages/peer/message.cpp \
181183
test/messages/peer/detail/address.cpp \
@@ -221,8 +223,6 @@ test_libbitcoin_network_test_SOURCES = \
221223
test/messages/peer/enums/level.cpp \
222224
test/messages/peer/enums/magic_numbers.cpp \
223225
test/messages/peer/enums/service.cpp \
224-
test/messages/rpc/body_reader.cpp \
225-
test/messages/rpc/body_writer.cpp \
226226
test/net/acceptor.cpp \
227227
test/net/connector.cpp \
228228
test/net/deadline.cpp \
@@ -328,15 +328,22 @@ include_bitcoin_network_impl_async_races_HEADERS = \
328328
include/bitcoin/network/impl/async/races/race_unity.ipp \
329329
include/bitcoin/network/impl/async/races/race_volume.ipp
330330

331-
include_bitcoin_network_impl_messages_jsondir = ${includedir}/bitcoin/network/impl/messages/json
332-
include_bitcoin_network_impl_messages_json_HEADERS = \
333-
include/bitcoin/network/impl/messages/json/body.ipp
331+
include_bitcoin_network_impl_messagesdir = ${includedir}/bitcoin/network/impl/messages
332+
include_bitcoin_network_impl_messages_HEADERS = \
333+
include/bitcoin/network/impl/messages/json_body.ipp
334334

335335
include_bitcoin_network_impl_rpcdir = ${includedir}/bitcoin/network/impl/rpc
336336
include_bitcoin_network_impl_rpc_HEADERS = \
337337
include/bitcoin/network/impl/rpc/broadcaster.ipp \
338338
include/bitcoin/network/impl/rpc/dispatcher.ipp
339339

340+
include_bitcoin_network_interfacedir = ${includedir}/bitcoin/network/interface
341+
include_bitcoin_network_interface_HEADERS = \
342+
include/bitcoin/network/interface/http.hpp \
343+
include/bitcoin/network/interface/interface.hpp \
344+
include/bitcoin/network/interface/peer_broadcast.hpp \
345+
include/bitcoin/network/interface/peer_dispatch.hpp
346+
340347
include_bitcoin_network_logdir = ${includedir}/bitcoin/network/log
341348
include_bitcoin_network_log_HEADERS = \
342349
include/bitcoin/network/log/capture.hpp \
@@ -347,10 +354,16 @@ include_bitcoin_network_log_HEADERS = \
347354
include/bitcoin/network/log/timer.hpp \
348355
include/bitcoin/network/log/tracker.hpp
349356

357+
include_bitcoin_network_messagesdir = ${includedir}/bitcoin/network/messages
358+
include_bitcoin_network_messages_HEADERS = \
359+
include/bitcoin/network/messages/json_body.hpp \
360+
include/bitcoin/network/messages/messages.hpp \
361+
include/bitcoin/network/messages/monad_body.hpp \
362+
include/bitcoin/network/messages/rpc_body.hpp
363+
350364
include_bitcoin_network_messages_httpdir = ${includedir}/bitcoin/network/messages/http
351365
include_bitcoin_network_messages_http_HEADERS = \
352366
include/bitcoin/network/messages/http/fields.hpp \
353-
include/bitcoin/network/messages/http/http.hpp \
354367
include/bitcoin/network/messages/http/method.hpp
355368

356369
include_bitcoin_network_messages_http_enumsdir = ${includedir}/bitcoin/network/messages/http/enums
@@ -361,16 +374,6 @@ include_bitcoin_network_messages_http_enums_HEADERS = \
361374
include/bitcoin/network/messages/http/enums/target.hpp \
362375
include/bitcoin/network/messages/http/enums/verb.hpp
363376

364-
include_bitcoin_network_messages_jsondir = ${includedir}/bitcoin/network/messages/json
365-
include_bitcoin_network_messages_json_HEADERS = \
366-
include/bitcoin/network/messages/json/body.hpp \
367-
include/bitcoin/network/messages/json/json.hpp
368-
369-
include_bitcoin_network_messages_monaddir = ${includedir}/bitcoin/network/messages/monad
370-
include_bitcoin_network_messages_monad_HEADERS = \
371-
include/bitcoin/network/messages/monad/body.hpp \
372-
include/bitcoin/network/messages/monad/monad.hpp
373-
374377
include_bitcoin_network_messages_peerdir = ${includedir}/bitcoin/network/messages/peer
375378
include_bitcoin_network_messages_peer_HEADERS = \
376379
include/bitcoin/network/messages/peer/heading.hpp \
@@ -426,11 +429,6 @@ include_bitcoin_network_messages_peer_enums_HEADERS = \
426429
include/bitcoin/network/messages/peer/enums/magic_numbers.hpp \
427430
include/bitcoin/network/messages/peer/enums/service.hpp
428431

429-
include_bitcoin_network_messages_rpcdir = ${includedir}/bitcoin/network/messages/rpc
430-
include_bitcoin_network_messages_rpc_HEADERS = \
431-
include/bitcoin/network/messages/rpc/body.hpp \
432-
include/bitcoin/network/messages/rpc/rpc.hpp
433-
434432
include_bitcoin_network_netdir = ${includedir}/bitcoin/network/net
435433
include_bitcoin_network_net_HEADERS = \
436434
include/bitcoin/network/net/acceptor.hpp \
@@ -476,13 +474,6 @@ include_bitcoin_network_rpc_enums_HEADERS = \
476474
include/bitcoin/network/rpc/enums/grouping.hpp \
477475
include/bitcoin/network/rpc/enums/version.hpp
478476

479-
include_bitcoin_network_rpc_interfacesdir = ${includedir}/bitcoin/network/rpc/interfaces
480-
include_bitcoin_network_rpc_interfaces_HEADERS = \
481-
include/bitcoin/network/rpc/interfaces/http.hpp \
482-
include/bitcoin/network/rpc/interfaces/interfaces.hpp \
483-
include/bitcoin/network/rpc/interfaces/peer_broadcast.hpp \
484-
include/bitcoin/network/rpc/interfaces/peer_dispatch.hpp
485-
486477
include_bitcoin_network_sessionsdir = ${includedir}/bitcoin/network/sessions
487478
include_bitcoin_network_sessions_HEADERS = \
488479
include/bitcoin/network/sessions/session.hpp \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,11 @@ add_library( ${CANONICAL_LIB_NAME}
235235
"../../src/log/capture.cpp"
236236
"../../src/log/logger.cpp"
237237
"../../src/log/reporter.cpp"
238+
"../../src/messages/monad_body.cpp"
239+
"../../src/messages/rpc_body.cpp"
238240
"../../src/messages/http/fields.cpp"
239241
"../../src/messages/http/enums/media_type.cpp"
240242
"../../src/messages/http/enums/target.cpp"
241-
"../../src/messages/monad/body.cpp"
242243
"../../src/messages/peer/message.cpp"
243244
"../../src/messages/peer/detail/address.cpp"
244245
"../../src/messages/peer/detail/address_item.cpp"
@@ -280,7 +281,6 @@ add_library( ${CANONICAL_LIB_NAME}
280281
"../../src/messages/peer/detail/version.cpp"
281282
"../../src/messages/peer/detail/version_acknowledge.cpp"
282283
"../../src/messages/peer/detail/witness_tx_id_relay.cpp"
283-
"../../src/messages/rpc/body.cpp"
284284
"../../src/net/acceptor.cpp"
285285
"../../src/net/connector.cpp"
286286
"../../src/net/deadline.cpp"
@@ -373,15 +373,17 @@ if (with-tests)
373373
"../../test/config/utilities.cpp"
374374
"../../test/log/timer.cpp"
375375
"../../test/log/tracker.cpp"
376+
"../../test/messages/json_body_reader.cpp"
377+
"../../test/messages/json_body_writer.cpp"
378+
"../../test/messages/monad_body_reader.cpp"
379+
"../../test/messages/monad_body_writer.cpp"
380+
"../../test/messages/rpc_body_reader.cpp"
381+
"../../test/messages/rpc_body_writer.cpp"
376382
"../../test/messages/http/fields.cpp"
383+
"../../test/messages/http/method.cpp"
377384
"../../test/messages/http/enums/magic_numbers.cpp"
378385
"../../test/messages/http/enums/media_type.cpp"
379386
"../../test/messages/http/enums/target.cpp"
380-
"../../test/messages/json/body_reader.cpp"
381-
"../../test/messages/json/body_writer.cpp"
382-
"../../test/messages/monad/body_reader.cpp"
383-
"../../test/messages/monad/body_writer.cpp"
384-
"../../test/messages/monad/method.cpp"
385387
"../../test/messages/peer/heading.cpp"
386388
"../../test/messages/peer/message.cpp"
387389
"../../test/messages/peer/detail/address.cpp"
@@ -427,8 +429,6 @@ if (with-tests)
427429
"../../test/messages/peer/enums/level.cpp"
428430
"../../test/messages/peer/enums/magic_numbers.cpp"
429431
"../../test/messages/peer/enums/service.cpp"
430-
"../../test/messages/rpc/body_reader.cpp"
431-
"../../test/messages/rpc/body_writer.cpp"
432432
"../../test/net/acceptor.cpp"
433433
"../../test/net/connector.cpp"
434434
"../../test/net/deadline.cpp"

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,13 @@
151151
<ClCompile Include="..\..\..\..\test\messages\http\enums\media_type.cpp" />
152152
<ClCompile Include="..\..\..\..\test\messages\http\enums\target.cpp" />
153153
<ClCompile Include="..\..\..\..\test\messages\http\fields.cpp" />
154-
<ClCompile Include="..\..\..\..\test\messages\json\body_reader.cpp">
155-
<ObjectFileName>$(IntDir)test_messages_json_body_reader.obj</ObjectFileName>
156-
</ClCompile>
157-
<ClCompile Include="..\..\..\..\test\messages\json\body_writer.cpp">
158-
<ObjectFileName>$(IntDir)test_messages_json_body_writer.obj</ObjectFileName>
159-
</ClCompile>
160-
<ClCompile Include="..\..\..\..\test\messages\monad\body_reader.cpp">
161-
<ObjectFileName>$(IntDir)test_messages_monad_body_reader.obj</ObjectFileName>
162-
</ClCompile>
163-
<ClCompile Include="..\..\..\..\test\messages\monad\body_writer.cpp">
164-
<ObjectFileName>$(IntDir)test_messages_monad_body_writer.obj</ObjectFileName>
165-
</ClCompile>
166-
<ClCompile Include="..\..\..\..\test\messages\monad\method.cpp">
167-
<ObjectFileName>$(IntDir)test_messages_monad_method.obj</ObjectFileName>
154+
<ClCompile Include="..\..\..\..\test\messages\http\method.cpp">
155+
<ObjectFileName>$(IntDir)test_messages_http_method.obj</ObjectFileName>
168156
</ClCompile>
157+
<ClCompile Include="..\..\..\..\test\messages\json_body_reader.cpp" />
158+
<ClCompile Include="..\..\..\..\test\messages\json_body_writer.cpp" />
159+
<ClCompile Include="..\..\..\..\test\messages\monad_body_reader.cpp" />
160+
<ClCompile Include="..\..\..\..\test\messages\monad_body_writer.cpp" />
169161
<ClCompile Include="..\..\..\..\test\messages\peer\detail\address.cpp">
170162
<ObjectFileName>$(IntDir)test_messages_peer_detail_address.obj</ObjectFileName>
171163
</ClCompile>
@@ -215,12 +207,8 @@
215207
<ClCompile Include="..\..\..\..\test\messages\peer\enums\service.cpp" />
216208
<ClCompile Include="..\..\..\..\test\messages\peer\heading.cpp" />
217209
<ClCompile Include="..\..\..\..\test\messages\peer\message.cpp" />
218-
<ClCompile Include="..\..\..\..\test\messages\rpc\body_reader.cpp">
219-
<ObjectFileName>$(IntDir)test_messages_rpc_body_reader.obj</ObjectFileName>
220-
</ClCompile>
221-
<ClCompile Include="..\..\..\..\test\messages\rpc\body_writer.cpp">
222-
<ObjectFileName>$(IntDir)test_messages_rpc_body_writer.obj</ObjectFileName>
223-
</ClCompile>
210+
<ClCompile Include="..\..\..\..\test\messages\rpc_body_reader.cpp" />
211+
<ClCompile Include="..\..\..\..\test\messages\rpc_body_writer.cpp" />
224212
<ClCompile Include="..\..\..\..\test\net.cpp" />
225213
<ClCompile Include="..\..\..\..\test\net\acceptor.cpp" />
226214
<ClCompile Include="..\..\..\..\test\net\connector.cpp" />

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj.filters‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,15 @@
3232
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000B}</UniqueIdentifier>
3333
</Filter>
3434
<Filter Include="src\messages\http\enums">
35-
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000001}</UniqueIdentifier>
36-
</Filter>
37-
<Filter Include="src\messages\json">
38-
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000C}</UniqueIdentifier>
39-
</Filter>
40-
<Filter Include="src\messages\monad">
4135
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000D}</UniqueIdentifier>
4236
</Filter>
4337
<Filter Include="src\messages\peer">
44-
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000E}</UniqueIdentifier>
38+
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000C}</UniqueIdentifier>
4539
</Filter>
4640
<Filter Include="src\messages\peer\detail">
47-
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000002}</UniqueIdentifier>
41+
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000E}</UniqueIdentifier>
4842
</Filter>
4943
<Filter Include="src\messages\peer\enums">
50-
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-000000000003}</UniqueIdentifier>
51-
</Filter>
52-
<Filter Include="src\messages\rpc">
5344
<UniqueIdentifier>{D28FC18A-8B81-4247-0000-00000000000F}</UniqueIdentifier>
5445
</Filter>
5546
<Filter Include="src\net">
@@ -153,20 +144,20 @@
153144
<ClCompile Include="..\..\..\..\test\messages\http\fields.cpp">
154145
<Filter>src\messages\http</Filter>
155146
</ClCompile>
156-
<ClCompile Include="..\..\..\..\test\messages\json\body_reader.cpp">
157-
<Filter>src\messages\json</Filter>
147+
<ClCompile Include="..\..\..\..\test\messages\http\method.cpp">
148+
<Filter>src\messages\http</Filter>
158149
</ClCompile>
159-
<ClCompile Include="..\..\..\..\test\messages\json\body_writer.cpp">
160-
<Filter>src\messages\json</Filter>
150+
<ClCompile Include="..\..\..\..\test\messages\json_body_reader.cpp">
151+
<Filter>src\messages</Filter>
161152
</ClCompile>
162-
<ClCompile Include="..\..\..\..\test\messages\monad\body_reader.cpp">
163-
<Filter>src\messages\monad</Filter>
153+
<ClCompile Include="..\..\..\..\test\messages\json_body_writer.cpp">
154+
<Filter>src\messages</Filter>
164155
</ClCompile>
165-
<ClCompile Include="..\..\..\..\test\messages\monad\body_writer.cpp">
166-
<Filter>src\messages\monad</Filter>
156+
<ClCompile Include="..\..\..\..\test\messages\monad_body_reader.cpp">
157+
<Filter>src\messages</Filter>
167158
</ClCompile>
168-
<ClCompile Include="..\..\..\..\test\messages\monad\method.cpp">
169-
<Filter>src\messages\monad</Filter>
159+
<ClCompile Include="..\..\..\..\test\messages\monad_body_writer.cpp">
160+
<Filter>src\messages</Filter>
170161
</ClCompile>
171162
<ClCompile Include="..\..\..\..\test\messages\peer\detail\address.cpp">
172163
<Filter>src\messages\peer\detail</Filter>
@@ -303,11 +294,11 @@
303294
<ClCompile Include="..\..\..\..\test\messages\peer\message.cpp">
304295
<Filter>src\messages\peer</Filter>
305296
</ClCompile>
306-
<ClCompile Include="..\..\..\..\test\messages\rpc\body_reader.cpp">
307-
<Filter>src\messages\rpc</Filter>
297+
<ClCompile Include="..\..\..\..\test\messages\rpc_body_reader.cpp">
298+
<Filter>src\messages</Filter>
308299
</ClCompile>
309-
<ClCompile Include="..\..\..\..\test\messages\rpc\body_writer.cpp">
310-
<Filter>src\messages\rpc</Filter>
300+
<ClCompile Include="..\..\..\..\test\messages\rpc_body_writer.cpp">
301+
<Filter>src\messages</Filter>
311302
</ClCompile>
312303
<ClCompile Include="..\..\..\..\test\net.cpp">
313304
<Filter>src</Filter>

0 commit comments

Comments
 (0)