MarcoFalke
e57559a8da
Merge #10096 : Check that all test scripts in test/functional are being run
...
29d6634 Check that all test scripts in test/functional are being run (John Newbery)
Tree-SHA512: 9231d3a119632be031c51c4f7e95a8adae58489a8ec36fc967d499c0708bae2941a3bf28f11dcd4efd59141eb54c3c920f2629f5cd8a0139d30397a19591666d
2019-05-21 08:52:46 -05:00
Wladimir J. van der Laan
c2258978bf
Merge #10057 : [init] Deduplicated sigaction() boilerplate
...
81a3857 Deduplicated sigaction() boilerplate (Thomas Snider)
Tree-SHA512: 705b73f285a3d76504ba01476e072fdce67731b65f309bb04e4bbd765556c37e127cb769b475de2d68b33f50d7737fb136aefa0fa7c725a11ad16a47b9d0365f
2019-05-21 08:52:46 -05:00
Wladimir J. van der Laan
6bb55d5474
Merge #10056 : [zmq] Call va_end() on va_start()ed args.
...
5ba61f0 [zmq] Call va_end() on va_start()ed args. (Karl-Johan Alm)
Tree-SHA512: fbd3a0c29308ca9607f362f14fa7ea9c949a3f25dc09a349fe3b3ffd316b573c86778e29d3b9d55c684571eacae50aca90bb872e2e5489818d0af8310511fe79
2019-05-21 08:52:46 -05:00
Wladimir J. van der Laan
142b5cba0b
Merge #10073 : Actually run assumevalid.py
...
717ad13 Actually run assumevalid.py. (John Newbery)
Tree-SHA512: 6fd55789be43e26347f8f5456194aa5e7beeeba3db85411dc75581b98059ca3a85485494fca36848f21c0f48096004906a0409fd76309951b5f977bab9f45b91
2019-05-21 08:52:45 -05:00
Wladimir J. van der Laan
14001a3d94
Merge #10085 : Docs: remove 'noconnect' option
...
d5690f1 remove 'noconnect' option from documentation (Jameson Lopp)
Tree-SHA512: 9c61df5ee7b2b9a8188cbf44fced05c41ded3454758dbc1b1ae641cea0301a65169381f20c045027e571ebe211a42e680a66daed47090f91766403cc60147e89
2019-05-21 08:52:45 -05:00
Wladimir J. van der Laan
1209417938
Merge #10083 : [QA] Renaming rawTx into rawtx
...
dd5be2c [QA] Renaming rawTx into rawtx (NicolasDorier)
Tree-SHA512: c999c3cbe7bbd00bf5cc9813741c485caea9925de1214c8a7ef717a7c109c1a8baf73b460db3b08f4ec138d773b46176531c48295504ed75180d4b3666b85b99
2019-05-21 08:52:45 -05:00
MarcoFalke
1781c7a701
Merge #10069 : [QA] Fix typo in fundrawtransaction test
...
803e6a3 [QA] Fix typo in fundrawtransaction test (Nicolas Dorier)
Tree-SHA512: 7b88cf09d7e756f0f5535738993868287d4c7049db44072e318f48a9b08786bebb9877f787471bbf6aac58b3d709275eefa372d727f4afd6ded41494fe0024d1
2019-05-21 08:52:45 -05:00
Wladimir J. van der Laan
3793129315
Merge #9946 : Fix build errors if spaces in path or parent directory
...
b1f584d fix build if spaces in src dir path (Matthew Zipkin)
Tree-SHA512: 5834690c1f63b85ed04bb8ed411a94da04738534364d58bd9ee333ccff7129b2bbb710f31598c40123199e023da02c1745514294af3efdbb2c2e4c1320aded35
2019-05-21 08:52:45 -05:00
Wladimir J. van der Laan
ba20c9031d
Merge #10067 : [trivial] Dead code removal
...
c59aedc [trivial] Dead code removal (Thomas Snider)
Tree-SHA512: 09962c1ae36fb2f19b7e4a03abf3de6632bab984ce30040ca3f843431df33a0f8fa6a2c1d55b076b800547bb656e344d74ea085ff081b613bcdfd7d2f9826374
2019-05-21 08:52:44 -05:00
MarcoFalke
ae05068c5d
Merge #10053 : [test] Allow functional test cases to be skipped
...
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
2019-05-21 08:52:44 -05:00
MarcoFalke
9f07f489de
Merge #10047 : [tests] Remove unused variables and imports
...
3897459 [tests] Remove unused variables (practicalswift)
72163d4 [tests] Remove unused and duplicate imports (practicalswift)
Tree-SHA512: 926af14b844bfca3bdd08b3cfdcb0edd3652efb4612d5571fee9abb917a6ce4e7d11d3601ff9c3d017e943ebe1e9ebdfccaf0af3db84d201b61941e9c1c9146a
2019-05-21 08:52:44 -05:00
Jonas Schnelli
96a5f5730b
Merge #9500 : [Qt][RPC] Autocomplete commands for 'help' command in debug console
...
6d8fe35 'help' rpc commands autocomplete (Andrew Chow)
Tree-SHA512: 289bc4fa16a1c0291262998caa18556f1c5aa89662c85528606dc03b596b8833a0fb2c5c9c068b6dcf2adb3a136d4f154591d4a95b8c3313638b77355aaed955
2019-05-21 08:52:43 -05:00
Jonas Schnelli
07e0567dcc
Merge #9558 : Clarify assumptions made about when BlockCheck is called
...
c4a6929 Clarify assumptions made about when BlockCheck is called (Matt Corallo)
Tree-SHA512: 2eceb0c4f06c7fd6b290b93843bda11a4b63131559c5e8226bfec84596ed4e54ee6d8f5bc9cf789a80675be8b8079cf9234c96032df306258cb2260b9d8c7825
2019-05-21 08:52:43 -05:00
Jonas Schnelli
2aa3f890d1
Merge #10029 : Fix parameter naming inconsistencies between .h and .cpp files
...
97b8213 Fix parameter naming inconsistencies between .h and .cpp files (practicalswift)
Tree-SHA512: 4f46cc3973a898d2478bdb1b8c8d1829c3a7298b63bc47359c5dc2f135466773072d9672134ef3e7557dfc913720e49b675176b9e435b8bd1992af9ad53866e4
2019-05-21 08:52:43 -05:00
Wladimir J. van der Laan
7edb9e15ac
Merge #10017 : combine_logs.py - aggregates log files from multiple 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
2019-05-21 08:52:43 -05:00
Jonas Schnelli
f2e976a051
Merge #10045 : [trivial] Fix typos in comments
...
dbf30ff [trivial] Fix typos in comments (practicalswift)
Tree-SHA512: a841c96ba1a80ab57206e8ef4fa9b40ecff2244075a5539fc09f57e763bf2e92b0ed089e32a0dbac3902518dcda43d224f75a3462a560148841746560640ba70
2019-05-21 08:52:42 -05:00
Wladimir J. van der Laan
2c833eff3e
Merge #10039 : Fix compile errors with Qt 5.3.2 and Boost 1.55.0
...
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
2019-05-21 08:52:36 -05:00
UdjinM6
a3f0306097
Implement getmerkleblocks rpc ( #2894 )
2019-05-21 15:36:13 +02:00
PastaPastaPasta
a6eee07f29
Merge bitcoin#9963: util: Properly handle errors during log message formatting ( #2917 )
...
* Merge #9963 : util: Properly handle errors during log message formatting
b651270 util: Throw tinyformat::format_error on formatting error (Wladimir J. van der Laan)
3b092bd util: Properly handle errors during log message formatting (Wladimir J. van der Laan)
Tree-SHA512: 85e3b7afec2255fc88034187f1abd6060e9421de17ed4e3d918416f393429a99cc2c974b362099aaaff6970549df47664bea4c857c4e46acc0789663201dc541
* "cast" debugMsg to a c string
Signed-off-by: Pasta <Pasta@dash.org>
"cast" debugMsg to a c string pt 2
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-21 15:32:33 +02:00
PastaPastaPasta
32aa229c7f
Reorganize Dash Specific code into folders ( #2753 )
...
* rename instantx.* file to instantsend.*
* Reorganize Dash Specific code into folders
add to privatesend folder the header files
Signed-off-by: Pasta <Pasta@dash.org>
add "masternode" to imports
Signed-off-by: Pasta <Pasta@dash.org>
add "masternode" to imports
Signed-off-by: Pasta <Pasta@dash.org>
add "masternode" to imports pt 2
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-21 15:26:15 +02:00
Pasta
67c735b156
s/bitcoin-config.h/dash-config.h/
...
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-19 20:43:04 -05:00
Pasta
2f63322cdc
dashify "Finding reviewers" section to be more relevant
...
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-19 20:43:04 -05:00
NicolasDorier
e7a21faa2b
Merge Bitcoin#9960: Trivial: Add const modifier to GetHDChain and IsHDEnabled
...
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-19 20:43:03 -05:00
Pieter Wuille
eecc724362
Merge #10564 : Return early in IsBanned.
...
bf376eacc Return early in IsBanned. (Gregory Maxwell)
Tree-SHA512: d8ed4aaf9a7523b00effa4ac17cec3be1ec1f5c5ce64d89833fbc8f3d73d13b022043354fbcf2682b2af05070d115e1fc0cc0b122197e9ddee5959c3fb9dd16d
2019-05-19 20:43:03 -05:00
MarcoFalke
742744f25f
Merge #10522 : [wallet] Remove unused variables
...
a8c09af Remove unused variables (practicalswift)
Tree-SHA512: 34807dc3a0471c83b086f430b66465602c8f6a3a158b54ace2ec8afb746f1f5907f7dfcde5a4bad4041df9721ec46b61681b2dbf89725c9c8c4c5ad0ca99f78f
2019-05-19 20:43:03 -05:00
MarcoFalke
31bb4622a6
Merge #10538 : [trivial] Fix typo: "occurrences" (misspelled as "occurrances")
...
b083db6 [trivial] Fix typo: "occurrences" (misspelled as "occurrances") (practicalswift)
Tree-SHA512: 5141526dbbbbe797ef103fcbdc0a1318648214973214607e35cc0e99abfc4dd547e3ef15fe21976c53a78b03dff140fe76e5c92a0f7e7d2b08081215983a8616
2019-05-19 20:43:03 -05:00
Wladimir J. van der Laan
f570631556
Merge #10514 : Bugfix: missing == 0 after randrange
...
9aa215b Bugfixes: missing == 0 after randrange (Pieter Wuille)
Tree-SHA512: 160657ac09553f23ad7a3966c753a30ba938ce6f7ccfd34a4ef0d05d73d712362f7eef97e44a96e37a181b8347caa9d8e1584cc4485f69674ab2de3d8a247373
2019-05-19 20:43:03 -05:00
Wladimir J. van der Laan
b708ea819a
Merge #10469 : Fixing typo in rpcdump.cpp
...
16d94d3 Fixing typo in rpcdump.cpp (James Evans)
Tree-SHA512: 84ef1b91c719131196ebed6b865e282b77bee7699614e15884ba59010239a3bbc1380dc8f856c83338f071e3eb3ca41c6b10f830816e6c794531cf6a965d63a9
2019-05-19 20:43:02 -05:00
Wladimir J. van der Laan
55dc3dae52
Merge #10486 : devtools: Retry after signing fails in github-merge
...
1983c87 devtools: Retry after signing fails in github-merge (Wladimir J. van der Laan)
Tree-SHA512: f5ef91c93f4e53c9b234e7dc3ac398c6715144021d92c8592174d02c672ae99d27e88faefd52239c2a74c8e49cfd3a979e0229580016ce9a74829bdb0af206ec
2019-05-19 20:43:02 -05:00
Wladimir J. van der Laan
0d2f2b3617
Merge #10273 : [scripts] Minor improvements to macdeployqtplus
script.
...
e8babc4 Use `with` in `macdeployqtplus` script. (Chris Gavin)
4f3ac7d Remove unused variable from `macdeployqtplus` script. (Chris Gavin)
Tree-SHA512: 0259506b36f3bfcc64ada951dcd4fdab1611ef76a39f92effd1163b6d8fab06bdbf50784b4b22f8b1483697c3029c12cfee5372b442ab445887ac4f928f6de80
2019-05-19 20:43:02 -05:00
Wladimir J. van der Laan
317b797e2a
Merge #9670 : contrib: github-merge improvements
...
b508424 contrib: github-merge improvements (Wladimir J. van der Laan)
Tree-SHA512: 56a34e887716bf6bfcd1b6520f6b9a1bb742e1ad17e75618caf982af71fceb75d50caec1bf4279cb9a2f7a74319f1bcec4c824682841bd6e994acc0991616451
2019-05-19 20:43:02 -05:00
Wladimir J. van der Laan
a3467dd269
Merge #10228 : build: regenerate bitcoin-config.h as necessary
...
91ab8f5 build: fix bitcoin-config.h regeneration after touching build files (Cory Fields)
3577603 build: remove wonky auto top-level convenience targets (Cory Fields)
Tree-SHA512: 2e68634439eeb7eca43cd2858135a583bfe0cf146e021a8384a24f7267aacc6f99bdc7a6d497a04d32e6a03e9446f0f599afb5bd53346dadf19f47d5fb2ea9f9
2019-05-19 20:43:02 -05:00
Wladimir J. van der Laan
a089c9325e
Merge #9827 : Improve ScanForWalletTransactions return value
...
30abce7 Improve ScanForWalletTransactions return value (Russell Yanofsky)
Tree-SHA512: 195028553b103052a842b6a37e67410118a20c32475b80f7fd22d6d8622f92eca1c2d84f291d1092bef2161d3187d91052799b533e1e265b7613d51955490b8d
2019-05-19 20:43:01 -05:00
Wladimir J. van der Laan
383d1819a9
Merge #10211 : [doc] Contributor fixes & new "finding reviewers" section
...
3ddd227 [doc] Add blob about finding reviewers. (Kalle Alm)
846dc17 [doc] Wording fixes in CONTRIBUTING.md. (Kalle Alm)
Tree-SHA512: 232e6496769f0fba1022da2e9a3add10dcec721e6cc168d552445125849a8c02729a71b7c526bbff30c7428bcdcfdd92b424014fbb6310148392d261408b4044
2019-05-19 20:43:01 -05:00
Pieter Wuille
632956a806
Merge #9693 : Prevent integer overflow in ReadVarInt.
...
45f0961 Prevent integer overflow in ReadVarInt. (Gregory Maxwell)
Tree-SHA512: 385ea0efb6b59d44c45a49227e5f6fff236b4775544cbeb236312a3fd87fd75c226ac56f7aa1bca66b853639da75a579610074f7582f92cf2ebd4a74bc40f6f0
2019-05-19 20:43:01 -05:00
Wladimir J. van der Laan
0db1328a24
Merge #10177 : Changed "Send" button default status from true to false
...
8c3e6c6 Changed "Send" button default status from true to false (KibbledJiveElkZoo)
Tree-SHA512: e60d7481351e88925d99b33bdb616f3c234e93ef052571b9c4a1328186ec9abb8b61b0c4299afcb731edad2634aef6b1adaad121646b6c0c56dc933662904674
2019-05-19 20:43:01 -05:00
Wladimir J. van der Laan
dccd6970bf
Merge #10164 : Wallet: reduce excess logic InMempool()
...
3491476 Wallet: reduce excess logic InMemPool() (Kewde)
Tree-SHA512: 554ea2827cfd482281fae0ba3d0a7989dbfeace98a35462732ea08bf3cc94c9564a9ea8ca2fa9905b963367d0b56a490ef0d83ceb6731c8f06187de98b6a7f23
2019-05-19 20:43:01 -05:00
Wladimir J. van der Laan
23530a88a8
Merge #10135 : [p2p] Send the correct error code in reject messages
...
5d08c9c Send the correct error code in reject messages (John Newbery)
Tree-SHA512: 0cd3ef3ae202584b138cc0bbfba4125635822e0c5a755fb9276a604b39286959ab22dabc3104aa5d7e71358cd69d965de2a333ff04bf3e8ed43cf0296ac01264
2019-05-19 20:43:00 -05:00
Wladimir J. van der Laan
e5ecff6e8a
Merge #9949 : [bench] Avoid function call arguments which are pointers to uninitialized values
...
218d915 [bench] Avoid function call arguments which are pointers to uninitialized values (practicalswift)
Tree-SHA512: 68d62e9442094f171433291b7f13dba20fc7ead5fd7f2292e1eb97ae51aa2345d40224c4a65c2e5d3552802b3cd0f675a82b6181cf5b77e964355650b25089f0
2019-05-19 20:43:00 -05:00
Wladimir J. van der Laan
3dcaf47494
Merge #10166 : Ignore Doxyfile generated from Doxyfile.in template.
...
9eaf718 Ignore Doxyfile generated from Doxyfile.in template. (Pavel Janík)
Tree-SHA512: 03d6d0fb4a708d9e41ada8b6d3d277f8c66abc2f07081629ac81ed90a3e5b2d76fa2faab9afb2ee8c91597ee031b3f5c6923d5658019321e290cdf6a70724896
2019-05-19 20:43:00 -05:00
Wladimir J. van der Laan
13cdff4989
Merge #10104 : linearize script: Option to use RPC cookie
...
bd41d98 Datadir option in linearize scripts (Andrew Chow)
Tree-SHA512: 0d11866b574986c087ec962a8a9fc0b6dfee8175ae20ef827f8b4a143f657c5bffc9f9696e9dabf29b68002003a5b6a7d8ac473231b5c9c81c3a4fa0318f5bd0
2019-05-19 20:43:00 -05:00
Wladimir J. van der Laan
f471b75aec
Merge #9533 : Allow non-power-of-2 signature cache sizes
...
7482781 Allow non-power-of-2 signature cache sizes (Pieter Wuille)
Tree-SHA512: 5731c22b46c5ae81cf6d52000c28e39b243a47d96d91079942a5b5a10db214449217f71aa2195e18f8a3917cb206b04c75dc13e4522eb700a1dbf1819013ba22
2019-05-19 20:42:59 -05:00
Wladimir J. van der Laan
1988088949
Merge #10058 : No need to use OpenSSL malloc/free
...
6d5dd60 No need to use OpenSSL malloc/free (Thomas Snider)
Tree-SHA512: 29f790067ffd5a10a8e1a621318a0ba445691f57c804aa3b7c8ca372c8408d8c7fe703c42b48018e400fc32e3feff5ab401d97433910ce2c50e69da0b8a6662e
2019-05-19 20:42:59 -05:00
Wladimir J. van der Laan
22b21f50cc
Merge #10077 : [qa] Add setnetworkactive smoke test
...
fa697b7 [qa] Add setnetworkactive smoke test (MarcoFalke)
Tree-SHA512: 7205bae16f551e93383987392702e6853cfb06d4448735815fa116385cbf5deb6c4a8f521efdd43cf3cc59fede3b3d1ffe74e662890b74bcc21b5c13ce1f20b7
2019-05-19 20:42:59 -05:00
MarcoFalke
9fa51cc667
Merge #10072 : Remove sources of unreliablility in extended functional tests
...
a4fd89f Make forknotify.py more robust (John Newbery)
1f3d78b Wait for connection to open in bip9-softforks.py (John Newbery)
Tree-SHA512: de7d0002ee62ad97059b6f6c89b11f6e9901e3b4164ef6906bcd61e4ca499c277d9034784755966e5baf599869fad611b0b18f5547a384ceb5b7db3cc5bbd132
2019-05-19 20:42:59 -05:00
Wladimir J. van der Laan
818ec218d6
Merge #10128 : Speed Up CuckooCache tests
...
3f098cc Decrease testcase sizes in cuckoocache tests (Jeremy Rubin)
Tree-SHA512: 71a0e171be8d5473c791440aa4353d99b885b926b7284a3a1914c95e0c2c77925d5f3a6f329778cd81931a4e5832a082cb31d82ee8adb433d357d2e2b4f7a9e5
2019-05-19 20:42:58 -05:00
Wladimir J. van der Laan
07ed44df6b
Merge #10136 : build: Disable Wshadow warning
...
2c83911 build: Disable Wshadow warning (Wladimir J. van der Laan)
Tree-SHA512: e3c1f7253c43449740760da287985b8027344dfc48c8a85ea9bca977c73cbaf75709d6e32ac0fea51eb89dccb48706a5abdf006be45375838df10ccba35e9aa1
2019-05-19 20:42:58 -05:00
Wladimir J. van der Laan
b5968cd7a7
Merge #10129 : scheduler: fix sub-second precision with boost < 1.50
...
e025246 scheduler: fix sub-second precision with boost < 1.50 (Cory Fields)
Tree-SHA512: b9d4875406c1a2bf3cb6412d7511c24d871bfba6a2ea5ccfbbf7392f2f8850027b001b776da422fea592878da21d897b1aa56d92bc2239869055dce79fd442ac
2019-05-19 20:42:58 -05:00
Wladimir J. van der Laan
16641e1b1a
Merge #10095 : refactor: Move GetDifficulty out of rpc/server.h
...
f885b67 refactor: Make rest.cpp dependency on `*toJSON` in `blockchain.cpp` explicit (Wladimir J. van der Laan)
8d8f28d refactor: Move RPCNotifyBlockChange out of `rpc/server.h` (Wladimir J. van der Laan)
e6dcfee refactor: Move GetDifficulty out of `rpc/server.h` (Wladimir J. van der Laan)
Tree-SHA512: fc2656611d18442f2fddba5ac1554d958151f6785c2039afdfc36735d7e71592d9686ff6cc7b2ad95180071d7514470e62c52d697c5a1e88f851bddaf5942edb
2019-05-19 20:42:58 -05:00
PastaPastaPasta
6edbc9cebd
Merge bitcoin#9956: Reorganise qa directory ( #2912 )
...
* Merge #9956 : Reorganise qa directory
63d66ba Move src/test/bitcoin-util-test.py to test/util/bitcoin-util-test.py (John Newbery)
5b0bff4 Rename --enable-extended-rpc-tests to --enable-extended-functional-tests (John Newbery)
a9bd622 Rename test/pull-tester/rpc-tests.py to test/functional/test_runner.py (John Newbery)
c28ee91 Rename rpc-tests directory to functional (John Newbery)
00902c4 Rename qa directory to test (John Newbery)
Tree-SHA512: ee7125c0c647d81590177beef2c8852c4ef76fdcf888096d9d4d360562a01d8d3b453345c3040487b2a043935bd1e7e80018f34462d6e02262bedbe23edcc576
resolve build errors
Signed-off-by: Pasta <Pasta@dash.org>
update test_runner.py in testintegrations.sh
Signed-off-by: Pasta <Pasta@dash.org>
* moved dash specific tests
Signed-off-by: Pasta <Pasta@dash.org>
* dashify README.md
Signed-off-by: Pasta <Pasta@dash.org>
* removed autoix*.py
Signed-off-by: Pasta <Pasta@dash.org>
* change back file perms
* dedashify
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-19 23:20:34 +03:00