[Upbit] Consider only main networks for currencies, fix deposit-info …

…command
sjanel · Nov 4, 2023 · 59ac25e · 59ac25e
1 parent 0b319c0
commit 59ac25e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/api/exchanges/include/binancepublicapi.hpp b/src/api/exchanges/include/binancepublicapi.hpp
@@ -15,7 +15,6 @@
 #include "monetaryamount.hpp"
 #include "permanentcurloptions.hpp"
 #include "runmodes.hpp"
-#include "timedef.hpp"
 
 namespace cct {
 

diff --git a/src/api/exchanges/include/bithumbpublicapi.hpp b/src/api/exchanges/include/bithumbpublicapi.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <string_view>
+
 #include "cachedresult.hpp"
 #include "curlhandle.hpp"
 #include "exchangepublicapi.hpp"
 #include "exchangepublicapitypes.hpp"
-#include "timedef.hpp"
 
 namespace cct {
 

diff --git a/src/api/exchanges/include/upbitprivateapi.hpp b/src/api/exchanges/include/upbitprivateapi.hpp
@@ -1,10 +1,6 @@
 #pragma once
 
-#include <span>
-#include <unordered_map>
-
 #include "cachedresult.hpp"
-#include "cct_json.hpp"
 #include "curlhandle.hpp"
 #include "exchangeprivateapi.hpp"
 #include "exchangeprivateapitypes.hpp"

diff --git a/src/api/exchanges/src/upbitprivateapi.cpp b/src/api/exchanges/src/upbitprivateapi.cpp
@@ -136,9 +136,13 @@ CurrencyExchangeFlatSet UpbitPrivate::TradableCurrenciesFunc::operator()() {
   const CurrencyCodeSet& excludedCurrencies = _exchangeInfo.excludedCurrenciesAll();
   CurrencyExchangeVector currencies;
   json result = PrivateQuery(_curlHandle, _apiKey, HttpRequestType::kGet, "/v1/status/wallet");
-  currencies.reserve(static_cast<CurrencyExchangeVector::size_type>(result.size() - excludedCurrencies.size()));
   for (const json& curDetails : result) {
     CurrencyCode cur(curDetails["currency"].get<std::string_view>());
+    CurrencyCode networkName(curDetails["net_type"].get<std::string_view>());
+    if (cur != networkName) {
+      log::debug("Forgive about {}-{} as net type is not the main one", cur, networkName);
+      continue;
+    }
     if (UpbitPublic::CheckCurrencyCode(cur, excludedCurrencies)) {
       std::string_view walletState = curDetails["wallet_state"].get<std::string_view>();
       CurrencyExchange::Withdraw withdrawStatus = CurrencyExchange::Withdraw::kUnavailable;

diff --git a/src/api/exchanges/test/commonapi_test.hpp b/src/api/exchanges/test/commonapi_test.hpp
@@ -190,7 +190,7 @@ class TestAPI {
           });
       if (!depositableCryptos.empty()) {
         CurrencyExchangeFlatSet sample;
-        int nbSamples = exchangePrivateOpt->canGenerateDepositAddress() ? 1 : 5;
+        const int nbSamples = exchangePrivateOpt->canGenerateDepositAddress() ? 1 : 5;
         std::ranges::sample(depositableCryptos, std::inserter(sample, sample.end()), nbSamples,
                             std::mt19937{std::random_device{}()});