Skip to content

Remove dead code and use network message types, add p2p tests. #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 2 commits into from
Aug 25, 2026
Merged

Remove dead code and use network message types, add p2p tests. #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3185711
Remove dead code and use network message types.
evoskuil Aug 25, 2026
a53ff53
Add p2p setup fixture and a few test cases.
evoskuil Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions builds/gnu/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ src_libbitcoin_node_la_SOURCES = \
${srcdir}/../../src/chasers/chaser_validate_batch.cpp \
${srcdir}/../../src/chasers/chaser_validate_capture.cpp \
${srcdir}/../../src/chasers/chaser_validate_parallel.cpp \
${srcdir}/../../src/messages/block.cpp \
${srcdir}/../../src/messages/transaction.cpp \
${srcdir}/../../src/protocols/protocol.cpp \
${srcdir}/../../src/protocols/protocol_block_in_106.cpp \
${srcdir}/../../src/protocols/protocol_block_in_31800.cpp \
Expand Down Expand Up @@ -156,14 +154,6 @@ include_bitcoin_node_impl_sessionsdir = \
include_bitcoin_node_impl_sessions_HEADERS = \
${srcdir}/../../include/bitcoin/node/impl/sessions/session_peer.ipp

include_bitcoin_node_messagesdir = \
${includedir}/bitcoin/node/messages

include_bitcoin_node_messages_HEADERS = \
${srcdir}/../../include/bitcoin/node/messages/block.hpp \
${srcdir}/../../include/bitcoin/node/messages/messages.hpp \
${srcdir}/../../include/bitcoin/node/messages/transaction.hpp

include_bitcoin_node_protocolsdir = \
${includedir}/bitcoin/node/protocols

Expand Down Expand Up @@ -240,7 +230,8 @@ test_libbitcoin_node_test_SOURCES = \
${srcdir}/../../test/chasers/chaser_template.cpp \
${srcdir}/../../test/chasers/chaser_transaction.cpp \
${srcdir}/../../test/chasers/chaser_validate.cpp \
${srcdir}/../../test/messages/block.cpp \
${srcdir}/../../test/functional/p2p.cpp \
${srcdir}/../../test/functional/p2p_setup_fixture.cpp \
${srcdir}/../../test/protocols/protocol.cpp \
${srcdir}/../../test/sessions/session.cpp

Expand Down
4 changes: 3 additions & 1 deletion builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,16 @@
<ClCompile Include="..\..\..\..\test\error.cpp" />
<ClCompile Include="..\..\..\..\test\estimator.cpp" />
<ClCompile Include="..\..\..\..\test\full_node.cpp" />
<ClCompile Include="..\..\..\..\test\functional\p2p.cpp" />
<ClCompile Include="..\..\..\..\test\functional\p2p_setup_fixture.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\messages\block.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\test\settings.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\functional\p2p_setup_fixture.hpp" />
<ClInclude Include="..\..\..\..\test\test.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down
14 changes: 10 additions & 4 deletions builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Filter Include="src\chasers">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages">
<Filter Include="src\functional">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
Expand Down Expand Up @@ -72,12 +72,15 @@
<ClCompile Include="..\..\..\..\test\full_node.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\functional\p2p.cpp">
<Filter>src\functional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\functional\p2p_setup_fixture.cpp">
<Filter>src\functional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\block.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand All @@ -92,6 +95,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\functional\p2p_setup_fixture.hpp">
<Filter>src\functional</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\test\test.hpp">
<Filter>src</Filter>
</ClInclude>
Expand Down
5 changes: 0 additions & 5 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\estimator.cpp" />
<ClCompile Include="..\..\..\..\src\full_node.cpp" />
<ClCompile Include="..\..\..\..\src\messages\block.cpp" />
<ClCompile Include="..\..\..\..\src\messages\transaction.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_31800.cpp" />
Expand Down Expand Up @@ -194,9 +192,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\estimator.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\events.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\block.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\messages.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\transaction.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_31800.hpp" />
Expand Down
37 changes: 8 additions & 29 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,29 @@
<Filter Include="include\bitcoin\node\impl\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\messages">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="src\channels">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="src\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000F}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000001}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000002}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000F}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -126,12 +120,6 @@
<ClCompile Include="..\..\..\..\src\full_node.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\messages\block.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\messages\transaction.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand Down Expand Up @@ -278,15 +266,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\block.hpp">
<Filter>include\bitcoin\node\messages</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\messages.hpp">
<Filter>include\bitcoin\node\messages</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\transaction.hpp">
<Filter>include\bitcoin\node\messages</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down
4 changes: 3 additions & 1 deletion builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,16 @@
<ClCompile Include="..\..\..\..\test\error.cpp" />
<ClCompile Include="..\..\..\..\test\estimator.cpp" />
<ClCompile Include="..\..\..\..\test\full_node.cpp" />
<ClCompile Include="..\..\..\..\test\functional\p2p.cpp" />
<ClCompile Include="..\..\..\..\test\functional\p2p_setup_fixture.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\messages\block.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\test\settings.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\functional\p2p_setup_fixture.hpp" />
<ClInclude Include="..\..\..\..\test\test.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down
14 changes: 10 additions & 4 deletions builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Filter Include="src\chasers">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages">
<Filter Include="src\functional">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
Expand Down Expand Up @@ -72,12 +72,15 @@
<ClCompile Include="..\..\..\..\test\full_node.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\functional\p2p.cpp">
<Filter>src\functional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\functional\p2p_setup_fixture.cpp">
<Filter>src\functional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\messages\block.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand All @@ -92,6 +95,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\functional\p2p_setup_fixture.hpp">
<Filter>src\functional</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\test\test.hpp">
<Filter>src</Filter>
</ClInclude>
Expand Down
5 changes: 0 additions & 5 deletions builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\estimator.cpp" />
<ClCompile Include="..\..\..\..\src\full_node.cpp" />
<ClCompile Include="..\..\..\..\src\messages\block.cpp" />
<ClCompile Include="..\..\..\..\src\messages\transaction.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_31800.cpp" />
Expand Down Expand Up @@ -194,9 +192,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\estimator.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\events.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\block.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\messages.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\transaction.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_31800.hpp" />
Expand Down
37 changes: 8 additions & 29 deletions builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,29 @@
<Filter Include="include\bitcoin\node\impl\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\messages">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="src\channels">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="src\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src\messages">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000F}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000001}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000002}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000F}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -126,12 +120,6 @@
<ClCompile Include="..\..\..\..\src\full_node.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\messages\block.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\messages\transaction.cpp">
<Filter>src\messages</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand Down Expand Up @@ -278,15 +266,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\block.hpp">
<Filter>include\bitcoin\node\messages</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\messages.hpp">
<Filter>include\bitcoin\node\messages</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\messages\transaction.hpp">
<Filter>include\bitcoin\node\messages</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down
3 changes: 0 additions & 3 deletions include/bitcoin/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
#include <bitcoin/node/chasers/chaser_transaction.hpp>
#include <bitcoin/node/chasers/chaser_validate.hpp>
#include <bitcoin/node/chasers/chasers.hpp>
#include <bitcoin/node/messages/block.hpp>
#include <bitcoin/node/messages/messages.hpp>
#include <bitcoin/node/messages/transaction.hpp>
#include <bitcoin/node/protocols/protocol.hpp>
#include <bitcoin/node/protocols/protocol_block_in_106.hpp>
#include <bitcoin/node/protocols/protocol_block_in_31800.hpp>
Expand Down
Loading
Loading