Fix (unused variable, NO_KEY renamed to NO_ACCOUNT)

joeynor · Aug 2, 2017 · 79b817f · 79b817f
1 parent 57984f2
commit 79b817f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/iroha-cli/client.cpp b/iroha-cli/client.cpp
@@ -50,14 +50,14 @@ namespace iroha_cli {
     std::string client_priv_key_;
     std::ifstream priv_file(model_tx.creator_account_id + ".priv");
     if (not priv_file) {
-      return NO_KEYS;
+      return NO_ACCOUNT;
     }
     priv_file >> client_priv_key_;
     priv_file.close();
 
     std::ifstream pub_file(model_tx.creator_account_id + ".pub");
     if (not pub_file) {
-      return NO_KEYS;
+      return NO_ACCOUNT;
     }
     pub_file >> client_pub_key_;
     pub_file.close();

diff --git a/iroha-cli/client.hpp b/iroha-cli/client.hpp
@@ -32,7 +32,7 @@ namespace iroha_cli {
    public:
     enum Status {
       WRONG_FORMAT,
-      NO_KEYS,
+      NO_ACCOUNT,
       NOT_VALID,
       OK
     };

diff --git a/iroha-cli/main.cpp b/iroha-cli/main.cpp
@@ -79,7 +79,7 @@ int main(int argc, char* argv[]) {
         break;
       case iroha_cli::CliClient::WRONG_FORMAT:  std::cout << "Transaction wrong json format" << std::endl;
         break;
-      case iroha_cli::CliClient::NO_KEYS: std::cout << "No public and private key found. Run with new_account flag." << std::endl;
+      case iroha_cli::CliClient::NO_ACCOUNT: std::cout << "No public and private key found. Run with new_account flag." << std::endl;
         break;
       case iroha_cli::CliClient::NOT_VALID: std::cout << "Transaction is not valid." << std::endl;
         break;

diff --git a/test/module/iroha-cli/client_test.cpp b/test/module/iroha-cli/client_test.cpp
@@ -153,7 +153,6 @@ TEST_F(ClientTest, SendTxWhenStatelessInvalid) {
 
 
 TEST_F(ClientTest, SendTxWhenNoKeys) {
-  std::string account_name = "test";
   // Client without public, private keys
   iroha_cli::CliClient client(Ip, Port);
   EXPECT_CALL(svMock, validate(A<const iroha::model::Transaction &>()))
@@ -169,5 +168,5 @@ TEST_F(ClientTest, SendTxWhenNoKeys) {
       "  }]\n"
       "}";
   std::cout << "Sending  json transaction to Iroha" << std::endl;
-  ASSERT_EQ(client.sendTx(json_tx), iroha_cli::CliClient::NO_KEYS);
-}
+  ASSERT_EQ(client.sendTx(json_tx), iroha_cli::CliClient::NO_ACCOUNT);
+}