diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-20 16:41:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-20 16:43:07 +0200 |
| commit | dc51608c9c279a3eb33e9a071ded27f613282ac7 (patch) | |
| tree | 064226f069fded9ce84a6d958698cf47b2559e6e /src | |
| parent | 3c923e897538b9d8d55956b981d5540f0fdbf0b2 (diff) | |
| parent | 2cb8ee9ac7fb4d2600305a61400ab5e8a200b722 (diff) | |
| download | bitcoin-dc51608c9c279a3eb33e9a071ded27f613282ac7.tar.xz | |
Merge pull request #6447
2cb8ee9 remove unused inv from ConnectTip() (Pavel Vasin)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 03c09f0a27..fb90d7578c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2059,7 +2059,6 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * LogPrint("bench", " - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001); { CCoinsViewCache view(pcoinsTip); - CInv inv(MSG_BLOCK, pindexNew->GetBlockHash()); bool rv = ConnectBlock(*pblock, state, pindexNew, view); GetMainSignals().BlockChecked(*pblock, state); if (!rv) { @@ -2067,7 +2066,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * InvalidBlockFound(pindexNew, state); return error("ConnectTip(): ConnectBlock %s failed", pindexNew->GetBlockHash().ToString()); } - mapBlockSource.erase(inv.hash); + mapBlockSource.erase(pindexNew->GetBlockHash()); nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2; LogPrint("bench", " - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001); assert(view.Flush()); |