remove BUMP_SEQUENCE_NOT_SUPPORTED_YET, use operation level failure i…

…nstead
stellar · latobarita · Mar 21, 2018 · Nov 27, 2017 · Jan 30, 2018 · Jan 30, 2018
commit e9ed4c5cd2aabf1577e0db60fb4718dfc3e47b20
diff --git a/src/test/TestExceptions.cpp b/src/test/TestExceptions.cpp
@@ -269,8 +269,6 @@ throwIf(BumpSequenceResult const& result)
         break;
     case BUMP_SEQUENCE_TOO_FAR:
         throw ex_BUMP_SEQUENCE_TOO_FAR{};
-    case BUMP_SEQUENCE_NOT_SUPPORTED_YET:
-        throw ex_BUMP_SEQUENCE_NOT_SUPPORTED_YET{};
     default:
         throw ex_UNKNOWN{};
     }

diff --git a/src/test/TestExceptions.h b/src/test/TestExceptions.h
@@ -46,7 +46,6 @@ TEST_EXCEPTION(ex_ALLOW_TRUST_CANT_REVOKE)
 TEST_EXCEPTION(ex_ALLOW_TRUST_SELF_NOT_ALLOWED)
 
 TEST_EXCEPTION(ex_BUMP_SEQUENCE_TOO_FAR)
-TEST_EXCEPTION(ex_BUMP_SEQUENCE_NOT_SUPPORTED_YET)
 
 TEST_EXCEPTION(ex_CREATE_ACCOUNT_MALFORMED)
 TEST_EXCEPTION(ex_CREATE_ACCOUNT_UNDERFUNDED)

diff --git a/src/transactions/BumpSequenceOpFrame.cpp b/src/transactions/BumpSequenceOpFrame.cpp
@@ -29,6 +29,12 @@ BumpSequenceOpFrame::getThresholdLevel() const
     return ThresholdLevel::LOW;
 }
 
+bool
+BumpSequenceOpFrame::isVersionSupported(uint32_t protocolVersion) const
+{
+    return protocolVersion >= 10;
+}
+
 bool
 BumpSequenceOpFrame::doApply(Application& app, LedgerDelta& delta,
                              LedgerManager& ledgerManager)
@@ -62,16 +68,6 @@ BumpSequenceOpFrame::doApply(Application& app, LedgerDelta& delta,
 bool
 BumpSequenceOpFrame::doCheckValid(Application& app)
 {
-    if (app.getLedgerManager().getCurrentLedgerVersion() <= 9)
-    {
-        app.getMetrics()
-            .NewMeter({"op-bump-sequence", "failure", "not-supported-yet"},
-                      "operation")
-            .Mark();
-        innerResult().code(BUMP_SEQUENCE_NOT_SUPPORTED_YET);
-        return false;
-    }
-
     return true;
 }
 }
diff --git a/src/transactions/BumpSequenceOpFrame.h b/src/transactions/BumpSequenceOpFrame.h
@@ -11,6 +11,8 @@ namespace stellar
 class BumpSequenceOpFrame : public OperationFrame
 {
     ThresholdLevel getThresholdLevel() const override;
+    bool isVersionSupported(uint32_t protocolVersion) const override;
+
     BumpSequenceResult&
     innerResult()
     {

diff --git a/src/transactions/BumpSequenceTests.cpp b/src/transactions/BumpSequenceTests.cpp
@@ -71,7 +71,6 @@ TEST_CASE("bump sequence", "[tx][bumpsequence]")
         }
     });
     for_versions_to(9, *app, [&]() {
-        REQUIRE_THROWS_AS(a.bumpSequence(maxSeqNum),
-                          ex_BUMP_SEQUENCE_NOT_SUPPORTED_YET);
+        REQUIRE_THROWS_AS(a.bumpSequence(maxSeqNum), ex_opNOT_SUPPORTED);
     });
 }
diff --git a/src/xdr/Stellar-transaction.x b/src/xdr/Stellar-transaction.x
@@ -672,9 +672,8 @@ enum BumpSequenceResultCode
     // codes considered as "success" for the operation
     BUMP_SEQUENCE_SUCCESS = 0,
     // codes considered as "failure" for the operation
-    BUMP_SEQUENCE_TOO_FAR = -1, // operation would bump past the maximum sequence number allowed
-    BUMP_SEQUENCE_NOT_SUPPORTED_YET =
-        -2 // The network hasn't moved to this protocol change yet
+    BUMP_SEQUENCE_TOO_FAR =
+        -1 // operation would bump past the maximum sequence number allowed
 };
 
 union BumpSequenceResult switch (BumpSequenceResultCode code)