diff options
| author | James O'Beirne <james.obeirne@gmail.com> | 2019-07-24 11:45:04 -0400 |
|---|---|---|
| committer | James O'Beirne <james.obeirne@gmail.com> | 2019-08-06 13:13:06 -0400 |
| commit | fae6ab6aed3b9fdc9201bb19a307dfc3d9b89891 (patch) | |
| tree | 32136f410bdb26e8c414caddf9e3c86dbf45a8db /src/node | |
| parent | e5fdda68c6d2313edb74443f0d1e6d2ce2d97f5e (diff) | |
| download | bitcoin-fae6ab6aed3b9fdc9201bb19a307dfc3d9b89891.tar.xz | |
refactor: pcoinsTip -> CChainState::CoinsTip()
This aliasing makes subsequent commits easier to review; eventually CoinsTip()
will return the CCoinsViewCache managed by CChainState.
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/coin.cpp | 3 | ||||
| -rw-r--r-- | src/node/transaction.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/node/coin.cpp b/src/node/coin.cpp index bb98e63f3a..ad8d1d3af4 100644 --- a/src/node/coin.cpp +++ b/src/node/coin.cpp @@ -10,8 +10,7 @@ void FindCoins(std::map<COutPoint, Coin>& coins) { LOCK2(cs_main, ::mempool.cs); - assert(pcoinsTip); - CCoinsViewCache& chain_view = *::pcoinsTip; + CCoinsViewCache& chain_view = ::ChainstateActive().CoinsTip(); CCoinsViewMemPool mempool_view(&chain_view, ::mempool); for (auto& coin : coins) { if (!mempool_view.GetCoin(coin.first, coin.second)) { diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp index 8e56496358..037576b828 100644 --- a/src/node/transaction.cpp +++ b/src/node/transaction.cpp @@ -25,7 +25,7 @@ TransactionError BroadcastTransaction(const CTransactionRef tx, std::string& err LOCK(cs_main); // If the transaction is already confirmed in the chain, don't do anything // and return early. - CCoinsViewCache &view = *pcoinsTip; + CCoinsViewCache &view = ::ChainstateActive().CoinsTip(); for (size_t o = 0; o < tx->vout.size(); o++) { const Coin& existingCoin = view.AccessCoin(COutPoint(hashTx, o)); // IsSpent doesnt mean the coin is spent, it means the output doesnt' exist. |