Skip to content

Typo fix upspent -> unspent #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spyder46n2 merged 1 commit into from
Dec 5, 2018
Merged

Typo fix upspent -> unspent #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/assets/assets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,15 +1165,15 @@ bool CAssetsCache::TrySpendCoin(const COutPoint& out, const CTxOut& txOut)
return true;
}

bool CAssetsCache::AddToMyUpspentOutPoints(const std::string& strName, const COutPoint& out)
bool CAssetsCache::AddToMyUnspentOutPoints(const std::string& strName, const COutPoint& out)
{
if (!mapMyUnspentAssets.count(strName)) {
std::set<COutPoint> setOuts;
setOuts.insert(out);
mapMyUnspentAssets.insert(std::make_pair(strName, setOuts));
} else {
if (!mapMyUnspentAssets[strName].insert(out).second)
return error("%s: Tried adding an asset to my map of upspent assets, but it already existed in the set of assets: %s, COutPoint: %s", __func__, strName, out.ToString());
return error("%s: Tried adding an asset to my map of unspent assets, but it already existed in the set of assets: %s, COutPoint: %s", __func__, strName, out.ToString());
}

// Add the outpoint to the set so we know what we need to database
Expand Down Expand Up @@ -1201,7 +1201,7 @@ bool CAssetsCache::AddPossibleOutPoint(const CAssetCachePossibleMine& possibleMi

// If asset is in an CTxOut that I own add it to my cache
if (vpwallets[0]->IsMine(possibleMine.txOut) == ISMINE_SPENDABLE) {
if (!AddToMyUpspentOutPoints(possibleMine.assetName, possibleMine.out))
if (!AddToMyUnspentOutPoints(possibleMine.assetName, possibleMine.out))
return error("%s: Failed to add an asset I own to my Unspent Asset Cache. asset %s",
__func__, possibleMine.assetName);
}
Expand Down Expand Up @@ -2116,7 +2116,7 @@ void UpdatePossibleAssets()
for (auto item : passets->setPossiblyMineAdd) {
// If the CTxOut is mine add it to the list of unspent outpoints
if (vpwallets[0]->IsMine(item.txOut) == ISMINE_SPENDABLE) {
if (!passets->AddToMyUpspentOutPoints(item.assetName, item.out)) // Boolean true means only change the in memory data. We will want to save at the same time that RVN coin saves its cache
if (!passets->AddToMyUnspentOutPoints(item.assetName, item.out)) // Boolean true means only change the in memory data. We will want to save at the same time that RVN coin saves its cache
error("%s: Failed to add an asset I own to my Unspent Asset Database. asset %s",
__func__, item.assetName);
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/assets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public :
bool AddNewAsset(const CNewAsset& asset, const std::string address, const int& nHeight, const uint256& blockHash);
bool AddTransferAsset(const CAssetTransfer& transferAsset, const std::string& address, const COutPoint& out, const CTxOut& txOut);
bool AddOwnerAsset(const std::string& assetsName, const std::string address);
bool AddToMyUpspentOutPoints(const std::string& strName, const COutPoint& out);
bool AddToMyUnspentOutPoints(const std::string& strName, const COutPoint& out);
bool AddReissueAsset(const CReissueAsset& reissue, const std::string address, const COutPoint& out);

// Cache only validation functions
Expand Down