More strict checking of ExchangeName creation from 2 parameters

src/api-objects/include/ordersconstraints.hpp

@@ -27,7 +27,7 @@ class OrderConstraintsBitmap {
   void set(ConstraintType constraintType) { _bmp |= (1U << static_cast<uint8_t>(constraintType)); }
 
   bool isConstrained(ConstraintType constraintType) const {
-    return _bmp & (1U << static_cast<uint8_t>(constraintType));
+    return (_bmp & (1U << static_cast<uint8_t>(constraintType))) != decltype(_bmp){};
   }
 
   bool empty() const { return _bmp == 0U; }
@@ -40,7 +40,7 @@ class OrderConstraintsBitmap {
 
   bool isOrderIdOnlyDependent() const { return _bmp == kIdConstrained; }
 
-  bool operator==(const OrderConstraintsBitmap &) const = default;
+  bool operator==(const OrderConstraintsBitmap &) const noexcept = default;
 
  private:
   uint8_t _bmp{};
@@ -61,9 +61,9 @@ class OrdersConstraints {
   bool isPlacedTimeAfterDefined() const { return _placedAfter != TimePoint::min(); }
   bool isPlacedTimeBeforeDefined() const { return _placedBefore != TimePoint::max(); }
 
-  bool validatePlacedTime(TimePoint t) const { return t >= _placedAfter && t <= _placedBefore; }
+  bool validatePlacedTime(TimePoint tp) const { return tp >= _placedAfter && tp <= _placedBefore; }
 
-  bool validateTime(TimePoint t) const { return validatePlacedTime(t); }
+  bool validateTime(TimePoint tp) const { return validatePlacedTime(tp); }
 
   bool validateCur(CurrencyCode cur) const { return currencyCode().isNeutral() || cur == currencyCode(); }
 
@@ -81,7 +81,7 @@ class OrdersConstraints {
   bool isCur2Defined() const { return !_cur2.isNeutral(); }
   bool isMarketDefined() const { return isCurDefined() && isCur2Defined(); }
 
-  Market market() const { return Market(_cur1, _cur2); }
+  Market market() const { return {_cur1, _cur2}; }
 
   string curStr1() const { return _cur1.str(); }
   string curStr2() const { return _cur2.str(); }

src/api/interface/test/exchangeretriever_test.cpp

@@ -13,6 +13,7 @@
 #include "cct_string.hpp"
 #include "coincenterinfo.hpp"
 #include "commonapi.hpp"
+#include "exchange-names.hpp"
 #include "exchange.hpp"
 #include "exchangeconfigmap.hpp"
 #include "exchangeconfigparser.hpp"

src/engine/include/coincenter.hpp

@@ -6,6 +6,7 @@
 #include "apikeysprovider.hpp"
 #include "coincenterinfo.hpp"
 #include "commonapi.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "exchangepool.hpp"
 #include "exchangesorchestrator.hpp"

src/engine/include/coincentercommand.hpp

@@ -8,7 +8,7 @@
 #include "coincentercommandtype.hpp"
 #include "currencycode.hpp"
 #include "depositsconstraints.hpp"
-#include "exchangename.hpp"
+#include "exchange-names.hpp"
 #include "market.hpp"
 #include "monetaryamount.hpp"
 #include "ordersconstraints.hpp"

src/engine/include/exchangesorchestrator.hpp

@@ -3,6 +3,8 @@
 #include <optional>
 #include <span>
 
+#include "exchange-names.hpp"
+#include "exchangename.hpp"
 #include "exchangeretriever.hpp"
 #include "market.hpp"
 #include "queryresulttypes.hpp"
@@ -25,24 +27,24 @@ class ExchangesOrchestrator {
   MarketOrderBookConversionRates getMarketOrderBooks(Market mk, ExchangeNameSpan exchangeNames,
                                                      CurrencyCode equiCurrencyCode, std::optional<int> depth);
 
-  BalancePerExchange getBalance(std::span<const ExchangeName> privateExchangeNames,
+  BalancePerExchange getBalance(ExchangeNameSpan privateExchangeNames,
                                 const BalanceOptions &balanceOptions = BalanceOptions());
 
-  WalletPerExchange getDepositInfo(std::span<const ExchangeName> privateExchangeNames, CurrencyCode depositCurrency);
+  WalletPerExchange getDepositInfo(ExchangeNameSpan privateExchangeNames, CurrencyCode depositCurrency);
 
-  ClosedOrdersPerExchange getClosedOrders(std::span<const ExchangeName> privateExchangeNames,
+  ClosedOrdersPerExchange getClosedOrders(ExchangeNameSpan privateExchangeNames,
                                           const OrdersConstraints &closedOrdersConstraints);
 
-  OpenedOrdersPerExchange getOpenedOrders(std::span<const ExchangeName> privateExchangeNames,
+  OpenedOrdersPerExchange getOpenedOrders(ExchangeNameSpan privateExchangeNames,
                                           const OrdersConstraints &openedOrdersConstraints);
 
-  NbCancelledOrdersPerExchange cancelOrders(std::span<const ExchangeName> privateExchangeNames,
+  NbCancelledOrdersPerExchange cancelOrders(ExchangeNameSpan privateExchangeNames,
                                             const OrdersConstraints &ordersConstraints);
 
-  DepositsPerExchange getRecentDeposits(std::span<const ExchangeName> privateExchangeNames,
+  DepositsPerExchange getRecentDeposits(ExchangeNameSpan privateExchangeNames,
                                         const DepositsConstraints &depositsConstraints);
 
-  WithdrawsPerExchange getRecentWithdraws(std::span<const ExchangeName> privateExchangeNames,
+  WithdrawsPerExchange getRecentWithdraws(ExchangeNameSpan privateExchangeNames,
                                           const WithdrawsConstraints &withdrawsConstraints);
 
   MonetaryAmountPerExchange getConversion(MonetaryAmount amount, CurrencyCode targetCurrencyCode,
@@ -60,16 +62,15 @@ class ExchangesOrchestrator {
   UniquePublicSelectedExchanges getExchangesTradingMarket(Market mk, ExchangeNameSpan exchangeNames);
 
   TradeResultPerExchange trade(MonetaryAmount from, bool isPercentageTrade, CurrencyCode toCurrency,
-                               std::span<const ExchangeName> privateExchangeNames, const TradeOptions &tradeOptions);
+                               ExchangeNameSpan privateExchangeNames, const TradeOptions &tradeOptions);
 
-  TradeResultPerExchange smartBuy(MonetaryAmount endAmount, std::span<const ExchangeName> privateExchangeNames,
+  TradeResultPerExchange smartBuy(MonetaryAmount endAmount, ExchangeNameSpan privateExchangeNames,
                                   const TradeOptions &tradeOptions);
 
   TradeResultPerExchange smartSell(MonetaryAmount startAmount, bool isPercentageTrade,
-                                   std::span<const ExchangeName> privateExchangeNames,
-                                   const TradeOptions &tradeOptions);
+                                   ExchangeNameSpan privateExchangeNames, const TradeOptions &tradeOptions);
 
-  TradedAmountsVectorWithFinalAmountPerExchange dustSweeper(std::span<const ExchangeName> privateExchangeNames,
+  TradedAmountsVectorWithFinalAmountPerExchange dustSweeper(ExchangeNameSpan privateExchangeNames,
                                                             CurrencyCode currencyCode);
 
   DeliveredWithdrawInfoWithExchanges withdraw(MonetaryAmount grossAmount, bool isPercentageWithdraw,

src/engine/include/stringoptionparser.hpp

@@ -8,7 +8,7 @@
 #include "cct_string.hpp"
 #include "cct_vector.hpp"
 #include "currencycode.hpp"
-#include "exchangename.hpp"
+#include "exchange-names.hpp"
 #include "market.hpp"
 #include "monetaryamount.hpp"
 

src/engine/include/transferablecommandresult.hpp

@@ -5,6 +5,7 @@
 
 #include "cct_smallvector.hpp"
 #include "cct_type_traits.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "monetaryamount.hpp"
 

src/engine/src/coincenter.cpp

@@ -15,6 +15,7 @@
 #include "coincenterinfo.hpp"
 #include "currencycode.hpp"
 #include "depositsconstraints.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "exchangepublicapi.hpp"
 #include "exchangeretriever.hpp"

src/engine/src/coincentercommand.cpp

@@ -6,7 +6,7 @@
 #include "coincentercommandtype.hpp"
 #include "currencycode.hpp"
 #include "depositsconstraints.hpp"
-#include "exchangename.hpp"
+#include "exchange-names.hpp"
 #include "market.hpp"
 #include "monetaryamount.hpp"
 #include "ordersconstraints.hpp"

src/engine/src/exchangesorchestrator.cpp

@@ -24,6 +24,7 @@
 #include "currencycode.hpp"
 #include "currencyexchangeflatset.hpp"
 #include "depositsconstraints.hpp"
+#include "exchange-names.hpp"
 #include "exchange.hpp"
 #include "exchangename.hpp"
 #include "exchangeprivateapitypes.hpp"
@@ -175,7 +176,7 @@ MarketOrderBookConversionRates ExchangesOrchestrator::getMarketOrderBooks(Market
   return ret;
 }
 
-BalancePerExchange ExchangesOrchestrator::getBalance(std::span<const ExchangeName> privateExchangeNames,
+BalancePerExchange ExchangesOrchestrator::getBalance(ExchangeNameSpan privateExchangeNames,
                                                      const BalanceOptions &balanceOptions) {
   CurrencyCode equiCurrency = balanceOptions.equiCurrency();
   bool withBalanceInUse =
@@ -202,7 +203,7 @@ BalancePerExchange ExchangesOrchestrator::getBalance(std::span<const ExchangeNam
   return ret;
 }
 
-WalletPerExchange ExchangesOrchestrator::getDepositInfo(std::span<const ExchangeName> privateExchangeNames,
+WalletPerExchange ExchangesOrchestrator::getDepositInfo(ExchangeNameSpan privateExchangeNames,
                                                         CurrencyCode depositCurrency) {
   log::info("Query {} deposit information from {}", depositCurrency,
             ConstructAccumulatedExchangeNames(privateExchangeNames));
@@ -244,7 +245,7 @@ WalletPerExchange ExchangesOrchestrator::getDepositInfo(std::span<const Exchange
   return ret;
 }
 
-ClosedOrdersPerExchange ExchangesOrchestrator::getClosedOrders(std::span<const ExchangeName> privateExchangeNames,
+ClosedOrdersPerExchange ExchangesOrchestrator::getClosedOrders(ExchangeNameSpan privateExchangeNames,
                                                                const OrdersConstraints &closedOrdersConstraints) {
   log::info("Query closed orders matching {} on {}", closedOrdersConstraints,
             ConstructAccumulatedExchangeNames(privateExchangeNames));
@@ -261,7 +262,7 @@ ClosedOrdersPerExchange ExchangesOrchestrator::getClosedOrders(std::span<const E
   return ret;
 }
 
-OpenedOrdersPerExchange ExchangesOrchestrator::getOpenedOrders(std::span<const ExchangeName> privateExchangeNames,
+OpenedOrdersPerExchange ExchangesOrchestrator::getOpenedOrders(ExchangeNameSpan privateExchangeNames,
                                                                const OrdersConstraints &openedOrdersConstraints) {
   log::info("Query opened orders matching {} on {}", openedOrdersConstraints,
             ConstructAccumulatedExchangeNames(privateExchangeNames));
@@ -278,7 +279,7 @@ OpenedOrdersPerExchange ExchangesOrchestrator::getOpenedOrders(std::span<const E
   return ret;
 }
 
-NbCancelledOrdersPerExchange ExchangesOrchestrator::cancelOrders(std::span<const ExchangeName> privateExchangeNames,
+NbCancelledOrdersPerExchange ExchangesOrchestrator::cancelOrders(ExchangeNameSpan privateExchangeNames,
                                                                  const OrdersConstraints &ordersConstraints) {
   log::info("Cancel opened orders matching {} on {}", ordersConstraints,
             ConstructAccumulatedExchangeNames(privateExchangeNames));
@@ -293,7 +294,7 @@ NbCancelledOrdersPerExchange ExchangesOrchestrator::cancelOrders(std::span<const
   return nbOrdersCancelled;
 }
 
-DepositsPerExchange ExchangesOrchestrator::getRecentDeposits(std::span<const ExchangeName> privateExchangeNames,
+DepositsPerExchange ExchangesOrchestrator::getRecentDeposits(ExchangeNameSpan privateExchangeNames,
                                                              const DepositsConstraints &depositsConstraints) {
   log::info("Query recent deposits matching {} on {}", depositsConstraints,
             ConstructAccumulatedExchangeNames(privateExchangeNames));
@@ -309,7 +310,7 @@ DepositsPerExchange ExchangesOrchestrator::getRecentDeposits(std::span<const Exc
   return ret;
 }
 
-WithdrawsPerExchange ExchangesOrchestrator::getRecentWithdraws(std::span<const ExchangeName> privateExchangeNames,
+WithdrawsPerExchange ExchangesOrchestrator::getRecentWithdraws(ExchangeNameSpan privateExchangeNames,
                                                                const WithdrawsConstraints &withdrawsConstraints) {
   log::info("Query recent withdraws matching {} on {}", withdrawsConstraints,
             ConstructAccumulatedExchangeNames(privateExchangeNames));
@@ -564,8 +565,7 @@ ExchangeAmountMarketsPathVector CreateExchangeAmountMarketsPathVector(ExchangeRe
 }  // namespace
 
 TradeResultPerExchange ExchangesOrchestrator::trade(MonetaryAmount from, bool isPercentageTrade,
-                                                    CurrencyCode toCurrency,
-                                                    std::span<const ExchangeName> privateExchangeNames,
+                                                    CurrencyCode toCurrency, ExchangeNameSpan privateExchangeNames,
                                                     const TradeOptions &tradeOptions) {
   if (privateExchangeNames.size() == 1 && !isPercentageTrade) {
     // In this special case we don't need to call the balance - call trade directly
@@ -614,8 +614,7 @@ TradeResultPerExchange ExchangesOrchestrator::trade(MonetaryAmount from, bool is
   return LaunchAndCollectTrades(_threadPool, exchangeAmountMarketsPathVector.begin(), it, toCurrency, tradeOptions);
 }
 
-TradeResultPerExchange ExchangesOrchestrator::smartBuy(MonetaryAmount endAmount,
-                                                       std::span<const ExchangeName> privateExchangeNames,
+TradeResultPerExchange ExchangesOrchestrator::smartBuy(MonetaryAmount endAmount, ExchangeNameSpan privateExchangeNames,
                                                        const TradeOptions &tradeOptions) {
   const CurrencyCode toCurrency = endAmount.currencyCode();
   BalancePerExchange balancePerExchange = getBalance(privateExchangeNames);
@@ -717,7 +716,7 @@ TradeResultPerExchange ExchangesOrchestrator::smartBuy(MonetaryAmount endAmount,
 }
 
 TradeResultPerExchange ExchangesOrchestrator::smartSell(MonetaryAmount startAmount, bool isPercentageTrade,
-                                                        std::span<const ExchangeName> privateExchangeNames,
+                                                        ExchangeNameSpan privateExchangeNames,
                                                         const TradeOptions &tradeOptions) {
   const CurrencyCode fromCurrency = startAmount.currencyCode();
   // Retrieve amount per start amount currency for each exchange
@@ -804,8 +803,8 @@ TradeResultPerExchange ExchangesOrchestrator::smartSell(MonetaryAmount startAmou
   return LaunchAndCollectTrades(_threadPool, trades.begin(), trades.end(), tradeOptions);
 }
 
-TradedAmountsVectorWithFinalAmountPerExchange ExchangesOrchestrator::dustSweeper(
-    std::span<const ExchangeName> privateExchangeNames, CurrencyCode currencyCode) {
+TradedAmountsVectorWithFinalAmountPerExchange ExchangesOrchestrator::dustSweeper(ExchangeNameSpan privateExchangeNames,
+                                                                                 CurrencyCode currencyCode) {
   log::info("Query {} dust sweeper from {}", currencyCode, ConstructAccumulatedExchangeNames(privateExchangeNames));
 
   ExchangeRetriever::SelectedExchanges selExchanges = _exchangeRetriever.select(

src/engine/src/stringoptionparser.cpp

@@ -9,6 +9,7 @@
 #include "cct_string.hpp"
 #include "cct_vector.hpp"
 #include "currencycode.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "market.hpp"
 #include "monetaryamount.hpp"

src/engine/src/transferablecommandresult.cpp

@@ -8,6 +8,7 @@
 #include "cct_exception.hpp"
 #include "cct_log.hpp"
 #include "coincentercommand.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "monetaryamount.hpp"
 

src/engine/test/coincentercommandfactory_test.cpp

@@ -9,6 +9,7 @@
 #include "coincentercommandtype.hpp"
 #include "coincenteroptions.hpp"
 #include "currencycode.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "monetaryamount.hpp"
 #include "ordersconstraints.hpp"

src/engine/test/exchangesorchestrator_public_test.cpp

@@ -8,6 +8,7 @@
 #include "currencycode.hpp"
 #include "currencyexchange.hpp"
 #include "currencyexchangeflatset.hpp"
+#include "exchange-names.hpp"
 #include "exchange.hpp"
 #include "exchangedata_test.hpp"
 #include "exchangename.hpp"

src/engine/test/exchangesorchestrator_trade_test.cpp

@@ -9,6 +9,7 @@
 #include "balanceoptions.hpp"
 #include "cct_exception.hpp"
 #include "currencycode.hpp"
+#include "exchange-names.hpp"
 #include "exchange.hpp"
 #include "exchangedata_test.hpp"
 #include "exchangename.hpp"

src/engine/test/stringoptionparser_test.cpp

@@ -8,6 +8,7 @@
 #include "cct_string.hpp"
 #include "cct_vector.hpp"
 #include "currencycode.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "market.hpp"
 #include "monetaryamount.hpp"

src/engine/test/transferablecommandresult_test.cpp

@@ -7,6 +7,7 @@
 #include "cct_exception.hpp"
 #include "coincentercommand.hpp"
 #include "coincentercommandtype.hpp"
+#include "exchange-names.hpp"
 #include "exchangename.hpp"
 #include "monetaryamount.hpp"
 

src/objects/include/coincentercommandtype.hpp

@@ -4,6 +4,7 @@
 #include <string_view>
 
 namespace cct {
+
 enum class CoincenterCommandType : int8_t {
   kHealthCheck,
   kCurrencies,

src/objects/include/exchange-names.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <span>
+
+#include "cct_smallvector.hpp"
+#include "cct_string.hpp"
+#include "exchangename.hpp"
+
+namespace cct {
+
+using ExchangeNameSpan = std::span<const ExchangeName>;
+using ExchangeNames = SmallVector<ExchangeName, 1>;
+
+string ConstructAccumulatedExchangeNames(ExchangeNameSpan exchangeNames);
+
+}  // namespace cct