Trivial: Rename misleading 'defaultPort' to 'http_port' #14628

pull murrayn wants to merge 1 commits into bitcoin:master from murrayn:rpc_port changing 1 files +6 −6

murrayn commented at 9:29 AM on November 1, 2018: contributor

defaultPort in HTTPBindAddresses() is misleadingly named. defaultPort suggests a constant, not something that might be overridden by -rpcport.
fanquake added the label Refactoring on Nov 1, 2018
fanquake added the label RPC/REST/ZMQ on Nov 1, 2018
DrahtBot commented at 9:56 AM on November 1, 2018: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #14532 (Never bind INADDR_ANY by default, and warn when doing so explicitly by luke-jr)
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.
practicalswift commented at 10:40 AM on November 1, 2018: contributor

Concept ACK
kristapsk commented at 10:43 AM on November 1, 2018: contributor

utACK 37062827e75a0ccf145f1f788819d10327760be9
Empact commented at 2:22 PM on November 2, 2018: member

This would make a good scripted-diff.
murrayn force-pushed on Nov 5, 2018

scripted-diff: Rename misleading 'defaultPort' to 'http_port'

-BEGIN VERIFY SCRIPT-
sed -i -e 's/\<defaultPort\>/http_port/g' src/httpserver.cpp
-END VERIFY SCRIPT-

4ed730802f

in src/httpserver.cpp:295 in fcc344f076 outdated

 291 | @@ -292,26 +292,26 @@ static bool ThreadHTTP(struct event_base* base)
 292 |  /** Bind HTTP server to specified addresses */
 293 |  static bool HTTPBindAddresses(struct evhttp* http)
 294 |  {
 295 | -    int defaultPort = gArgs.GetArg("-rpcport", BaseParams().RPCPort());
 296 | +    int rpc_port = gArgs.GetArg("-rpcport", BaseParams().RPCPort());

laanwj commented at 10:23 AM on November 5, 2018:

http_port please (yes, I know the setting is called rpcport, however, this the http server and in principle it's decoupled from higher layers like RPC and REST)

murrayn force-pushed on Nov 5, 2018
fanquake commented at 12:16 PM on November 5, 2018: member

utACK 4ed7308
laanwj merged this on Nov 5, 2018
laanwj closed this on Nov 5, 2018
laanwj commented at 12:20 PM on November 5, 2018: member

utACK 4ed730802f9ec3d65477a29a318dd78216ef7085
laanwj referenced this in commit 15a219ff8e on Nov 5, 2018
fanquake renamed this:
~~Trivial: Rename misleading 'defaultPort' to 'rpc_port'~~
Trivial: Rename misleading 'defaultPort' to 'http_port'
on Nov 5, 2018
codablock referenced this in commit 0f32868f8b on Oct 14, 2019
deadalnix referenced this in commit 5eabe26068 on Apr 16, 2020
ftrader referenced this in commit 3a81a244a1 on Aug 17, 2020
Munkybooty referenced this in commit 9e6d3d0f8a on Jul 22, 2021
Munkybooty referenced this in commit c42c9d8723 on Jul 23, 2021
Munkybooty referenced this in commit d31a4ba792 on Jul 23, 2021
Munkybooty referenced this in commit b2de412e24 on Jul 23, 2021
Munkybooty referenced this in commit ae04509662 on Jul 23, 2021
Munkybooty referenced this in commit 0e87feed78 on Jul 26, 2021
Munkybooty referenced this in commit edca8bdf33 on Jul 27, 2021
Munkybooty referenced this in commit e74e8a74f4 on Jul 28, 2021
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Refactoring RPC/REST/ZMQ

Trivial: Rename misleading 'defaultPort' to 'http_port' #14628

Conflicts