Move ParseConfirmTarget from rpc/mining to rpc/util #15373

pull ryanofsky wants to merge 1 commits into bitcoin:master from ryanofsky:pr/movtarget changing 4 files +15 −13

ryanofsky commented at 10:31 PM on February 8, 2019: member

Util is a better home since it's called both by wallet and mining code.

Suggested #15288 (review)

Move ParseConfirmTarget from rpc/mining to rpc/util

Util is a better home since it's called both by wallet and mining code.

Suggested https://github.com/bitcoin/bitcoin/pull/15288#discussion_r254449444

50e647210d

fanquake added the label Refactoring on Feb 8, 2019
fanquake added the label Utils/log/libs on Feb 8, 2019
DrahtBot commented at 12:26 AM on February 9, 2019: 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:
- #14978 (Factor out PSBT utilities from RPCs for use in GUI code; related refactoring. by gwillen)
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.
promag commented at 11:29 AM on February 9, 2019: member

utACK c706207.

in src/rpc/util.cpp:11 in c7062070c1 outdated

   3 | @@ -4,9 +4,11 @@
   4 |  
   5 |  #include <key_io.h>
   6 |  #include <keystore.h>
   7 | +#include <policy/fees.h>
   8 |  #include <rpc/protocol.h>
   9 |  #include <rpc/util.h>
  10 |  #include <tinyformat.h>
  11 | +#include <validation.h>

practicalswift commented at 1:26 PM on February 9, 2019:

Nit: Sort includes :-)

ryanofsky commented at 9:25 PM on February 9, 2019:

Thanks, fixed now

ryanofsky force-pushed on Feb 9, 2019
ryanofsky commented at 9:27 PM on February 9, 2019: member

Updated c7062070c15e5fec47b740164a8a5b9d8508883b -> 50e647210d513dab8f40ded61fe439ecaa9a67c3 (pr/movtarget.1 -> pr/movtarget.2, compare) to fix #include sort order
laanwj commented at 3:59 PM on February 10, 2019: member

Agree—utACK 50e647210d513dab8f40ded61fe439ecaa9a67c3
MarcoFalke merged this on Feb 11, 2019
MarcoFalke closed this on Feb 11, 2019
MarcoFalke referenced this in commit ad039aa0d3 on Feb 11, 2019
jnewbery commented at 4:10 PM on February 12, 2019: member

utACK 50e647210d513dab8f40ded61fe439ecaa9a67c3. Thanks Russ.

The #include <rpc/mining.h> can be removed from rpcwallet.cpp once generate() has been removed post v0.18 (was deprecated in #14468)
Munkybooty referenced this in commit 7ca39f6330 on Aug 27, 2021
Munkybooty referenced this in commit d474e479fa on Aug 28, 2021
Munkybooty referenced this in commit 808ffe58b5 on Aug 29, 2021
Munkybooty referenced this in commit 84262d02de on Sep 1, 2021
Munkybooty referenced this in commit 69316c7f77 on Sep 5, 2021
Munkybooty referenced this in commit 5cb84a2df1 on Sep 7, 2021
Munkybooty referenced this in commit 9a5b485c52 on Sep 7, 2021
Munkybooty referenced this in commit a0f7dade43 on Sep 9, 2021
Munkybooty referenced this in commit fe26048800 on Sep 10, 2021
Munkybooty referenced this in commit 7e05caae39 on Sep 13, 2021
DrahtBot locked this on Dec 16, 2021

Contributors

Labels

Refactoring Utils/log/libs

Linked (view graph)

#15288 Remove wallet -> node global function calls #28722 Multiprocess tracking issue

Move ParseConfirmTarget from rpc/mining to rpc/util #15373

Conflicts