Fix client tests with mst batches

Signed-off-by: Fedor Muratov <[email protected]>
hyperledger-iroha · Aug 15, 2018 · 91e1279 · 91e1279
1 parent 01c65d7
commit 91e1279
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/test/module/iroha-cli/CMakeLists.txt b/test/module/iroha-cli/CMakeLists.txt
@@ -15,14 +15,13 @@
 # limitations under the License.
 #
 
-#TODO: muratovv, IR-1589, fix compilation errors and pass tests
-#addtest(client_test client_test.cpp)
-#target_link_libraries(client_test
-#    client
-#    processors
-#    server_runner
-#    query_execution
-#    )
-#target_include_directories(client_test PUBLIC
-#    ${PROJECT_SOURCE_DIR}/iroha-cli
-#    )
+addtest(client_test client_test.cpp)
+target_link_libraries(client_test
+    client
+    processors
+    server_runner
+    query_execution
+    )
+target_include_directories(client_test PUBLIC
+    ${PROJECT_SOURCE_DIR}/iroha-cli
+    )
diff --git a/test/module/iroha-cli/client_test.cpp b/test/module/iroha-cli/client_test.cpp
@@ -81,9 +81,9 @@ class ClientServerTest : public testing::Test {
     EXPECT_CALL(*pcsMock, on_verified_proposal())
         .WillRepeatedly(Return(verified_prop_notifier.get_observable()));
 
-    EXPECT_CALL(*mst, onPreparedTransactionsImpl())
+    EXPECT_CALL(*mst, onPreparedBatchesImpl())
         .WillRepeatedly(Return(mst_prepared_notifier.get_observable()));
-    EXPECT_CALL(*mst, onExpiredTransactionsImpl())
+    EXPECT_CALL(*mst, onExpiredBatchesImpl())
         .WillRepeatedly(Return(mst_expired_notifier.get_observable()));
 
     auto status_bus = std::make_shared<iroha::torii::StatusBusImpl>();
@@ -146,7 +146,7 @@ class ClientServerTest : public testing::Test {
 
 TEST_F(ClientServerTest, SendTxWhenValid) {
   iroha_cli::CliClient client(ip, port);
-  EXPECT_CALL(*pcsMock, propagate_transaction(_)).Times(1);
+  EXPECT_CALL(*pcsMock, propagate_batch(_)).Times(1);
 
   auto shm_tx = shared_model::proto::TransactionBuilder()
                     .creatorAccountId("some@account")
@@ -225,7 +225,7 @@ TEST_F(ClientServerTest, SendTxWhenStatelessInvalid) {
  */
 TEST_F(ClientServerTest, SendTxWhenStatefulInvalid) {
   iroha_cli::CliClient client(ip, port);
-  EXPECT_CALL(*pcsMock, propagate_transaction(_)).Times(1);
+  EXPECT_CALL(*pcsMock, propagate_batch(_)).Times(1);
 
   // creating stateful invalid tx
   auto tx = TransactionBuilder()