refactor: implement MnNetInfo::ToString() for printing internal state

Author: kwvg

src/evo/dmnstate.cpp

@@ -27,12 +27,12 @@ std::string CDeterministicMNState::ToString() const
 
     return strprintf("CDeterministicMNState(nVersion=%d, nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, "
                      "nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, "
-                     "ownerAddress=%s, pubKeyOperator=%s, votingAddress=%s, addr=%s, payoutAddress=%s, "
-                     "operatorPayoutAddress=%s)",
+                     "ownerAddress=%s, pubKeyOperator=%s, votingAddress=%s, payoutAddress=%s, "
+                     "operatorPayoutAddress=%s)\n"
+                     "  %s",
                      nVersion, nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight,
                      nRevocationReason, EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(),
-                     EncodeDestination(PKHash(keyIDVoting)), netInfo.GetPrimary().ToStringAddrPort(), payoutAddress,
-                     operatorPayoutAddress);
+                     EncodeDestination(PKHash(keyIDVoting)), payoutAddress, operatorPayoutAddress, netInfo.ToString());
 }
 
 UniValue CDeterministicMNState::ToJson(MnType nType) const

src/evo/netinfo.cpp

@@ -58,3 +58,11 @@ NetInfoStatus MnNetInfo::AddEntry(const std::string& input)
     }
     return NetInfoStatus::BadInput;
 }
+
+std::string MnNetInfo::ToString() const
+{
+    // Extra padding to account for padding done by the calling function.
+    return strprintf("MnNetInfo()\n"
+                     "    CService(addr=%s, port=%u)\n",
+                     m_addr.ToStringAddr(), m_addr.GetPort());
+}

src/evo/netinfo.h

@@ -54,6 +54,7 @@ class MnNetInfo
     const CService& GetPrimary() const { return m_addr; }
     bool IsEmpty() const { return *this == MnNetInfo(); }
     NetInfoStatus Validate() const { return ValidateService(m_addr); }
+    std::string ToString() const;
 
     void Clear() { m_addr = CService(); }
 };

src/evo/providertx.cpp

@@ -87,14 +87,14 @@ std::string CProRegTx::ToString() const
         payee = EncodeDestination(dest);
     }
 
-    return strprintf("CProRegTx(nVersion=%d, nType=%d, collateralOutpoint=%s, addr=%s, nOperatorReward=%f, "
+    return strprintf("CProRegTx(nVersion=%d, nType=%d, collateralOutpoint=%s, nOperatorReward=%f, "
                      "ownerAddress=%s, pubKeyOperator=%s, votingAddress=%s, scriptPayout=%s, platformNodeID=%s, "
-                     "platformP2PPort=%d, platformHTTPPort=%d)",
-                     nVersion, ToUnderlying(nType), collateralOutpoint.ToStringShort(),
-                     netInfo.GetPrimary().ToStringAddrPort(), (double)nOperatorReward / 100,
+                     "platformP2PPort=%d, platformHTTPPort=%d)\n"
+                     "  %s",
+                     nVersion, ToUnderlying(nType), collateralOutpoint.ToStringShort(), (double)nOperatorReward / 100,
                      EncodeDestination(PKHash(keyIDOwner)), pubKeyOperator.ToString(),
                      EncodeDestination(PKHash(keyIDVoting)), payee, platformNodeID.ToString(), platformP2PPort,
-                     platformHTTPPort);
+                     platformHTTPPort, netInfo.ToString());
 }
 
 bool CProUpServTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const
@@ -117,10 +117,11 @@ std::string CProUpServTx::ToString() const
         payee = EncodeDestination(dest);
     }
 
-    return strprintf("CProUpServTx(nVersion=%d, nType=%d, proTxHash=%s, addr=%s, operatorPayoutAddress=%s, "
-                     "platformNodeID=%s, platformP2PPort=%d, platformHTTPPort=%d)",
-                     nVersion, ToUnderlying(nType), proTxHash.ToString(), netInfo.GetPrimary().ToStringAddrPort(),
-                     payee, platformNodeID.ToString(), platformP2PPort, platformHTTPPort);
+    return strprintf("CProUpServTx(nVersion=%d, nType=%d, proTxHash=%s, operatorPayoutAddress=%s, "
+                     "platformNodeID=%s, platformP2PPort=%d, platformHTTPPort=%d)\n"
+                     "  %s",
+                     nVersion, ToUnderlying(nType), proTxHash.ToString(), payee, platformNodeID.ToString(),
+                     platformP2PPort, platformHTTPPort, netInfo.ToString());
 }
 
 bool CProUpRegTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const

src/evo/simplifiedmns.cpp

@@ -62,13 +62,13 @@ std::string CSimplifiedMNListEntry::ToString() const
         operatorPayoutAddress = EncodeDestination(dest);
     }
 
-    return strprintf("CSimplifiedMNListEntry(nVersion=%d, nType=%d, proRegTxHash=%s, confirmedHash=%s, addr=%s, "
+    return strprintf("CSimplifiedMNListEntry(nVersion=%d, nType=%d, proRegTxHash=%s, confirmedHash=%s, "
                      "pubKeyOperator=%s, votingAddress=%s, isValid=%d, payoutAddress=%s, operatorPayoutAddress=%s, "
-                     "platformHTTPPort=%d, platformNodeID=%s)",
+                     "platformHTTPPort=%d, platformNodeID=%s)\n"
+                     "  %s",
                      nVersion, ToUnderlying(nType), proRegTxHash.ToString(), confirmedHash.ToString(),
-                     netInfo.GetPrimary().ToStringAddrPort(), pubKeyOperator.ToString(),
-                     EncodeDestination(PKHash(keyIDVoting)), isValid, payoutAddress, operatorPayoutAddress,
-                     platformHTTPPort, platformNodeID.ToString());
+                     pubKeyOperator.ToString(), EncodeDestination(PKHash(keyIDVoting)), isValid, payoutAddress,
+                     operatorPayoutAddress, platformHTTPPort, platformNodeID.ToString(), netInfo.ToString());
 }
 
 UniValue CSimplifiedMNListEntry::ToJson(bool extended) const