Skip to content

Commit 78f4a45

Browse files
evoskuilevoskuil
authored
Merge pull request #610 from evoskuil/master
Rename web to admin and explore to native.
2 parents 82758e5 + 0dbc7c2 commit 78f4a45

Some content is hidden

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

50 files changed

+776
-673
lines changed

‎Makefile.am‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ src_libbitcoin_server_la_SOURCES = \
4242
src/settings.cpp \
4343
src/parsers/bitcoind_query.cpp \
4444
src/parsers/bitcoind_target.cpp \
45-
src/parsers/explore_query.cpp \
46-
src/parsers/explore_target.cpp \
45+
src/parsers/native_query.cpp \
46+
src/parsers/native_target.cpp \
4747
src/protocols/protocol_bitcoind_rest.cpp \
4848
src/protocols/protocol_bitcoind_rpc.cpp \
4949
src/protocols/protocol_electrum.cpp \
5050
src/protocols/protocol_electrum_version.cpp \
51-
src/protocols/protocol_explore.cpp \
5251
src/protocols/protocol_html.cpp \
5352
src/protocols/protocol_http.cpp \
53+
src/protocols/protocol_native.cpp \
5454
src/protocols/protocol_stratum_v1.cpp
5555

5656
# local: test/libbitcoin-server-test
@@ -71,8 +71,8 @@ test_libbitcoin_server_test_SOURCES = \
7171
test/test.hpp \
7272
test/parsers/bitcoind_query.cpp \
7373
test/parsers/bitcoind_target.cpp \
74-
test/parsers/explore_query.cpp \
75-
test/parsers/explore_target.cpp
74+
test/parsers/native_query.cpp \
75+
test/parsers/native_target.cpp
7676

7777
endif WITH_TESTS
7878

@@ -100,17 +100,17 @@ console_bs_SOURCES = \
100100
console/main.cpp \
101101
console/stack_trace.cpp \
102102
console/stack_trace.hpp \
103+
console/embedded/admin_css.cpp \
104+
console/embedded/admin_font.cpp \
105+
console/embedded/admin_html.cpp \
106+
console/embedded/admin_icon.cpp \
107+
console/embedded/amin_ecma.cpp \
103108
console/embedded/embedded.hpp \
104-
console/embedded/explore_css.cpp \
105-
console/embedded/explore_ecma.cpp \
106-
console/embedded/explore_font.cpp \
107-
console/embedded/explore_html.cpp \
108-
console/embedded/explore_icon.cpp \
109-
console/embedded/web_css.cpp \
110-
console/embedded/web_ecma.cpp \
111-
console/embedded/web_font.cpp \
112-
console/embedded/web_html.cpp \
113-
console/embedded/web_icon.cpp
109+
console/embedded/native_css.cpp \
110+
console/embedded/native_ecma.cpp \
111+
console/embedded/native_font.cpp \
112+
console/embedded/native_html.cpp \
113+
console/embedded/native_icon.cpp
114114

115115
endif WITH_CONSOLE
116116

@@ -139,13 +139,17 @@ include_bitcoin_server_channels_HEADERS = \
139139
include/bitcoin/server/channels/channel_ws.hpp \
140140
include/bitcoin/server/channels/channels.hpp
141141

142+
include_bitcoin_server_impl_protocolsdir = ${includedir}/bitcoin/server/impl/protocols
143+
include_bitcoin_server_impl_protocols_HEADERS = \
144+
include/bitcoin/server/impl/protocols/protocol_native.ipp
145+
142146
include_bitcoin_server_interfacesdir = ${includedir}/bitcoin/server/interfaces
143147
include_bitcoin_server_interfaces_HEADERS = \
144148
include/bitcoin/server/interfaces/bitcoind_rest.hpp \
145149
include/bitcoin/server/interfaces/bitcoind_rpc.hpp \
146150
include/bitcoin/server/interfaces/electrum.hpp \
147-
include/bitcoin/server/interfaces/explore.hpp \
148151
include/bitcoin/server/interfaces/interfaces.hpp \
152+
include/bitcoin/server/interfaces/native.hpp \
149153
include/bitcoin/server/interfaces/stratum_v1.hpp \
150154
include/bitcoin/server/interfaces/stratum_v2.hpp \
151155
include/bitcoin/server/interfaces/types.hpp
@@ -155,24 +159,24 @@ include_bitcoin_server_parsers_HEADERS = \
155159
include/bitcoin/server/parsers/bitcoind_query.hpp \
156160
include/bitcoin/server/parsers/bitcoind_target.hpp \
157161
include/bitcoin/server/parsers/electrum_version.hpp \
158-
include/bitcoin/server/parsers/explore_query.hpp \
159-
include/bitcoin/server/parsers/explore_target.hpp \
162+
include/bitcoin/server/parsers/native_query.hpp \
163+
include/bitcoin/server/parsers/native_target.hpp \
160164
include/bitcoin/server/parsers/parsers.hpp
161165

162166
include_bitcoin_server_protocolsdir = ${includedir}/bitcoin/server/protocols
163167
include_bitcoin_server_protocols_HEADERS = \
164168
include/bitcoin/server/protocols/protocol.hpp \
169+
include/bitcoin/server/protocols/protocol_admin.hpp \
165170
include/bitcoin/server/protocols/protocol_bitcoind_rest.hpp \
166171
include/bitcoin/server/protocols/protocol_bitcoind_rpc.hpp \
167172
include/bitcoin/server/protocols/protocol_electrum.hpp \
168173
include/bitcoin/server/protocols/protocol_electrum_version.hpp \
169-
include/bitcoin/server/protocols/protocol_explore.hpp \
170174
include/bitcoin/server/protocols/protocol_html.hpp \
171175
include/bitcoin/server/protocols/protocol_http.hpp \
176+
include/bitcoin/server/protocols/protocol_native.hpp \
172177
include/bitcoin/server/protocols/protocol_rpc.hpp \
173178
include/bitcoin/server/protocols/protocol_stratum_v1.hpp \
174179
include/bitcoin/server/protocols/protocol_stratum_v2.hpp \
175-
include/bitcoin/server/protocols/protocol_web.hpp \
176180
include/bitcoin/server/protocols/protocols.hpp
177181

178182
include_bitcoin_server_sessionsdir = ${includedir}/bitcoin/server/sessions

‎builds/cmake/CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@ add_library( ${CANONICAL_LIB_NAME}
241241
"../../src/settings.cpp"
242242
"../../src/parsers/bitcoind_query.cpp"
243243
"../../src/parsers/bitcoind_target.cpp"
244-
"../../src/parsers/explore_query.cpp"
245-
"../../src/parsers/explore_target.cpp"
244+
"../../src/parsers/native_query.cpp"
245+
"../../src/parsers/native_target.cpp"
246246
"../../src/protocols/protocol_bitcoind_rest.cpp"
247247
"../../src/protocols/protocol_bitcoind_rpc.cpp"
248248
"../../src/protocols/protocol_electrum.cpp"
249249
"../../src/protocols/protocol_electrum_version.cpp"
250-
"../../src/protocols/protocol_explore.cpp"
251250
"../../src/protocols/protocol_html.cpp"
252251
"../../src/protocols/protocol_http.cpp"
252+
"../../src/protocols/protocol_native.cpp"
253253
"../../src/protocols/protocol_stratum_v1.cpp" )
254254

255255
# ${CANONICAL_LIB_NAME} project specific include directory normalization for build.
@@ -294,8 +294,8 @@ if (with-tests)
294294
"../../test/test.hpp"
295295
"../../test/parsers/bitcoind_query.cpp"
296296
"../../test/parsers/bitcoind_target.cpp"
297-
"../../test/parsers/explore_query.cpp"
298-
"../../test/parsers/explore_target.cpp" )
297+
"../../test/parsers/native_query.cpp"
298+
"../../test/parsers/native_target.cpp" )
299299

300300
add_test( NAME libbitcoin-server-test COMMAND libbitcoin-server-test
301301
--run_test=*
@@ -339,17 +339,17 @@ if (with-console)
339339
"../../console/main.cpp"
340340
"../../console/stack_trace.cpp"
341341
"../../console/stack_trace.hpp"
342+
"../../console/embedded/admin_css.cpp"
343+
"../../console/embedded/admin_font.cpp"
344+
"../../console/embedded/admin_html.cpp"
345+
"../../console/embedded/admin_icon.cpp"
346+
"../../console/embedded/amin_ecma.cpp"
342347
"../../console/embedded/embedded.hpp"
343-
"../../console/embedded/explore_css.cpp"
344-
"../../console/embedded/explore_ecma.cpp"
345-
"../../console/embedded/explore_font.cpp"
346-
"../../console/embedded/explore_html.cpp"
347-
"../../console/embedded/explore_icon.cpp"
348-
"../../console/embedded/web_css.cpp"
349-
"../../console/embedded/web_ecma.cpp"
350-
"../../console/embedded/web_font.cpp"
351-
"../../console/embedded/web_html.cpp"
352-
"../../console/embedded/web_icon.cpp" )
348+
"../../console/embedded/native_css.cpp"
349+
"../../console/embedded/native_ecma.cpp"
350+
"../../console/embedded/native_font.cpp"
351+
"../../console/embedded/native_html.cpp"
352+
"../../console/embedded/native_icon.cpp" )
353353

354354
# bs project specific include directories.
355355
#------------------------------------------------------------------------------

‎builds/msvc/vs2022/bs/bs.vcxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@
118118
<Import Project="$(ProjectDir)$(ProjectName).props" />
119119
</ImportGroup>
120120
<ItemGroup>
121-
<ClCompile Include="..\..\..\..\console\embedded\explore_css.cpp" />
122-
<ClCompile Include="..\..\..\..\console\embedded\explore_ecma.cpp" />
123-
<ClCompile Include="..\..\..\..\console\embedded\explore_font.cpp" />
124-
<ClCompile Include="..\..\..\..\console\embedded\explore_html.cpp" />
125-
<ClCompile Include="..\..\..\..\console\embedded\explore_icon.cpp" />
126-
<ClCompile Include="..\..\..\..\console\embedded\web_css.cpp" />
127-
<ClCompile Include="..\..\..\..\console\embedded\web_ecma.cpp" />
128-
<ClCompile Include="..\..\..\..\console\embedded\web_font.cpp" />
129-
<ClCompile Include="..\..\..\..\console\embedded\web_html.cpp" />
130-
<ClCompile Include="..\..\..\..\console\embedded\web_icon.cpp" />
121+
<ClCompile Include="..\..\..\..\console\embedded\admin_css.cpp" />
122+
<ClCompile Include="..\..\..\..\console\embedded\admin_font.cpp" />
123+
<ClCompile Include="..\..\..\..\console\embedded\admin_html.cpp" />
124+
<ClCompile Include="..\..\..\..\console\embedded\admin_icon.cpp" />
125+
<ClCompile Include="..\..\..\..\console\embedded\amin_ecma.cpp" />
126+
<ClCompile Include="..\..\..\..\console\embedded\native_css.cpp" />
127+
<ClCompile Include="..\..\..\..\console\embedded\native_ecma.cpp" />
128+
<ClCompile Include="..\..\..\..\console\embedded\native_font.cpp" />
129+
<ClCompile Include="..\..\..\..\console\embedded\native_html.cpp" />
130+
<ClCompile Include="..\..\..\..\console\embedded\native_icon.cpp" />
131131
<ClCompile Include="..\..\..\..\console\executor.cpp" />
132132
<ClCompile Include="..\..\..\..\console\executor_commands.cpp" />
133133
<ClCompile Include="..\..\..\..\console\executor_dumps.cpp" />

‎builds/msvc/vs2022/bs/bs.vcxproj.filters‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
</Filter>
1919
</ItemGroup>
2020
<ItemGroup>
21-
<ClCompile Include="..\..\..\..\console\embedded\explore_css.cpp">
21+
<ClCompile Include="..\..\..\..\console\embedded\admin_css.cpp">
2222
<Filter>src\embedded</Filter>
2323
</ClCompile>
24-
<ClCompile Include="..\..\..\..\console\embedded\explore_ecma.cpp">
24+
<ClCompile Include="..\..\..\..\console\embedded\admin_font.cpp">
2525
<Filter>src\embedded</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\..\..\..\console\embedded\explore_font.cpp">
27+
<ClCompile Include="..\..\..\..\console\embedded\admin_html.cpp">
2828
<Filter>src\embedded</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\..\..\..\console\embedded\explore_html.cpp">
30+
<ClCompile Include="..\..\..\..\console\embedded\admin_icon.cpp">
3131
<Filter>src\embedded</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\..\..\..\console\embedded\explore_icon.cpp">
33+
<ClCompile Include="..\..\..\..\console\embedded\amin_ecma.cpp">
3434
<Filter>src\embedded</Filter>
3535
</ClCompile>
36-
<ClCompile Include="..\..\..\..\console\embedded\web_css.cpp">
36+
<ClCompile Include="..\..\..\..\console\embedded\native_css.cpp">
3737
<Filter>src\embedded</Filter>
3838
</ClCompile>
39-
<ClCompile Include="..\..\..\..\console\embedded\web_ecma.cpp">
39+
<ClCompile Include="..\..\..\..\console\embedded\native_ecma.cpp">
4040
<Filter>src\embedded</Filter>
4141
</ClCompile>
42-
<ClCompile Include="..\..\..\..\console\embedded\web_font.cpp">
42+
<ClCompile Include="..\..\..\..\console\embedded\native_font.cpp">
4343
<Filter>src\embedded</Filter>
4444
</ClCompile>
45-
<ClCompile Include="..\..\..\..\console\embedded\web_html.cpp">
45+
<ClCompile Include="..\..\..\..\console\embedded\native_html.cpp">
4646
<Filter>src\embedded</Filter>
4747
</ClCompile>
48-
<ClCompile Include="..\..\..\..\console\embedded\web_icon.cpp">
48+
<ClCompile Include="..\..\..\..\console\embedded\native_icon.cpp">
4949
<Filter>src\embedded</Filter>
5050
</ClCompile>
5151
<ClCompile Include="..\..\..\..\console\executor.cpp">
@@ -116,4 +116,4 @@
116116
<Filter>resource</Filter>
117117
</ResourceCompile>
118118
</ItemGroup>
119-
</Project>
119+
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
<ClCompile Include="..\..\..\..\test\main.cpp" />
124124
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp" />
125125
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp" />
126-
<ClCompile Include="..\..\..\..\test\parsers\explore_query.cpp" />
127-
<ClCompile Include="..\..\..\..\test\parsers\explore_target.cpp" />
126+
<ClCompile Include="..\..\..\..\test\parsers\native_query.cpp" />
127+
<ClCompile Include="..\..\..\..\test\parsers\native_target.cpp" />
128128
<ClCompile Include="..\..\..\..\test\settings.cpp" />
129129
<ClCompile Include="..\..\..\..\test\test.cpp" />
130130
</ItemGroup>
@@ -167,4 +167,4 @@
167167
<ItemGroup>
168168
<Natvis Include="..\..\debug.natvis" />
169169
</ItemGroup>
170-
</Project>
170+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
3131
<Filter>src\parsers</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\..\..\..\test\parsers\explore_query.cpp">
33+
<ClCompile Include="..\..\..\..\test\parsers\native_query.cpp">
3434
<Filter>src\parsers</Filter>
3535
</ClCompile>
36-
<ClCompile Include="..\..\..\..\test\parsers\explore_target.cpp">
36+
<ClCompile Include="..\..\..\..\test\parsers\native_target.cpp">
3737
<Filter>src\parsers</Filter>
3838
</ClCompile>
3939
<ClCompile Include="..\..\..\..\test\settings.cpp">

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@
126126
<ClCompile Include="..\..\..\..\src\parser.cpp" />
127127
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp" />
128128
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp" />
129-
<ClCompile Include="..\..\..\..\src\parsers\explore_query.cpp" />
130-
<ClCompile Include="..\..\..\..\src\parsers\explore_target.cpp" />
129+
<ClCompile Include="..\..\..\..\src\parsers\native_query.cpp" />
130+
<ClCompile Include="..\..\..\..\src\parsers\native_target.cpp" />
131131
<ClCompile Include="..\..\..\..\src\protocols\protocol_bitcoind_rest.cpp" />
132132
<ClCompile Include="..\..\..\..\src\protocols\protocol_bitcoind_rpc.cpp" />
133133
<ClCompile Include="..\..\..\..\src\protocols\protocol_electrum.cpp" />
134134
<ClCompile Include="..\..\..\..\src\protocols\protocol_electrum_version.cpp" />
135-
<ClCompile Include="..\..\..\..\src\protocols\protocol_explore.cpp" />
136135
<ClCompile Include="..\..\..\..\src\protocols\protocol_html.cpp" />
137136
<ClCompile Include="..\..\..\..\src\protocols\protocol_http.cpp" />
137+
<ClCompile Include="..\..\..\..\src\protocols\protocol_native.cpp" />
138138
<ClCompile Include="..\..\..\..\src\protocols\protocol_stratum_v1.cpp" />
139139
<ClCompile Include="..\..\..\..\src\server_node.cpp" />
140140
<ClCompile Include="..\..\..\..\src\settings.cpp" />
@@ -153,30 +153,30 @@
153153
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\bitcoind_rest.hpp" />
154154
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\bitcoind_rpc.hpp" />
155155
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\electrum.hpp" />
156-
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\explore.hpp" />
157156
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\interfaces.hpp" />
157+
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\native.hpp" />
158158
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\stratum_v1.hpp" />
159159
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\stratum_v2.hpp" />
160160
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\types.hpp" />
161161
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp" />
162162
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_query.hpp" />
163163
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp" />
164164
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\electrum_version.hpp" />
165-
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\explore_query.hpp" />
166-
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\explore_target.hpp" />
165+
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_query.hpp" />
166+
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_target.hpp" />
167167
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\parsers.hpp" />
168168
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol.hpp" />
169+
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_admin.hpp" />
169170
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_bitcoind_rest.hpp" />
170171
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_bitcoind_rpc.hpp" />
171172
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_electrum.hpp" />
172173
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_electrum_version.hpp" />
173-
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_explore.hpp" />
174174
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_html.hpp" />
175175
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_http.hpp" />
176+
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_native.hpp" />
176177
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_rpc.hpp" />
177178
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v1.hpp" />
178179
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v2.hpp" />
179-
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_web.hpp" />
180180
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocols.hpp" />
181181
<ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp" />
182182
<ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_handshake.hpp" />
@@ -187,6 +187,7 @@
187187
<ClInclude Include="..\..\resource.h" />
188188
</ItemGroup>
189189
<ItemGroup>
190+
<None Include="..\..\..\..\include\bitcoin\server\impl\protocols\protocol_native.ipp" />
190191
<None Include="packages.config" />
191192
</ItemGroup>
192193
<ItemGroup>

0 commit comments

Comments
 (0)