From 5f9509db96bf80648e86c165d16c30bbba3ae115 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Thu, 7 Sep 2017 13:55:36 -0400
Subject: [PATCH] don't use google finance

---
 CHANGELOG.md                                  |  5 ++++
 lbrynet/daemon/ExchangeRateManager.py         | 27 +++++++------------
 .../test_ExchangeRateManager.py               |  4 +--
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 314eab847..dc5a00ef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,11 @@ at anytime.
   *
 
 
+## [0.15.2] - 2017-09-07
+### Changed
+ * Use lbry.io exchange rate API instead of google finance
+
+
 ## [0.15.1] - 2017-08-22
 ### Changed
  * Bumped `lbryschema` requirement to 0.0.10 [see changelog](https://github.com/lbryio/lbryschema/blob/master/CHANGELOG.md#0010---2017-08-22)
diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py
index 87455ee81..998d06d0d 100644
--- a/lbrynet/daemon/ExchangeRateManager.py
+++ b/lbrynet/daemon/ExchangeRateManager.py
@@ -129,26 +129,22 @@ class LBRYioFeed(MarketFeed):
         return defer.succeed(1.0 / json_response['data']['lbc_btc'])
 
 
-class GoogleBTCFeed(MarketFeed):
+class LBRYioBTCFeed(MarketFeed):
     def __init__(self):
         MarketFeed.__init__(
             self,
             "USDBTC",
-            "Coinbase via Google finance",
-            'http://finance.google.com/finance/info',
-            {'client':'ig', 'q':'CURRENCY:USDBTC'},
-            COINBASE_FEE
+            "lbry.io",
+            "https://api.lbry.io/lbc/exchange_rate",
+            {},
+            0.0,
         )
 
     def _handle_response(self, response):
-        response = response[3:] # response starts with "// "
-        json_response = json.loads(response)[0]
-        if 'l' not in json_response:
-            raise InvalidExchangeRateResponse(self.name, 'last trade not found')
-        last_trade_price = float(json_response['l'])
-        if last_trade_price <= 0:
-            raise InvalidExchangeRateResponse(self.name, 'trade price was not positive')
-        return defer.succeed(last_trade_price)
+        json_response = json.loads(response)
+        if 'data' not in json_response:
+            raise InvalidExchangeRateResponse(self.name, 'result not found')
+        return defer.succeed(1.0 / json_response['data']['btc_usd'])
 
 
 def get_default_market_feed(currency_pair):
@@ -160,7 +156,7 @@ def get_default_market_feed(currency_pair):
     assert currencies is not None
 
     if currencies == ("USD", "BTC"):
-        return GoogleBTCFeed()
+        return LBRYioBTCFeed()
     elif currencies == ("BTC", "LBC"):
         return LBRYioFeed()
 
@@ -199,6 +195,3 @@ class ExchangeRateManager(object):
 
     def fee_dict(self):
         return {market: market.rate.as_dict() for market in self.market_feeds}
-
-
-
diff --git a/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py b/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
index f91a01ff6..15e4bba4a 100644
--- a/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
+++ b/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
@@ -1,7 +1,7 @@
 from lbryschema.fee import Fee
 from lbrynet.daemon import ExchangeRateManager
 from lbrynet.core.Error import InvalidExchangeRateResponse
-
+import unittest as py_unittest
 from twisted.trial import unittest
 from twisted.internet import defer
 from tests import util
@@ -81,8 +81,8 @@ class FeeTest(unittest.TestCase):
 
 
 class GoogleBTCFeedTest(unittest.TestCase):
-
     @defer.inlineCallbacks
+    @py_unittest.skip(":(")
     def test_handle_response(self):
         feed = ExchangeRateManager.GoogleBTCFeed()