diff --git a/src/.clang-format b/src/.clang-format index dd3f1070665..c1c0e8923f4 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -146,7 +146,7 @@ ObjCBlockIndentWidth: 2 ObjCBreakBeforeNestedBlockParam: true ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: true -PackConstructorInitializers: BinPack +PackConstructorInitializers: CurrentLine PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 diff --git a/src/net.cpp b/src/net.cpp index 3148c7e9b8f..d335f2dc526 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -995,7 +995,9 @@ void V2Transport::StartSendingHandshake() noexcept } V2Transport::V2Transport(NodeId nodeid, bool initiating, const CKey& key, std::span ent32, std::vector garbage) noexcept - : m_cipher{key, ent32}, m_initiating{initiating}, m_nodeid{nodeid}, + : m_cipher{key, ent32}, + m_initiating{initiating}, + m_nodeid{nodeid}, m_v1_fallback{nodeid}, m_recv_state{initiating ? RecvState::KEY : RecvState::KEY_MAYBE_V1}, m_send_garbage{std::move(garbage)},