diff options
| author | Wladimir J. van der Laan <[email protected]> | 2018-05-03 11:25:43 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2018-05-03 11:27:36 +0200 |
| commit | 2afdc294039fc99f098b11b8883c1d530004a66d (patch) | |
| tree | f55ffa749d05ac9e2ab9cdbf0f6e7696053a2bdc /src/test/script_tests.cpp | |
| parent | Merge #12928: qt: Initialize non-static class members that were previously ne... (diff) | |
| parent | wallet: Interrupt rescan on shutdown request (diff) | |
| download | discoin-2afdc294039fc99f098b11b8883c1d530004a66d.tar.xz discoin-2afdc294039fc99f098b11b8883c1d530004a66d.zip | |
Merge #12507: Interrupt rescan on shutdown request
c4fda76 wallet: Interrupt rescan on shutdown request (João Barbosa)
Pull request description:
Fixes #10987.
Here are the steps to test the feature:
1. start bitcoind, generate a couple of transactions and then stop:
```
bitcoind -regtest -printtoconsole
bitcoin-cli -regtest generate 100
```
2. apply the following patch
```diff
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2478d67ce..8f8cea40c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1671,6 +1671,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
}
while (pindex && !fAbortRescan && !ShutdownRequested())
{
+ MilliSleep(500);
if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) {
double gvp = 0;
{
```
3. start bitcoind with rescan flag, interrupt with CTRL+C and the output should look like:
```
bitcoind -regtest -printtoconsole -rescan
...
^C2018-02-22 01:00:55 AddToWallet e8bfb4501b630ad2acb91e88ab0112a779766536d2c564b04faae45ae90e18f7
2018-02-22 01:00:55 Rescan interrupted by shutdown request at block 5. Progress=1.000000
2018-02-22 01:00:55 rescan 1774ms
2018-02-22 01:00:55 setKeyPool.size() = 1995
2018-02-22 01:00:55 mapWallet.size() = 10145
2018-02-22 01:00:55 mapAddressBook.size() = 3
2018-02-22 01:00:55 Shutdown: In progress...
2018-02-22 01:00:55 scheduler thread interrupt
2018-02-22 01:00:55 Shutdown: done
```
Tree-SHA512: f9bebe2cdacf0359b6cbfcbc48ac2818a3ae7aa7822ff0c2c0de4ca2fff7c88493380b74a1c5ff2ce1de01fe605b0e5ef3576f124ea9cff8ef25a9e762477b92
Diffstat (limited to 'src/test/script_tests.cpp')
0 files changed, 0 insertions, 0 deletions