nLocalServices variable was changed to std::atomic<ServiceFlags> in #30807 and I suggested the variable name to get updated with a scripted diff along with it. It wasn’t included in the PR but I am still suggesting to do it as a follow-up since I had already prepared the commit.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For detailed information about the code coverage, see the test coverage report.
See the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
-BEGIN VERIFY SCRIPT-
sed -i 's/nLocalServices/m_local_services/g' src/net.h src/net.cpp
sed -i 's/connOptions.nLocalServices/connOptions.m_local_services/g' src/init.cpp
sed -i 's/nLocalServices/g_local_services/g' src/init.cpp
-END VERIFY SCRIPT-
839@@ -840,7 +840,7 @@ namespace { // Variables internal to initialization process only
840
841 int nMaxConnections;
842 int available_fds;
843-ServiceFlags nLocalServices = ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
844+ServiceFlags local_services = ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
g_, no? See also g_enabled_filter_types two lines below.
2944@@ -2945,7 +2945,7 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
2945 return;
2946 pnode->grantOutbound = std::move(grant_outbound);
2947
2948- m_msgproc->InitializeNode(*pnode, nLocalServices);
2949+ m_msgproc->InitializeNode(*pnode, m_local_services);
GetLocalServices() here.
ACK 33381ea530ad79ac1e04c37f5707e93d3e0509ca
Following the last push, suggest renaming the pull title to scripted-diff: Modernize nLocalServices naming (edit: and also the commit name)
Following the last push, suggest renaming the pull title to
scripted-diff: Modernize nLocalServices naming(edit: and also the commit name)
done
For the record, I don’t like refactor PRs that just rename things to a new convention. It’s fine for me if the code is touched anyway, but opening a PR just for that? We probably have hundreds of variables that could be modernized the same way.
Sure, I agree and I had not opened it if I had not already written the commit and had not been encouraged to open it as a follow-up even though the PR where the code was touched was merged without it, see #30807 (comment).
