Skip to content

Commit c1a1f63

Browse files
evoskuilevoskuil
committed
Organizers parsers for addition of bitcoind rpc.
1 parent b5befa4 commit c1a1f63

24 files changed

+510
-270
lines changed

‎Makefile.am‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ src_libbitcoin_node_la_SOURCES = \
5353
src/chasers/chaser_template.cpp \
5454
src/chasers/chaser_transaction.cpp \
5555
src/chasers/chaser_validate.cpp \
56-
src/parse/query.cpp \
57-
src/parse/target.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 \
5860
src/protocols/protocol.cpp \
5961
src/protocols/protocol_bitcoind_rest.cpp \
6062
src/protocols/protocol_bitcoind_rpc.cpp \
@@ -108,8 +110,10 @@ test_libbitcoin_node_test_SOURCES = \
108110
test/chasers/chaser_template.cpp \
109111
test/chasers/chaser_transaction.cpp \
110112
test/chasers/chaser_validate.cpp \
111-
test/parse/query.cpp \
112-
test/parse/target.cpp \
113+
test/parsers/bitcoind_query.cpp \
114+
test/parsers/bitcoind_target.cpp \
115+
test/parsers/explore_query.cpp \
116+
test/parsers/explore_target.cpp \
113117
test/protocols/protocol.cpp \
114118
test/sessions/session.cpp
115119

@@ -212,11 +216,13 @@ include_bitcoin_node_interfaces_HEADERS = \
212216
include/bitcoin/node/interfaces/stratum_v2.hpp \
213217
include/bitcoin/node/interfaces/types.hpp
214218

215-
include_bitcoin_node_parsedir = ${includedir}/bitcoin/node/parse
216-
include_bitcoin_node_parse_HEADERS = \
217-
include/bitcoin/node/parse/parse.hpp \
218-
include/bitcoin/node/parse/query.hpp \
219-
include/bitcoin/node/parse/target.hpp
219+
include_bitcoin_node_parsersdir = ${includedir}/bitcoin/node/parsers
220+
include_bitcoin_node_parsers_HEADERS = \
221+
include/bitcoin/node/parsers/bitcoind_query.hpp \
222+
include/bitcoin/node/parsers/bitcoind_target.hpp \
223+
include/bitcoin/node/parsers/explore_query.hpp \
224+
include/bitcoin/node/parsers/explore_target.hpp \
225+
include/bitcoin/node/parsers/parsers.hpp
220226

221227
include_bitcoin_node_protocolsdir = ${includedir}/bitcoin/node/protocols
222228
include_bitcoin_node_protocols_HEADERS = \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,10 @@ add_library( ${CANONICAL_LIB_NAME}
265265
"../../src/chasers/chaser_template.cpp"
266266
"../../src/chasers/chaser_transaction.cpp"
267267
"../../src/chasers/chaser_validate.cpp"
268-
"../../src/parse/query.cpp"
269-
"../../src/parse/target.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"
270272
"../../src/protocols/protocol.cpp"
271273
"../../src/protocols/protocol_bitcoind_rest.cpp"
272274
"../../src/protocols/protocol_bitcoind_rpc.cpp"
@@ -350,8 +352,10 @@ if (with-tests)
350352
"../../test/chasers/chaser_template.cpp"
351353
"../../test/chasers/chaser_transaction.cpp"
352354
"../../test/chasers/chaser_validate.cpp"
353-
"../../test/parse/query.cpp"
354-
"../../test/parse/target.cpp"
355+
"../../test/parsers/bitcoind_query.cpp"
356+
"../../test/parsers/bitcoind_target.cpp"
357+
"../../test/parsers/explore_query.cpp"
358+
"../../test/parsers/explore_target.cpp"
355359
"../../test/protocols/protocol.cpp"
356360
"../../test/sessions/session.cpp" )
357361

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@
134134
<ClCompile Include="..\..\..\..\test\full_node.cpp" />
135135
<ClCompile Include="..\..\..\..\test\main.cpp" />
136136
<ClCompile Include="..\..\..\..\test\node.cpp" />
137-
<ClCompile Include="..\..\..\..\test\parse\query.cpp" />
138-
<ClCompile Include="..\..\..\..\test\parse\target.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" />
139141
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
140142
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
141143
<ClCompile Include="..\..\..\..\test\settings.cpp" />

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Filter Include="src\chasers">
1414
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000001}</UniqueIdentifier>
1515
</Filter>
16-
<Filter Include="src\parse">
16+
<Filter Include="src\parsers">
1717
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000002}</UniqueIdentifier>
1818
</Filter>
1919
<Filter Include="src\protocols">
@@ -72,11 +72,17 @@
7272
<ClCompile Include="..\..\..\..\test\node.cpp">
7373
<Filter>src</Filter>
7474
</ClCompile>
75-
<ClCompile Include="..\..\..\..\test\parse\query.cpp">
76-
<Filter>src\parse</Filter>
75+
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp">
76+
<Filter>src\parsers</Filter>
7777
</ClCompile>
78-
<ClCompile Include="..\..\..\..\test\parse\target.cpp">
79-
<Filter>src\parse</Filter>
78+
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
79+
<Filter>src\parsers</Filter>
80+
</ClCompile>
81+
<ClCompile Include="..\..\..\..\test\parsers\explore_query.cpp">
82+
<Filter>src\parsers</Filter>
83+
</ClCompile>
84+
<ClCompile Include="..\..\..\..\test\parsers\explore_target.cpp">
85+
<Filter>src\parsers</Filter>
8086
</ClCompile>
8187
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
8288
<Filter>src\protocols</Filter>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,11 @@
137137
<ClCompile Include="..\..\..\..\src\configuration.cpp" />
138138
<ClCompile Include="..\..\..\..\src\error.cpp" />
139139
<ClCompile Include="..\..\..\..\src\full_node.cpp" />
140-
<ClCompile Include="..\..\..\..\src\parse\query.cpp" />
141-
<ClCompile Include="..\..\..\..\src\parse\target.cpp" />
142140
<ClCompile Include="..\..\..\..\src\parser.cpp" />
141+
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp" />
142+
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp" />
143+
<ClCompile Include="..\..\..\..\src\parsers\explore_query.cpp" />
144+
<ClCompile Include="..\..\..\..\src\parsers\explore_target.cpp" />
143145
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp" />
144146
<ClCompile Include="..\..\..\..\src\protocols\protocol_bitcoind_rest.cpp" />
145147
<ClCompile Include="..\..\..\..\src\protocols\protocol_bitcoind_rpc.cpp" />
@@ -201,10 +203,12 @@
201203
<ClInclude Include="..\..\..\..\include\bitcoin\node\interfaces\stratum_v1.hpp" />
202204
<ClInclude Include="..\..\..\..\include\bitcoin\node\interfaces\stratum_v2.hpp" />
203205
<ClInclude Include="..\..\..\..\include\bitcoin\node\interfaces\types.hpp" />
204-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\parse.hpp" />
205-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\query.hpp" />
206-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\target.hpp" />
207206
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp" />
207+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\bitcoind_query.hpp" />
208+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\bitcoind_target.hpp" />
209+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\explore_query.hpp" />
210+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\explore_target.hpp" />
211+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\parsers.hpp" />
208212
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp" />
209213
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_bitcoind_rest.hpp" />
210214
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_bitcoind_rpc.hpp" />

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

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Filter Include="include\bitcoin\node\interfaces">
3232
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
3333
</Filter>
34-
<Filter Include="include\bitcoin\node\parse">
34+
<Filter Include="include\bitcoin\node\parsers">
3535
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
3636
</Filter>
3737
<Filter Include="include\bitcoin\node\protocols">
@@ -52,7 +52,7 @@
5252
<Filter Include="src\chasers">
5353
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000002}</UniqueIdentifier>
5454
</Filter>
55-
<Filter Include="src\parse">
55+
<Filter Include="src\parsers">
5656
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000003}</UniqueIdentifier>
5757
</Filter>
5858
<Filter Include="src\protocols">
@@ -111,15 +111,21 @@
111111
<ClCompile Include="..\..\..\..\src\full_node.cpp">
112112
<Filter>src</Filter>
113113
</ClCompile>
114-
<ClCompile Include="..\..\..\..\src\parse\query.cpp">
115-
<Filter>src\parse</Filter>
116-
</ClCompile>
117-
<ClCompile Include="..\..\..\..\src\parse\target.cpp">
118-
<Filter>src\parse</Filter>
119-
</ClCompile>
120114
<ClCompile Include="..\..\..\..\src\parser.cpp">
121115
<Filter>src</Filter>
122116
</ClCompile>
117+
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp">
118+
<Filter>src\parsers</Filter>
119+
</ClCompile>
120+
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp">
121+
<Filter>src\parsers</Filter>
122+
</ClCompile>
123+
<ClCompile Include="..\..\..\..\src\parsers\explore_query.cpp">
124+
<Filter>src\parsers</Filter>
125+
</ClCompile>
126+
<ClCompile Include="..\..\..\..\src\parsers\explore_target.cpp">
127+
<Filter>src\parsers</Filter>
128+
</ClCompile>
123129
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp">
124130
<Filter>src\protocols</Filter>
125131
</ClCompile>
@@ -299,17 +305,23 @@
299305
<ClInclude Include="..\..\..\..\include\bitcoin\node\interfaces\types.hpp">
300306
<Filter>include\bitcoin\node\interfaces</Filter>
301307
</ClInclude>
302-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\parse.hpp">
303-
<Filter>include\bitcoin\node\parse</Filter>
308+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp">
309+
<Filter>include\bitcoin\node</Filter>
304310
</ClInclude>
305-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\query.hpp">
306-
<Filter>include\bitcoin\node\parse</Filter>
311+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\bitcoind_query.hpp">
312+
<Filter>include\bitcoin\node\parsers</Filter>
307313
</ClInclude>
308-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\target.hpp">
309-
<Filter>include\bitcoin\node\parse</Filter>
314+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\bitcoind_target.hpp">
315+
<Filter>include\bitcoin\node\parsers</Filter>
310316
</ClInclude>
311-
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp">
312-
<Filter>include\bitcoin\node</Filter>
317+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\explore_query.hpp">
318+
<Filter>include\bitcoin\node\parsers</Filter>
319+
</ClInclude>
320+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\explore_target.hpp">
321+
<Filter>include\bitcoin\node\parsers</Filter>
322+
</ClInclude>
323+
<ClInclude Include="..\..\..\..\include\bitcoin\node\parsers\parsers.hpp">
324+
<Filter>include\bitcoin\node\parsers</Filter>
313325
</ClInclude>
314326
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp">
315327
<Filter>include\bitcoin\node\protocols</Filter>

‎include/bitcoin/node.hpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@
5353
#include <bitcoin/node/interfaces/stratum_v1.hpp>
5454
#include <bitcoin/node/interfaces/stratum_v2.hpp>
5555
#include <bitcoin/node/interfaces/types.hpp>
56-
#include <bitcoin/node/parse/parse.hpp>
57-
#include <bitcoin/node/parse/query.hpp>
58-
#include <bitcoin/node/parse/target.hpp>
56+
#include <bitcoin/node/parsers/bitcoind_query.hpp>
57+
#include <bitcoin/node/parsers/bitcoind_target.hpp>
58+
#include <bitcoin/node/parsers/explore_query.hpp>
59+
#include <bitcoin/node/parsers/explore_target.hpp>
60+
#include <bitcoin/node/parsers/parsers.hpp>
5961
#include <bitcoin/node/protocols/protocol.hpp>
6062
#include <bitcoin/node/protocols/protocol_bitcoind_rest.hpp>
6163
#include <bitcoin/node/protocols/protocol_bitcoind_rpc.hpp>

‎include/bitcoin/node/parsers/bitcoind_query.hpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/**
2+
* Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
3+
*
4+
* This file is part of libbitcoin.
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
19+
#ifndef LIBBITCOIN_NODE_PARSERS_BITCOIND_QUERY_HPP
20+
#define LIBBITCOIN_NODE_PARSERS_BITCOIND_QUERY_HPP
21+
22+
#include <bitcoin/node/define.hpp>
23+
24+
namespace libbitcoin {
25+
namespace node {
26+
27+
BCN_API bool bitcoind_query(network::rpc::request_t& out,
28+
const network::http::request& request) NOEXCEPT;
29+
30+
} // namespace network
31+
} // namespace libbitcoin
32+
33+
#endif

‎include/bitcoin/node/parsers/bitcoind_target.hpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/**
2+
* Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
3+
*
4+
* This file is part of libbitcoin.
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
19+
#ifndef LIBBITCOIN_NODE_PARSERS_BITCOIND_TARGET_HPP
20+
#define LIBBITCOIN_NODE_PARSERS_BITCOIND_TARGET_HPP
21+
22+
#include <bitcoin/node/define.hpp>
23+
24+
namespace libbitcoin {
25+
namespace node {
26+
27+
BCN_API code bitcoind_target(network::rpc::request_t& out,
28+
const std::string_view& path) NOEXCEPT;
29+
30+
} // namespace network
31+
} // namespace libbitcoin
32+
33+
#endif

include/bitcoin/node/parse/query.hpp renamed to include/bitcoin/node/parsers/explore_query.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
* You should have received a copy of the GNU Affero General Public License
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
#ifndef LIBBITCOIN_NODE_PARSE_QUERY_HPP
20-
#define LIBBITCOIN_NODE_PARSE_QUERY_HPP
19+
#ifndef LIBBITCOIN_NODE_PARSERS_EXPLORE_QUERY_HPP
20+
#define LIBBITCOIN_NODE_PARSERS_EXPLORE_QUERY_HPP
2121

2222
#include <bitcoin/node/define.hpp>
2323

2424
namespace libbitcoin {
2525
namespace node {
2626

27-
BCN_API bool parse_query(network::rpc::request_t& out,
27+
BCN_API bool explore_query(network::rpc::request_t& out,
2828
const network::http::request& request) NOEXCEPT;
2929

3030
} // namespace network

0 commit comments

Comments
 (0)