rpcdaemon: remove awaitable create_state (#1270)

erigontech · Jun 22, 2023 · 8361208 · 8361208
1 parent 6bbeb7c
commit 8361208
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 41 deletions.
diff --git a/silkworm/silkrpc/commands/debug_api_test.cpp b/silkworm/silkrpc/commands/debug_api_test.cpp
@@ -180,10 +180,6 @@ class DummyTransaction : public ethdb::Transaction {
         co_return cursor;
     }
 
-    awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& /* db_reader */, uint64_t /* block_number */) override {
-        co_return nullptr;
-    }
-
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t) override {
         return nullptr;
     }

diff --git a/silkworm/silkrpc/commands/engine_api_test.cpp b/silkworm/silkrpc/commands/engine_api_test.cpp
@@ -74,10 +74,6 @@ namespace {
             co_return nullptr;
         }
 
-        awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& /* db_reader */, uint64_t /* block_number */) override {
-            co_return nullptr;
-        }
-
         std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t) override {
             return nullptr;
         }

diff --git a/silkworm/silkrpc/core/account_dumper_test.cpp b/silkworm/silkrpc/core/account_dumper_test.cpp
@@ -171,11 +171,6 @@ class DummyTransaction : public ethdb::Transaction {
         co_return cursor;
     }
 
-    boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& /* db_reader */,
-                                                                          uint64_t /* block_number */) override {
-        co_return nullptr;
-    }
-
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t) override {
         return nullptr;
     }

diff --git a/silkworm/silkrpc/core/account_walker_test.cpp b/silkworm/silkrpc/core/account_walker_test.cpp
@@ -169,11 +169,6 @@ class DummyTransaction : public ethdb::Transaction {
         co_return cursor;
     }
 
-    boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& /* db_reader */,
-                                                                          uint64_t /* block_number */) override {
-        co_return nullptr;
-    }
-
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t) override {
         return nullptr;
     }

diff --git a/silkworm/silkrpc/core/storage_walker_test.cpp b/silkworm/silkrpc/core/storage_walker_test.cpp
@@ -168,10 +168,6 @@ class DummyTransaction : public ethdb::Transaction {
         co_return cursor;
     }
 
-    boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& /* db_reader */, uint64_t /* block_number */) override {
-        co_return nullptr;
-    }
-
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t) override {
         return nullptr;
     }

diff --git a/silkworm/silkrpc/ethdb/file/local_transaction.cpp b/silkworm/silkrpc/ethdb/file/local_transaction.cpp
@@ -63,10 +63,6 @@ boost::asio::awaitable<std::shared_ptr<CursorDupSort>> LocalTransaction::get_cur
     co_return cursor;
 }
 
-boost::asio::awaitable<std::shared_ptr<silkworm::State>> LocalTransaction::create_state(const core::rawdb::DatabaseReader&, uint64_t block_number) {
-    co_return std::make_shared<silkworm::rpc::state::LocalState>(block_number, chaindata_env_);
-}
-
 std::shared_ptr<silkworm::State> LocalTransaction::create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t block_number) {
     return std::make_shared<silkworm::rpc::state::LocalState>(block_number, chaindata_env_);
 }

diff --git a/silkworm/silkrpc/ethdb/file/local_transaction.hpp b/silkworm/silkrpc/ethdb/file/local_transaction.hpp
@@ -49,7 +49,6 @@ class LocalTransaction : public Transaction {
 
     boost::asio::awaitable<std::shared_ptr<CursorDupSort>> cursor_dup_sort(const std::string& table) override;
 
-    boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) override;
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor& executor, const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) override;
 
     boost::asio::awaitable<void> close() override;

diff --git a/silkworm/silkrpc/ethdb/kv/remote_transaction.cpp b/silkworm/silkrpc/ethdb/kv/remote_transaction.cpp
@@ -67,11 +67,6 @@ boost::asio::awaitable<std::shared_ptr<CursorDupSort>> RemoteTransaction::get_cu
     co_return cursor;
 }
 
-boost::asio::awaitable<std::shared_ptr<silkworm::State>> RemoteTransaction::create_state(const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) {
-    auto executor = co_await boost::asio::this_coro::executor;
-    co_return std::make_shared<silkworm::rpc::state::RemoteState>(executor, db_reader, block_number);
-}
-
 std::shared_ptr<silkworm::State> RemoteTransaction::create_state(boost::asio::any_io_executor& executor, const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) {
     return std::make_shared<silkworm::rpc::state::RemoteState>(executor, db_reader, block_number);
 }

diff --git a/silkworm/silkrpc/ethdb/kv/remote_transaction.hpp b/silkworm/silkrpc/ethdb/kv/remote_transaction.hpp
@@ -50,7 +50,6 @@ class RemoteTransaction : public Transaction {
 
     boost::asio::awaitable<std::shared_ptr<CursorDupSort>> cursor_dup_sort(const std::string& table) override;
 
-    boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) override;
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor& executor, const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) override;
 
     boost::asio::awaitable<void> close() override;

diff --git a/silkworm/silkrpc/ethdb/transaction.hpp b/silkworm/silkrpc/ethdb/transaction.hpp
@@ -48,7 +48,6 @@ class Transaction {
 
     virtual boost::asio::awaitable<std::shared_ptr<CursorDupSort>> cursor_dup_sort(const std::string& table) = 0;
 
-    virtual boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) = 0;
     virtual std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor& executor, const core::rawdb::DatabaseReader& db_reader, uint64_t block_number) = 0;
 
     virtual boost::asio::awaitable<void> close() = 0;

diff --git a/silkworm/silkrpc/test/dummy_transaction.hpp b/silkworm/silkrpc/test/dummy_transaction.hpp
@@ -46,11 +46,6 @@ class DummyTransaction : public ethdb::Transaction {
         co_return cursor_;
     }
 
-    boost::asio::awaitable<std::shared_ptr<silkworm::State>> create_state(const core::rawdb::DatabaseReader& /* db_reader */,
-                                                                          uint64_t /* block_number */) override {
-        co_return nullptr;
-    }
-
     std::shared_ptr<silkworm::State> create_state(boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t) override {
         return nullptr;
     }

diff --git a/silkworm/silkrpc/test/mock_transaction.hpp b/silkworm/silkrpc/test/mock_transaction.hpp
@@ -35,8 +35,6 @@ class MockTransaction : public ethdb::Transaction {
     MOCK_METHOD((boost::asio::awaitable<void>), open, ());
     MOCK_METHOD((boost::asio::awaitable<std::shared_ptr<ethdb::Cursor>>), cursor, (const std::string&));
     MOCK_METHOD((boost::asio::awaitable<std::shared_ptr<ethdb::CursorDupSort>>), cursor_dup_sort, (const std::string&));
-    MOCK_METHOD((boost::asio::awaitable<std::shared_ptr<silkworm::State>>), create_state,
-                (const core::rawdb::DatabaseReader&, uint64_t));
     MOCK_METHOD((std::shared_ptr<silkworm::State>), create_state,
                 (boost::asio::any_io_executor&, const core::rawdb::DatabaseReader&, uint64_t));
     MOCK_METHOD((boost::asio::awaitable<void>), close, ());