Backports 0.15 pr9 #2771

PastaPastaPasta · 2019-03-14T13:15:56Z

will be rebased after pr8 is merged

review 070b209 and on

UdjinM6 · 2019-05-17T09:23:28Z

needs rebase

codablock · 2019-05-17T10:22:21Z

I'd suggest to first rebase #2912 so that we can merge it first, and only then rebase this PR.

PastaPastaPasta · 2019-05-20T01:42:09Z

rebased 👍

UdjinM6 · 2019-05-20T07:13:15Z

build fails https://travis-ci.org/dashpay/dash/jobs/534614270#L2085

src/qt/test/wallettests.cpp

test/functional/assumevalid.py

src/init.cpp

test/functional/sendheaders.py

test/functional/dip4-coinbasemerkleroots.py

test/functional/llmq-is-cl-conflicts.py

src/init.cpp

PastaPastaPasta · 2019-05-20T17:53:01Z

dropped 10086, fixed 6c3d15b and force pushed

UdjinM6

👍

LGTM, let's wait for Travis

PastaPastaPasta · 2019-05-20T18:07:02Z

Travis looks good :)

PastaPastaPasta · 2019-05-20T18:10:12Z

@codablock Please review

UdjinM6 · 2019-05-20T18:10:16Z

The following scripts are not being run:['txindex.py', 'pruning.py']
Check the test lists in test_runner.py
The command "test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh --jobs=3" exited with 1.

🤔

PastaPastaPasta · 2019-05-21T02:39:40Z

🤷‍♂️

UdjinM6 · 2019-05-21T13:34:47Z

Pls see https://github.com/UdjinM6/dash/commits/pr2771

~~Works for me (locally), Travis is here https://travis-ci.org/UdjinM6/dash/builds/535277921 (in progress)~~

EDIT: Hold on, I think I broke other tests...

b5bec4e Avoid QTimer::singleShot compile error with Qt 5.3.2 (Russell Yanofsky) d5046e7 Avoid scoped_connection compile error with boost 1.55.0 (Russell Yanofsky) Tree-SHA512: 96362b872817681b062e05c8fcb76cfc23b6e87e0371584a6aae0e17535fd34ccdba922380aa4b669a8e75ef3f9fadd25061541f77cb3198173f04249a7bcd62

dbf30ff [trivial] Fix typos in comments (practicalswift) Tree-SHA512: a841c96ba1a80ab57206e8ef4fa9b40ecff2244075a5539fc09f57e763bf2e92b0ed089e32a0dbac3902518dcda43d224f75a3462a560148841746560640ba70

…iple bitcoinds during functional tests. 8317a45 Python functional tests should log in UTC (John Newbery) 61d75f5 Introduce combine_logs.py to combine log files from multiple bitcoinds. (John Newbery) Tree-SHA512: 472a00907c938cd558353086eda0fbd8746a889680d5db4900eb95496f5f6a12eeb46560a5efd4bbfee10c85307fcf50d021356c5aad64168eb5cc2ababb073a

…and .cpp files 97b8213 Fix parameter naming inconsistencies between .h and .cpp files (practicalswift) Tree-SHA512: 4f46cc3973a898d2478bdb1b8c8d1829c3a7298b63bc47359c5dc2f135466773072d9672134ef3e7557dfc913720e49b675176b9e435b8bd1992af9ad53866e4

… called c4a6929 Clarify assumptions made about when BlockCheck is called (Matt Corallo) Tree-SHA512: 2eceb0c4f06c7fd6b290b93843bda11a4b63131559c5e8226bfec84596ed4e54ee6d8f5bc9cf789a80675be8b8079cf9234c96032df306258cb2260b9d8c7825

…d in debug console 6d8fe35 'help' rpc commands autocomplete (Andrew Chow) Tree-SHA512: 289bc4fa16a1c0291262998caa18556f1c5aa89662c85528606dc03b596b8833a0fb2c5c9c068b6dcf2adb3a136d4f154591d4a95b8c3313638b77355aaed955

3897459 [tests] Remove unused variables (practicalswift) 72163d4 [tests] Remove unused and duplicate imports (practicalswift) Tree-SHA512: 926af14b844bfca3bdd08b3cfdcb0edd3652efb4612d5571fee9abb917a6ce4e7d11d3601ff9c3d017e943ebe1e9ebdfccaf0af3db84d201b61941e9c1c9146a

0c1ade6 Skip rpcbind_test if OS/network requirements are not met. (John Newbery) 232b666 Allow test cases to be skipped (John Newbery) Tree-SHA512: d90c956ba6e27e53f422cba6267bdcc60faef9370a7e66b7f6480137f84d9a813442ac477b20fbbc540be2b4636928be910c46e221570ab3b9a5b9f0f11f7fc8

c59aedc [trivial] Dead code removal (Thomas Snider) Tree-SHA512: 09962c1ae36fb2f19b7e4a03abf3de6632bab984ce30040ca3f843431df33a0f8fa6a2c1d55b076b800547bb656e344d74ea085ff081b613bcdfd7d2f9826374

…ctory b1f584d fix build if spaces in src dir path (Matthew Zipkin) Tree-SHA512: 5834690c1f63b85ed04bb8ed411a94da04738534364d58bd9ee333ccff7129b2bbb710f31598c40123199e023da02c1745514294af3efdbb2c2e4c1320aded35

803e6a3 [QA] Fix typo in fundrawtransaction test (Nicolas Dorier) Tree-SHA512: 7b88cf09d7e756f0f5535738993868287d4c7049db44072e318f48a9b08786bebb9877f787471bbf6aac58b3d709275eefa372d727f4afd6ded41494fe0024d1

dd5be2c [QA] Renaming rawTx into rawtx (NicolasDorier) Tree-SHA512: c999c3cbe7bbd00bf5cc9813741c485caea9925de1214c8a7ef717a7c109c1a8baf73b460db3b08f4ec138d773b46176531c48295504ed75180d4b3666b85b99

d5690f1 remove 'noconnect' option from documentation (Jameson Lopp) Tree-SHA512: 9c61df5ee7b2b9a8188cbf44fced05c41ded3454758dbc1b1ae641cea0301a65169381f20c045027e571ebe211a42e680a66daed47090f91766403cc60147e89

717ad13 Actually run assumevalid.py. (John Newbery) Tree-SHA512: 6fd55789be43e26347f8f5456194aa5e7beeeba3db85411dc75581b98059ca3a85485494fca36848f21c0f48096004906a0409fd76309951b5f977bab9f45b91

5ba61f0 [zmq] Call va_end() on va_start()ed args. (Karl-Johan Alm) Tree-SHA512: fbd3a0c29308ca9607f362f14fa7ea9c949a3f25dc09a349fe3b3ffd316b573c86778e29d3b9d55c684571eacae50aca90bb872e2e5489818d0af8310511fe79

81a3857 Deduplicated sigaction() boilerplate (Thomas Snider) Tree-SHA512: 705b73f285a3d76504ba01476e072fdce67731b65f309bb04e4bbd765556c37e127cb769b475de2d68b33f50d7737fb136aefa0fa7c725a11ad16a47b9d0365f

…re being run 29d6634 Check that all test scripts in test/functional are being run (John Newbery) Tree-SHA512: 9231d3a119632be031c51c4f7e95a8adae58489a8ec36fc967d499c0708bae2941a3bf28f11dcd4efd59141eb54c3c920f2629f5cd8a0139d30397a19591666d

fa4535d [qa] combine_logs: Use ordered list for logfiles (MarcoFalke) Tree-SHA512: 66da6f2659018d24b1cac1f6d2ee8603c2c6f15ce5aff456e8e4b208874e97c7046b97112046d5b45bfd777b405771a3ad0a55036c4f4cdeec06842563af2c4d

…rence, not value 5335132 ApproximateBestSubset should take inputs by reference, not value (Ryan Havar) Tree-SHA512: 0990de7efbeba8ef9b70ccee45298c2fb982459a64e44b6395f7d28808740315d2d26e87103d4848677fc519cdf3247c1bde498ecb2e239e18134cb933e6b661

…ay help group 0fb2887 Move several relay options into the Relay help group (Jameson Lopp) Tree-SHA512: 31fdfd8c741adb6fe6806a28955f0fbbc9360b1d8c3d8a28684794822f1b3231fffab93357357d986b81a4532c9eeabb79e5ede9378ff3ad8930ceb6588d9eb6

…ng semicolons in Python code 85de9d4 Remove call to gettransaction(...) where the result is unused (practicalswift) bd02422 Remove accidental trailing semicolons in Python code (practicalswift) Tree-SHA512: 23ffb1ccc29bf73b334d62b274ab614cb40e2969147adccacbaecc69a410a661a9f2dd9e9cbc8a70bd2c7f345095efc68743f288eb866315e0e8731441ba01d0

159fe88 Remove SingleNodeConnCB (John Newbery) Tree-SHA512: 2fc3d060f4ac9445e657134919a871c46987d53eb98d23a858ee9515fc997be7a81923f08f2a37d07d123b55b912ae82ffa0f820d16297b044ab24dcf0788a8a

e9a6461 Make qt wallet test compatible with qt4 (Russell Yanofsky) Tree-SHA512: a3e4598986cb3c5c20aaa1d440abc886d84fcc69a6ee4079787cfc8e3a2dce655060ff95612cb15ce8b5a9b8911e4afe2281345b59a4353ec32edf3771338381

…asn't timed out 6a18bb9 [tests] sync_with_ping should assert that ping hasn't timed out (John Newbery) 6426716 Add send_await_disconnect() method to p2p-compactblocks.py (John Newbery) Tree-SHA512: d0eeb066ed3f6aef594caaa693280d10abedac9b719e795c9659e52ddae315085eb2845131644793007e30a16e3e0bf3e3925b40ca2ae023cad923c5ab32df25

Signed-off-by: Pasta <Pasta@dash.org>

UdjinM6 · 2019-05-21T15:50:55Z

Pls see https://github.com/UdjinM6/dash/commits/pr2771, tests should finally pass now.

Travis: https://travis-ci.org/UdjinM6/dash/builds/535314818

Pruning works when starting in -litemode

UdjinM6

utACK

codablock

utACK

UdjinM6 added this to the 14.1 milestone May 10, 2019

PastaPastaPasta force-pushed the backports-0.15-pr9 branch from b7fe68b to bbaffa3 Compare May 20, 2019 01:41

UdjinM6 requested changes May 20, 2019

View reviewed changes

src/qt/test/wallettests.cpp Outdated Show resolved Hide resolved

test/functional/assumevalid.py Outdated Show resolved Hide resolved

src/init.cpp Outdated Show resolved Hide resolved

test/functional/sendheaders.py Outdated Show resolved Hide resolved

UdjinM6 requested changes May 20, 2019

View reviewed changes

test/functional/dip4-coinbasemerkleroots.py Outdated Show resolved Hide resolved

test/functional/llmq-is-cl-conflicts.py Outdated Show resolved Hide resolved

src/init.cpp Outdated Show resolved Hide resolved

PastaPastaPasta force-pushed the backports-0.15-pr9 branch from 50a99de to 6c3d15b Compare May 20, 2019 17:51

UdjinM6 reviewed May 20, 2019

View reviewed changes

laanwj and others added 14 commits May 21, 2019 08:52

Merge bitcoin#10045: [trivial] Fix typos in comments

f2e976a

dbf30ff [trivial] Fix typos in comments (practicalswift) Tree-SHA512: a841c96ba1a80ab57206e8ef4fa9b40ecff2244075a5539fc09f57e763bf2e92b0ed089e32a0dbac3902518dcda43d224f75a3462a560148841746560640ba70

Merge bitcoin#10067: [trivial] Dead code removal

ba20c90

c59aedc [trivial] Dead code removal (Thomas Snider) Tree-SHA512: 09962c1ae36fb2f19b7e4a03abf3de6632bab984ce30040ca3f843431df33a0f8fa6a2c1d55b076b800547bb656e344d74ea085ff081b613bcdfd7d2f9826374

Merge bitcoin#9946: Fix build errors if spaces in path or parent dire…

3793129

…ctory b1f584d fix build if spaces in src dir path (Matthew Zipkin) Tree-SHA512: 5834690c1f63b85ed04bb8ed411a94da04738534364d58bd9ee333ccff7129b2bbb710f31598c40123199e023da02c1745514294af3efdbb2c2e4c1320aded35

Merge bitcoin#10069: [QA] Fix typo in fundrawtransaction test

1781c7a

803e6a3 [QA] Fix typo in fundrawtransaction test (Nicolas Dorier) Tree-SHA512: 7b88cf09d7e756f0f5535738993868287d4c7049db44072e318f48a9b08786bebb9877f787471bbf6aac58b3d709275eefa372d727f4afd6ded41494fe0024d1

Merge bitcoin#10083: [QA] Renaming rawTx into rawtx

1209417

dd5be2c [QA] Renaming rawTx into rawtx (NicolasDorier) Tree-SHA512: c999c3cbe7bbd00bf5cc9813741c485caea9925de1214c8a7ef717a7c109c1a8baf73b460db3b08f4ec138d773b46176531c48295504ed75180d4b3666b85b99

Merge bitcoin#10085: Docs: remove 'noconnect' option

14001a3

d5690f1 remove 'noconnect' option from documentation (Jameson Lopp) Tree-SHA512: 9c61df5ee7b2b9a8188cbf44fced05c41ded3454758dbc1b1ae641cea0301a65169381f20c045027e571ebe211a42e680a66daed47090f91766403cc60147e89

Merge bitcoin#10073: Actually run assumevalid.py

142b5cb

717ad13 Actually run assumevalid.py. (John Newbery) Tree-SHA512: 6fd55789be43e26347f8f5456194aa5e7beeeba3db85411dc75581b98059ca3a85485494fca36848f21c0f48096004906a0409fd76309951b5f977bab9f45b91

laanwj and others added 11 commits May 21, 2019 08:52

Merge bitcoin#10056: [zmq] Call va_end() on va_start()ed args.

6bb55d5

5ba61f0 [zmq] Call va_end() on va_start()ed args. (Karl-Johan Alm) Tree-SHA512: fbd3a0c29308ca9607f362f14fa7ea9c949a3f25dc09a349fe3b3ffd316b573c86778e29d3b9d55c684571eacae50aca90bb872e2e5489818d0af8310511fe79

Merge bitcoin#10057: [init] Deduplicated sigaction() boilerplate

c225897

81a3857 Deduplicated sigaction() boilerplate (Thomas Snider) Tree-SHA512: 705b73f285a3d76504ba01476e072fdce67731b65f309bb04e4bbd765556c37e127cb769b475de2d68b33f50d7737fb136aefa0fa7c725a11ad16a47b9d0365f

Merge bitcoin#10076: [qa] combine_logs: Use ordered list for logfiles

bfd63c1

fa4535d [qa] combine_logs: Use ordered list for logfiles (MarcoFalke) Tree-SHA512: 66da6f2659018d24b1cac1f6d2ee8603c2c6f15ce5aff456e8e4b208874e97c7046b97112046d5b45bfd777b405771a3ad0a55036c4f4cdeec06842563af2c4d

Merge bitcoin#10109: Remove SingleNodeConnCB

cc06ef5

159fe88 Remove SingleNodeConnCB (John Newbery) Tree-SHA512: 2fc3d060f4ac9445e657134919a871c46987d53eb98d23a858ee9515fc997be7a81923f08f2a37d07d123b55b912ae82ffa0f820d16297b044ab24dcf0788a8a

Merge bitcoin#10098: Make qt wallet test compatible with qt4

4121dab

e9a6461 Make qt wallet test compatible with qt4 (Russell Yanofsky) Tree-SHA512: a3e4598986cb3c5c20aaa1d440abc886d84fcc69a6ee4079787cfc8e3a2dce655060ff95612cb15ce8b5a9b8911e4afe2281345b59a4353ec32edf3771338381

update dip4-coinbasemerkalroots.py and llmq-is-cl-conflicts.py

c37008a

Signed-off-by: Pasta <Pasta@dash.org>

PastaPastaPasta force-pushed the backports-0.15-pr9 branch from 6c3d15b to c37008a Compare May 21, 2019 13:53

UdjinM6 added 4 commits May 21, 2019 11:23

fix txindex.py and add it to extended scripts

bfeb5bc

Fix and re-enable pruning.py

92fed92

Pruning works when starting in -litemode

Fix p2p-fingerprint.py

6f91144

Drop redundant imports and fix related code

15fa187

UdjinM6 approved these changes May 21, 2019

View reviewed changes

UdjinM6 requested a review from codablock May 21, 2019 17:35

codablock approved these changes May 22, 2019

View reviewed changes

UdjinM6 merged commit 44b7e55 into dashpay:develop May 22, 2019

PastaPastaPasta deleted the backports-0.15-pr9 branch May 22, 2019 13:19

Backports 0.15 pr9 #2771

Backports 0.15 pr9 #2771

Uh oh!

Conversation

PastaPastaPasta commented Mar 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 commented May 17, 2019

Uh oh!

codablock commented May 17, 2019

Uh oh!

PastaPastaPasta commented May 20, 2019

Uh oh!

UdjinM6 commented May 20, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PastaPastaPasta commented May 20, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented May 20, 2019

Uh oh!

PastaPastaPasta commented May 20, 2019

Uh oh!

UdjinM6 commented May 20, 2019

Uh oh!

PastaPastaPasta commented May 21, 2019

Uh oh!

UdjinM6 commented May 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 commented May 21, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

codablock left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

PastaPastaPasta commented Mar 14, 2019 •

edited

Loading

UdjinM6 commented May 21, 2019 •

edited

Loading