[fold] address review comments

XRPLF · Apr 29, 2020 · 2590960 · 2590960
1 parent 8100770
commit 2590960
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 39 deletions.
diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp
@@ -374,7 +374,7 @@ populateProtoResponse(
                     if (txnMeta)
                     {
                         RPC::convert(*txnProto->mutable_meta(), txnMeta);
-                        if (!txnMeta->hasDeliveredAmount())
+                        if (!txnProto->meta().has_delivered_amount())
                         {
                             if (auto amt = getDeliveredAmount(
                                     context,

diff --git a/src/test/rpc/Tx_test.cpp b/src/test/rpc/Tx_test.cpp
@@ -548,7 +548,7 @@ class Tx_test : public beast::unit_test::suite
         };
 
         auto grpcAccountTx = [&grpcPort](
-                                 uint256 const& hash,
+                                 uint256 const& id,
                                  auto binary,
                                  AccountID const& account) {
             GrpcAccountTxClient client(grpcPort);
@@ -559,7 +559,7 @@ class Tx_test : public beast::unit_test::suite
 
             for (auto tx : client.reply.transactions())
             {
-                if (uint256::fromVoid(tx.hash().data()) == hash)
+                if (uint256::fromVoid(tx.hash().data()) == id)
                 {
                     return std::
                         pair<bool, org::xrpl::rpc::v1::GetTransactionResponse>(
@@ -716,45 +716,42 @@ class Tx_test : public beast::unit_test::suite
                     cmpPaymentTx(result.second.transaction(), tx);
                 }
 
-                if (ledger && !b)
-                {
-                    auto rawMeta = ledger->txRead(id).second;
-                    if (rawMeta)
-                    {
-                        auto txMeta = std::make_shared<TxMeta>(
-                            id, ledger->seq(), *rawMeta);
+                if (not ledger or b)
+                    continue;
 
-                        cmpMeta(result.second.meta(), txMeta);
-                        cmpDeliveredAmount(
-                            result.second.meta(),
-                            result.second.transaction(),
-                            txMeta,
-                            tx);
+                auto rawMeta = ledger->txRead(id).second;
+                if (not rawMeta)
+                    continue;
 
-                        // Compare result to result from account_tx
-                        auto mentioned = tx->getMentionedAccounts();
+                auto txMeta =
+                    std::make_shared<TxMeta>(id, ledger->seq(), *rawMeta);
 
-                        if (BEAST_EXPECT(mentioned.size()))
-                        {
-                            auto a = *mentioned.begin();
-                            auto const accountTxResult =
-                                grpcAccountTx(id, b, a);
-
-                            BEAST_EXPECT(accountTxResult.first);
-                            if (accountTxResult.first)
-                            {
-                                cmpPaymentTx(
-                                    accountTxResult.second.transaction(), tx);
-                                cmpMeta(accountTxResult.second.meta(), txMeta);
-                                cmpDeliveredAmount(
-                                    accountTxResult.second.meta(),
-                                    accountTxResult.second.transaction(),
-                                    txMeta,
-                                    tx);
-                            }
-                        }
-                    }
-                }
+                cmpMeta(result.second.meta(), txMeta);
+                cmpDeliveredAmount(
+                    result.second.meta(),
+                    result.second.transaction(),
+                    txMeta,
+                    tx);
+
+                // Compare result to result from account_tx
+                auto mentioned = tx->getMentionedAccounts();
+
+                if (not BEAST_EXPECT(mentioned.size()))
+                    continue;
+
+                auto account = *mentioned.begin();
+                auto const accountTxResult = grpcAccountTx(id, b, account);
+
+                if (not BEAST_EXPECT(accountTxResult.first))
+                    continue;
+
+                cmpPaymentTx(accountTxResult.second.transaction(), tx);
+                cmpMeta(accountTxResult.second.meta(), txMeta);
+                cmpDeliveredAmount(
+                    accountTxResult.second.meta(),
+                    accountTxResult.second.transaction(),
+                    txMeta,
+                    tx);
             }
             index++;
         }