Merge #10180: [trivial] Fix typos (tempoarily → temporarily, inadvertantly → inadvertently)

66082e0 [trivial] Fix typos (tempoarily → temporarily, inadvertantly → inadvertently) (practicalswift)

Tree-SHA512: f377c379c9b6702894289c96fa50e64da01fa4e9353f8507ec5f1f58b0f3047fffdc473dffca61774f57793b82cf9e1c9b5f3d9a04fb864ccc1f44fc2a711f32
This commit is contained in:
Wladimir J. van der Laan 2017-05-02 14:47:53 +02:00 committed by Pasta
parent f097b2d94d
commit 60aa17e0a9

View File

@ -1317,12 +1317,12 @@ void CWallet::TransactionAddedToMempool(const CTransactionRef& ptx) {
void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex *pindex, const std::vector<CTransactionRef>& vtxConflicted) { void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex *pindex, const std::vector<CTransactionRef>& vtxConflicted) {
LOCK2(cs_main, cs_wallet); LOCK2(cs_main, cs_wallet);
// TODO: Tempoarily ensure that mempool removals are notified before // TODO: Temporarily ensure that mempool removals are notified before
// connected transactions. This shouldn't matter, but the abandoned // connected transactions. This shouldn't matter, but the abandoned
// state of transactions in our wallet is currently cleared when we // state of transactions in our wallet is currently cleared when we
// receive another notification and there is a race condition where // receive another notification and there is a race condition where
// notification of a connected conflict might cause an outside process // notification of a connected conflict might cause an outside process
// to abandon a transaction and then have it inadvertantly cleared by // to abandon a transaction and then have it inadvertently cleared by
// the notification that the conflicted transaction was evicted. // the notification that the conflicted transaction was evicted.
for (const CTransactionRef& ptx : vtxConflicted) { for (const CTransactionRef& ptx : vtxConflicted) {