Fix smart pointer on storage

neo4reo · Aug 2, 2017 · 10c3376 · 10c3376
1 parent 122895c
commit 10c3376
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/irohad/ametsuchi/impl/storage_impl.cpp b/irohad/ametsuchi/impl/storage_impl.cpp
@@ -118,7 +118,7 @@ namespace iroha {
           std::move(wsv_transaction), std::move(wsv), std::move(executor));
     }
 
-    std::unique_ptr<StorageImpl> StorageImpl::create(
+    std::shared_ptr<StorageImpl> StorageImpl::create(
         std::string block_store_dir, std::string redis_host,
         std::size_t redis_port, std::string postgres_options) {
       // TODO lock
@@ -150,7 +150,7 @@ namespace iroha {
       std::unique_ptr<WsvQuery> wsv =
           std::make_unique<PostgresWsvQuery>(*wsv_transaction);
 
-      return std::unique_ptr<StorageImpl>(
+      return std::shared_ptr<StorageImpl>(
           new StorageImpl(block_store_dir, redis_host, redis_port,
                           postgres_options, std::move(block_store),
                           std::move(index), std::move(postgres_connection),

diff --git a/irohad/ametsuchi/impl/storage_impl.hpp b/irohad/ametsuchi/impl/storage_impl.hpp
@@ -31,7 +31,7 @@ namespace iroha {
   namespace ametsuchi {
     class StorageImpl : public Storage {
      public:
-      static std::unique_ptr<StorageImpl> create(
+      static std::shared_ptr<StorageImpl> create(
           std::string block_store_dir, std::string redis_host,
           std::size_t redis_port, std::string postgres_connection);
       std::unique_ptr<TemporaryWsv> createTemporaryWsv() override;

diff --git a/irohad/main/application.hpp b/irohad/main/application.hpp
@@ -44,7 +44,7 @@ class Irohad {
   std::string pg_conn_;
 
  public:
-  std::unique_ptr<iroha::ametsuchi::StorageImpl> storage;  // FIXME when integration
+  std::shared_ptr<iroha::ametsuchi::StorageImpl> storage;
 };
 
 #endif  // IROHA_APPLICATION_HPP