Stateful Validation Error Codes in Endpoint

iroha-cli/interactive/impl/interactive_status_cli.cpp

@@ -151,8 +151,8 @@ namespace iroha_cli {
       std::string message;
       try {
         message = userMessageMap.at(status);
-        if (not answer.error_message().empty()) {
-          message += " " + answer.error_message();
+        if (not answer.err_or_cmd_name().empty()) {
+          message += " error '" + answer.err_or_cmd_name() + "'";
         }
       } catch (const std::out_of_range &e) {
         message =

irohad/ametsuchi/command_executor.hpp

@@ -27,7 +27,7 @@ namespace shared_model {
     class SetQuorum;
     class SubtractAssetQuantity;
     class TransferAsset;
-  } // namespace interface
+  }  // namespace interface
 }  // namespace shared_model
 
 namespace iroha {
@@ -38,8 +38,11 @@ namespace iroha {
      * Contains command name, as well as an error message
      */
     struct CommandError {
+      using ErrorCodeType = uint32_t;
+
       std::string command_name;
-      std::string error_message;
+      ErrorCodeType error_code;
+      std::string error_extra;
 
       std::string toString() const;
     };

irohad/ametsuchi/impl/mutable_storage_impl.cpp

@@ -19,16 +19,13 @@ namespace iroha {
     MutableStorageImpl::MutableStorageImpl(
         shared_model::interface::types::HashType top_hash,
         std::unique_ptr<soci::session> sql,
-        std::shared_ptr<shared_model::interface::CommonObjectsFactory> factory,
-        std::shared_ptr<shared_model::interface::PermissionToString>
-            perm_converter)
+        std::shared_ptr<shared_model::interface::CommonObjectsFactory> factory)
         : top_hash_(top_hash),
           sql_(std::move(sql)),
           peer_query_(std::make_unique<PeerQueryWsv>(
               std::make_shared<PostgresWsvQuery>(*sql_, std::move(factory)))),
           block_index_(std::make_unique<PostgresBlockIndex>(*sql_)),
-          command_executor_(std::make_shared<PostgresCommandExecutor>(
-              *sql_, std::move(perm_converter))),
+          command_executor_(std::make_shared<PostgresCommandExecutor>(*sql_)),
           committed(false),
           log_(logger::log("MutableStorage")) {
       *sql_ << "BEGIN";

irohad/ametsuchi/impl/mutable_storage_impl.hpp

@@ -13,7 +13,6 @@
 #include <soci/soci.h>
 #include "ametsuchi/command_executor.hpp"
 #include "interfaces/common_objects/common_objects_factory.hpp"
-#include "interfaces/permission_to_string.hpp"
 #include "logger/logger.hpp"
 
 namespace iroha {
@@ -28,9 +27,7 @@ namespace iroha {
           shared_model::interface::types::HashType top_hash,
           std::unique_ptr<soci::session> sql,
           std::shared_ptr<shared_model::interface::CommonObjectsFactory>
-              factory,
-          std::shared_ptr<shared_model::interface::PermissionToString>
-              perm_converter);
+              factory);
 
       bool apply(const shared_model::interface::Block &block) override;