Backport missing PRs from Bitcoin 0.14 - Part 2 #1842

codablock · 2018-01-09T16:47:14Z

Continuation of #1770

653bb3d Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)

4207630 trivial: remove unused variable (Daniel Kraft)

…allet. 8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman) e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)

7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)

…PC unit tests 9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman) 25400c4 Account wallet feature RPC tests. (Patrick Strateman)

c911035 Add default port numbers to REST doc (djpnewton)

fa1cf9e [test] Remove unused code (MarcoFalke)

… smart quotes) be1d451 contributing.md: Fix formatting (Will Binns)

2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)

f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)

…request received with a hashStop of Null 259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)

4c3e2cb Show XTHIN in GUI (R E Broadley)

fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)

fa6dc9f Remove unused variables (MarcoFalke)

…ase-process.md c25083b [trivial][doc] Mention gpg --refresh-keys in release-process.md (fanquake)

…in dev notes ab53207 [trivial][doc] Mention ++i as preferred to i++ in dev notes (fanquake)

ff8d279 Do not shadow member variables (Pavel Janík)

fa3d974 [doc] Update git-subtree-check.sh README (MarcoFalke)

fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke) fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke) fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke) 67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)

…ursor beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)

…inux using 7zip and SleuthKit b729fcd Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit (Luke Dashjr)

fae6bb8 [doc] build: Mention curl (MarcoFalke)

…rpc-tests.py 1467561 [doc] - clarify statement about parallel jobs in rpc-tests.py (isle2983)

3fe0b68 Set defaults to gitian defaults (Andrew Chow) 6ffd6b4 Create option to detach sign gitian builds and not commit the files in the script (Andrew Chow) 498d8da Check for OSX SDK (Andrew Chow) eda4cfb Create an easy to use gitian building script (Andrew Chow)

203f212 Reduce default number of blocks to check at startup (Pieter Wuille)

323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)

fa994a7 contrib: Don't use shell=True (MarcoFalke)

6275123 doc: Update build-openbsd for 0.13.0+ and OpenBSD 5.9 (Wladimir J. van der Laan) 883175f build: Updates for OpenBSD (Wladimir J. van der Laan)

3e7d2a2 [depends] Remove Qt46 package (Michael Ford)

Closes bitcoin#7595 as by removing the hardcoded version number from `verify.sh`.

faaed88 [contrib] verifybinaries: Mention mandatory preparation step (MarcoFalke) fa917f6 [contrib] verifybinaries: Keep downloads by default (MarcoFalke) fab1f92 [contrib] verifybinaries: Adjust parsing to new rc path (MarcoFalke)

…TP_BAD_REQUEST f012a85 rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST (djpnewton)

854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)

cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)

b7c349d Do not shadow variables in networking code (Pavel Janík)

ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)

38acbf8 Remove unused Qt 4.6 patch. (Doug)

144ed76 Fix some locks (Pieter Wuille)

… test 426e7bc Fix obvious assignment/equality error in test (Jeremy Rubin)

df2d2e7 update name of file bitcoin.qrc (Gaurav Rana)

d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)

878faac Add configure check for -latomic (Anthony Towns)

…t -Wshadow compiler warning. 125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)

…d vector ec81881 Performance Regression Fix: Pre-Allocate txChanged vector (Jeremy Rubin)

…eHash 2f2548d Fix SIGHASH_SINGLE bug in test_framework SignatureHash (Johnson Lau)

…autogenerated manpages d19583f improved gen-manpages.sh, includes bitcoin-tx and strips commit tag, now also runs binaries from build dir by default, added variables for more control (nomnombtc) 09546ca regenerated all manpages with commit tag stripped, also add bitcoin-tx (nomnombtc) ae6e754 change help string --enable-man to --disable-man (nomnombtc) a32c102 add conditional for --enable-man, default is yes (nomnombtc) dc84b6f add doc/man to subdir if configure flag --enable-man is set (nomnombtc) 00dba72 add doc/man/Makefile.am to include manpages (nomnombtc) eb5643b add autogenerated manpages by help2man (nomnombtc) 6edf2fd add gen-manpages.sh description to README.md (nomnombtc) d2cd9c0 add script to generate manpages with help2man (nomnombtc)

…MP before genesis 37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)

gladcow · 2018-01-10T13:36:42Z

src/httprpc.cpp

 {
 public:
-    HTTPRPCTimerInterface(struct event_base* base) : base(base)
+    HTTPRPCTimerInterface(struct event_base* _base) : base(_base)


It is not good style to use leading underscore, such names are reserved (https://stackoverflow.com/questions/228783/what-are-the-rules-about-using-an-underscore-in-a-c-identifier#228797, for example). We can use underscore at the end of the identifier instead (base_) or leave it as it is now, may be it is not really important for argument names.

I actually believe that both (prefix and postfix underscores) are bad style ;) But that's unfortunately how it's done in Bitcoin. I'd prefer to stick 1:1 with what comes from the backports to avoid future merge conflicts. When we are at the point where we stop following Bitcoin (maybe after 0.15?), I'm fine with any type of refactorings that diverge from Bitcoin.

UdjinM6

Looks good 👍
contrib/verifybinaries/* files should probably be dashified too but they never were dashified before so can be done in a separate PR later.

Slightly tested ACK

laanwj and others added 30 commits January 9, 2018 12:24

Merge bitcoin#8558: Add copyright header to wallet_text_fixture.cpp

39909d3

653bb3d Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)

Merge bitcoin#8554: trivial: remove unused variable

61a3d9a

4207630 trivial: remove unused variable (Daniel Kraft)

doc: Add historical release notes for 0.12.1 0.13.0

bb93f82

Merge bitcoin#8445: Move CWallet::setKeyPool to private section of CW…

d97fa04

…allet. 8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman) e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)

Merge bitcoin#8560: Trivial: Fix two VarInt examples in serialize.h

c9ebd95

7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)

Merge bitcoin#8450: [Test] Replace rpc_wallet_tests.cpp with python R…

e61556e

…PC unit tests 9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman) 25400c4 Account wallet feature RPC tests. (Patrick Strateman)

Merge bitcoin#8567: Add default port numbers to REST doc

7269e4a

c911035 Add default port numbers to REST doc (djpnewton)

Merge bitcoin#8578: [test] Remove unused code

249e720

fa1cf9e [test] Remove unused code (MarcoFalke)

Merge bitcoin#8226: contributing.md: Fix formatting (line lengths and…

909945d

… smart quotes) be1d451 contributing.md: Fix formatting (Will Binns)

Merge bitcoin#7579: [Qt] show network/chain errors in the GUI

3fca7e2

2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)

Merge bitcoin#8462: Move AdvertiseLocal debug output to net category

3a497a6

f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)

Merge bitcoin#8561: Show "end" instead of many zeros when getheaders …

df07a31

…request received with a hashStop of Null 259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)

Merge bitcoin#8583: Show XTHIN in GUI

b00f025

4c3e2cb Show XTHIN in GUI (R E Broadley)

Merge bitcoin#8581: [wallet] rpc: Drop misleading option

15b9e43

fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)

Merge bitcoin#8590: Remove unused variables

95c6163

fa6dc9f Remove unused variables (MarcoFalke)

Merge bitcoin#8603: [trivial][doc] Mention gpg --refresh-keys in rele…

59f4df1

…ase-process.md c25083b [trivial][doc] Mention gpg --refresh-keys in release-process.md (fanquake)

Merge bitcoin#8602: [trivial][doc] Mention ++i as preferred over i++ …

87c81ba

…in dev notes ab53207 [trivial][doc] Mention ++i as preferred to i++ in dev notes (fanquake)

Merge bitcoin#8109: Do not shadow member variables

30066a6

ff8d279 Do not shadow member variables (Pavel Janík)

Merge bitcoin#8545: [doc] Update git-subtree-check.sh README

f81e4f5

fa3d974 [doc] Update git-subtree-check.sh README (MarcoFalke)

Merge bitcoin#8564: [Wallet] remove unused code/conditions in ReadAtC…

707e294

…ursor beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)

Merge bitcoin#8617: Include instructions to extract Mac OS X SDK on L…

e7da915

…inux using 7zip and SleuthKit b729fcd Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit (Luke Dashjr)

Merge bitcoin#8624: [doc] build: Mention curl

2da811b

fae6bb8 [doc] build: Mention curl (MarcoFalke)

Merge bitcoin#8625: [doc] - clarify statement about parallel jobs in …

e8e9599

…rpc-tests.py 1467561 [doc] - clarify statement about parallel jobs in rpc-tests.py (isle2983)

Dashify gitian-build.sh

40202ef

Merge bitcoin#8611: Reduce default number of blocks to check at startup

f6658c0

203f212 Reduce default number of blocks to check at startup (Pieter Wuille)

Merge bitcoin#8626: Berkeley DB v6 compatibility fix

3b45cae

323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)

Merge bitcoin#8621: [contrib] python: Don't use shell=True

d16b2e5

fa994a7 contrib: Don't use shell=True (MarcoFalke)

Merge bitcoin#8604: build,doc: Update for 0.13.0+ and OpenBSD 5.9

75f65e9

6275123 doc: Update build-openbsd for 0.13.0+ and OpenBSD 5.9 (Wladimir J. van der Laan) 883175f build: Updates for OpenBSD (Wladimir J. van der Laan)

laanwj and others added 23 commits January 9, 2018 14:16

Merge bitcoin#8640: [depends] Remove Qt46 package

a2d18b4

3e7d2a2 [depends] Remove Qt46 package (Michael Ford)

contrib: remove hardcoded version from verify.sh

aed0b04

Closes bitcoin#7595 as by removing the hardcoded version number from `verify.sh`.

[contrib] Remove reference to sf and add doc to verify.sh

ae0aca9

Merge bitcoin#8638: rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HT…

bc91f34

…TP_BAD_REQUEST f012a85 rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST (djpnewton)

Merge bitcoin#8272: Make the dummy argument to getaddednodeinfo optional

4d0be42

854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)

Merge bitcoin#8629: C++11: s/boost::scoped_ptr/std::unique_ptr/

414272a

cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)

Merge bitcoin#8466: [Trivial] Do not shadow variables in networking code

313cfb0

b7c349d Do not shadow variables in networking code (Pavel Janík)

Merge bitcoin#8663: trivial: remove unnecessary variable fDaemon

75f920e

ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)

Merge bitcoin#8645: Remove unused Qt 4.6 patch.

2189570

38acbf8 Remove unused Qt 4.6 patch. (Doug)

Merge bitcoin#8606: Fix some locks

f7e9bc6

144ed76 Fix some locks (Pieter Wuille)

Merge bitcoin#8673: Trivial: Fix obvious assignment/equality error in…

3d26438

… test 426e7bc Fix obvious assignment/equality error in test (Jeremy Rubin)

Merge bitcoin#8683: fix incorrect file name bitcoin.qrc

6924212

df2d2e7 update name of file bitcoin.qrc (Gaurav Rana)

Merge bitcoin#8680: Address Travis spurious failures

c2a601f

d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)

Merge bitcoin#8563: Add configure check for -latomic

b90d761

878faac Add configure check for -latomic (Anthony Towns)

Merge bitcoin#8677: Do not shadow upper local variable 'send', preven…

0324fa0

…t -Wshadow compiler warning. 125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)

Merge bitcoin#8681: Performance Regression Fix: Pre-Allocate txChange…

3baee7b

…d vector ec81881 Performance Regression Fix: Pre-Allocate txChanged vector (Jeremy Rubin)

Merge bitcoin#8667: Fix SIGHASH_SINGLE bug in test_framework Signatur…

85c0aab

…eHash 2f2548d Fix SIGHASH_SINGLE bug in test_framework SignatureHash (Johnson Lau)

Dashify gen-manpages.sh

f9694ba

Remove bitcoin man pages and call gen-manpages.sh for Dash

610470c

Merge bitcoin#8928: Fix init segfault where InitLoadWallet() calls AT…

fdd0638

…MP before genesis 37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)

Fix wallet-accounts.py tests

8efec7b

gladcow reviewed Jan 10, 2018

View reviewed changes

UdjinM6 added this to the 12.3 milestone Jan 10, 2018

zgreat mentioned this pull request Jan 10, 2018

[Wallet] Fix build warnings for wallet.cpp #1845

Closed

UdjinM6 approved these changes Jan 10, 2018

View reviewed changes

UdjinM6 merged commit 94e891c into dashpay:develop Jan 11, 2018

thephez mentioned this pull request Feb 21, 2018

[RPC] Update getaddednodeinfo help example to remove dummy argument #1947

Merged

codablock deleted the pr_backport_bitcoin_0.14-2 branch September 14, 2018 12:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Backport missing PRs from Bitcoin 0.14 - Part 2 #1842

Backport missing PRs from Bitcoin 0.14 - Part 2 #1842

Uh oh!

codablock commented Jan 9, 2018

Uh oh!

gladcow Jan 10, 2018

Uh oh!

codablock Jan 10, 2018 •

edited

Loading

Uh oh!

UdjinM6 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Backport missing PRs from Bitcoin 0.14 - Part 2 #1842

Backport missing PRs from Bitcoin 0.14 - Part 2 #1842

Uh oh!

Conversation

codablock commented Jan 9, 2018

Uh oh!

gladcow Jan 10, 2018

Choose a reason for hiding this comment

Uh oh!

codablock Jan 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codablock Jan 10, 2018 •

edited

Loading