Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove zhtlc_enter_enabling and zhtlc_leave_enabling #2097

Merged
1 commit merged into from
Nov 30, 2022
Merged

remove zhtlc_enter_enabling and zhtlc_leave_enabling #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/core/atomicdex/events/events.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ namespace atomic_dex
using gui_leave_trading = entt::tag<"gui_leave_trading"_hs>;
using mm2_initialized = entt::tag<"mm2_running_and_enabling"_hs>;
using default_coins_enabled = entt::tag<"default_coins_enabled"_hs>;
using zhtlc_enter_enabling = entt::tag<"zhtlc_enter_enabling"_hs>;
using zhtlc_leave_enabling = entt::tag<"zhtlc_leave_enabling"_hs>;
using band_oracle_refreshed = entt::tag<"band_oracle_refreshed"_hs>;
using current_currency_changed = entt::tag<"update_orders_and_swap_values"_hs>;
using force_update_providers = entt::tag<"force_update_providers"_hs>;
Expand Down
39 changes: 0 additions & 39 deletions src/core/atomicdex/services/mm2/mm2.service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,6 @@ namespace atomic_dex
{
m_orderbook_clock = std::chrono::high_resolution_clock::now();
m_info_clock = std::chrono::high_resolution_clock::now();
dispatcher_.sink<zhtlc_enter_enabling>().connect<&mm2_service::on_zhtlc_enter_enabling>(*this);
dispatcher_.sink<zhtlc_leave_enabling>().connect<&mm2_service::on_zhtlc_leave_enabling>(*this);
dispatcher_.sink<gui_enter_trading>().connect<&mm2_service::on_gui_enter_trading>(*this);
dispatcher_.sink<gui_leave_trading>().connect<&mm2_service::on_gui_leave_trading>(*this);
dispatcher_.sink<orderbook_refresh>().connect<&mm2_service::on_refresh_orderbook>(*this);
Expand Down Expand Up @@ -342,8 +340,6 @@ namespace atomic_dex
dispatcher_.sink<gui_enter_trading>().disconnect<&mm2_service::on_gui_enter_trading>(*this);
dispatcher_.sink<gui_leave_trading>().disconnect<&mm2_service::on_gui_leave_trading>(*this);
dispatcher_.sink<orderbook_refresh>().disconnect<&mm2_service::on_refresh_orderbook>(*this);
dispatcher_.sink<zhtlc_enter_enabling>().disconnect<&mm2_service::on_zhtlc_enter_enabling>(*this);
dispatcher_.sink<zhtlc_leave_enabling>().disconnect<&mm2_service::on_zhtlc_leave_enabling>(*this);
SPDLOG_INFO("mm2 signals successfully disconnected");
bool mm2_stopped = false;
if (m_mm2_running)
Expand Down Expand Up @@ -1202,7 +1198,6 @@ namespace atomic_dex

void mm2_service::enable_zhtlc(const t_coins& coins)
{
dispatcher_.trigger<zhtlc_enter_enabling>();
auto request_functor = [this](coin_config coin_info) -> std::pair<nlohmann::json, std::vector<std::string>>
{
t_init_z_coin_request request{
Expand Down Expand Up @@ -1320,30 +1315,19 @@ namespace atomic_dex
if (z_answers[0].at("result").at("details").contains("UpdatingBlocksCache"))
{
event = "UpdatingBlocksCache";
std::size_t current_scanned_block = z_answers[0].at("result").at("details").at("UpdatingBlocksCache").at("current_scanned_block");
std::size_t latest_block = z_answers[0].at("result").at("details").at("UpdatingBlocksCache").at("latest_block");
// SPDLOG_DEBUG("Waiting for {} to enable [{}: {}] {}/{} blocks scanned", tickers[idx], status, event, current_scanned_block, latest_block);
}
else if (z_answers[0].at("result").at("details").contains("BuildingWalletDb"))
{
event = "BuildingWalletDb";
std::size_t current_scanned_block = z_answers[0].at("result").at("details").at("BuildingWalletDb").at("current_scanned_block");
std::size_t latest_block = z_answers[0].at("result").at("details").at("BuildingWalletDb").at("latest_block");
// SPDLOG_DEBUG("Waiting for {} to enable [{}: {}] {}/{} blocks scanned", tickers[idx], status, event, current_scanned_block, latest_block);
}
else
{
event = z_answers[0].at("result").at("details").get<std::string>();
// SPDLOG_DEBUG("Waiting for {} to enable [{}: {}]...", tickers[idx], status, event);
// Do we need to handle this? Happens when running init_zcoin_enable twice
// {"mmrpc":"2.0","result":{"status":"InProgress","details":{"TemporaryError":"z_rpc:387] UNIQUE constraint failed: blocks.height"}},"id":null}
}

if (event != last_event)
{
SPDLOG_DEBUG("Waiting for {} to enable [{}: {}]...", tickers[idx], status, event);
// After an event change, full activation is just a matter of time (earlier it might fail).
// We tag it as activated, so it shows up in portfolio and not enable list.
if (!m_coins_informations[tickers[idx]].currently_enabled && event != "ActivatingCoin")
{
std::unique_lock lock(m_coin_cfg_mutex);
Expand Down Expand Up @@ -1436,7 +1420,6 @@ namespace atomic_dex
this->handle_exception_pplx_task(previous_task, "batch_enable_coins", batch);
update_coin_status(this->m_current_wallet_name, tickers, false, m_coins_informations, m_coin_cfg_mutex);
});
dispatcher_.trigger<zhtlc_leave_enabling>();
this->m_nb_update_required += 1;
};

Expand Down Expand Up @@ -2078,22 +2061,6 @@ namespace atomic_dex
}
}

void
mm2_service::on_zhtlc_enter_enabling([[maybe_unused]] const zhtlc_enter_enabling& evt)
{
SPDLOG_DEBUG("{} l{} f[{}]", __FUNCTION__, __LINE__, fs::path(__FILE__).filename().string());

m_zhtlc_enable_thread_active = true;
}

void
mm2_service::on_zhtlc_leave_enabling([[maybe_unused]] const zhtlc_leave_enabling& evt)
{
SPDLOG_DEBUG("{} l{} f[{}]", __FUNCTION__, __LINE__, fs::path(__FILE__).filename().string());

m_zhtlc_enable_thread_active = false;
}

void
mm2_service::on_gui_enter_trading([[maybe_unused]] const gui_enter_trading& evt)
{
Expand Down Expand Up @@ -2138,12 +2105,6 @@ namespace atomic_dex
return this->m_orderbook_thread_active.load();
}

bool
mm2_service::is_zhtlc_enable_thread_active() const
{
return this->m_zhtlc_enable_thread_active.load();
}

nlohmann::json
mm2_service::get_raw_mm2_ticker_cfg(const std::string& ticker) const
{
Expand Down
6 changes: 0 additions & 6 deletions src/core/atomicdex/services/mm2/mm2.service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ namespace atomic_dex
//! Atomicity / Threads
std::atomic_bool m_mm2_running{false};
std::atomic_bool m_orderbook_thread_active{false};
std::atomic_bool m_zhtlc_enable_thread_active{false};
std::atomic_size_t m_nb_update_required{0};
std::thread m_mm2_init_thread;

Expand Down Expand Up @@ -154,10 +153,6 @@ namespace atomic_dex

void on_gui_leave_trading(const gui_leave_trading& evt);

void on_zhtlc_enter_enabling(const zhtlc_enter_enabling& evt);

void on_zhtlc_leave_enabling(const zhtlc_leave_enabling& evt);

//! Spawn mm2 instance with given seed
void spawn_mm2_instance(std::string wallet_name, std::string passphrase, bool with_pin_cfg = false);

Expand Down Expand Up @@ -251,7 +246,6 @@ namespace atomic_dex
[[nodiscard]] bool do_i_have_enough_funds(const std::string& ticker, const t_float_50& amount) const;

[[nodiscard]] bool is_orderbook_thread_active() const;
[[nodiscard]] bool is_zhtlc_enable_thread_active() const;

[[nodiscard]] nlohmann::json get_raw_mm2_ticker_cfg(const std::string& ticker) const;

Expand Down