Skip to content

Commit fae6e31

Browse files
author
MarcoFalke
committed
refactor: Set fSuccessfullyConnected in FillNode
Also, pass ConnmanTestMsg& and PeerManager& (needed for later commits).
1 parent fa3583f commit fae6e31

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/test/fuzz/process_message.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ void fuzz_target(FuzzBufferType buffer, const std::string& LIMIT_TO_MESSAGE_TYPE
7979
}
8080
CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
8181

82-
const bool successfully_connected{fuzzed_data_provider.ConsumeBool()};
83-
p2p_node.fSuccessfullyConnected = successfully_connected;
8482
connman.AddTestNode(p2p_node);
8583
g_setup->m_node.peerman->InitializeNode(&p2p_node);
86-
FillNode(fuzzed_data_provider, p2p_node, /*init_version=*/successfully_connected);
84+
FillNode(fuzzed_data_provider, connman, *g_setup->m_node.peerman, p2p_node);
8785

8886
const auto mock_time = ConsumeTime(fuzzed_data_provider);
8987
SetMockTime(mock_time);

src/test/fuzz/process_messages.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ FUZZ_TARGET_INIT(process_messages, initialize_process_messages)
4646
peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release());
4747
CNode& p2p_node = *peers.back();
4848

49-
const bool successfully_connected{fuzzed_data_provider.ConsumeBool()};
50-
p2p_node.fSuccessfullyConnected = successfully_connected;
51-
p2p_node.fPauseSend = false;
5249
g_setup->m_node.peerman->InitializeNode(&p2p_node);
53-
FillNode(fuzzed_data_provider, p2p_node, /*init_version=*/successfully_connected);
50+
FillNode(fuzzed_data_provider, connman, *g_setup->m_node.peerman, p2p_node);
5451

5552
connman.AddTestNode(p2p_node);
5653
}

src/test/fuzz/util.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,16 +200,19 @@ bool FuzzedSock::IsConnected(std::string& errmsg) const
200200
return false;
201201
}
202202

203-
void FillNode(FuzzedDataProvider& fuzzed_data_provider, CNode& node, bool init_version) noexcept
203+
void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, PeerManager& peerman, CNode& node) noexcept
204204
{
205+
const bool successfully_connected{fuzzed_data_provider.ConsumeBool()};
206+
node.fSuccessfullyConnected = successfully_connected;
205207
const ServiceFlags remote_services = ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS);
206208
const NetPermissionFlags permission_flags = ConsumeWeakEnum(fuzzed_data_provider, ALL_NET_PERMISSION_FLAGS);
207209
const int32_t version = fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(MIN_PEER_PROTO_VERSION, std::numeric_limits<int32_t>::max());
208210
const bool filter_txs = fuzzed_data_provider.ConsumeBool();
209211

212+
node.fPauseSend = false;
210213
node.nServices = remote_services;
211214
node.m_permissionFlags = permission_flags;
212-
if (init_version) {
215+
if (successfully_connected) {
213216
node.nVersion = version;
214217
node.SetCommonVersion(std::min(version, PROTOCOL_VERSION));
215218
}

src/test/fuzz/util.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include <string>
3737
#include <vector>
3838

39+
class PeerManager;
40+
3941
template <typename... Callables>
4042
size_t CallOneOf(FuzzedDataProvider& fuzzed_data_provider, Callables... callables)
4143
{
@@ -275,7 +277,7 @@ auto ConsumeNode(FuzzedDataProvider& fuzzed_data_provider, const std::optional<N
275277
}
276278
inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, node_id_in); }
277279

278-
void FillNode(FuzzedDataProvider& fuzzed_data_provider, CNode& node, bool init_version) noexcept;
280+
void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, PeerManager& peerman, CNode& node) noexcept;
279281

280282
class FuzzedFileProvider
281283
{

0 commit comments

Comments
 (0)