diff options
| author | Pieter Wuille <[email protected]> | 2014-09-10 01:38:43 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2014-09-10 01:44:30 +0200 |
| commit | f7cdcb80ab7016e33e8399df796885ce54eb63b0 (patch) | |
| tree | 0d8dc00b07b55b3be99fb475d04827f5e37506c6 /src/miner.cpp | |
| parent | Merge pull request #4882 (diff) | |
| parent | Combine CCoinsViewCache's HaveCoins and const GetCoins into AccessCoins. (diff) | |
| download | discoin-f7cdcb80ab7016e33e8399df796885ce54eb63b0.tar.xz discoin-f7cdcb80ab7016e33e8399df796885ce54eb63b0.zip | |
Merge pull request #4822
629d75f Combine CCoinsViewCache's HaveCoins and const GetCoins into AccessCoins. (Pieter Wuille)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 96dc80a26..d05ddbeb1 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -167,12 +167,13 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) nTotalIn += mempool.mapTx[txin.prevout.hash].GetTx().vout[txin.prevout.n].nValue; continue; } - const CCoins &coins = view.GetCoins(txin.prevout.hash); + const CCoins* coins = view.AccessCoins(txin.prevout.hash); + assert(coins); - int64_t nValueIn = coins.vout[txin.prevout.n].nValue; + int64_t nValueIn = coins->vout[txin.prevout.n].nValue; nTotalIn += nValueIn; - int nConf = pindexPrev->nHeight - coins.nHeight + 1; + int nConf = pindexPrev->nHeight - coins->nHeight + 1; dPriority += (double)nValueIn * nConf; } |