Added a missing API feature; fixed anonymous client initialization

kripod · Dec 2, 2014 · da0871c · da0871c
1 parent 051ac01
commit da0871c
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/PoloniexApi.Net.sln b/PoloniexApi.Net.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PoloniexApi.Net.Demo", "PoloniexApi.Net.Demo\PoloniexApi.Net.Demo.csproj", "{10D79671-870B-4088-9100-69E3CAAF364C}"
 EndProject

diff --git a/PoloniexApi.Net/MarketTools/Markets.Interface.cs b/PoloniexApi.Net/MarketTools/Markets.Interface.cs
@@ -15,10 +15,16 @@ public interface IMarkets
         /// <param name="depth">The number of orders to fetch from each side.</param>
         Task<IOrderBook> GetOpenOrdersAsync(CurrencyPair currencyPair, uint depth = 50);
 
-        /// <summary>Fetches the last 200 trades for a given market.</summary>
+        /// <summary>Fetches the last 200 trades of a given market.</summary>
         /// <param name="currencyPair">The currency pair, which consists of the currency being traded on the market, and the base's code.</param>
         Task<IList<ITrade>> GetTradesAsync(CurrencyPair currencyPair);
 
+        /// <summary>Fetches the trades of a given market in a given time period.</summary>
+        /// <param name="currencyPair">The currency pair, which consists of the currency being traded on the market, and the base's code.</param>
+        /// <param name="startTime">The time to start fetching data from.</param>
+        /// <param name="endTime">The time to stop fetching data at.</param>
+        Task<IList<ITrade>> GetTradesAsync(CurrencyPair currencyPair, DateTime startTime, DateTime endTime);
+
         /// <summary>Fetches the chart data which Poloniex uses for their candlestick graphs for a market view of a given time period.</summary>
         /// <param name="currencyPair">The currency pair, which consists of the currency being traded on the market, and the base's code.</param>
         /// <param name="period">The sampling frequency of the chart.</param>

diff --git a/PoloniexApi.Net/MarketTools/Markets.cs b/PoloniexApi.Net/MarketTools/Markets.cs
@@ -24,7 +24,7 @@ private IDictionary<CurrencyPair, IMarketData> GetSummary()
             );
         }
 
-        public IOrderBook GetOpenOrders(CurrencyPair currencyPair, uint depth)
+        private IOrderBook GetOpenOrders(CurrencyPair currencyPair, uint depth)
         {
             var data = GetData<OrderBook>(
                 "returnOrderBook",
@@ -34,7 +34,7 @@ public IOrderBook GetOpenOrders(CurrencyPair currencyPair, uint depth)
             return data;
         }
 
-        public IList<ITrade> GetTrades(CurrencyPair currencyPair)
+        private IList<ITrade> GetTrades(CurrencyPair currencyPair)
         {
             var data = GetData<IList<Trade>>(
                 "returnTradeHistory",
@@ -43,7 +43,18 @@ public IList<ITrade> GetTrades(CurrencyPair currencyPair)
             return new List<ITrade>(data);
         }
 
-        public IList<IMarketChartData> GetChartData(CurrencyPair currencyPair, MarketPeriod period, DateTime startTime, DateTime endTime)
+        private IList<ITrade> GetTrades(CurrencyPair currencyPair, DateTime startTime, DateTime endTime)
+        {
+            var data = GetData<IList<Trade>>(
+                "returnTradeHistory",
+                "currencyPair=" + currencyPair,
+                "start=" + Helper.DateTimeToUnixTimeStamp(startTime),
+                "end=" + Helper.DateTimeToUnixTimeStamp(endTime)
+            );
+            return new List<ITrade>(data);
+        }
+
+        private IList<IMarketChartData> GetChartData(CurrencyPair currencyPair, MarketPeriod period, DateTime startTime, DateTime endTime)
         {
             var data = GetData<IList<MarketChartData>>(
                 "returnChartData",
@@ -70,6 +81,11 @@ public Task<IList<ITrade>> GetTradesAsync(CurrencyPair currencyPair)
             return Task.Factory.StartNew(() => GetTrades(currencyPair));
         }
 
+        public Task<IList<ITrade>> GetTradesAsync(CurrencyPair currencyPair, DateTime startTime, DateTime endTime)
+        {
+            return Task.Factory.StartNew(() => GetTrades(currencyPair, startTime, endTime));
+        }
+
         public Task<IList<IMarketChartData>> GetChartDataAsync(CurrencyPair currencyPair, MarketPeriod period, DateTime startTime, DateTime endTime)
         {
             return Task.Factory.StartNew(() => GetChartData(currencyPair, period, startTime, endTime));

diff --git a/PoloniexApi.Net/PoloniexClient.cs b/PoloniexApi.Net/PoloniexClient.cs
@@ -35,7 +35,7 @@ public PoloniexClient(string publicApiKey, string privateApiKey)
         }
 
         /// <summary>Creates a new, unauthorized instance of Poloniex API .NET's client service.</summary>
-        public PoloniexClient() : this(null, null)
+        public PoloniexClient() : this("", "")
         {
 
         }

diff --git a/PoloniexApi.Net/Properties/AssemblyInfo.cs b/PoloniexApi.Net/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4")]
-[assembly: AssemblyFileVersion("1.1.4")]
+[assembly: AssemblyVersion("1.2.0")]
+[assembly: AssemblyFileVersion("1.2.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/PoloniexApi.Net/TradingTools/Trading.Interface.cs b/PoloniexApi.Net/TradingTools/Trading.Interface.cs
@@ -13,6 +13,10 @@ public interface ITrading
 
         /// <summary>Fetches the trades made in your account, ordered by most recent first.</summary>
         /// <param name="currencyPair">The currency pair, which consists of the currency being traded on the market, and the base's code.</param>
+        Task<IList<ITrade>> GetTradesAsync(CurrencyPair currencyPair);
+
+        /// <summary>Fetches the trades made in your account in a given time period, ordered by most recent first.</summary>
+        /// <param name="currencyPair">The currency pair, which consists of the currency being traded on the market, and the base's code.</param>
         /// <param name="startTime">The time to start fetching data from.</param>
         /// <param name="endTime">The time to stop fetching data at.</param>
         Task<IList<ITrade>> GetTradesAsync(CurrencyPair currencyPair, DateTime startTime, DateTime endTime);