Jonas Schnelli
1090502c3e
Fix superfluous cast and code style nits in RPC wallet-hd.py test
2017-03-24 10:28:40 +01:00
Jonas Schnelli
58e148333e
CKeyPool avoid "catch (...)" in SerializationOp
2017-03-24 10:28:40 +01:00
Jonas Schnelli
e138876f0a
Only show keypoolsize_hd_internal if HD split is enabled
2017-03-24 10:28:40 +01:00
Jonas Schnelli
add38d9b83
GetOldestKeyPoolTime: if HD & HD Chain Split is enabled, response max(oldest-internal-key, oldest-external-key)
2017-03-24 10:28:39 +01:00
Jonas Schnelli
dd526c2a2d
Don't switch to HD-chain-split during wallet encryption of non HD-chain-split wallets
2017-03-24 10:28:39 +01:00
Jonas Schnelli
79df9df348
Switch to 100% for the HD internal keypool size
2017-03-24 10:28:39 +01:00
Jonas Schnelli
bcafca1077
Make sure we always generate one keypool key at minimum
2017-03-24 10:28:39 +01:00
Jonas Schnelli
d0a627a53a
Fix issue where CDataStream->nVersion was taken a CKeyPool record version
2017-03-24 10:28:39 +01:00
Jonas Schnelli
9af8f00a75
Make sure we hand out keypool keys if HD_SPLIT is not enabled
2017-03-24 10:28:38 +01:00
Jonas Schnelli
469a47b760
Make sure ReserveKeyFromKeyPool only hands out internal keys if HD_SPLIT is supported
2017-03-24 10:28:38 +01:00
Jonas Schnelli
05a9b493eb
Fix wrong keypool internal size in RPC getwalletinfo help
2017-03-24 10:28:38 +01:00
Jonas Schnelli
01de822c8d
Removed redundant IsLocked() check in NewKeyPool()
2017-03-24 10:28:38 +01:00
Jonas Schnelli
d59531ddfc
Immediately return setKeyPool's size if HD or HD_SPLIT is disabled or not supported
2017-03-24 10:28:37 +01:00
Jonas Schnelli
02592f4c5e
[Wallet] split the keypool in an internal and external part
2017-03-24 10:28:37 +01:00
MarcoFalke
a230b05887
Merge #9701 : Make bumpfee tests less fragile
...
f85ac54
[qa] Expand bumpfee test docstring (Russell Yanofsky)
0b94e49
[qa] Rename python input variable to tx_input (Russell Yanofsky)
1dfd64f
[qa] Make bumpfee.py test function order consistent (Russell Yanofsky)
e6b2963
[qa] Get rid of nondeterminism in bumpfee.py (Russell Yanofsky)
94b528b
[qa] Remove bumpfee.py get_change_address hack (Russell Yanofsky)
Tree-SHA512: 4017d58fe73837a0dfcca69c43f804498833f946efd9bc394877be242aa40b03d60bd6c3672ed5d24db88b3318304c1f2838050ec5fa6458d1a7e1f566ccda3e
2017-03-23 12:21:10 +01:00
MarcoFalke
dfef6b6af0
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
2017-03-23 11:37:21 +01:00
Jonas Schnelli
3568b30ca3
Merge #9500 : [Qt][RPC] Autocomplete commands for 'help' command in debug console
...
6d8fe35
'help' rpc commands autocomplete (Andrew Chow)
Tree-SHA512: 289bc4fa16a1c0291262998caa18556f1c5aa89662c85528606dc03b596b8833a0fb2c5c9c068b6dcf2adb3a136d4f154591d4a95b8c3313638b77355aaed955
2017-03-23 08:27:16 +01:00
Jonas Schnelli
7b585cf70e
Merge #9558 : Clarify assumptions made about when BlockCheck is called
...
c4a6929
Clarify assumptions made about when BlockCheck is called (Matt Corallo)
Tree-SHA512: 2eceb0c4f06c7fd6b290b93843bda11a4b63131559c5e8226bfec84596ed4e54ee6d8f5bc9cf789a80675be8b8079cf9234c96032df306258cb2260b9d8c7825
2017-03-23 08:18:43 +01:00
Jonas Schnelli
86f7d5b69b
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
2017-03-23 08:16:27 +01:00
practicalswift
389745901a
[tests] Remove unused variables
2017-03-22 17:50:03 +01:00
practicalswift
72163d4585
[tests] Remove unused and duplicate imports
2017-03-22 17:49:23 +01:00
Wladimir J. van der Laan
02d64bd929
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
2017-03-22 13:03:43 +01:00
Jonas Schnelli
90586b6897
Merge #10045 : [trivial] Fix typos in comments
...
dbf30ff
[trivial] Fix typos in comments (practicalswift)
Tree-SHA512: a841c96ba1a80ab57206e8ef4fa9b40ecff2244075a5539fc09f57e763bf2e92b0ed089e32a0dbac3902518dcda43d224f75a3462a560148841746560640ba70
2017-03-22 08:38:24 +01:00
John Newbery
8317a45161
Python functional tests should log in UTC
...
bitcoind logs use UTC. Python functional tests should also log in UTC.
2017-03-21 17:30:13 -04:00
John Newbery
61d75f587d
Introduce combine_logs.py to combine log files from multiple bitcoinds.
...
This commit adds a tool for combining log files from multiple instances
of bitcoinds as well as the test_framework.log file. This gives a
combined view of what the test framework and all bitcoin instances were
doing during a qa test.
2017-03-21 17:30:13 -04:00
practicalswift
dbf30ff10f
[trivial] Fix typos in comments
2017-03-21 19:49:08 +01:00
Russell Yanofsky
f85ac54e24
[qa] Expand bumpfee test docstring
2017-03-21 06:46:55 -04:00
Wladimir J. van der Laan
919aaf6508
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
2017-03-21 11:46:55 +01:00
Russell Yanofsky
0b94e49831
[qa] Rename python input variable to tx_input
...
input() is actually the name of a python built in function
2017-03-21 06:46:55 -04:00
Russell Yanofsky
1dfd64fadc
[qa] Make bumpfee.py test function order consistent
...
Run bumpfee tests in top-down order, now that the test fragility is fixed, and
they can actually run in order.
2017-03-21 05:46:55 -05:00
Russell Yanofsky
e6b2963241
[qa] Get rid of nondeterminism in bumpfee.py
...
Change bumpfee tests to use the spend_one_input function instead of the
create_fund_sign_send function. The latter function would choose transaction
inputs and fees in unpredictable ways depending on the order that tests ran,
which meant that adding new tests could cause old tests to fail, and in general
made bumpfee.py fragile and unpleasant to work with.
2017-03-21 05:46:55 -05:00
Russell Yanofsky
94b528bb0c
[qa] Remove bumpfee.py get_change_address hack
2017-03-21 05:46:55 -05:00
MarcoFalke
3192e5278a
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
2017-03-21 00:11:14 +01:00
Wladimir J. van der Laan
0c17afcbe7
Merge #9734 : Add updating of chainTxData to release process
...
41b8821
Add updating of chainTxData to release process (Pieter Wuille)
Tree-SHA512: f7d6e72b19aa83fc4851a9316d6c6a236e0e914d637525cda42c0b15a94543b8072ce67b57d6b12141332a03b64b6c715dff4d61e6e58e0197b22305b35ad65d
2017-03-20 17:59:20 +01:00
Russell Yanofsky
b5bec4e330
Avoid QTimer::singleShot compile error with Qt 5.3.2
...
Construct QTimer object directly, instead of relying on QTimer::singleShot
overloads accepting lambdas, which weren't introduced until Qt 5.4.
Avoids the following compile error in debian jessie:
```
qt/test/wallettests.cpp: In function ‘void {anonymous}::ConfirmSend()’:
qt/test/wallettests.cpp:34:6: error: no matching function for call to ‘QTimer::singleShot(int, Qt::TimerType, {anonymous}::ConfirmSend()::<lambda()>)’
});
^
qt/test/wallettests.cpp:34:6: note: candidates are:
In file included from /usr/include/x86_64-linux-gnu/qt5/QtCore/QTimer:1:0,
from ./qt/sendcoinsdialog.h:13,
from qt/test/wallettests.cpp:7:
/usr/include/x86_64-linux-gnu/qt5/QtCore/qtimer.h:81:17: note: static void QTimer::singleShot(int, const QObject*, const char*)
static void singleShot(int msec, const QObject *receiver, const char *member);
^
/usr/include/x86_64-linux-gnu/qt5/QtCore/qtimer.h:81:17: note: no known conversion for argument 2 from ‘Qt::TimerType’ to ‘const QObject*’
/usr/include/x86_64-linux-gnu/qt5/QtCore/qtimer.h:82:17: note: static void QTimer::singleShot(int, Qt::TimerType, const QObject*, const char*)
static void singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, const char *member);
^
/usr/include/x86_64-linux-gnu/qt5/QtCore/qtimer.h:82:17: note: candidate expects 4 arguments, 3 provided
```
Error reported by Pavel Janík <Pavel@Janik.cz> in
https://github.com/bitcoin/bitcoin/pull/9974#issuecomment-287574436
2017-03-20 12:35:37 -04:00
Russell Yanofsky
d5046e72f4
Avoid scoped_connection compile error with boost 1.55.0
...
Construct scoped_connection directly instead of relying on copy initialization
and move constructor. Avoids the following compile error in debian jessie:
```
In file included from /usr/include/boost/signals2/signal.hpp:21:0,
from ./util.h:29,
from ./dbwrapper.h:11,
from ./txdb.h:10,
from ./test/test_bitcoin.h:11,
from qt/test/wallettests.cpp:11:
/usr/include/boost/signals2/connection.hpp: In function ‘uint256 {anonymous}::SendCoins(CWallet&, SendCoinsDialog&, const CBitcoinAddress&, CAmount)’:
/usr/include/boost/signals2/connection.hpp:234:7: error: ‘boost::signals2::scoped_connection::scoped_connection(const boost::signals2::scoped_connection&)’ is private
scoped_connection(const scoped_connection &other);
^
qt/test/wallettests.cpp:47:6: error: within this context
});
^
```
Error reported by Pavel Janík <Pavel@Janik.cz> in
https://github.com/bitcoin/bitcoin/pull/9974#issuecomment-287550034
2017-03-20 12:27:07 -04:00
John Newbery
63d66ba20a
Move src/test/bitcoin-util-test.py to test/util/bitcoin-util-test.py
2017-03-20 10:40:31 -04:00
John Newbery
5b0bff4581
Rename --enable-extended-rpc-tests to --enable-extended-functional-tests
2017-03-20 10:40:31 -04:00
John Newbery
a9bd622a65
Rename test/pull-tester/rpc-tests.py to test/functional/test_runner.py
2017-03-20 10:40:31 -04:00
John Newbery
c28ee91db0
Rename rpc-tests directory to functional
2017-03-20 10:40:31 -04:00
John Newbery
00902c48cd
Rename qa directory to test
2017-03-20 10:40:31 -04:00
Wladimir J. van der Laan
d34995a7ba
Merge #10038 : Add mallocinfo mode to getmemoryinfo
RPC
...
e141aa4
Add mallocinfo mode to `getmemoryinfo` RPC (Wladimir J. van der Laan)
Tree-SHA512: e778631765c29b3b5fb94eb66e5f50a8f108a234891bdcc4883f1e6e2fdd223f7660fad987eb2d7cbda5b800482d78adc1a309a3f6f83a84c556af43ebee2ed7
2017-03-20 15:05:56 +01:00
MarcoFalke
7c7ddd9ead
Merge #10037 : Trivial: Fix typo in help getrawtransaction RPC
...
05a9f22
Trivial: Fix typo in help getrawtransaction RPC (James Evans)
Tree-SHA512: 22c68fb49771f96b94c482b28d7efc4d51737cbb973ed3954641f3ea1832c14e7b909030c132afebe17854da134f717acbf14ee26294c61a303bc33dc43aac4c
2017-03-20 10:42:58 +01:00
Wladimir J. van der Laan
e141aa4ba6
Add mallocinfo mode to getmemoryinfo
RPC
...
This adds a mode argument to `getmemoryinfo`. By default the output
will remain the same. However if a mode argument of `mallocinfo` is
provided the result of glibc `malloc_info` (if available) will
be returned as a string, as-is.
This is useful for tracking heap usage over time or troubleshooting
memory fragmentation issues.
2017-03-20 10:30:18 +01:00
James Evans
05a9f22358
Trivial: Fix typo in help getrawtransaction RPC
2017-03-20 05:19:41 -03:00
Wladimir J. van der Laan
5c1a958124
Merge #10027 : Set to nullptr after delete
...
d93b97f
Set to nullptr after delete (practicalswift)
Tree-SHA512: 7201cef4541557ffe31f52ce7527c4b08a2ff5aa1eae5268bdfee5b4843881f8fd115257bef6d1b4dfb71166951950a912ce87aef160ca89c2ca2ae264cfab1b
2017-03-20 08:39:18 +01:00
practicalswift
97b8213674
Fix parameter naming inconsistencies between .h and .cpp files
...
Inconsistencies prior to this commit:
* serializeFlags vs serialFlags
src/core_io.h:std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags = 0);
src/core_write.cpp:std::string EncodeHexTx(const CTransaction& tx, const int serialFlags)
* statusOut vs outStatus
src/rpc/server.h:bool RPCIsInWarmup(std::string *statusOut);
src/rpc/server.cpp:bool RPCIsInWarmup(std::string *outStatus)
* hashesToUpdate vs vHashesToUpdate
src/txmempool.h: void UpdateTransactionsFromBlock(const std::vector<uint256> &hashesToUpdate);
src/txmempool.cpp:void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashesToUpdate)
* nPruneUpToHeight vs nManualPruneHeight
src/validation.h:void PruneBlockFilesManual(int nPruneUpToHeight);
src/validation.cpp:void PruneBlockFilesManual(int nManualPruneHeight);
2017-03-19 16:14:29 +01:00
MarcoFalke
10b930dde8
Merge #10033 : Trivial: Fix typo in key.h comment
...
f490dae
Trivial: Fix typo in key.h comment (Michael Goldstein)
Tree-SHA512: 4b79bfa88313d3558edb9ab1c6d27bd45659355e81f224ba75c05ff069ebae4c9f443efd70ae274814bbb7cca8a9057942b9b867055c48e93822ac73e38a51ce
2017-03-19 11:26:55 +01:00
MarcoFalke
9225de2cf6
Merge #10024 : [trivial] Use log.info() instead of print() in remaining 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
2017-03-19 10:14:18 +01:00
Michael Goldstein
f490dae56b
Trivial: Fix typo in key.h comment
2017-03-18 18:13:55 -07:00