Avoid useless warning log of too many digits truncating integral part…

… from Huobi market info creation
sjanel · Oct 24, 2022 · d6637ee · d6637ee
1 parent 0bf4357
commit d6637ee
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/src/api/exchanges/include/huobipublicapi.hpp b/src/api/exchanges/include/huobipublicapi.hpp
@@ -92,7 +92,7 @@ class HuobiPublic : public ExchangePublic {
       VolAndPriNbDecimals volAndPriNbDecimals;
 
       MonetaryAmount minOrderValue;
-      MonetaryAmount maxOrderValueUSDT{std::numeric_limits<MonetaryAmount::AmountType>::max(), "USDT"};
+      MonetaryAmount maxOrderValueUSDT;
 
       MonetaryAmount limitMinOrderAmount;
       MonetaryAmount limitMaxOrderAmount;

diff --git a/src/api/exchanges/src/huobipublicapi.cpp b/src/api/exchanges/src/huobipublicapi.cpp
@@ -167,21 +167,22 @@ std::pair<MarketSet, HuobiPublic::MarketsFunc::MarketInfoMap> HuobiPublic::Marke
 
     marketInfo.volAndPriNbDecimals = VolAndPriNbDecimals(volNbDec, priNbDec);
 
-    marketInfo.minOrderValue = MonetaryAmount(marketDetails["min-order-value"].get<double>(), m.quote());
-    if (marketDetails.contains("max-order-value")) {  // in USDT
-      marketInfo.maxOrderValueUSDT = MonetaryAmount(marketDetails["max-order-value"].get<double>(), "USDT");
+    marketInfo.minOrderValue = MonetaryAmount(marketDetails["min-order-value"].get<double>(), quote);
+    auto maxOrderValueIt = marketDetails.find("max-order-value");
+    if (maxOrderValueIt != marketDetails.end()) {  // in USDT
+      marketInfo.maxOrderValueUSDT = MonetaryAmount(maxOrderValueIt->get<double>(), "USDT");
     }
 
-    marketInfo.limitMinOrderAmount = MonetaryAmount(marketDetails["limit-order-min-order-amt"].get<double>(), m.base());
-    marketInfo.limitMaxOrderAmount = MonetaryAmount(marketDetails["limit-order-max-order-amt"].get<double>(), m.base());
+    marketInfo.limitMinOrderAmount = MonetaryAmount(marketDetails["limit-order-min-order-amt"].get<double>(), base);
+    marketInfo.limitMaxOrderAmount = MonetaryAmount(marketDetails["limit-order-max-order-amt"].get<double>(), base);
 
     marketInfo.sellMarketMinOrderAmount =
-        MonetaryAmount(marketDetails["sell-market-min-order-amt"].get<double>(), m.base());
+        MonetaryAmount(marketDetails["sell-market-min-order-amt"].get<double>(), base);
     marketInfo.sellMarketMaxOrderAmount =
-        MonetaryAmount(marketDetails["sell-market-max-order-amt"].get<double>(), m.base());
+        MonetaryAmount(marketDetails["sell-market-max-order-amt"].get<double>(), base);
 
     marketInfo.buyMarketMaxOrderValue =
-        MonetaryAmount(marketDetails["buy-market-max-order-value"].get<double>(), m.quote());
+        MonetaryAmount(marketDetails["buy-market-max-order-value"].get<double>(), quote);
 
     marketInfoMap.insert_or_assign(m, std::move(marketInfo));
   }

diff --git a/src/api/exchanges/src/krakenprivateapi.cpp b/src/api/exchanges/src/krakenprivateapi.cpp
@@ -253,7 +253,7 @@ PlaceOrderInfo KrakenPrivate::placeOrder(MonetaryAmount /*from*/, MonetaryAmount
   const MonetaryAmount orderMin = krakenPublic.queryVolumeOrderMin(m);
   CurrencyExchange krakenCurrencyBase = _exchangePublic.convertStdCurrencyToCurrencyExchange(m.base());
   CurrencyExchange krakenCurrencyQuote = _exchangePublic.convertStdCurrencyToCurrencyExchange(m.quote());
-  Market krakenMarket(krakenCurrencyBase.altStr(), krakenCurrencyQuote.altStr());
+  Market krakenMarket(krakenCurrencyBase.altCode(), krakenCurrencyQuote.altCode());
   const std::string_view orderType = fromCurrencyCode == m.base() ? "sell" : "buy";
 
   auto volAndPriNbDecimals = krakenPublic._marketsCache.get().second.find(m)->second.volAndPriNbDecimals;

diff --git a/src/api/exchanges/src/krakenpublicapi.cpp b/src/api/exchanges/src/krakenpublicapi.cpp
@@ -375,7 +375,7 @@ MarketOrderBookMap KrakenPublic::AllOrderBooksFunc::operator()(int depth) {
       throw exception("Cannot find " + string(m.quoteStr()) + " in Kraken currencies");
     }
     CurrencyExchange krakenCurrencyExchangeQuote = *lb;
-    Market krakenMarket(krakenCurrencyExchangeBase.altStr(), krakenCurrencyExchangeQuote.altStr());
+    Market krakenMarket(krakenCurrencyExchangeBase.altCode(), krakenCurrencyExchangeQuote.altCode());
     string assetPairStr = krakenMarket.assetsPairStrUpper();
     if (!allAssetPairs.empty()) {
       allAssetPairs.push_back(',');
@@ -395,8 +395,8 @@ MarketOrderBookMap KrakenPublic::AllOrderBooksFunc::operator()(int depth) {
     }
 
     Market m = krakenAssetPairToStdMarketMap.find(krakenAssetPair)->second;
-    m = Market(CurrencyCode(_coincenterInfo.standardizeCurrencyCode(m.baseStr())),
-               CurrencyCode(_coincenterInfo.standardizeCurrencyCode(m.quoteStr())));
+    m = Market(CurrencyCode(_coincenterInfo.standardizeCurrencyCode(m.base())),
+               CurrencyCode(_coincenterInfo.standardizeCurrencyCode(m.quote())));
     //  a = ask array(<price>, <whole lot volume>, <lot volume>)
     //  b = bid array(<price>, <whole lot volume>, <lot volume>)
     const json& askDetails = assetPairDetails["a"];
@@ -456,8 +456,8 @@ MarketOrderBook KrakenPublic::OrderBookFunc::operator()(Market m, int count) {
 }
 
 KrakenPublic::TickerFunc::Last24hTradedVolumeAndLatestPricePair KrakenPublic::TickerFunc::operator()(Market m) {
-  Market krakenMarket(_tradableCurrenciesCache.get().getOrThrow(m.base()).altStr(),
-                      _tradableCurrenciesCache.get().getOrThrow(m.quote()).altStr());
+  Market krakenMarket(_tradableCurrenciesCache.get().getOrThrow(m.base()).altCode(),
+                      _tradableCurrenciesCache.get().getOrThrow(m.quote()).altCode());
   json result = PublicQuery(_curlHandle, "/public/Ticker", {{"pair", krakenMarket.assetsPairStrUpper()}});
   for (const auto& [krakenAssetPair, details] : result.items()) {
     std::string_view last24hVol = details["v"][1].get<std::string_view>();
@@ -468,8 +468,8 @@ KrakenPublic::TickerFunc::Last24hTradedVolumeAndLatestPricePair KrakenPublic::Ti
 }
 
 LastTradesVector KrakenPublic::queryLastTrades(Market m, int) {
-  Market krakenMarket(_tradableCurrenciesCache.get().getOrThrow(m.base()).altStr(),
-                      _tradableCurrenciesCache.get().getOrThrow(m.quote()).altStr());
+  Market krakenMarket(_tradableCurrenciesCache.get().getOrThrow(m.base()).altCode(),
+                      _tradableCurrenciesCache.get().getOrThrow(m.quote()).altCode());
   json result = PublicQuery(_curlHandle, "/public/Trades", {{"pair", krakenMarket.assetsPairStrUpper()}});
   LastTradesVector ret;
   for (const json& det : result.front()) {

diff --git a/src/objects/CMakeLists.txt b/src/objects/CMakeLists.txt
@@ -75,7 +75,7 @@ add_unit_test(
     wallet_test 
     test/wallet_test.cpp 
     LIBRARIES 
-    coincenter_objects 
+    coincenter_objects
     DEFINITIONS 
     CCT_DISABLE_SPDLOG
 )
diff --git a/src/tech/include/mathhelpers.hpp b/src/tech/include/mathhelpers.hpp
@@ -75,6 +75,7 @@ template <class T>
 concept UnsignedIntegral = std::integral<T> && !std::is_signed_v<T>;
 
 /// Return the number of digits of given integral.
+/// The minus sign is not counted.
 /// Uses dichotomy for highest performance as possible.
 constexpr int ndigits(SignedIntegral auto n) noexcept {
   using T = decltype(n);