Merge pull request #2644 from sipa/constfindblock

Make FindBlockByHeight constant-time
2013-05-30 08:06:44 -07:00
parent 3fad76bf83 0fe8010a10
commit d397715661
5 changed files with 36 additions and 51 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -779,7 +779,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
                if (AddToWalletIfInvolvingMe(tx.GetHash(), tx, &block, fUpdate))
                    ret++;
            }
-            pindex = pindex->pnext;
+            pindex = pindex->GetNextInMainChain();
        }
    }
    return ret;