Merge pull request #2297 from sisuresh/disable_inflation

disable inflation Reviewed-by: MonsieurNicolas
stellar · Sep 30, 2019 · de0b21c · de0b21c
2 parents 8d16810 + 4699e73
commit de0b21c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/transactions/InflationOpFrame.cpp b/src/transactions/InflationOpFrame.cpp
@@ -122,6 +122,12 @@ InflationOpFrame::doCheckValid(uint32_t ledgerVersion)
     return true;
 }
 
+bool
+InflationOpFrame::isVersionSupported(uint32_t protocolVersion) const
+{
+    return protocolVersion < 12;
+}
+
 ThresholdLevel
 InflationOpFrame::getThresholdLevel() const
 {

diff --git a/src/transactions/InflationOpFrame.h b/src/transactions/InflationOpFrame.h
@@ -26,6 +26,7 @@ class InflationOpFrame : public OperationFrame
 
     bool doApply(AbstractLedgerTxn& ltx) override;
     bool doCheckValid(uint32_t ledgerVersion) override;
+    bool isVersionSupported(uint32_t protocolVersion) const override;
 
     static InflationResultCode
     getInnerCode(OperationResult const& res)

diff --git a/src/transactions/test/InflationTests.cpp b/src/transactions/test/InflationTests.cpp
@@ -323,7 +323,7 @@ TEST_CASE("inflation", "[tx][inflation]")
 
     SECTION("not time")
     {
-        for_all_versions(*app, [&] {
+        for_versions_to(11, *app, [&] {
             closeLedgerOn(*app, 2, 30, 6, 2014);
             REQUIRE_THROWS_AS(root.inflation(), ex_INFLATION_NOT_TIME);
 
@@ -433,7 +433,7 @@ TEST_CASE("inflation", "[tx][inflation]")
                     getTotalCoins() + inflationError);
         });
 
-        for_versions_from(8, *app, [&] {
+        for_versions(8, 11, *app, [&] {
             closeLedgerOn(*app, 4, 21, 7, 2014, {inflationTx});
 
             REQUIRE(getFeePool() == 95361000000301);
@@ -467,7 +467,7 @@ TEST_CASE("inflation", "[tx][inflation]")
 
     SECTION("inflation scenarios")
     {
-        for_all_versions(*app, [&] {
+        for_versions_to(11, *app, [&] {
             std::function<int(int)> voteFunc;
             std::function<int64(int)> balanceFunc;
             int nbAccounts = 0;
@@ -607,24 +607,22 @@ TEST_CASE("inflation", "[tx][inflation]")
         {
             for_versions_to(9, *app,
                             [&] { inflationWithLiabilities(0, maxPayout); });
-            for_versions_from(10, *app,
-                              [&] { inflationWithLiabilities(0, 0); });
+            for_versions(10, 11, *app, [&] { inflationWithLiabilities(0, 0); });
         }
 
         SECTION("small available balance less than payout")
         {
             for_versions_to(9, *app,
                             [&] { inflationWithLiabilities(1, maxPayout); });
-            for_versions_from(10, *app,
-                              [&] { inflationWithLiabilities(1, 1); });
+            for_versions(10, 11, *app, [&] { inflationWithLiabilities(1, 1); });
         }
 
         SECTION("large available balance less than payout")
         {
             for_versions_to(9, *app, [&] {
                 inflationWithLiabilities(maxPayout - 1, maxPayout);
             });
-            for_versions_from(10, *app, [&] {
+            for_versions(10, 11, *app, [&] {
                 inflationWithLiabilities(maxPayout - 1, maxPayout - 1);
             });
         }
@@ -634,9 +632,16 @@ TEST_CASE("inflation", "[tx][inflation]")
             for_versions_to(9, *app, [&] {
                 inflationWithLiabilities(maxPayout + 1, maxPayout);
             });
-            for_versions_from(10, *app, [&] {
+            for_versions(10, 11, *app, [&] {
                 inflationWithLiabilities(maxPayout + 1, maxPayout);
             });
         }
     }
+
+    SECTION("not supported")
+    {
+        for_versions_from(12, *app, [&] {
+            REQUIRE_THROWS_AS(root.inflation(), ex_opNOT_SUPPORTED);
+        });
+    }
 }