Fix torii-related issues:

- Return correct status in case of transaction finalizing before subscription - Check only final transaction status in streaming test - Fix of same timestamp for different transactions issue Signed-off-by: luckychess <[email protected]>
hyperledger-iroha · Jun 4, 2018 · dc6b0a4 · dc6b0a4
1 parent e1b9457
commit dc6b0a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/irohad/torii/impl/command_service.cpp b/irohad/torii/impl/command_service.cpp
@@ -232,13 +232,17 @@ namespace torii {
 
           auto cache_second_check =
               cache_->findItem(shared_model::crypto::Hash(request.tx_hash()));
-          log_->debug("Status in cache: {}", cache_second_check->tx_status());
+          log_->debug("Status of tx {} in cache: {}",
+                      request_hash->hex(),
+                      cache_second_check->tx_status());
 
           /// final status means the case from a comment above
           /// if it's not - let's ignore it for now
           if (isFinalStatus(cache_second_check->tx_status())) {
-            log_->warn("Transaction was finalized before subscription");
-            response_writer.WriteLast(*resp, grpc::WriteOptions());
+            log_->warn("Transaction {} was finalized before subscription",
+                       request_hash->hex());
+            response_writer.WriteLast(*cache_second_check,
+                                      grpc::WriteOptions());
           }
         }
       }

diff --git a/test/module/irohad/torii/torii_service_test.cpp b/test/module/irohad/torii/torii_service_test.cpp
@@ -209,10 +209,11 @@ TEST_F(ToriiServiceTest, StatusWhenBlocking) {
 
   // create transactions and send them to Torii
   std::string account_id = "some@account";
+  auto now = iroha::time::now();
   for (size_t i = 0; i < TimesToriiBlocking; ++i) {
     auto shm_tx = shared_model::proto::TransactionBuilder()
                       .creatorAccountId(account_id)
-                      .createdTime(iroha::time::now())
+                      .createdTime(now + i)
                       .setAccountQuorum(account_id, 2)
                       .quorum(1)
                       .build()
@@ -406,7 +407,8 @@ TEST_F(ToriiServiceTest, StreamingFullPipelineTest) {
   block_notifier_.get_subscriber().on_completed();
   t.join();
 
-  ASSERT_GE(torii_response.size(), 2);
+  // we can be sure only about final status
+  // it can be only one or to follow by some non-final
   ASSERT_EQ(torii_response.back().tx_status(),
             iroha::protocol::TxStatus::COMMITTED);
 }