use exceptions also in inflation tests

Signed-off-by: Rafał Malinowski <[email protected]>
stellar · May 23, 2017 · 9290e1b · 9290e1b
1 parent a4e2eaf
commit 9290e1b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/src/test/TestExceptions.cpp b/src/test/TestExceptions.cpp
@@ -231,6 +231,8 @@ throwIf(InflationResult const& result)
 {
     switch (result.code())
     {
+    case INFLATION_NOT_TIME:
+        throw ex_INFLATION_NOT_TIME{};
     case INFLATION_SUCCESS:
         break;
     default:

diff --git a/src/test/TestExceptions.h b/src/test/TestExceptions.h
@@ -229,5 +229,9 @@ class ex_SET_OPTIONS_BAD_SIGNER
 class ex_SET_OPTIONS_INVALID_HOME_DOMAIN
 {
 };
+
+class ex_INFLATION_NOT_TIME
+{
+};
 }
 }
diff --git a/src/test/TxTests.cpp b/src/test/TxTests.cpp
@@ -843,19 +843,16 @@ createInflation(Hash const& networkID, SecretKey const& from,
 }
 
 OperationResult
-applyInflation(Application& app, SecretKey const& from, SequenceNumber seq,
-               InflationResultCode result)
+applyInflation(Application& app, SecretKey const& from, SequenceNumber seq)
 {
     TransactionFramePtr txFrame =
         createInflation(app.getNetworkID(), from, seq);
 
     LedgerDelta delta(app.getLedgerManager().getCurrentLedgerHeader(),
                       app.getDatabase());
     bool res = applyCheck(txFrame, delta, app);
-
+    throwIf(txFrame->getResult());
     checkTransaction(*txFrame);
-    REQUIRE(InflationOpFrame::getInnerCode(
-                txFrame->getResult().result.results()[0]) == result);
     if (res)
     {
         delta.commit();

diff --git a/src/test/TxTests.h b/src/test/TxTests.h
@@ -171,8 +171,7 @@ Operation createInflationOp();
 TransactionFramePtr createInflation(Hash const& networkID,
                                     SecretKey const& from, SequenceNumber seq);
 OperationResult
-applyInflation(Application& app, SecretKey const& from, SequenceNumber seq,
-               InflationResultCode targetResult = INFLATION_SUCCESS);
+applyInflation(Application& app, SecretKey const& from, SequenceNumber seq);
 
 Operation createMergeOp(SecretKey const* from, PublicKey const& dest);
 

diff --git a/src/transactions/InflationTests.cpp b/src/transactions/InflationTests.cpp
@@ -9,6 +9,7 @@
 #include "main/Application.h"
 #include "main/Config.h"
 #include "test/TestAccount.h"
+#include "test/TestExceptions.h"
 #include "test/TestUtils.h"
 #include "test/TxTests.h"
 #include "test/test.h"
@@ -295,8 +296,8 @@ TEST_CASE("inflation", "[tx][inflation]")
     {
         for_all_versions(app, [&]{
             closeLedgerOn(app, 2, 30, 6, 2014);
-            applyInflation(app, root, root.nextSequenceNumber(),
-                        INFLATION_NOT_TIME);
+            REQUIRE_THROWS_AS(applyInflation(app, root, root.nextSequenceNumber()),
+                              ex_INFLATION_NOT_TIME);
 
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     0);
@@ -310,30 +311,30 @@ TEST_CASE("inflation", "[tx][inflation]")
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     1);
 
-            applyInflation(app, root, root.nextSequenceNumber(),
-                        INFLATION_NOT_TIME);
+            REQUIRE_THROWS_AS(applyInflation(app, root, root.nextSequenceNumber()),
+                              ex_INFLATION_NOT_TIME);
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     1);
 
             closeLedgerOn(app, 5, 8, 7, 2014);
-            applyInflation(app, root, root.nextSequenceNumber(), INFLATION_SUCCESS);
+            applyInflation(app, root, root.nextSequenceNumber());
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     2);
 
             closeLedgerOn(app, 6, 14, 7, 2014);
-            applyInflation(app, root, root.nextSequenceNumber(),
-                        INFLATION_NOT_TIME);
+            REQUIRE_THROWS_AS(applyInflation(app, root, root.nextSequenceNumber()),
+                              ex_INFLATION_NOT_TIME);
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     2);
 
             closeLedgerOn(app, 7, 15, 7, 2014);
-            applyInflation(app, root, root.nextSequenceNumber(), INFLATION_SUCCESS);
+            applyInflation(app, root, root.nextSequenceNumber());
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     3);
 
             closeLedgerOn(app, 8, 21, 7, 2014);
-            applyInflation(app, root, root.nextSequenceNumber(),
-                        INFLATION_NOT_TIME);
+            REQUIRE_THROWS_AS(applyInflation(app, root, root.nextSequenceNumber()),
+                              ex_INFLATION_NOT_TIME);
             REQUIRE(app.getLedgerManager().getCurrentLedgerHeader().inflationSeq ==
                     3);
         });