Remove unused IN_PROGRESS transaction status (hyperledger-iroha#1100)

Signed-off-by: Andrei Lebedev <[email protected]>
AndreyAndreyev · Mar 30, 2018 · 66a9609 · 66a9609
1 parent fc189c1
commit 66a9609
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/iroha-cli/interactive/impl/interactive_status_cli.cpp b/iroha-cli/interactive/impl/interactive_status_cli.cpp
@@ -36,8 +36,6 @@ namespace iroha_cli {
              "Transaction has successfully passed stateful validation."},
             {iroha::protocol::TxStatus::COMMITTED,
              "Transaction was successfully committed."},
-            {iroha::protocol::TxStatus::IN_PROGRESS,
-             "Transaction is being processed at the moment."},
             {iroha::protocol::TxStatus::NOT_RECEIVED,
              "Transaction was not found in the system."}};
 

diff --git a/irohad/model/transaction_response.hpp b/irohad/model/transaction_response.hpp
@@ -39,7 +39,6 @@ namespace iroha {
         STATEFUL_VALIDATION_FAILED,    // stateful validation failed
         STATEFUL_VALIDATION_SUCCESS,   // stateful validation passed
         COMMITTED,                     // tx pipeline succeeded, tx is committed
-        IN_PROGRESS,  // transaction is received, but not validated
         NOT_RECEIVED  // transaction is not in handler map
       };
 

diff --git a/schema/endpoint.proto b/schema/endpoint.proto
@@ -14,8 +14,7 @@ enum TxStatus {
   STATEFUL_VALIDATION_FAILED = 2;
   STATEFUL_VALIDATION_SUCCESS = 3;
   COMMITTED = 4;
-  IN_PROGRESS = 5;
-  NOT_RECEIVED = 6;
+  NOT_RECEIVED = 5;
 }
 
 message ToriiResponse {

diff --git a/test/module/shared_model/backend_proto/shared_proto_tx_response_test.cpp b/test/module/shared_model/backend_proto/shared_proto_tx_response_test.cpp
@@ -40,12 +40,8 @@ TEST(ProtoTxResponse, TxResponseLoad) {
   boost::for_each(boost::irange(0, tx_status_enum->value_count()), [&](auto i) {
     response.GetReflection()->SetEnumValue(
         &response, tx_status, tx_status_enum->value(i)->number());
-    // proto::UnknownTxResponse is replacement for
-    // protocol::ON_PROCESS and protocol::NOT_RECEIVED
-    // thus last index is lesser by 1 than protobuf's
     auto model_response = shared_model::proto::TransactionResponse(response);
-    ASSERT_EQ(std::min(i, tx_status_enum->value_count() - 2),
-              model_response.get().which());
+    ASSERT_EQ(i, model_response.get().which());
     ASSERT_EQ(model_response.transactionHash(),
               shared_model::crypto::Hash(hash));
   });