backport: #26078: p2p: return `CSubNet` in `LookupSubNet` #6675

PastaPastaPasta · 2025-05-19T14:41:51Z

Issue being fixed or feature implemented

backport 26078

What was done?

simple backport

How Has This Been Tested?

tests

Breaking Changes

None

Checklist:

Go over all the following points, and put an x in all the boxes that apply.

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have added or updated relevant unit/integration/functional/e2e tests
I have made corresponding changes to the documentation
I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

coderabbitai · 2025-05-19T14:44:48Z

Walkthrough

The changes refactor the LookupSubNet function by changing its signature from returning a boolean with an output parameter to returning a CSubNet object directly. Correspondingly, all calls to LookupSubNet across the codebase are updated to use direct initialization from its return value instead of a two-step process involving a default-constructed CSubNet and a boolean return. The validity checks now rely on the IsValid() method of the returned CSubNet object. Test code is also updated to remove a local helper function and adapt to the new interface. Aside from the signature change of LookupSubNet, no other public or exported entity signatures are altered, and the logic, control flow, and error handling remain unchanged.

Note

⚡️ AI Code Reviews for VS Code, Cursor, Windsurf

CodeRabbit now has a plugin for VS Code, Cursor and Windsurf. This brings AI code reviews directly in the code editor. Each commit is reviewed immediately, finding bugs before the PR is raised. Seamless context handoff to your AI code agent ensures that you can easily incorporate review feedback.
Learn more here.

Note

⚡️ Faster reviews with caching

CodeRabbit now supports caching for code and dependencies, helping speed up reviews. This means quicker feedback, reduced wait times, and a smoother review experience overall. Cached data is encrypted and stored securely. This feature will be automatically enabled for all accounts on May 16th. To opt out, configure Review - Disable Cache at either the organization or repository level. If you prefer to disable all data retention across your organization, simply turn off the Data Retention setting under your Organization Settings.
Enjoy the performance boost—your workflow just got faster.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge Base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between 28ee56c and 3652c99.

📒 Files selected for processing (9)

src/httpserver.cpp (1 hunks)
src/net_permissions.cpp (1 hunks)
src/net_types.cpp (1 hunks)
src/netbase.cpp (2 hunks)
src/netbase.h (1 hunks)
src/qt/rpcconsole.cpp (1 hunks)
src/rpc/net.cpp (1 hunks)
src/test/fuzz/netbase_dns_lookup.cpp (1 hunks)
src/test/netbase_tests.cpp (3 hunks)

✅ Files skipped from review due to trivial changes (2)

src/test/fuzz/netbase_dns_lookup.cpp
src/httpserver.cpp

🚧 Files skipped from review as they are similar to previous changes (7)

src/net_permissions.cpp
src/net_types.cpp
src/netbase.h
src/rpc/net.cpp
src/qt/rpcconsole.cpp
src/test/netbase_tests.cpp
src/netbase.cpp

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

knst · 2025-05-20T14:05:36Z

src/qt/rpcconsole.cpp

-        CSubNet possibleSubnet;
-
-        LookupSubNet(strNode.toStdString(), possibleSubnet);
+        CSubNet possibleSubnet = LookupSubNet(strNode.toStdString());


nit: better to avoid use operator = here; it will avoid constructing empty object before actual initialization

Suggested change

CSubNet possibleSubnet = LookupSubNet(strNode.toStdString());

CSubNet possibleSubnet{LookupSubNet(strNode.toStdString())};

fb3e812 p2p: return `CSubNet` in `LookupSubNet` (brunoerg) Pull request description: Analyzing the usage of `LookupSubNet`, noticed that most cases uses check if the subnet is valid by calling `subnet.IsValid()`, and the boolean returned by `LookupSubNet` hasn't been used so much, see: https://github.com/bitcoin/bitcoin/blob/29d540b7ada890dd588c4825d40c27c5e6f20061/src/httpserver.cpp#L172-L174 https://github.com/bitcoin/bitcoin/blob/29d540b7ada890dd588c4825d40c27c5e6f20061/src/net_permissions.cpp#L114-L116 It makes sense to return `CSubNet` instead of `bool`. ACKs for top commit: achow101: ACK fb3e812 vasild: ACK fb3e812 theStack: Code-review ACK fb3e812 stickies-v: Concept ACK, but Approach ~0 (for now). Reviewed the code (fb3e812) and it all looks good to me. Tree-SHA512: ba50d6bd5d58dfdbe1ce1faebd80dd8cf8c92ac53ef33519860b83399afffab482d5658cb6921b849d7a3df6d5cea911412850e08f3f4e27f7af510fbde4b254

kwvg

utACK 3652c99

knst

utACK 3652c99

UdjinM6

utACK 3652c99

PastaPastaPasta added this to the 23 milestone May 19, 2025

PastaPastaPasta requested review from UdjinM6 and knst May 20, 2025 14:03

knst reviewed May 20, 2025

View reviewed changes

PastaPastaPasta force-pushed the backport-26078 branch from 28ee56c to 3652c99 Compare May 20, 2025 15:15

PastaPastaPasta requested a review from knst May 20, 2025 15:15

kwvg approved these changes May 20, 2025

View reviewed changes

knst approved these changes May 20, 2025

View reviewed changes

UdjinM6 approved these changes May 20, 2025

View reviewed changes

PastaPastaPasta merged commit cb86459 into dashpay:develop May 21, 2025
36 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

backport: #26078: p2p: return `CSubNet` in `LookupSubNet` #6675

backport: #26078: p2p: return `CSubNet` in `LookupSubNet` #6675

Uh oh!

PastaPastaPasta commented May 19, 2025

Uh oh!

coderabbitai bot commented May 19, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

knst May 20, 2025

Uh oh!

kwvg left a comment

Uh oh!

knst left a comment

Uh oh!

UdjinM6 left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	CSubNet possibleSubnet = LookupSubNet(strNode.toStdString());
	CSubNet possibleSubnet{LookupSubNet(strNode.toStdString())};

backport: #26078: p2p: return CSubNet in LookupSubNet #6675

backport: #26078: p2p: return CSubNet in LookupSubNet #6675

Uh oh!

Conversation

PastaPastaPasta commented May 19, 2025

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

Breaking Changes

Checklist:

Uh oh!

coderabbitai bot commented May 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

knst May 20, 2025

Choose a reason for hiding this comment

Uh oh!

kwvg left a comment

Choose a reason for hiding this comment

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

backport: #26078: p2p: return `CSubNet` in `LookupSubNet` #6675

backport: #26078: p2p: return `CSubNet` in `LookupSubNet` #6675

coderabbitai bot commented May 19, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)