Test and implement single market data differently.

jaapz · jaapz · commit 1ad7810cee84 · 2014-03-03T16:51:01.000+01:00
diff --git a/Cryptsy.py b/Cryptsy.py
@@ -40,23 +40,18 @@ def _api_query(self, method, request_data={}):
 
         return json.loads(rv.read())
 
-    def market_data(self, v2=False):
+    def market_data(self, marketid=None, v2=False):
         """ Get market data for all markets.
 
         Defaults to the old version of getmarketdata. Set v2 to True to use
         getmarketdatav2.
         """
         if v2 is True:
             return self._public_api_query("marketdatav2")
+        if marketid is not None:
+            return self._public_api_query("singlemarketdata", marketid=marketid)
         return self._public_api_query("marketdata")
 
-    def single_market_data(self, marketid=None):
-        """ Get general market data for the given market.
-
-        :param marketid: Market ID you are querying for.
-        """
-        return self._public_api_query("singlemarketdata", marketid=marketid)
-
     def order_book_data(self, marketid=None):
         """ Get orderbook data for all markets, or for a single one.
 
diff --git a/test_cryptsy.py b/test_cryptsy.py
@@ -99,6 +99,12 @@ def test_generate_new_address_currencyid(api, api_query_mock):
     })
 
 
+def test_single_market_data(api, public_api_query_mock):
+    """ Should call singlemarketdata if marketid is provided. """
+    api.market_data(marketid=10)
+    public_api_query_mock.assert_called_with('singlemarketdata', marketid=10)
+
+
 def test_market_data_old(api, public_api_query_mock):
     """ Should use the old marketdata method if v2 is not set to True. """
     api.market_data()
