Skip to content

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Mar 29, 2017

Includes:

I'm happy squashing the indentation commit, leaving it separated or leaving it out of the PR.

@jtimon
Copy link
Contributor Author

jtimon commented Apr 4, 2017

Needed rebase.

@jtimon jtimon force-pushed the 0.14-args-class2 branch 2 times, most recently from a3ddf70 to 1bcd337 Compare April 6, 2017 20:38
@jtimon jtimon force-pushed the 0.14-args-class2 branch from 1bcd337 to 6fe4c68 Compare May 19, 2017 03:25
@jtimon
Copy link
Contributor Author

jtimon commented May 19, 2017

Needed rebase after #9494 was merged. The indentation is improved for the first commit but the second commit making the indentation complete was not rebased and was removed instead. If it is wanted I am happy to re-write it.
Also, before this wasn't passing the python tests because it needed the change in ArgsManager::GetArgs().

Copy link
Contributor

@TheBlueMatt TheBlueMatt left a comment

Choose a reason for hiding this comment

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

Note you can also remove the IsArgSet("-addnode") at the top of ThreadOpenAddedConnections.

Also, would highly prefer you not leave indentation broken everywhere - its easy enough to review with whitespace diff ignored.

src/httprpc.cpp Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

We generally prefer to remove BOOST while changing lines, no (also, I believe could constify the strRPCAuth, while you're at it)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I was leaving it for #10193, but happy to do it here in the touched lines.
Specially since I'm not able to fix my problem with the reverse loop there :(

@jtimon
Copy link
Contributor Author

jtimon commented May 29, 2017

Fixed nits, squash pending.

@jtimon jtimon force-pushed the 0.14-args-class2 branch 2 times, most recently from 1ab4c69 to 78a997e Compare June 1, 2017 18:48
@jtimon
Copy link
Contributor Author

jtimon commented Jun 1, 2017

Needed rebase, squashed fixes to @TheBlueMatt 's nits.

@jtimon jtimon force-pushed the 0.14-args-class2 branch from 78a997e to b527f8d Compare June 14, 2017 03:56
@jtimon
Copy link
Contributor Author

jtimon commented Jun 14, 2017

Needed rebase after #10502 was merged.
Now it's slightly easier to review in the sense that #10118 (comment) which was fixed as nit in the PR is now irrelevant.

Extra motivation for review: "C'mon, +16 -37, must be good".

Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

utACK b527f8d3b10ee2232a921faf934e690af0e14640

src/util.cpp Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Could return {};

@jtimon jtimon force-pushed the 0.14-args-class2 branch from b527f8d to a0c0078 Compare June 17, 2017 18:24
@jtimon
Copy link
Contributor Author

jtimon commented Jun 17, 2017

Fixed @ryanofsky 's nit.

Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

utACK a0c00786d488a1022867e7461ff071dd78d2361e. Same as previous, just has the suggested change.

@maflcko
Copy link
Member

maflcko commented Jun 22, 2017

utACK a0c00786d488a1022867e7461ff071dd78d2361e

@laanwj
Copy link
Member

laanwj commented Jun 25, 2017

Concept ACK

@jtimon
Copy link
Contributor Author

jtimon commented Jun 25, 2017

If it helps I can do the proper indentation in a commit afterwards, I had it previously but I ditched on rebase out of laziness at some point. Trivial to put it back.

@laanwj
Copy link
Member

laanwj commented Jun 26, 2017

I'd prefer fixing up the identation in this same PR, a commit afterwards is fine, but I'd prefer we avoid a "fix up the identation after #10118" PR.
utACK otherwise.

Return empty std::vector<std::string> with ArgsManager::GetArgs if
nothing is set for that string
@jtimon jtimon force-pushed the 0.14-args-class2 branch from a0c0078 to 16470bf Compare June 27, 2017 01:11
@jtimon
Copy link
Contributor Author

jtimon commented Jun 27, 2017

Needed rebase, added commit for indentation.

@jtimon jtimon force-pushed the 0.14-args-class2 branch from 16470bf to ed866ab Compare June 27, 2017 05:40
@laanwj laanwj merged commit ed866ab into bitcoin:master Jun 27, 2017
laanwj added a commit that referenced this pull request Jun 27, 2017
ed866ab Indentation after 'Remove redundant calls to gArgs.IsArgSet()' (Jorge Timón)
506b700 Util: Remove redundant calls to gArgs.IsArgSet() (Jorge Timón)

Tree-SHA512: 4f97a0bf2a76c0f351a6343db62898cf057d745c848de00fa09465e870a120f28e0d836cafd6a047f4ec0da7ab671aebee43fa7410c9f0e66382edd1bb2009ba
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 11, 2019
…Set()

ed866ab Indentation after 'Remove redundant calls to gArgs.IsArgSet()' (Jorge Timón)
506b700 Util: Remove redundant calls to gArgs.IsArgSet() (Jorge Timón)

Tree-SHA512: 4f97a0bf2a76c0f351a6343db62898cf057d745c848de00fa09465e870a120f28e0d836cafd6a047f4ec0da7ab671aebee43fa7410c9f0e66382edd1bb2009ba
furszy added a commit to PIVX-Project/PIVX that referenced this pull request Oct 28, 2020
4709ff8 remove now unused gArgs wrappers (Fuzzbawls)
cc40f8d Manual prep for gArg wrapper removal (Fuzzbawls)
b3c843c scripted-diff: stop using the gArgs wrappers (Fuzzbawls)
5ce3844 Migrate g_logger fields to gArgs (Fuzzbawls)
72a6f56 Track negated arguments in the argument paser. (Fuzzbawls)
3142e1b Add additional tests for GetBoolArg() (Fuzzbawls)
4aef2f3 Fix constness of ArgsManager methods (Fuzzbawls)
13fd27d Fix indentation after 'Remove redundant calls to gArgs.IsArgSet()' (Fuzzbawls)
a4114f3 Util: Remove redundant calls to gArgs.IsArgSet() (Fuzzbawls)
92e7227 Util: Small improvements in gArgs usage (Fuzzbawls)
a8b26e7 Util: Put mapMultiArgs inside ArgsManager (Fuzzbawls)
d2f2e25 scripted-diff: Util: Encapsulate mapMultiArgs behind gArgs (Fuzzbawls)
b2abc59 Util: Create ArgsManager class... (Fuzzbawls)
8c4d9c5 Add a ForceSetArg method for testing (Fuzzbawls)
59d6529 Lock mapArgs/mapMultiArgs access in util (Fuzzbawls)
f7f2689 Un-expose mapArgs from util.h (Fuzzbawls)
7894b07 Get rid of mapArgs direct access in ZMQ construction (Matt Corallo)
b28789f Introduce (and use) an IsArgSet accessor method (Fuzzbawls)
4d8ecf9 Fix non-const mapMultiArgs[] access after init. (Fuzzbawls)
391388d Remove arguments to ReadConfigFile (Fuzzbawls)

Pull request description:

  This is a cumulation of several upstream backports surrounding the argument parsing code.

  Included here are the following upstream PRs:
  - bitcoin#9243
  - bitcoin#9494
  - bitcoin#10118
  - bitcoin#10901
  - bitcoin#12713
  - bitcoin#10607

  I've also refactored the global logging argument parsing to match, as that was an "out-of-order" PR that was previously backported to match our previous state.

ACKs for top commit:
  random-zebra:
    utACK 4709ff8
  furszy:
    cool encapsulation, utACK 4709ff8 and merging

Tree-SHA512: 74c8dc1b2280b726eff44855e9908f3563d4ef6493f296ebfafe240ac6470bc45cbc75baac614ed59dfda9e1377b7da7d47a695dfc05e364cada2468bb99a258
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants