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 structure binding in for loop in rpc/misc

Browse Source 
Co-authored-by: Konstantin Akimov <knstqq@gmail.com>
This commit is contained in:
Kittywhiskers Van Gogh 2023-09-25 16:31:26 +07:00
parent 109f57c83e
commit c65a10f349
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/rpc/misc.cpp
View File

@ -708,19 +708,16 @@ static UniValue getaddressmempool(const JSONRPCRequest& request)
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (const auto& index : indexes) { for (const auto& [mempoolAddressKey, mempoolAddressDelta] : indexes) {
const auto& mempoolAddressDeltaKey = index.first;
const auto& mempoolAddressDelta = index.second;
std::string address; std::string address;
if (!getAddressFromIndex(mempoolAddressDeltaKey.m_address_type, mempoolAddressDeltaKey.m_address_bytes, address)) { if (!getAddressFromIndex(mempoolAddressKey.m_address_type, mempoolAddressKey.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", mempoolAddressDeltaKey.m_tx_hash.GetHex()); delta.pushKV("txid", mempoolAddressKey.m_tx_hash.GetHex());
delta.pushKV("index", (int)mempoolAddressDeltaKey.m_tx_index); delta.pushKV("index", (int)mempoolAddressKey.m_tx_index);
delta.pushKV("satoshis", mempoolAddressDelta.m_amount); delta.pushKV("satoshis", mempoolAddressDelta.m_amount);
delta.pushKV("timestamp", count_seconds(mempoolAddressDelta.m_time)); delta.pushKV("timestamp", count_seconds(mempoolAddressDelta.m_time));
if (mempoolAddressDelta.m_amount < 0) { if (mempoolAddressDelta.m_amount < 0) {
@ -781,10 +778,7 @@ static UniValue getaddressutxos(const JSONRPCRequest& request)
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (const auto& unspentOutput : unspentOutputs) { for (const auto& [unspentKey, unspentValue] : 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(unspentKey.m_address_type, unspentKey.m_address_bytes, address)) { if (!getAddressFromIndex(unspentKey.m_address_type, unspentKey.m_address_bytes, address)) {
@ -870,9 +864,7 @@ static UniValue getaddressdeltas(const JSONRPCRequest& request)
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
for (const auto& index : addressIndex) { for (const auto& [indexKey, indexDelta] : addressIndex) {
const auto& indexKey = index.first;
const auto& indexDelta = index.second;
std::string address; std::string address;
if (!getAddressFromIndex(indexKey.m_address_type, indexKey.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");
@ -938,9 +930,7 @@ static UniValue getaddressbalance(const JSONRPCRequest& request)
CAmount balance_immature = 0; CAmount balance_immature = 0;
CAmount received = 0; CAmount received = 0;
for (const auto& index : addressIndex) { for (const auto& [indexKey, indexDelta] : addressIndex) {
const auto& indexKey = index.first;
const auto& indexDelta = index.second;
if (indexDelta > 0) { if (indexDelta > 0) {
received += indexDelta; received += indexDelta;
} }
@ -1017,9 +1007,7 @@ 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 (const auto& index : addressIndex) { for (const auto& [indexKey, _]: addressIndex) {
const auto& indexKey = index.first;
int height = indexKey.m_block_height; int height = indexKey.m_block_height;
std::string txid = indexKey.m_tx_hash.GetHex(); std::string txid = indexKey.m_tx_hash.GetHex();