Reuse default tx validator from application.cpp

Signed-off-by: Konstantin Munichev <toobwn@gmail.com>
hyperledger-archives · Nov 14, 2018 · fa3b6ef · fa3b6ef
1 parent d85cd31
commit fa3b6ef
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/irohad/main/application.cpp b/irohad/main/application.cpp
@@ -7,6 +7,7 @@
 
 #include "ametsuchi/impl/postgres_ordering_service_persistent_state.hpp"
 #include "ametsuchi/impl/wsv_restorer_impl.hpp"
+#include "application.hpp"
 #include "backend/protobuf/common_objects/proto_common_objects_factory.hpp"
 #include "backend/protobuf/proto_block_json_converter.hpp"
 #include "backend/protobuf/proto_permission_to_string.hpp"
@@ -193,9 +194,7 @@ void Irohad::initFactories() {
       std::make_shared<shared_model::interface::TransactionBatchFactoryImpl>();
   std::unique_ptr<shared_model::validation::AbstractValidator<
       shared_model::interface::Transaction>>
-      transaction_validator =
-          std::make_unique<shared_model::validation::
-                               DefaultOptionalSignedTransactionValidator>();
+      transaction_validator = getTxValidator();
   transaction_factory =
       std::make_shared<shared_model::proto::ProtoTransportFactory<
           shared_model::interface::Transaction,
@@ -443,3 +442,10 @@ Irohad::~Irohad() {
   // called in irohad destructor
   storage->freeConnections();
 }
+
+std::unique_ptr<shared_model::validation::AbstractValidator<
+    shared_model::interface::Transaction>>
+Irohad::getTxValidator() {
+  return std::make_unique<
+      shared_model::validation::DefaultOptionalSignedTransactionValidator>();
+}
diff --git a/irohad/main/application.hpp b/irohad/main/application.hpp
@@ -48,7 +48,6 @@ namespace iroha {
 
 class Irohad {
  public:
-
   using RunResult = iroha::expected::Result<void, std::string>;
 
   /**
@@ -106,6 +105,14 @@ class Irohad {
 
   virtual ~Irohad();
 
+  /**
+   * Creates transaction validator
+   * @return unique_ptr to the validator created
+   */
+  static std::unique_ptr<shared_model::validation::AbstractValidator<
+      shared_model::interface::Transaction>>
+  getTxValidator();
+
  protected:
   // -----------------------| component initialization |------------------------
 

diff --git a/test/fuzzing/CMakeLists.txt b/test/fuzzing/CMakeLists.txt
@@ -66,6 +66,7 @@ add_executable(mst_fuzz mst_fuzz.cpp)
 target_link_libraries(mst_fuzz
   gtest::gtest
   gmock::gmock
+  application
   mst_transport
   protobuf-mutator
   )
diff --git a/test/fuzzing/mst_fuzz.cpp b/test/fuzzing/mst_fuzz.cpp
@@ -11,6 +11,7 @@
 #include "backend/protobuf/proto_transport_factory.hpp"
 #include "interfaces/iroha_internal/transaction_batch_factory_impl.hpp"
 #include "interfaces/iroha_internal/transaction_batch_parser_impl.hpp"
+#include "main/application.hpp"
 #include "module/irohad/multi_sig_transactions/mst_test_helpers.hpp"
 #include "multi_sig_transactions/transport/mst_transport_grpc.hpp"
 
@@ -26,9 +27,7 @@ namespace fuzzing {
           iroha::network::AsyncGrpcClient<google::protobuf::Empty>>();
       std::unique_ptr<shared_model::validation::AbstractValidator<
           shared_model::interface::Transaction>>
-          tx_validator =
-              std::make_unique<shared_model::validation::
-                                   DefaultOptionalSignedTransactionValidator>();
+          tx_validator = Irohad::getTxValidator();
       auto tx_factory =
           std::make_shared<shared_model::proto::ProtoTransportFactory<
               shared_model::interface::Transaction,