Merge #10892: Replace traditional for with ranged for in block and transaction primitives

72f0060 Replace traditional for with ranged for in primitives (Dag Robole)

Pull request description:

  Replace traditional for with ranged for in block and transaction primitives to improve readability

Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528

src/primitives/block.cpp

@@ -25,9 +25,8 @@ std::string CBlock::ToString() const
         hashMerkleRoot.ToString(),
         nTime, nBits, nNonce,
         vtx.size());
-    for (unsigned int i = 0; i < vtx.size(); i++)
+    for (const auto& tx : vtx) {
-    {
+        s << "  " << tx->ToString() << "\n";
-        s << "  " << vtx[i]->ToString() << "\n";
     }
     return s.str();
 }

src/primitives/transaction.cpp

@@ -83,10 +83,9 @@ CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vi
 CAmount CTransaction::GetValueOut() const
 {
     CAmount nValueOut = 0;
-    for (std::vector<CTxOut>::const_iterator it(vout.begin()); it != vout.end(); ++it)
+    for (const auto& tx_out : vout) {
-    {
+        nValueOut += tx_out.nValue;
-        nValueOut += it->nValue;
+        if (!MoneyRange(tx_out.nValue) || !MoneyRange(nValueOut))
-        if (!MoneyRange(it->nValue) || !MoneyRange(nValueOut))
             throw std::runtime_error(std::string(__func__) + ": value out of range");
     }
     return nValueOut;
@@ -106,11 +105,11 @@ std::string CTransaction::ToString() const
         vin.size(),
         vout.size(),
         nLockTime);
-    for (unsigned int i = 0; i < vin.size(); i++)
+    for (const auto& tx_in : vin)
-        str += "    " + vin[i].ToString() + "\n";
+        str += "    " + tx_in.ToString() + "\n";
-    for (unsigned int i = 0; i < vin.size(); i++)
+    for (const auto& tx_in : vin)
-        str += "    " + vin[i].scriptWitness.ToString() + "\n";
+        str += "    " + tx_in.scriptWitness.ToString() + "\n";
-    for (unsigned int i = 0; i < vout.size(); i++)
+    for (const auto& tx_out : vout)
-        str += "    " + vout[i].ToString() + "\n";
+        str += "    " + tx_out.ToString() + "\n";
     return str;
 }