Skip to content

Commit cccffa6

Browse files
evoskuilevoskuil
authored
Merge pull request libbitcoin#953 from evoskuil/master
Factor out libbitcoin-server.
2 parents 2507118 + 6b342ed commit cccffa6

File tree

125 files changed

+182
-15245
lines changed

Some content is hidden

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

125 files changed

+182
-15245
lines changed

‎Makefile.am‎

Lines changed: 0 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ src_libbitcoin_node_la_SOURCES = \
4040
src/configuration.cpp \
4141
src/error.cpp \
4242
src/full_node.cpp \
43-
src/parser.cpp \
4443
src/settings.cpp \
4544
src/channels/channel_peer.cpp \
4645
src/chasers/chaser.cpp \
@@ -53,31 +52,19 @@ src_libbitcoin_node_la_SOURCES = \
5352
src/chasers/chaser_template.cpp \
5453
src/chasers/chaser_transaction.cpp \
5554
src/chasers/chaser_validate.cpp \
56-
src/parsers/bitcoind_query.cpp \
57-
src/parsers/bitcoind_target.cpp \
58-
src/parsers/explore_query.cpp \
59-
src/parsers/explore_target.cpp \
6055
src/protocols/protocol.cpp \
61-
src/protocols/protocol_bitcoind_rest.cpp \
62-
src/protocols/protocol_bitcoind_rpc.cpp \
6356
src/protocols/protocol_block_in_106.cpp \
6457
src/protocols/protocol_block_in_31800.cpp \
6558
src/protocols/protocol_block_out_106.cpp \
6659
src/protocols/protocol_block_out_70012.cpp \
67-
src/protocols/protocol_electrum.cpp \
68-
src/protocols/protocol_electrum_version.cpp \
69-
src/protocols/protocol_explore.cpp \
7060
src/protocols/protocol_filter_out_70015.cpp \
7161
src/protocols/protocol_header_in_31800.cpp \
7262
src/protocols/protocol_header_in_70012.cpp \
7363
src/protocols/protocol_header_out_31800.cpp \
7464
src/protocols/protocol_header_out_70012.cpp \
75-
src/protocols/protocol_html.cpp \
76-
src/protocols/protocol_http.cpp \
7765
src/protocols/protocol_observer.cpp \
7866
src/protocols/protocol_peer.cpp \
7967
src/protocols/protocol_performer.cpp \
80-
src/protocols/protocol_stratum_v1.cpp \
8168
src/protocols/protocol_transaction_in_106.cpp \
8269
src/protocols/protocol_transaction_out_106.cpp \
8370
src/sessions/session.cpp \
@@ -114,53 +101,11 @@ test_libbitcoin_node_test_SOURCES = \
114101
test/chasers/chaser_template.cpp \
115102
test/chasers/chaser_transaction.cpp \
116103
test/chasers/chaser_validate.cpp \
117-
test/parsers/bitcoind_query.cpp \
118-
test/parsers/bitcoind_target.cpp \
119-
test/parsers/explore_query.cpp \
120-
test/parsers/explore_target.cpp \
121104
test/protocols/protocol.cpp \
122105
test/sessions/session.cpp
123106

124107
endif WITH_TESTS
125108

126-
# console/bn => ${bindir}
127-
#------------------------------------------------------------------------------
128-
if WITH_CONSOLE
129-
130-
bin_PROGRAMS = console/bn
131-
console_bn_CPPFLAGS = -I${srcdir}/include ${bitcoin_database_BUILD_CPPFLAGS} ${bitcoin_network_BUILD_CPPFLAGS}
132-
console_bn_LDADD = src/libbitcoin-node.la ${bitcoin_database_LIBS} ${bitcoin_network_LIBS}
133-
console_bn_SOURCES = \
134-
console/executor.cpp \
135-
console/executor.hpp \
136-
console/executor_commands.cpp \
137-
console/executor_dumps.cpp \
138-
console/executor_events.cpp \
139-
console/executor_logging.cpp \
140-
console/executor_options.cpp \
141-
console/executor_runner.cpp \
142-
console/executor_scans.cpp \
143-
console/executor_store.cpp \
144-
console/executor_test_reader.cpp \
145-
console/executor_test_writer.cpp \
146-
console/localize.hpp \
147-
console/main.cpp \
148-
console/stack_trace.cpp \
149-
console/stack_trace.hpp \
150-
console/embedded/embedded.hpp \
151-
console/embedded/explore_css.cpp \
152-
console/embedded/explore_ecma.cpp \
153-
console/embedded/explore_font.cpp \
154-
console/embedded/explore_html.cpp \
155-
console/embedded/explore_icon.cpp \
156-
console/embedded/web_css.cpp \
157-
console/embedded/web_ecma.cpp \
158-
console/embedded/web_font.cpp \
159-
console/embedded/web_html.cpp \
160-
console/embedded/web_icon.cpp
161-
162-
endif WITH_CONSOLE
163-
164109
# files => ${includedir}/bitcoin
165110
#------------------------------------------------------------------------------
166111
include_bitcoindir = ${includedir}/bitcoin
@@ -177,19 +122,13 @@ include_bitcoin_node_HEADERS = \
177122
include/bitcoin/node/error.hpp \
178123
include/bitcoin/node/events.hpp \
179124
include/bitcoin/node/full_node.hpp \
180-
include/bitcoin/node/parser.hpp \
181125
include/bitcoin/node/settings.hpp \
182126
include/bitcoin/node/version.hpp
183127

184128
include_bitcoin_node_channelsdir = ${includedir}/bitcoin/node/channels
185129
include_bitcoin_node_channels_HEADERS = \
186130
include/bitcoin/node/channels/channel.hpp \
187-
include/bitcoin/node/channels/channel_electrum.hpp \
188-
include/bitcoin/node/channels/channel_http.hpp \
189131
include/bitcoin/node/channels/channel_peer.hpp \
190-
include/bitcoin/node/channels/channel_stratum_v1.hpp \
191-
include/bitcoin/node/channels/channel_stratum_v2.hpp \
192-
include/bitcoin/node/channels/channel_ws.hpp \
193132
include/bitcoin/node/channels/channels.hpp
194133

195134
include_bitcoin_node_chasersdir = ${includedir}/bitcoin/node/chasers
@@ -211,93 +150,31 @@ include_bitcoin_node_impl_chasersdir = ${includedir}/bitcoin/node/impl/chasers
211150
include_bitcoin_node_impl_chasers_HEADERS = \
212151
include/bitcoin/node/impl/chasers/chaser_organize.ipp
213152

214-
include_bitcoin_node_interfacesdir = ${includedir}/bitcoin/node/interfaces
215-
include_bitcoin_node_interfaces_HEADERS = \
216-
include/bitcoin/node/interfaces/bitcoind_rest.hpp \
217-
include/bitcoin/node/interfaces/bitcoind_rpc.hpp \
218-
include/bitcoin/node/interfaces/electrum.hpp \
219-
include/bitcoin/node/interfaces/explore.hpp \
220-
include/bitcoin/node/interfaces/interfaces.hpp \
221-
include/bitcoin/node/interfaces/stratum_v1.hpp \
222-
include/bitcoin/node/interfaces/stratum_v2.hpp \
223-
include/bitcoin/node/interfaces/types.hpp
224-
225-
include_bitcoin_node_parsersdir = ${includedir}/bitcoin/node/parsers
226-
include_bitcoin_node_parsers_HEADERS = \
227-
include/bitcoin/node/parsers/bitcoind_query.hpp \
228-
include/bitcoin/node/parsers/bitcoind_target.hpp \
229-
include/bitcoin/node/parsers/electrum_version.hpp \
230-
include/bitcoin/node/parsers/explore_query.hpp \
231-
include/bitcoin/node/parsers/explore_target.hpp \
232-
include/bitcoin/node/parsers/parsers.hpp
233-
234153
include_bitcoin_node_protocolsdir = ${includedir}/bitcoin/node/protocols
235154
include_bitcoin_node_protocols_HEADERS = \
236155
include/bitcoin/node/protocols/protocol.hpp \
237-
include/bitcoin/node/protocols/protocol_bitcoind_rest.hpp \
238-
include/bitcoin/node/protocols/protocol_bitcoind_rpc.hpp \
239156
include/bitcoin/node/protocols/protocol_block_in_106.hpp \
240157
include/bitcoin/node/protocols/protocol_block_in_31800.hpp \
241158
include/bitcoin/node/protocols/protocol_block_out_106.hpp \
242159
include/bitcoin/node/protocols/protocol_block_out_70012.hpp \
243-
include/bitcoin/node/protocols/protocol_electrum.hpp \
244-
include/bitcoin/node/protocols/protocol_electrum_version.hpp \
245-
include/bitcoin/node/protocols/protocol_explore.hpp \
246160
include/bitcoin/node/protocols/protocol_filter_out_70015.hpp \
247161
include/bitcoin/node/protocols/protocol_header_in_31800.hpp \
248162
include/bitcoin/node/protocols/protocol_header_in_70012.hpp \
249163
include/bitcoin/node/protocols/protocol_header_out_31800.hpp \
250164
include/bitcoin/node/protocols/protocol_header_out_70012.hpp \
251-
include/bitcoin/node/protocols/protocol_html.hpp \
252-
include/bitcoin/node/protocols/protocol_http.hpp \
253165
include/bitcoin/node/protocols/protocol_observer.hpp \
254166
include/bitcoin/node/protocols/protocol_peer.hpp \
255167
include/bitcoin/node/protocols/protocol_performer.hpp \
256-
include/bitcoin/node/protocols/protocol_rpc.hpp \
257-
include/bitcoin/node/protocols/protocol_stratum_v1.hpp \
258-
include/bitcoin/node/protocols/protocol_stratum_v2.hpp \
259168
include/bitcoin/node/protocols/protocol_transaction_in_106.hpp \
260169
include/bitcoin/node/protocols/protocol_transaction_out_106.hpp \
261-
include/bitcoin/node/protocols/protocol_web.hpp \
262170
include/bitcoin/node/protocols/protocols.hpp
263171

264172
include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions
265173
include_bitcoin_node_sessions_HEADERS = \
266174
include/bitcoin/node/sessions/session.hpp \
267-
include/bitcoin/node/sessions/session_handshake.hpp \
268175
include/bitcoin/node/sessions/session_inbound.hpp \
269176
include/bitcoin/node/sessions/session_manual.hpp \
270177
include/bitcoin/node/sessions/session_outbound.hpp \
271178
include/bitcoin/node/sessions/session_peer.hpp \
272-
include/bitcoin/node/sessions/session_server.hpp \
273179
include/bitcoin/node/sessions/sessions.hpp
274180

275-
# files => ${bash_completiondir}
276-
#------------------------------------------------------------------------------
277-
if BASH_COMPLETIONDIR
278-
279-
dist_bash_completion_DATA = \
280-
data/bn
281-
282-
endif BASH_COMPLETIONDIR
283-
284-
# files => ${sysconfdir}/libbitcoin
285-
#------------------------------------------------------------------------------
286-
if WITH_CONSOLE
287-
288-
sysconf_libbitcoindir = ${sysconfdir}/libbitcoin
289-
sysconf_libbitcoin_DATA = \
290-
data/bn.cfg
291-
292-
endif WITH_CONSOLE
293-
294-
295-
# Custom make targets.
296-
#==============================================================================
297-
# make target: console
298-
#------------------------------------------------------------------------------
299-
target_console = \
300-
console/bn
301-
302-
console: ${target_console}
303-

‎builds/cmake/CMakeLists.txt‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ add_library( ${CANONICAL_LIB_NAME}
252252
"../../src/configuration.cpp"
253253
"../../src/error.cpp"
254254
"../../src/full_node.cpp"
255-
"../../src/parser.cpp"
256255
"../../src/settings.cpp"
257256
"../../src/channels/channel_peer.cpp"
258257
"../../src/chasers/chaser.cpp"
@@ -265,31 +264,19 @@ add_library( ${CANONICAL_LIB_NAME}
265264
"../../src/chasers/chaser_template.cpp"
266265
"../../src/chasers/chaser_transaction.cpp"
267266
"../../src/chasers/chaser_validate.cpp"
268-
"../../src/parsers/bitcoind_query.cpp"
269-
"../../src/parsers/bitcoind_target.cpp"
270-
"../../src/parsers/explore_query.cpp"
271-
"../../src/parsers/explore_target.cpp"
272267
"../../src/protocols/protocol.cpp"
273-
"../../src/protocols/protocol_bitcoind_rest.cpp"
274-
"../../src/protocols/protocol_bitcoind_rpc.cpp"
275268
"../../src/protocols/protocol_block_in_106.cpp"
276269
"../../src/protocols/protocol_block_in_31800.cpp"
277270
"../../src/protocols/protocol_block_out_106.cpp"
278271
"../../src/protocols/protocol_block_out_70012.cpp"
279-
"../../src/protocols/protocol_electrum.cpp"
280-
"../../src/protocols/protocol_electrum_version.cpp"
281-
"../../src/protocols/protocol_explore.cpp"
282272
"../../src/protocols/protocol_filter_out_70015.cpp"
283273
"../../src/protocols/protocol_header_in_31800.cpp"
284274
"../../src/protocols/protocol_header_in_70012.cpp"
285275
"../../src/protocols/protocol_header_out_31800.cpp"
286276
"../../src/protocols/protocol_header_out_70012.cpp"
287-
"../../src/protocols/protocol_html.cpp"
288-
"../../src/protocols/protocol_http.cpp"
289277
"../../src/protocols/protocol_observer.cpp"
290278
"../../src/protocols/protocol_peer.cpp"
291279
"../../src/protocols/protocol_performer.cpp"
292-
"../../src/protocols/protocol_stratum_v1.cpp"
293280
"../../src/protocols/protocol_transaction_in_106.cpp"
294281
"../../src/protocols/protocol_transaction_out_106.cpp"
295282
"../../src/sessions/session.cpp"
@@ -356,10 +343,6 @@ if (with-tests)
356343
"../../test/chasers/chaser_template.cpp"
357344
"../../test/chasers/chaser_transaction.cpp"
358345
"../../test/chasers/chaser_validate.cpp"
359-
"../../test/parsers/bitcoind_query.cpp"
360-
"../../test/parsers/bitcoind_target.cpp"
361-
"../../test/parsers/explore_query.cpp"
362-
"../../test/parsers/explore_target.cpp"
363346
"../../test/protocols/protocol.cpp"
364347
"../../test/sessions/session.cpp" )
365348

@@ -384,51 +367,6 @@ if (with-tests)
384367

385368
endif()
386369

387-
# Define bn project.
388-
#------------------------------------------------------------------------------
389-
if (with-console)
390-
add_executable( bn
391-
"../../console/executor.cpp"
392-
"../../console/executor.hpp"
393-
"../../console/executor_commands.cpp"
394-
"../../console/executor_dumps.cpp"
395-
"../../console/executor_events.cpp"
396-
"../../console/executor_logging.cpp"
397-
"../../console/executor_options.cpp"
398-
"../../console/executor_runner.cpp"
399-
"../../console/executor_scans.cpp"
400-
"../../console/executor_store.cpp"
401-
"../../console/executor_test_reader.cpp"
402-
"../../console/executor_test_writer.cpp"
403-
"../../console/libbitcoin.ico"
404-
"../../console/localize.hpp"
405-
"../../console/main.cpp"
406-
"../../console/stack_trace.cpp"
407-
"../../console/stack_trace.hpp"
408-
"../../console/embedded/embedded.hpp"
409-
"../../console/embedded/explore_css.cpp"
410-
"../../console/embedded/explore_ecma.cpp"
411-
"../../console/embedded/explore_font.cpp"
412-
"../../console/embedded/explore_html.cpp"
413-
"../../console/embedded/explore_icon.cpp"
414-
"../../console/embedded/web_css.cpp"
415-
"../../console/embedded/web_ecma.cpp"
416-
"../../console/embedded/web_font.cpp"
417-
"../../console/embedded/web_html.cpp"
418-
"../../console/embedded/web_icon.cpp" )
419-
420-
# bn project specific include directories.
421-
#------------------------------------------------------------------------------
422-
target_include_directories( bn PRIVATE
423-
"../../include" )
424-
425-
# bn project specific libraries/linker flags.
426-
#------------------------------------------------------------------------------
427-
target_link_libraries( bn
428-
${CANONICAL_LIB_NAME} )
429-
430-
endif()
431-
432370
# Manage pkgconfig installation.
433371
#------------------------------------------------------------------------------
434372
configure_file(
@@ -458,34 +396,8 @@ install( TARGETS ${CANONICAL_LIB_NAME}
458396
ARCHIVE DESTINATION lib
459397
PUBLIC_HEADER DESTINATION include )
460398

461-
# Manage bn installation.
462-
#------------------------------------------------------------------------------
463-
if (with-console)
464-
install( TARGETS bn
465-
RUNTIME DESTINATION bin
466-
LIBRARY DESTINATION lib
467-
ARCHIVE DESTINATION lib
468-
PUBLIC_HEADER DESTINATION include )
469-
endif()
470-
471399
# Manage include installation.
472400
#------------------------------------------------------------------------------
473401
install( DIRECTORY "../../include/bitcoin"
474402
DESTINATION include )
475403

476-
# Manage data installation for bash_completion prefixed product.
477-
#------------------------------------------------------------------------------
478-
if (bash-completiondir)
479-
install( FILES
480-
"../../data/bn"
481-
DESTINATION etc/libbitcoin )
482-
endif()
483-
484-
# Manage data installation for sysconf prefixed product.
485-
#------------------------------------------------------------------------------
486-
if (with-console)
487-
install( FILES
488-
"../../data/bn.cfg"
489-
DESTINATION etc/libbitcoin )
490-
endif()
491-

‎builds/cmake/CMakePresets.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@
125125
"hidden": true,
126126
"targets": [
127127
"bitcoin-node",
128-
"libbitcoin-node-test",
129-
"bn"
128+
"libbitcoin-node-test"
130129
]
131130
},
132131
{

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@
134134
<ClCompile Include="..\..\..\..\test\full_node.cpp" />
135135
<ClCompile Include="..\..\..\..\test\main.cpp" />
136136
<ClCompile Include="..\..\..\..\test\node.cpp" />
137-
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp" />
138-
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp" />
139-
<ClCompile Include="..\..\..\..\test\parsers\explore_query.cpp" />
140-
<ClCompile Include="..\..\..\..\test\parsers\explore_target.cpp" />
141137
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
142138
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
143139
<ClCompile Include="..\..\..\..\test\settings.cpp" />

0 commit comments

Comments
 (0)