Backports 0.15 pr8 #2763

PastaPastaPasta · 2019-03-11T12:03:20Z

~~deb42a0 is broken, I can't quite tell why,~~ everything else seems good. @UdjinM6

UdjinM6

Needs rebase + see below

qa/rpc-tests/nulldummy.py

src/compat.h

src/Makefile.qttest.include

src/test/test_dash.cpp

test/README.md

Makefile.am

README.md

PastaPastaPasta · 2019-03-12T16:31:46Z

Rebased

Makefile.am

UdjinM6 · 2019-03-13T13:06:03Z

Needs rebase after #2765 was merged, otherwise looks good (travis failures are unrelated imo, some internal travis issues it seems). Also, I think it makes sense to finally squash fixes into corresponding original "merge bitcoin#xxxx" commits.

PastaPastaPasta · 2019-03-13T13:36:11Z

Rebased

UdjinM6

utACK

with a nit and a note :)

qa/rpc-tests/nulldummy.py

qa/rpc-tests/prioritise_transaction.py

UdjinM6 · 2019-03-14T14:46:14Z

Needs rebase

PastaPastaPasta · 2019-03-14T18:08:41Z

Only bitcoin#9842 had any conflicts, rebased and forced pushed. Please review.

UdjinM6

See inline comment + we should probably fix other tests broken by #2768 first (i.e. merge #2772)

test/functional/prioritise_transaction.py

UdjinM6 · 2019-03-14T20:23:38Z

Looks good 👍

codablock

See inline comments

ci/test_unittests.sh

qa/rpc-tests/prioritise_transaction.py

src/qt/test/rpcnestedtests.cpp

PastaPastaPasta · 2019-03-15T19:24:56Z

rebased and force pushed

UdjinM6 · 2019-03-16T08:29:15Z

Looks like permissions are broken now mempool_spendcoinbase.py 100755 → 100644.

PastaPastaPasta · 2019-03-16T15:27:53Z

resolved file perm problem and squashed

UdjinM6 · 2019-03-17T05:01:46Z

test/functional/prioritise_transaction.py

Suggested change

assert_raises_jsonrpc(-26, "66: insufficient priority", self.nodes[0].sendrawtransaction, tx2_hex)

assert_raises_jsonrpc(-26, "66: min relay fee not met", self.nodes[0].sendrawtransaction, tx_hex)

UdjinM6 · 2019-03-17T05:16:30Z

test/functional/prioritise_transaction.py

Suggested change

assert(tx2_id not in self.nodes[0].getrawmempool())

assert(tx_id not in self.nodes[0].getrawmempool())

UdjinM6 · 2019-03-17T05:17:12Z

test/functional/nulldummy.py

Suggested change

dip4_activated = self.lastblockheight + 1 >= 432

dip4_activated = self.lastblockheight + 1 >= 432

PastaPastaPasta · 2019-04-03T12:44:09Z

resolved comments and rebased

UdjinM6 · 2019-04-03T16:15:59Z

smth went wrong here

qa/rpc-tests/test_framework/__init__.py → test/functional/autoix-mempool.py 100644 → 100755

…9707) c9bd0f6 Fix RPC failure testing (2 of 2) (John Newbery) Tree-SHA512: df30e6e85abe8c4e12910dc60699f1201e9c243457abd738c1fdeac45f0ff05c674f68619ad9a47c847ec557954007d672cd89d3a9a3b2398dd188d9ffa6dcc9 s/serialize_with_witness/serialize/ miss a tx_submit -> sendrawtransaction dropped dip4 Fix tests Signed-off-by: Pasta <Pasta@dash.org> Fix file permissions

…NOSIGNAL a4d1c9f compat: use `unsigned int` instead of `u_int` (Wladimir J. van der Laan) 25da1ee build: cleanup: define MSG_DONTWAIT/MSG_NO_SIGNAL locally (Wladimir J. van der Laan) c459d50 build: Probe MSG_DONTWAIT in the same way as MSG_NOSIGNAL (Wladimir J. van der Laan) Tree-SHA512: 60d79d69439bb181465e4244aa5ddc28bbd84f69c0ca0c753956b3798c9022394e29d791bc085fe7ffb1268c64c789a57e24797daad63525bb776088188ff9ae fix merge error in configure.ac Signed-off-by: Pasta <Pasta@dash.org>

9350e13 util: rename variable to avoid shadowing (Pavol Rusnak) Tree-SHA512: 8abc09fdb134c913e823754f3f02a4d8ef120a73f252fbc1217dbd2bdd4ed4fffce92d823a66d1fe51607dc021065df8826f21274ef26e55d82575e96d07224f

9576b01 Enable xvfb in travis to allow running test_bitcoin-qt (Russell Yanofsky) 9e6817e Add new test_bitcoin-qt static library dependencies (Russell Yanofsky) 2754ef1 Add simple qt wallet test sending a transaction (Russell Yanofsky) b61b34c Add braces to if statements in Qt test_main (Russell Yanofsky) cc9503c Make qt test compatible with TestChain100Setup framework (Russell Yanofsky) 91e3035 Make test_bitcoin.cpp compatible with Qt Test framework (Russell Yanofsky) Tree-SHA512: da491181848b8c39138e997ae5ff2df0b16eef2d9cdd0a965229b1a28d4fa862d5f1ef314a1736e5050e88858f329124d15c689659fc6e50fefde769ba24e523 remove line, testing bitcoin -> dash, testing bitcoin -> dash, testing resolve name conflict, testing bitcoin -> dash re-add test fixture line code review, fix tests Signed-off-by: Pasta <Pasta@dash.org> move ExceptionInitializer into test_dash_main.cpp remove witness from nulldummy.py Signed-off-by: Pasta <Pasta@dash.org> change error text to match expected Signed-off-by: Pasta <Pasta@dash.org>

9155241 Change 'Clear' button string to 'Reset' (Daniel Aleksandersen) Tree-SHA512: 9d68aaaeef88f174b29bffced81f3b2cb6a76f7a2dd8c43df4d9bd5d29cdbcf073c1f250c6bdfad12540976b1bb27a764e5033d219a1491f27f4d89ddd06e49b

7759aa2 Save watch only key timestamps when reimporting keys (Russell Yanofsky) Tree-SHA512: 433b5a78e5626fb2f3166e6c84c22eabd5239d451dc82694da95af237e034612a24f1a8bc959b7d2f2e576ce0b679be1fa4af929ebfae758c7e832056ab67061

8dc957a Remove unused code (practicalswift) Tree-SHA512: c7bb286e3b92e42fec8aa1ac2491fd38be36602efca16b4bdc4e9d5ada75c11d99e7713092ec13794abd69d5ef2c732b86209a6d01710e5ebf6fc51b8a65c92a resolve usage of `MiningRequiresPeers()` remove `fMiningRequiresPeers`

d7f80b6 Rename first iterator to prevent shadowing. (Pavel Janík) b42ff60 Fix shadowing of local variables. (Pavel Janík) c4b60b3 Make some global variables less-global (static) (Pavel Janík) bb2aaee Prevent -Wshadow warnings with gcc versions 4.8.5, 5.3.1 and 6.2.1. (Pavel Janík) Tree-SHA512: 3aea4e28146c8f2a31351c6e2b0cce88b6f1e567a0ea0e6131624453e7193d0904e30d81b1439d8c69e281cf0e369b895851fb882ae48d5967b5c2e2c227404e

…emaining functional test cases. e722777 fix logging in nulldummy and proxy_test (John Newbery) 1f70653 Use log.info() instead of print() in importmulti.py (John Newbery) Tree-SHA512: 0e58f0a970cd93bc1e9d73c6f53ca0671b0c5135cbf92e97d8563bd8a063679bf04f8bde511c275d5f84036aed32f70d3d03679a92688952b46dc97929e0405c

f490dae Trivial: Fix typo in key.h comment (Michael Goldstein) Tree-SHA512: 4b79bfa88313d3558edb9ab1c6d27bd45659355e81f224ba75c05ff069ebae4c9f443efd70ae274814bbb7cca8a9057942b9b867055c48e93822ac73e38a51ce

d93b97f Set to nullptr after delete (practicalswift) Tree-SHA512: 7201cef4541557ffe31f52ce7527c4b08a2ff5aa1eae5268bdfee5b4843881f8fd115257bef6d1b4dfb71166951950a912ce87aef160ca89c2ca2ae264cfab1b set dash pointers to nullptr after deletion

e141aa4 Add mallocinfo mode to `getmemoryinfo` RPC (Wladimir J. van der Laan) Tree-SHA512: e778631765c29b3b5fb94eb66e5f50a8f108a234891bdcc4883f1e6e2fdd223f7660fad987eb2d7cbda5b800482d78adc1a309a3f6f83a84c556af43ebee2ed7

41b8821 Add updating of chainTxData to release process (Pieter Wuille) Tree-SHA512: f7d6e72b19aa83fc4851a9316d6c6a236e0e914d637525cda42c0b15a94543b8072ce67b57d6b12141332a03b64b6c715dff4d61e6e58e0197b22305b35ad65d

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

bf10264 Run bitcoin_test-qt under minimal QPA platform (Russell Yanofsky) Tree-SHA512: 35782f0d7e4dcdc27d991d5a10fcffbd2d201139293fe7917ef6f7cd7ae4d3a162ebc21f83266d821ae3bad86f62d947b047bb317f6c5899df4d6bcb4c957157

…ndows builds 0be03c7 Qt: Use _putenv_s instead of setenv on Windows builds (Brian McMichael) Pull request description: Fixes bitcoin#10836 Error message I would get on `make`: ``` ... CXXLD bench/bench_bitcoin.exe OBJCXXLD qt/bitcoin-qt.exe qt/test/test_main.cpp: In function ‘int main(int, char**)’: qt/test/test_main.cpp:64:43: error: ‘setenv’ was not declared in this scope setenv("QT_QPA_PLATFORM", "minimal", 0); ^ make[2]: *** [qt/test/qt_test_test_bitcoin_qt-test_main.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory `/home/bmcmichael/Projects/bcoin/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/bmcmichael/Projects/bcoin/src' make: *** [all-recursive] Error 1 ``` `setenv` function is not available from the Microsoft runtime library. Need to use `_putenv_s` instead. This solution tells the compiler to use `_putenv_s` on `WIN32` compilation (Note: this also works on 64-bit Windows instances.) and `setenv` everywhere else. I've tested builds on Windows 10 x64 and Ubuntu 16.04 with this code. Tree-SHA512: d53c996c890e3c6f22b4f2dcca718bef9168f19a6d4a29b8ff13391bfc0c8ea9c1cd16782b47c25b156dcbdff18bb19e23bfd5f6fefb1f373c9d5454a13fc969

PastaPastaPasta · 2019-05-06T19:52:53Z

rebased on top of latest develop

UdjinM6

LGTM 👍

Review suggestions were applied

PastaPastaPasta · 2019-05-07T02:42:26Z

LGTM +1

phew 😅 @codablock review requested :)

UdjinM6

utACK to merge after #2928

codablock

utACK 👍

UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label Mar 11, 2019

UdjinM6 requested changes Mar 11, 2019

View reviewed changes

PastaPastaPasta force-pushed the backports-0.15-pr8 branch 2 times, most recently from 318b50c to a5d22aa Compare March 12, 2019 16:31

UdjinM6 reviewed Mar 12, 2019

View reviewed changes

Makefile.am Outdated Show resolved Hide resolved

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from cb5b7a0 to 39c5d56 Compare March 13, 2019 13:34

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from 39c5d56 to 0e200df Compare March 13, 2019 20:54

UdjinM6 previously approved these changes Mar 13, 2019

View reviewed changes

qa/rpc-tests/nulldummy.py Outdated Show resolved Hide resolved

qa/rpc-tests/prioritise_transaction.py Outdated Show resolved Hide resolved

UdjinM6 added this to the 14.0 milestone Mar 13, 2019

UdjinM6 requested a review from codablock March 14, 2019 10:40

PastaPastaPasta dismissed UdjinM6’s stale review via f29633f March 14, 2019 18:08

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from 0e200df to f29633f Compare March 14, 2019 18:08

UdjinM6 requested changes Mar 14, 2019

View reviewed changes

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

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from f29633f to d703bf9 Compare March 14, 2019 20:00

codablock reviewed Mar 15, 2019

View reviewed changes

ci/test_unittests.sh Outdated Show resolved Hide resolved

qa/rpc-tests/prioritise_transaction.py Outdated Show resolved Hide resolved

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

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from d703bf9 to e407c2e Compare March 15, 2019 19:24

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from e407c2e to 30d9194 Compare March 16, 2019 15:25

UdjinM6 requested changes Mar 17, 2019

View reviewed changes

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from aec7735 to f8165b0 Compare April 3, 2019 12:43

MarcoFalke and others added 19 commits May 6, 2019 14:51

Merge bitcoin#10010: util: rename variable to avoid shadowing

ae9ca84

9350e13 util: rename variable to avoid shadowing (Pavol Rusnak) Tree-SHA512: 8abc09fdb134c913e823754f3f02a4d8ef120a73f252fbc1217dbd2bdd4ed4fffce92d823a66d1fe51607dc021065df8826f21274ef26e55d82575e96d07224f

Merge bitcoin#9690: Change 'Clear' button string to 'Reset'

8e0968f

9155241 Change 'Clear' button string to 'Reset' (Daniel Aleksandersen) Tree-SHA512: 9d68aaaeef88f174b29bffced81f3b2cb6a76f7a2dd8c43df4d9bd5d29cdbcf073c1f250c6bdfad12540976b1bb27a764e5033d219a1491f27f4d89ddd06e49b

Merge bitcoin#10033: Trivial: Fix typo in key.h comment

d563222

f490dae Trivial: Fix typo in key.h comment (Michael Goldstein) Tree-SHA512: 4b79bfa88313d3558edb9ab1c6d27bd45659355e81f224ba75c05ff069ebae4c9f443efd70ae274814bbb7cca8a9057942b9b867055c48e93822ac73e38a51ce

Merge bitcoin#10038: Add mallocinfo mode to getmemoryinfo RPC

1914c2d

e141aa4 Add mallocinfo mode to `getmemoryinfo` RPC (Wladimir J. van der Laan) Tree-SHA512: e778631765c29b3b5fb94eb66e5f50a8f108a234891bdcc4883f1e6e2fdd223f7660fad987eb2d7cbda5b800482d78adc1a309a3f6f83a84c556af43ebee2ed7

Merge bitcoin#9734: Add updating of chainTxData to release process

5f45198

41b8821 Add updating of chainTxData to release process (Pieter Wuille) Tree-SHA512: f7d6e72b19aa83fc4851a9316d6c6a236e0e914d637525cda42c0b15a94543b8072ce67b57d6b12141332a03b64b6c715dff4d61e6e58e0197b22305b35ad65d

add a comment linking to xvfb documentation

720f13d

code review

9cef545

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

Review suggestions

826846f

Merge bitcoin#10142: Run bitcoin_test-qt under minimal QPA platform

f8c3f9f

bf10264 Run bitcoin_test-qt under minimal QPA platform (Russell Yanofsky) Tree-SHA512: 35782f0d7e4dcdc27d991d5a10fcffbd2d201139293fe7917ef6f7cd7ae4d3a162ebc21f83266d821ae3bad86f62d947b047bb317f6c5899df4d6bcb4c957157

Drop xvfb and run tests in linux64_nowallet

ace96a9

PastaPastaPasta force-pushed the backports-0.15-pr8 branch from 49427c7 to ace96a9 Compare May 6, 2019 19:52

UdjinM6 reviewed May 6, 2019

View reviewed changes

UdjinM6 added this to the 14.1 milestone May 10, 2019

UdjinM6 mentioned this pull request May 15, 2019

Merge bitcoin#9956: Reorganise qa directory #2912

Merged

UdjinM6 approved these changes May 16, 2019

View reviewed changes

codablock approved these changes May 17, 2019

View reviewed changes

UdjinM6 merged commit 89d8f7a into dashpay:develop May 17, 2019

PastaPastaPasta deleted the backports-0.15-pr8 branch May 30, 2019 00:22

	assert_raises_jsonrpc(-26, "66: insufficient priority", self.nodes[0].sendrawtransaction, tx2_hex)
	assert_raises_jsonrpc(-26, "66: min relay fee not met", self.nodes[0].sendrawtransaction, tx_hex)

	assert(tx2_id not in self.nodes[0].getrawmempool())
	assert(tx_id not in self.nodes[0].getrawmempool())

	dip4_activated = self.lastblockheight + 1 >= 432
	dip4_activated = self.lastblockheight + 1 >= 432

Backports 0.15 pr8 #2763

Backports 0.15 pr8 #2763

Uh oh!

Conversation

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

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PastaPastaPasta commented Mar 12, 2019

Uh oh!

Uh oh!

UdjinM6 commented Mar 13, 2019

Uh oh!

PastaPastaPasta commented Mar 13, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

UdjinM6 commented Mar 14, 2019

Uh oh!

PastaPastaPasta commented Mar 14, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

UdjinM6 commented Mar 14, 2019

Uh oh!

codablock left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PastaPastaPasta commented Mar 15, 2019

Uh oh!

UdjinM6 commented Mar 16, 2019

Uh oh!

PastaPastaPasta commented Mar 16, 2019

Uh oh!

UdjinM6 Mar 17, 2019

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Mar 17, 2019

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Mar 17, 2019

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented Apr 3, 2019

Uh oh!

UdjinM6 commented Apr 3, 2019

Uh oh!

PastaPastaPasta commented May 6, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented May 7, 2019

Uh oh!

UdjinM6 left a comment • 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!

codablock left a comment

Choose a reason for hiding this comment

PastaPastaPasta commented Mar 11, 2019 •

edited by UdjinM6

Loading

UdjinM6 left a comment •

edited

Loading