Simplify GetActiveFundingStreamElements.

Signed-off-by: Daira-Emma Hopwood <[email protected]>

Author: daira

src/consensus/params.cpp

@@ -349,7 +349,11 @@ namespace Consensus {
         // Funding streams are disabled if Canopy is not active.
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
             for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+                // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
+                // in the definition of vFundingStreams.
                 auto fs = vFundingStreams[idx];
+
+                // Funding period is [startHeight, endHeight).
                 if (fs && nHeight >= fs.value().GetStartHeight() && nHeight < fs.value().GetEndHeight()) {
                     activeStreams.push_back(std::make_pair(FundingStreamInfo[idx], fs.value()));
                 }
@@ -372,16 +376,10 @@ namespace Consensus {
 
         // Funding streams are disabled if Canopy is not active.
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
-            for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
-                // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
-                // in the definition of vFundingStreams.
-                auto fs = vFundingStreams[idx];
-                // Funding period is [startHeight, endHeight)
-                if (fs && nHeight >= fs.value().GetStartHeight() && nHeight < fs.value().GetEndHeight()) {
-                    requiredElements.insert(std::make_pair(
-                        fs.value().Recipient(*this, nHeight),
-                        FundingStreamInfo[idx].Value(blockSubsidy)));
-                }
+            for (const auto& [fsinfo, fs] : GetActiveFundingStreams(nHeight)) {
+                requiredElements.insert(std::make_pair(
+                    fs.Recipient(*this, nHeight),
+                    fsinfo.Value(blockSubsidy)));
             }
         }