highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-22 18:05:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

move-only: InitializeNode to handshake helper

Browse Source
This commit is contained in:
MacroFake 2022-07-11 18:07:53 +02:00
parent fa7098947c
commit fa4be8e7c3
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/fuzz/process_message.cpp
View File

@ -80,8 +80,7 @@ void fuzz_target(FuzzBufferType buffer, const std::string& LIMIT_TO_MESSAGE_TYPE
CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release(); CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
connman.AddTestNode(p2p_node); connman.AddTestNode(p2p_node);
g_setup->m_node.peerman->InitializeNode(&p2p_node); FillNode(fuzzed_data_provider, connman, p2p_node);
FillNode(fuzzed_data_provider, connman, *g_setup->m_node.peerman, p2p_node);
const auto mock_time = ConsumeTime(fuzzed_data_provider); const auto mock_time = ConsumeTime(fuzzed_data_provider);
SetMockTime(mock_time); SetMockTime(mock_time);

3
src/test/fuzz/process_messages.cpp
View File

@ -46,8 +46,7 @@ FUZZ_TARGET_INIT(process_messages, initialize_process_messages)
peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release()); peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release());
CNode& p2p_node = *peers.back(); CNode& p2p_node = *peers.back();
g_setup->m_node.peerman->InitializeNode(&p2p_node); FillNode(fuzzed_data_provider, connman, p2p_node);
FillNode(fuzzed_data_provider, connman, *g_setup->m_node.peerman, p2p_node);
connman.AddTestNode(p2p_node); connman.AddTestNode(p2p_node);
} }

2
src/test/fuzz/util.cpp
View File

@ -289,7 +289,7 @@ bool FuzzedSock::IsConnected(std::string& errmsg) const
return false; return false;
} }
void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, PeerManager& peerman, CNode& node) noexcept void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, CNode& node) noexcept
{ {
connman.Handshake(node, connman.Handshake(node,
/*successfully_connected=*/fuzzed_data_provider.ConsumeBool(), /*successfully_connected=*/fuzzed_data_provider.ConsumeBool(),

2
src/test/fuzz/util.h
View File

@ -331,7 +331,7 @@ auto ConsumeNode(FuzzedDataProvider& fuzzed_data_provider, const std::optional<N
} }
inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, node_id_in); } inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, node_id_in); }
void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, PeerManager& peerman, CNode& node) noexcept; void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, CNode& node) noexcept;
class FuzzedFileProvider class FuzzedFileProvider
{ {

2
src/test/util/net.cpp
View File

@ -24,6 +24,8 @@ void ConnmanTestMsg::Handshake(CNode& node,
auto& connman{*this}; auto& connman{*this};
const CNetMsgMaker mm{0}; const CNetMsgMaker mm{0};
peerman.InitializeNode(&node);
CSerializedNetMsg msg_version{ CSerializedNetMsg msg_version{
mm.Make(NetMsgType::VERSION, mm.Make(NetMsgType::VERSION,
version, // version, //