diff --git a/src/wallet/plain_wallet_api.cpp b/src/wallet/plain_wallet_api.cpp index 1413e093..8105ff83 100644 --- a/src/wallet/plain_wallet_api.cpp +++ b/src/wallet/plain_wallet_api.cpp @@ -34,6 +34,19 @@ //TODO: global objects, subject to refactoring +struct plain_wallet_instance +{ + plain_wallet_instance() :initialized(false), gjobs_counter(1) + {} + wallets_manager gwm; + std::atomic initialized; + + std::atomic gjobs_counter; + std::map gjobs; + epee::critical_section gjobs_lock; +}; + + std::shared_ptr ginstance_ptr; #define GET_INSTANCE_PTR(ptr_name) \ diff --git a/src/wallet/plain_wallet_api_ex.h b/src/wallet/plain_wallet_api_ex.h deleted file mode 100644 index a56cd108..00000000 --- a/src/wallet/plain_wallet_api_ex.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2014-2020 Zano Project -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - - -#pragma once - -#include - -#include "wallet2.h" - -namespace plain_wallet -{ - struct plain_wallet_instance -{ - plain_wallet_instance() :initialized(false), gjobs_counter(1) - {} - wallets_manager gwm; - std::atomic initialized; - - std::atomic gjobs_counter; - std::map gjobs; - epee::critical_section gjobs_lock; -}; - - - extern std::shared_ptr ginstance_ptr; - - - -} \ No newline at end of file