sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: use range-based loops instead of iterators

Browse Source 
Co-authored-by: Konstantin Akimov <knstqq@gmail.com>
This commit is contained in:
Kittywhiskers Van Gogh 2023-09-25 22:53:15 +05:30
parent b08a6343a7
commit 109f57c83e
3 changed files with 66 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpc/blockchain.cpp
View File

@ -838,8 +838,8 @@ static UniValue getblockhashes(const JSONRPCRequest& request)
} }
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (std::vector<uint256>::const_iterator it=blockHashes.begin(); it!=blockHashes.end(); it++) { for (const auto& hash : blockHashes) {
result.push_back(it->GetHex()); result.push_back(hash.GetHex());
} }
return result; return result;
@ -1828,9 +1828,9 @@ static UniValue getchaintips(const JSONRPCRequest& request)
} }
} }
for (std::set<const CBlockIndex*>::iterator it = setOrphans.begin(); it != setOrphans.end(); ++it) { for (const auto& orphan : setOrphans) {
if (setPrevs.erase(*it) == 0) { if (setPrevs.erase(orphan) == 0) {
setTips.insert(*it); setTips.insert(orphan);
} }
} }

109
src/rpc/misc.cpp
View File

@ -635,13 +635,10 @@ static bool getAddressesFromParams(const UniValue& params, std::vector<std::pair
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Addresses is expected to be an array"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Addresses is expected to be an array");
} }
std::vector<UniValue> values = addressValues.getValues(); for (const auto& address : addressValues.getValues()) {
for (std::vector<UniValue>::iterator it = values.begin(); it != values.end(); ++it) {
uint160 hashBytes; uint160 hashBytes;
int type{AddressType::UNKNOWN}; int type{AddressType::UNKNOWN};
if (!getIndexKey(it->get_str(), hashBytes, type)) { if (!getIndexKey(address.get_str(), hashBytes, type)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
} }
addresses.push_back(std::make_pair(hashBytes, type)); addresses.push_back(std::make_pair(hashBytes, type));
@ -711,23 +708,24 @@ static UniValue getaddressmempool(const JSONRPCRequest& request)
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> >::iterator it = indexes.begin(); for (const auto& index : indexes) {
it != indexes.end(); it++) { const auto& mempoolAddressDeltaKey = index.first;
const auto& mempoolAddressDelta = index.second;
std::string address; std::string address;
if (!getAddressFromIndex(it->first.m_address_type, it->first.m_address_bytes, address)) { if (!getAddressFromIndex(mempoolAddressDeltaKey.m_address_type, mempoolAddressDeltaKey.m_address_bytes, address)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
} }
UniValue delta(UniValue::VOBJ); UniValue delta(UniValue::VOBJ);
delta.pushKV("address", address); delta.pushKV("address", address);
delta.pushKV("txid", it->first.m_tx_hash.GetHex()); delta.pushKV("txid", mempoolAddressDeltaKey.m_tx_hash.GetHex());
delta.pushKV("index", (int)it->first.m_tx_index); delta.pushKV("index", (int)mempoolAddressDeltaKey.m_tx_index);
delta.pushKV("satoshis", it->second.m_amount); delta.pushKV("satoshis", mempoolAddressDelta.m_amount);
delta.pushKV("timestamp", count_seconds(it->second.m_time)); delta.pushKV("timestamp", count_seconds(mempoolAddressDelta.m_time));
if (it->second.m_amount < 0) { if (mempoolAddressDelta.m_amount < 0) {
delta.pushKV("prevtxid", it->second.m_prev_hash.GetHex()); delta.pushKV("prevtxid", mempoolAddressDelta.m_prev_hash.GetHex());
delta.pushKV("prevout", (int)it->second.m_prev_out); delta.pushKV("prevout", (int)mempoolAddressDelta.m_prev_out);
} }
result.push_back(delta); result.push_back(delta);
} }
@ -773,8 +771,8 @@ static UniValue getaddressutxos(const JSONRPCRequest& request)
std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) { for (const auto& address : addresses) {
if (!GetAddressUnspent((*it).first, (*it).second, unspentOutputs)) { if (!GetAddressUnspent(address.first, address.second, unspentOutputs)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
} }
} }
@ -783,19 +781,22 @@ static UniValue getaddressutxos(const JSONRPCRequest& request)
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) { for (const auto& unspentOutput : unspentOutputs) {
const auto& unspentKey = unspentOutput.first;
const auto& unspentValue = unspentOutput.second;
UniValue output(UniValue::VOBJ); UniValue output(UniValue::VOBJ);
std::string address; std::string address;
if (!getAddressFromIndex(it->first.m_address_type, it->first.m_address_bytes, address)) { if (!getAddressFromIndex(unspentKey.m_address_type, unspentKey.m_address_bytes, address)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
} }
output.pushKV("address", address); output.pushKV("address", address);
output.pushKV("txid", it->first.m_tx_hash.GetHex()); output.pushKV("txid", unspentKey.m_tx_hash.GetHex());
output.pushKV("outputIndex", (int)it->first.m_tx_index); output.pushKV("outputIndex", (int)unspentKey.m_tx_index);
output.pushKV("script", HexStr(it->second.m_tx_script)); output.pushKV("script", HexStr(unspentValue.m_tx_script));
output.pushKV("satoshis", it->second.m_amount); output.pushKV("satoshis", unspentValue.m_amount);
output.pushKV("height", it->second.m_block_height); output.pushKV("height", unspentValue.m_block_height);
result.push_back(output); result.push_back(output);
} }
@ -855,13 +856,13 @@ static UniValue getaddressdeltas(const JSONRPCRequest& request)
std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex; std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) { for (const auto& address : addresses) {
if (start > 0 && end > 0) { if (start > 0 && end > 0) {
if (!GetAddressIndex((*it).first, (*it).second, addressIndex, start, end)) { if (!GetAddressIndex(address.first, address.second, addressIndex, start, end)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
} }
} else { } else {
if (!GetAddressIndex((*it).first, (*it).second, addressIndex)) { if (!GetAddressIndex(address.first, address.second, addressIndex)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
} }
} }
@ -869,18 +870,20 @@ static UniValue getaddressdeltas(const JSONRPCRequest& request)
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) { for (const auto& index : addressIndex) {
const auto& indexKey = index.first;
const auto& indexDelta = index.second;
std::string address; std::string address;
if (!getAddressFromIndex(it->first.m_address_type, it->first.m_address_bytes, address)) { if (!getAddressFromIndex(indexKey.m_address_type, indexKey.m_address_bytes, address)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
} }
UniValue delta(UniValue::VOBJ); UniValue delta(UniValue::VOBJ);
delta.pushKV("satoshis", it->second); delta.pushKV("satoshis", indexDelta);
delta.pushKV("txid", it->first.m_tx_hash.GetHex()); delta.pushKV("txid", indexKey.m_tx_hash.GetHex());
delta.pushKV("index", (int)it->first.m_tx_index); delta.pushKV("index", (int)indexKey.m_tx_index);
delta.pushKV("blockindex", (int)it->first.m_block_tx_pos); delta.pushKV("blockindex", (int)indexKey.m_block_tx_pos);
delta.pushKV("height", it->first.m_block_height); delta.pushKV("height", indexKey.m_block_height);
delta.pushKV("address", address); delta.pushKV("address", address);
result.push_back(delta); result.push_back(delta);
} }
@ -921,8 +924,8 @@ static UniValue getaddressbalance(const JSONRPCRequest& request)
std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex; std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) { for (const auto& address : addresses) {
if (!GetAddressIndex((*it).first, (*it).second, addressIndex)) { if (!GetAddressIndex(address.first, address.second, addressIndex)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
} }
} }
@ -935,16 +938,18 @@ static UniValue getaddressbalance(const JSONRPCRequest& request)
CAmount balance_immature = 0; CAmount balance_immature = 0;
CAmount received = 0; CAmount received = 0;
for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) { for (const auto& index : addressIndex) {
if (it->second > 0) { const auto& indexKey = index.first;
received += it->second; const auto& indexDelta = index.second;
if (indexDelta > 0) {
received += indexDelta;
} }
if (it->first.m_block_tx_pos == 0 && nHeight - it->first.m_block_height < COINBASE_MATURITY) { if (indexKey.m_block_tx_pos == 0 && nHeight - indexKey.m_block_height < COINBASE_MATURITY) {
balance_immature += it->second; balance_immature += indexDelta;
} else { } else {
balance_spendable += it->second; balance_spendable += indexDelta;
} }
balance += it->second; balance += indexDelta;
} }
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
@ -997,13 +1002,13 @@ static UniValue getaddresstxids(const JSONRPCRequest& request)
std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex; std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) { for (const auto& address : addresses) {
if (start > 0 && end > 0) { if (start > 0 && end > 0) {
if (!GetAddressIndex((*it).first, (*it).second, addressIndex, start, end)) { if (!GetAddressIndex(address.first, address.second, addressIndex, start, end)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
} }
} else { } else {
if (!GetAddressIndex((*it).first, (*it).second, addressIndex)) { if (!GetAddressIndex(address.first, address.second, addressIndex)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
} }
} }
@ -1012,9 +1017,11 @@ static UniValue getaddresstxids(const JSONRPCRequest& request)
std::set<std::pair<int, std::string> > txids; std::set<std::pair<int, std::string> > txids;
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (std::vector<std::pair<CAddressIndexKey, CAmount> >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) { for (const auto& index : addressIndex) {
int height = it->first.m_block_height; const auto& indexKey = index.first;
std::string txid = it->first.m_tx_hash.GetHex();
int height = indexKey.m_block_height;
std::string txid = indexKey.m_tx_hash.GetHex();
if (addresses.size() > 1) { if (addresses.size() > 1) {
txids.insert(std::make_pair(height, txid)); txids.insert(std::make_pair(height, txid));
@ -1026,8 +1033,8 @@ static UniValue getaddresstxids(const JSONRPCRequest& request)
} }
if (addresses.size() > 1) { if (addresses.size() > 1) {
for (std::set<std::pair<int, std::string> >::const_iterator it=txids.begin(); it!=txids.end(); it++) { for (const auto& tx : txids) {
result.push_back(it->second); result.push_back(tx.second);
} }
} }

6
src/txmempool.cpp
View File

@ -510,9 +510,9 @@ bool CTxMemPool::getAddressIndex(std::vector<std::pair<uint160, int> > &addresse
std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> > &results) std::vector<std::pair<CMempoolAddressDeltaKey, CMempoolAddressDelta> > &results)
{ {
LOCK(cs); LOCK(cs);
for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++) { for (const auto& address : addresses) {
addressDeltaMap::iterator ait = mapAddress.lower_bound(CMempoolAddressDeltaKey((*it).second, (*it).first)); addressDeltaMap::iterator ait = mapAddress.lower_bound(CMempoolAddressDeltaKey(address.second, address.first));
while (ait != mapAddress.end() && (*ait).first.m_address_bytes == (*it).first && (*ait).first.m_address_type == (*it).second) { while (ait != mapAddress.end() && (*ait).first.m_address_bytes == address.first && (*ait).first.m_address_type == address.second) {
results.push_back(*ait); results.push_back(*ait);
ait++; ait++;
} }