resolve new comments

Author: yinyiqian1

src/rpc/handlers/AccountMPTokenIssuances.cpp

@@ -116,7 +116,7 @@ AccountMPTokenIssuancesHandler::process(AccountMPTokenIssuancesHandler::Input co
     auto const accountLedgerObject =
         sharedPtrBackend_->fetchLedgerObject(ripple::keylet::account(*accountID).key, lgrInfo.seq, ctx.yield);
 
-    if (not accountLedgerObject)
+    if (not accountLedgerObject.has_value())
         return Error{Status{RippledError::rpcACT_NOT_FOUND}};
 
     Output response;
@@ -191,8 +191,8 @@ tag_invoke(boost::json::value_from_tag, boost::json::value& jv, AccountMPTokenIs
         {"mpt_issuances", value_from(output.issuances)},
     };
 
-    if (output.marker)
-        obj[JS(marker)] = output.marker.value();
+    if (output.marker.has_value())
+        obj[JS(marker)] = *output.marker;
 
     jv = std::move(obj);
 }

src/rpc/handlers/AccountMPTokens.cpp

@@ -90,7 +90,7 @@ AccountMPTokensHandler::process(AccountMPTokensHandler::Input const& input, Cont
     auto const accountLedgerObject =
         sharedPtrBackend_->fetchLedgerObject(ripple::keylet::account(*accountID).key, lgrInfo.seq, ctx.yield);
 
-    if (not accountLedgerObject)
+    if (not accountLedgerObject.has_value())
         return Error{Status{RippledError::rpcACT_NOT_FOUND}};
 
     Output response;
@@ -109,7 +109,7 @@ AccountMPTokensHandler::process(AccountMPTokensHandler::Input const& input, Cont
     if (!expectedNext.has_value())
         return Error{expectedNext.error()};
 
-    auto const nextMarker = expectedNext.value();
+    auto const& nextMarker = expectedNext.value();
 
     response.account = input.account;
     response.limit = input.limit;
@@ -126,7 +126,7 @@ AccountMPTokensHandler::process(AccountMPTokensHandler::Input const& input, Cont
 AccountMPTokensHandler::Input
 tag_invoke(boost::json::value_to_tag<AccountMPTokensHandler::Input>, boost::json::value const& jv)
 {
-    auto input = AccountMPTokensHandler::Input{};
+    AccountMPTokensHandler::Input input{};
     auto const& jsonObject = jv.as_object();
 
     input.account = boost::json::value_to<std::string>(jv.at(JS(account)));
@@ -160,7 +160,7 @@ tag_invoke(boost::json::value_from_tag, boost::json::value& jv, AccountMPTokensH
         {"mptokens", boost::json::value_from(output.mpts)},
     };
 
-    if (output.marker)
+    if (output.marker.has_value())
         obj[JS(marker)] = *output.marker;
 
     jv = std::move(obj);

tests/common/util/TestObject.cpp

@@ -1465,19 +1465,19 @@ createMptIssuanceObject(
     mptIssuance.setFieldU32(ripple::sfPreviousTxnLgrSeq, 0);
     mptIssuance.setFieldU64(ripple::sfOutstandingAmount, outstandingAmount);
 
-    if (transferFee)
+    if (transferFee.has_value())
         mptIssuance.setFieldU16(ripple::sfTransferFee, *transferFee);
-    if (assetScale)
+    if (assetScale.has_value())
         mptIssuance.setFieldU8(ripple::sfAssetScale, *assetScale);
-    if (maxAmount)
+    if (maxAmount.has_value())
         mptIssuance.setFieldU64(ripple::sfMaximumAmount, *maxAmount);
-    if (lockedAmount)
+    if (lockedAmount.has_value())
         mptIssuance.setFieldU64(ripple::sfLockedAmount, *lockedAmount);
-    if (metadata) {
+    if (metadata.has_value()) {
         ripple::Slice const sliceMetadata(metadata->data(), metadata->size());
         mptIssuance.setFieldVL(ripple::sfMPTokenMetadata, sliceMetadata);
     }
-    if (domainId)
+    if (domainId.has_value())
         mptIssuance.setFieldH256(ripple::sfDomainID, ripple::uint256{*domainId});
 
     return mptIssuance;
@@ -1503,7 +1503,7 @@ createMpTokenObject(
 
     if (mptAmount != 0u)
         mptoken.setFieldU64(ripple::sfMPTAmount, mptAmount);
-    if (lockedAmount)
+    if (lockedAmount.has_value())
         mptoken.setFieldU64(ripple::sfLockedAmount, *lockedAmount);
 
     return mptoken;