Merge branch 'dev' into fix-delivered-amt

src/ripple/rpc/impl/DeliveredAmount.cpp

@@ -60,24 +60,9 @@ getDeliveredAmount(
     }
 
     if (serializedTx->isFieldPresent(sfAmount))
-    {
-        using namespace std::chrono_literals;
-
-        // Ledger 4594095 is the first ledger in which the DeliveredAmount field
-        // was present when a partial payment was made and its absence indicates
-        // that the amount delivered is listed in the Amount field.
-        //
-        // If the ledger closed long after the DeliveredAmount code was deployed
-        // then its absence indicates that the amount delivered is listed in the
-        // Amount field. DeliveredAmount went live January 24, 2014.
-        // 446000000 is in Feb 2014, well after DeliveredAmount went live
-        if (getLedgerIndex() >= 4594095 ||
-            getCloseTime() > NetClock::time_point{446000000s} ||
-            (serializedTx && serializedTx->isFieldPresent(sfNetworkID)))
     {
         return serializedTx->getFieldAmount(sfAmount);
     }
-    }
 
     return {};
 }

src/test/app/SetHookTSH_test.cpp

@@ -5466,6 +5466,7 @@ private:
             params[jss::transaction] = txIds[i];
             auto const jrr = env.rpc("json", "tx", to_string(params));
             auto const meta = jrr[jss::result][jss::meta];
+            BEAST_EXPECT(meta[jss::delivered_amount] == "1000000");
             for (auto const& node : meta[sfAffectedNodes.jsonName])
             {
                 auto const nodeType = node[sfLedgerEntryType.jsonName];

src/test/rpc/DeliveredAmount_test.cpp

@@ -191,17 +191,12 @@ class DeliveredAmount_test : public beast::unit_test::suite
         auto const gw = Account("gateway");
         auto const USD = gw["USD"];
 
-        for (bool const afterSwitchTime : {true, false})
-        {
         Env env{*this, features};
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.trust(USD(1000), alice, bob, carol);
-            if (afterSwitchTime)
-                env.close(NetClock::time_point{446000000s});
-            else
         env.close();
 
-            CheckDeliveredAmount checkDeliveredAmount{afterSwitchTime};
+        CheckDeliveredAmount checkDeliveredAmount{true};
         {
             // add payments, but do no close until subscribed
 
@@ -239,8 +234,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
                 BEAST_EXPECT(
                     jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
                 BEAST_EXPECT(
-                        jv.isMember(jss::ripplerpc) &&
+                    jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
-                        jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::ledger_index] == 3);
@@ -265,7 +259,6 @@ class DeliveredAmount_test : public beast::unit_test::suite
         }
         BEAST_EXPECT(checkDeliveredAmount.checkExpectedCounters());
     }
-    }
     void
     testTxDeliveredAmountRPC(FeatureBitset features)
     {
@@ -280,17 +273,12 @@ class DeliveredAmount_test : public beast::unit_test::suite
         auto const gw = Account("gateway");
         auto const USD = gw["USD"];
 
-        for (bool const afterSwitchTime : {true, false})
-        {
         Env env{*this, features};
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.trust(USD(1000), alice, bob, carol);
-            if (afterSwitchTime)
-                env.close(NetClock::time_point{446000000s});
-            else
         env.close();
 
-            CheckDeliveredAmount checkDeliveredAmount{afterSwitchTime};
+        CheckDeliveredAmount checkDeliveredAmount{true};
         // normal payments
         env(pay(gw, alice, USD(50)));
         checkDeliveredAmount.adjCountersSuccess();
@@ -316,14 +304,11 @@ class DeliveredAmount_test : public beast::unit_test::suite
         auto const jtxn = env.rpc(
             "json",
             "ledger",
-                to_string(
+            to_string(jvParams))[jss::result][jss::ledger][jss::transactions];
-                    jvParams))[jss::result][jss::ledger][jss::transactions];
         for (auto const& t : jtxn)
-                BEAST_EXPECT(
+            BEAST_EXPECT(checkDeliveredAmount.checkTxn(t, t[jss::metaData]));
-                    checkDeliveredAmount.checkTxn(t, t[jss::metaData]));
         BEAST_EXPECT(checkDeliveredAmount.checkExpectedCounters());
     }
-    }
 
 public:
     void

src/test/rpc/ServerDefinitions_test.cpp

@@ -57,7 +57,6 @@ public:
         {
             Env env(*this);
             auto const result = env.rpc("server_definitions");
-            std::cout << "RESULT: " << result << "\n";
             BEAST_EXPECT(!result[jss::result].isMember(jss::error));
             BEAST_EXPECT(result[jss::result].isMember(jss::FIELDS));
             BEAST_EXPECT(result[jss::result].isMember(jss::LEDGER_ENTRY_TYPES));