Add UnitCostAveragingCalculator.IsLastTrade

References #47
andreashuber69 · Dec 24, 2017 · 3969816 · 3969816
1 parent efc8db6
commit 3969816
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Bitstamp/UnitCostAveragingCalculator.cs b/Bitstamp/UnitCostAveragingCalculator.cs
@@ -81,7 +81,7 @@ public sealed class UnitCostAveragingCalculator
             }
             else
             {
-                if ((startBalance - tradeAmount) < this.minOptimalTradeAmount)
+                if (this.IsLastTrade(startBalance, tradeAmount))
                 {
                     tradeAmount = startBalance;
                 }
@@ -90,6 +90,11 @@ public sealed class UnitCostAveragingCalculator
             return tradeAmount;
         }
 
+        /// <summary>Gets a value indicating whether a trade with <paramref name="tradeAmount"/> would be the last
+        /// trade.</summary>
+        public bool IsLastTrade(decimal startBalance, decimal tradeAmount) =>
+            (startBalance - tradeAmount) < this.minOptimalTradeAmount;
+
         /// <summary>Gets the trading fee for <paramref name="tradeAmount"/>.</summary>
         public decimal GetFee(decimal tradeAmount) => Ceiling(tradeAmount * this.feeStepsPerUnit) * this.feeStep;
 

diff --git a/SmartTrade/TradeService.cs b/SmartTrade/TradeService.cs
@@ -358,9 +358,9 @@ private DateTime GetStart(List<ITransaction> transactions)
 
                     if (buy)
                     {
-                        // If we're going to spend the whole second balance, we need to subtract the fee first, as the
-                        // exchange will do the same.
-                        if (secondAmount.Value == secondBalance)
+                        // If this is the last trade, we need to subtract the fee first, as the exchange will do the
+                        // same.
+                        if (calculator.IsLastTrade(secondBalance, secondAmountToTrade))
                         {
                             secondAmountToTrade -= calculator.GetFee(secondAmountToTrade);
                         }