Skip to content

Commit 07d96aa

Browse files
evoskuilevoskuil
authored
Merge pull request #670 from evoskuil/master
Stub in socket json-rpc support.
2 parents 14950d8 + 3d915c8 commit 07d96aa

File tree

26 files changed

+345
-904
lines changed

26 files changed

+345
-904
lines changed

‎Makefile.am‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,6 @@ include_bitcoin_network_impl_async_races_HEADERS = \
329329
include/bitcoin/network/impl/async/races/race_unity.ipp \
330330
include/bitcoin/network/impl/async/races/race_volume.ipp
331331

332-
include_bitcoin_network_impl_messages_httpdir = ${includedir}/bitcoin/network/impl/messages/http
333-
include_bitcoin_network_impl_messages_http_HEADERS = \
334-
include/bitcoin/network/impl/messages/http/head.ipp
335-
336-
include_bitcoin_network_impl_messages_monaddir = ${includedir}/bitcoin/network/impl/messages/monad
337-
include_bitcoin_network_impl_messages_monad_HEADERS = \
338-
include/bitcoin/network/impl/messages/monad/head.ipp
339-
340332
include_bitcoin_network_impl_rpcdir = ${includedir}/bitcoin/network/impl/rpc
341333
include_bitcoin_network_impl_rpc_HEADERS = \
342334
include/bitcoin/network/impl/rpc/broadcaster.ipp \
@@ -355,8 +347,8 @@ include_bitcoin_network_log_HEADERS = \
355347
include_bitcoin_network_messages_httpdir = ${includedir}/bitcoin/network/messages/http
356348
include_bitcoin_network_messages_http_HEADERS = \
357349
include/bitcoin/network/messages/http/fields.hpp \
358-
include/bitcoin/network/messages/http/head.hpp \
359-
include/bitcoin/network/messages/http/http.hpp
350+
include/bitcoin/network/messages/http/http.hpp \
351+
include/bitcoin/network/messages/http/method.hpp
360352

361353
include_bitcoin_network_messages_http_enumsdir = ${includedir}/bitcoin/network/messages/http/enums
362354
include_bitcoin_network_messages_http_enums_HEADERS = \
@@ -374,11 +366,7 @@ include_bitcoin_network_messages_json_HEADERS = \
374366
include_bitcoin_network_messages_monaddir = ${includedir}/bitcoin/network/messages/monad
375367
include_bitcoin_network_messages_monad_HEADERS = \
376368
include/bitcoin/network/messages/monad/body.hpp \
377-
include/bitcoin/network/messages/monad/head.hpp \
378-
include/bitcoin/network/messages/monad/method.hpp \
379-
include/bitcoin/network/messages/monad/monad.hpp \
380-
include/bitcoin/network/messages/monad/request.hpp \
381-
include/bitcoin/network/messages/monad/response.hpp
369+
include/bitcoin/network/messages/monad/monad.hpp
382370

383371
include_bitcoin_network_messages_peerdir = ${includedir}/bitcoin/network/messages/peer
384372
include_bitcoin_network_messages_peer_HEADERS = \

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,12 @@
271271
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\enums\target.hpp" />
272272
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\enums\verb.hpp" />
273273
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\fields.hpp" />
274-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\head.hpp" />
275274
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\http.hpp" />
275+
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\method.hpp" />
276276
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\json\body.hpp" />
277277
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\json\json.hpp" />
278278
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\body.hpp" />
279-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\head.hpp" />
280-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\method.hpp" />
281279
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\monad.hpp" />
282-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\request.hpp" />
283-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\response.hpp" />
284280
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\peer\detail\address.hpp" />
285281
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\peer\detail\address_item.hpp" />
286282
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\peer\detail\alert.hpp" />
@@ -388,8 +384,6 @@
388384
<None Include="..\..\..\..\include\bitcoin\network\impl\async\races\race_volume.ipp" />
389385
<None Include="..\..\..\..\include\bitcoin\network\impl\async\subscriber.ipp" />
390386
<None Include="..\..\..\..\include\bitcoin\network\impl\async\unsubscriber.ipp" />
391-
<None Include="..\..\..\..\include\bitcoin\network\impl\messages\http\head.ipp" />
392-
<None Include="..\..\..\..\include\bitcoin\network\impl\messages\monad\head.ipp" />
393387
<None Include="..\..\..\..\include\bitcoin\network\impl\rpc\broadcaster.ipp" />
394388
<None Include="..\..\..\..\include\bitcoin\network\impl\rpc\dispatcher.ipp" />
395389
<None Include="packages.config" />

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

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,10 @@
3535
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000F1}</UniqueIdentifier>
3636
</Filter>
3737
<Filter Include="include\bitcoin\network\impl\async\races">
38-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000004}</UniqueIdentifier>
39-
</Filter>
40-
<Filter Include="include\bitcoin\network\impl\messages">
41-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000002}</UniqueIdentifier>
42-
</Filter>
43-
<Filter Include="include\bitcoin\network\impl\messages\http">
44-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000005}</UniqueIdentifier>
45-
</Filter>
46-
<Filter Include="include\bitcoin\network\impl\messages\monad">
47-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000006}</UniqueIdentifier>
38+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000003}</UniqueIdentifier>
4839
</Filter>
4940
<Filter Include="include\bitcoin\network\impl\rpc">
50-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000003}</UniqueIdentifier>
41+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000002}</UniqueIdentifier>
5142
</Filter>
5243
<Filter Include="include\bitcoin\network\log">
5344
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000009}</UniqueIdentifier>
@@ -56,28 +47,28 @@
5647
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000010}</UniqueIdentifier>
5748
</Filter>
5849
<Filter Include="include\bitcoin\network\messages\http">
59-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000007}</UniqueIdentifier>
50+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000004}</UniqueIdentifier>
6051
</Filter>
6152
<Filter Include="include\bitcoin\network\messages\http\enums">
62-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000A2}</UniqueIdentifier>
53+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000009}</UniqueIdentifier>
6354
</Filter>
6455
<Filter Include="include\bitcoin\network\messages\json">
65-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000008}</UniqueIdentifier>
56+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000005}</UniqueIdentifier>
6657
</Filter>
6758
<Filter Include="include\bitcoin\network\messages\monad">
68-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000009}</UniqueIdentifier>
59+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000006}</UniqueIdentifier>
6960
</Filter>
7061
<Filter Include="include\bitcoin\network\messages\peer">
71-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000010}</UniqueIdentifier>
62+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000007}</UniqueIdentifier>
7263
</Filter>
7364
<Filter Include="include\bitcoin\network\messages\peer\detail">
74-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000B2}</UniqueIdentifier>
65+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000010}</UniqueIdentifier>
7566
</Filter>
7667
<Filter Include="include\bitcoin\network\messages\peer\enums">
77-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000C2}</UniqueIdentifier>
68+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000011}</UniqueIdentifier>
7869
</Filter>
7970
<Filter Include="include\bitcoin\network\messages\rpc">
80-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000011}</UniqueIdentifier>
71+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000008}</UniqueIdentifier>
8172
</Filter>
8273
<Filter Include="include\bitcoin\network\net">
8374
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000A1}</UniqueIdentifier>
@@ -89,16 +80,16 @@
8980
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000C1}</UniqueIdentifier>
9081
</Filter>
9182
<Filter Include="include\bitcoin\network\rpc\enums">
92-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000D2}</UniqueIdentifier>
83+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000A2}</UniqueIdentifier>
9384
</Filter>
9485
<Filter Include="include\bitcoin\network\rpc\interfaces">
95-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000E2}</UniqueIdentifier>
86+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000B2}</UniqueIdentifier>
9687
</Filter>
9788
<Filter Include="include\bitcoin\network\sessions">
9889
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000D1}</UniqueIdentifier>
9990
</Filter>
10091
<Filter Include="resource">
101-
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000F2}</UniqueIdentifier>
92+
<UniqueIdentifier>{564EB540-D6B6-425C-0000-0000000000C2}</UniqueIdentifier>
10293
</Filter>
10394
<Filter Include="src">
10495
<UniqueIdentifier>{564EB540-D6B6-425C-0000-000000000000}</UniqueIdentifier>
@@ -569,10 +560,10 @@
569560
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\fields.hpp">
570561
<Filter>include\bitcoin\network\messages\http</Filter>
571562
</ClInclude>
572-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\head.hpp">
563+
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\http.hpp">
573564
<Filter>include\bitcoin\network\messages\http</Filter>
574565
</ClInclude>
575-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\http.hpp">
566+
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\http\method.hpp">
576567
<Filter>include\bitcoin\network\messages\http</Filter>
577568
</ClInclude>
578569
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\json\body.hpp">
@@ -584,21 +575,9 @@
584575
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\body.hpp">
585576
<Filter>include\bitcoin\network\messages\monad</Filter>
586577
</ClInclude>
587-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\head.hpp">
588-
<Filter>include\bitcoin\network\messages\monad</Filter>
589-
</ClInclude>
590-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\method.hpp">
591-
<Filter>include\bitcoin\network\messages\monad</Filter>
592-
</ClInclude>
593578
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\monad.hpp">
594579
<Filter>include\bitcoin\network\messages\monad</Filter>
595580
</ClInclude>
596-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\request.hpp">
597-
<Filter>include\bitcoin\network\messages\monad</Filter>
598-
</ClInclude>
599-
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\monad\response.hpp">
600-
<Filter>include\bitcoin\network\messages\monad</Filter>
601-
</ClInclude>
602581
<ClInclude Include="..\..\..\..\include\bitcoin\network\messages\peer\detail\address.hpp">
603582
<Filter>include\bitcoin\network\messages\peer\detail</Filter>
604583
</ClInclude>
@@ -916,12 +895,6 @@
916895
<None Include="..\..\..\..\include\bitcoin\network\impl\async\unsubscriber.ipp">
917896
<Filter>include\bitcoin\network\impl\async</Filter>
918897
</None>
919-
<None Include="..\..\..\..\include\bitcoin\network\impl\messages\http\head.ipp">
920-
<Filter>include\bitcoin\network\impl\messages\http</Filter>
921-
</None>
922-
<None Include="..\..\..\..\include\bitcoin\network\impl\messages\monad\head.ipp">
923-
<Filter>include\bitcoin\network\impl\messages\monad</Filter>
924-
</None>
925898
<None Include="..\..\..\..\include\bitcoin\network\impl\rpc\broadcaster.ipp">
926899
<Filter>include\bitcoin\network\impl\rpc</Filter>
927900
</None>

‎include/bitcoin/network.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
#include <bitcoin/network/log/timer.hpp>
5858
#include <bitcoin/network/log/tracker.hpp>
5959
#include <bitcoin/network/messages/http/fields.hpp>
60-
#include <bitcoin/network/messages/http/head.hpp>
6160
#include <bitcoin/network/messages/http/http.hpp>
61+
#include <bitcoin/network/messages/http/method.hpp>
6262
#include <bitcoin/network/messages/http/enums/magic_numbers.hpp>
6363
#include <bitcoin/network/messages/http/enums/media_type.hpp>
6464
#include <bitcoin/network/messages/http/enums/status.hpp>
@@ -67,11 +67,7 @@
6767
#include <bitcoin/network/messages/json/body.hpp>
6868
#include <bitcoin/network/messages/json/json.hpp>
6969
#include <bitcoin/network/messages/monad/body.hpp>
70-
#include <bitcoin/network/messages/monad/head.hpp>
71-
#include <bitcoin/network/messages/monad/method.hpp>
7270
#include <bitcoin/network/messages/monad/monad.hpp>
73-
#include <bitcoin/network/messages/monad/request.hpp>
74-
#include <bitcoin/network/messages/monad/response.hpp>
7571
#include <bitcoin/network/messages/peer/heading.hpp>
7672
#include <bitcoin/network/messages/peer/message.hpp>
7773
#include <bitcoin/network/messages/peer/peer.hpp>

‎include/bitcoin/network/async/handlers.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ inline Type move_copy(const Type& instance) NOEXCEPT
3636
typedef std::function<bool(const code&)> notify_handler;
3737
typedef std::function<void(const code&)> result_handler;
3838
typedef std::function<void(const code&, size_t)> count_handler;
39-
typedef std::function<void(const code&,
40-
const boost::json::value&)> json_handler;
4139

4240
} // namespace network
4341
} // namespace libbitcoin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <bitcoin/network/channels/channel.hpp>
2626
#include <bitcoin/network/define.hpp>
2727
#include <bitcoin/network/log/log.hpp>
28-
#include <bitcoin/network/messages/monad/monad.hpp>
28+
#include <bitcoin/network/messages/http/http.hpp>
2929
#include <bitcoin/network/rpc/rpc.hpp>
3030
#include <bitcoin/network/net/socket.hpp>
3131

0 commit comments

Comments
 (0)