Skip to content
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.

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

[Cleanup] Remove fNetworkNode and pnodeLocalHost, and encapsulate CNode id. #2586

Merged
merged 4 commits into from
Nov 21, 2021

Conversation

furszy
Copy link

@furszy furszy commented Oct 6, 2021

Coming straight from upstream:

bitcoin#9226
bitcoin#10189

Initial steps towards the DMNs quorum connections work.

Coming from btc@083f20369878196785151e038e5f5126fed74021
@furszy furszy self-assigned this Oct 6, 2021
@furszy furszy added the Upstream label Oct 6, 2021
@furszy furszy changed the title [Cleanup] Remove fNetworkNode and pnodeLocalHost, and encapsulate CNode id. [WIP][Cleanup] Remove fNetworkNode and pnodeLocalHost, and encapsulate CNode id. Oct 7, 2021
gmaxwell and others added 3 commits October 7, 2021 23:52
Mostly a legacy of the long removed pub/sub system
-BEGIN VERIFY SCRIPT-
sed -i "s/\(node\|to\|from\)->id/\1->GetId()/" src/net.cpp src/net_processing.cpp src/tiertwo_networksync.cpp
-END VERIFY SCRIPT-
@furszy furszy changed the title [WIP][Cleanup] Remove fNetworkNode and pnodeLocalHost, and encapsulate CNode id. [Cleanup] Remove fNetworkNode and pnodeLocalHost, and encapsulate CNode id. Oct 8, 2021
@furszy furszy force-pushed the 2021_net_processing_cleanup branch from 15de825 to 37f2238 Compare October 8, 2021 02:53
@furszy furszy added the Network label Oct 16, 2021
@furszy furszy added this to the 6.0.0 milestone Oct 16, 2021
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 37f2238

@furszy furszy modified the milestones: 6.0.0, 5.4.0 Nov 18, 2021
@furszy furszy merged commit 6b4790d into PIVX-Project:master Nov 21, 2021
furszy added a commit that referenced this pull request Dec 7, 2021
e1d12d3 Add Clang thread safety analysis annotations (furszy)
5716940 net: Add missing locks in net.{cpp,h} (furszy)
8c02b59 net: simplify fRelayTxes flag processing (furszy)
71667df remove unused IsArgSet check (Marko Bencun)
729c63d add m_added_nodes to connman options (Marko Bencun)
8c8ad18 [net] Fix use of uninitialized value in getnetworkinfo(const JSONRPCRequest& request) (practicalswift)
a13b7c9 Add vConnect to CConnman::Options (Marko Bencun)
987342e ActiveMasternode: fix not initialized socket. (furszy)
8d788ba add SeedNodes to CConnman::Options (Marko Bencun)
d9e91ff add Binds, WhiteBinds to CConnman::Options (Marko Bencun)
41c89af add WhitelistedRange to CConnman::Options (Marko Bencun)

Pull request description:

  More groundwork for the LLMQ sessions connections work, built on top of #2586 and #2587 (starts in 10efb72).

  Focused on cleaning the connman init/start by decoupling the command line arguments.

  Backported PRs list:

  * bitcoin#10467.
  * bitcoin#10496.
  * bitcoin#10596.
  * bitcoin#10977.
  * bitcoin#11301.
  * bitcoin#11744 (partially, without the outbound members changes as we don't have them).

ACKs for top commit:
  random-zebra:
    utACK e1d12d3
  Fuzzbawls:
    ACK e1d12d3

Tree-SHA512: 81a1ab7a1e7f487330354631ee728be9ec78223fe4978c8b9c97b7fbc8d2bfe4f4ea9e88ac4a3d1f0553f7adad871c81261b1a7545bae710a4e3200b8a5031d7
@furszy furszy deleted the 2021_net_processing_cleanup branch November 29, 2022 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants