Address nits from per-utxo change #10558

pull morcos wants to merge 2 commits into bitcoin:master from morcos:10195nits changing 2 files +5 −1

morcos commented at 4:16 PM on June 8, 2017: member

@sipa the other nits from my review
laanwj added the label UTXO Db and Indexes on Jun 8, 2017
sipa commented at 6:13 PM on June 8, 2017: member

utACK 567a8fb86878d69619925fb1b945d6613ce134ad
gmaxwell approved
gmaxwell commented at 6:51 PM on June 8, 2017: contributor

utACK
morcos force-pushed on Jun 8, 2017
morcos commented at 9:06 PM on June 8, 2017: member

Removed one of the comment changes to reflect new semantics of HaveCoinInCache from #10559

in src/coins.h:157 in d3cbbf1129 outdated

 148 | @@ -149,8 +149,7 @@ class CCoinsView
 149 |      //! Retrieve the Coin (unspent transaction output) for a given outpoint.
 150 |      virtual bool GetCoin(const COutPoint &outpoint, Coin &coin) const;
 151 |  
 152 | -    //! Just check whether we have data for a given outpoint.
 153 | -    //! This may (but cannot always) return true for spent outputs.
 154 | +    //! Just check whether we have data for a given outpoint and that it is not spent.

sipa commented at 12:11 AM on June 13, 2017:

As pointed out in another PR, CCoinViewMemPool::HaveCoin would violate this (which has no effect as it isn't called anywhere).

laanwj commented at 8:24 AM on June 23, 2017: member

Needs rebase

Add belt-and-suspenders in DisconnectBlock

These extra variables were previously checked before the move to per-txout database.

3c8a9aefff

morcos force-pushed on Jun 27, 2017
morcos commented at 7:07 PM on June 27, 2017: member

rebased again... this PR is slowly getting smaller and smaller :)
Comment clarifications in coins.cpp 21d4afa12f

in src/coins.h:158 in 5e6f2cacf4 outdated

 150 | @@ -151,7 +151,11 @@ class CCoinsView
 151 |       */
 152 |      virtual bool GetCoin(const COutPoint &outpoint, Coin &coin) const;
 153 |  
 154 | +<<<<<<< HEAD
 155 |      //! Just check whether a given outpoint is unspent.
 156 | +=======
 157 | +    //! Just check whether we have data for a given outpoint and that it is not spent.
 158 | +>>>>>>> d3cbbf1... Comment clarifications in coins.cpp

sipa commented at 7:08 PM on June 27, 2017:

This does not look like valid C++.

morcos commented at 8:05 PM on June 27, 2017:

sigh....

morcos force-pushed on Jun 27, 2017
morcos commented at 8:13 PM on June 27, 2017: member

fixed broken push
sipa commented at 11:23 PM on June 27, 2017: member

utACK 21d4afa12fbf1e7f59b629060c9e10db213fe07a
laanwj commented at 4:22 PM on June 28, 2017: member

utACK 21d4afa
sipa merged this on Jun 28, 2017
sipa closed this on Jun 28, 2017
sipa referenced this in commit 90a002ea64 on Jun 28, 2017
morcos deleted the branch on Jun 29, 2017
laanwj deleted a comment on Jun 29, 2017
codablock referenced this in commit e64636ed51 on Sep 27, 2017
codablock referenced this in commit 08b9eceb2a on Oct 12, 2017
codablock referenced this in commit 626d577926 on Oct 26, 2017
codablock referenced this in commit 8fa926aaaf on Oct 26, 2017
codablock referenced this in commit 48288d1bea on Oct 26, 2017
codablock referenced this in commit d43ad565ca on Oct 30, 2017
codablock referenced this in commit 14a5935b8d on Oct 31, 2017
codablock referenced this in commit e62f01b10b on Oct 31, 2017
codablock referenced this in commit 5b232161a7 on Oct 31, 2017
UdjinM6 referenced this in commit b12c14f46b on Nov 8, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels