Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

don't use google finance

Browse source
This commit is contained in:
Jack Robison 2017-09-07 13:55:36 -04:00
parent 2d39f3b2ab
commit 5f9509db96
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -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 ## [0.15.1] - 2017-08-22
### Changed ### Changed
* Bumped `lbryschema` requirement to 0.0.10 [see changelog](https://github.com/lbryio/lbryschema/blob/master/CHANGELOG.md#0010---2017-08-22) * Bumped `lbryschema` requirement to 0.0.10 [see changelog](https://github.com/lbryio/lbryschema/blob/master/CHANGELOG.md#0010---2017-08-22)

27
lbrynet/daemon/ExchangeRateManager.py
View file

@ -129,26 +129,22 @@ class LBRYioFeed(MarketFeed):
return defer.succeed(1.0 / json_response['data']['lbc_btc']) return defer.succeed(1.0 / json_response['data']['lbc_btc'])
class GoogleBTCFeed(MarketFeed): class LBRYioBTCFeed(MarketFeed):
def __init__(self): def __init__(self):
MarketFeed.__init__( MarketFeed.__init__(
self, self,
"USDBTC", "USDBTC",
"Coinbase via Google finance", "lbry.io",
'http://finance.google.com/finance/info', "https://api.lbry.io/lbc/exchange_rate",
{'client':'ig', 'q':'CURRENCY:USDBTC'}, {},
COINBASE_FEE 0.0,
) )
def _handle_response(self, response): def _handle_response(self, response):
response = response[3:] # response starts with "// " json_response = json.loads(response)
json_response = json.loads(response)[0] if 'data' not in json_response:
if 'l' not in json_response: raise InvalidExchangeRateResponse(self.name, 'result not found')
raise InvalidExchangeRateResponse(self.name, 'last trade not found') return defer.succeed(1.0 / json_response['data']['btc_usd'])
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)
def get_default_market_feed(currency_pair): def get_default_market_feed(currency_pair):
@ -160,7 +156,7 @@ def get_default_market_feed(currency_pair):
assert currencies is not None assert currencies is not None
if currencies == ("USD", "BTC"): if currencies == ("USD", "BTC"):
return GoogleBTCFeed() return LBRYioBTCFeed()
elif currencies == ("BTC", "LBC"): elif currencies == ("BTC", "LBC"):
return LBRYioFeed() return LBRYioFeed()
@ -199,6 +195,3 @@ class ExchangeRateManager(object):
def fee_dict(self): def fee_dict(self):
return {market: market.rate.as_dict() for market in self.market_feeds} return {market: market.rate.as_dict() for market in self.market_feeds}

4
tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
View file

@ -1,7 +1,7 @@
from lbryschema.fee import Fee from lbryschema.fee import Fee
from lbrynet.daemon import ExchangeRateManager from lbrynet.daemon import ExchangeRateManager
from lbrynet.core.Error import InvalidExchangeRateResponse from lbrynet.core.Error import InvalidExchangeRateResponse
import unittest as py_unittest
from twisted.trial import unittest from twisted.trial import unittest
from twisted.internet import defer from twisted.internet import defer
from tests import util from tests import util
@ -81,8 +81,8 @@ class FeeTest(unittest.TestCase):
class GoogleBTCFeedTest(unittest.TestCase): class GoogleBTCFeedTest(unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
@py_unittest.skip(":(")
def test_handle_response(self): def test_handle_response(self):
feed = ExchangeRateManager.GoogleBTCFeed() feed = ExchangeRateManager.GoogleBTCFeed()