Merge pull request #607 from lbryio/fix-stream-cost-estimate

fix stream_cost_estimate

CHANGELOG.md

@@ -17,6 +17,7 @@ at anytime.
   * Use `uri` instead of `name` in `get_availability`
   * Add `channel_name` to claim and file responses where applicable
   * Return None (instead of errors) if a uri cannot be resolved
+  * Use `uri` instead of `name` for `stream_cost_estimate`, update cost estimate for lbryschema
 
 ### Fixed
   * `file_list` for files with bad signatures

lbrynet/lbrynet_daemon/Daemon.py

@@ -16,6 +16,8 @@ from twisted.internet import defer, threads, error, reactor
 from twisted.internet.task import LoopingCall
 from twisted.python.failure import Failure
 
+from lbryschema.claim import ClaimDict
+
 # TODO: importing this when internet is disabled raises a socket.gaierror
 from lbryum.version import LBRYUM_VERSION
 from lbrynet import __version__ as LBRYNET_VERSION
@@ -832,15 +834,15 @@ class Daemon(AuthJSONRPCServer):
             return 0.0
         return size / (10 ** 6) * conf.settings['data_rate']
 
-    def get_est_cost_using_known_size(self, name, size):
+    def get_est_cost_using_known_size(self, uri, size):
         """
         Calculate estimated LBC cost for a stream given its size in bytes
         """
 
         cost = self._get_est_cost_from_stream_size(size)
 
-        d = self._resolve_name(name)
-        d.addCallback(lambda metadata: self._add_key_fee_to_est_data_cost(metadata, cost))
+        d = self.session.wallet.resolve_uri(uri)
+        d.addCallback(lambda response: self._add_key_fee_to_est_data_cost(response, cost))
         return d
 
     def get_est_cost_from_sd_hash(self, sd_hash):
@@ -867,29 +869,39 @@ class Daemon(AuthJSONRPCServer):
         d.addCallback(lambda data_cost: self._add_key_fee_to_est_data_cost(metadata, data_cost))
         return d
 
-    def _add_key_fee_to_est_data_cost(self, metadata, data_cost):
-        fee = self.exchange_rate_manager.to_lbc(metadata.get('fee', None))
+    def _add_key_fee_to_est_data_cost(self, claim_response, data_cost):
+        fee = self.exchange_rate_manager.to_lbc(claim_response['stream']['metadata'].get('fee',
+                                                                                         None))
         fee_amount = 0.0 if fee is None else fee.amount
         return data_cost + fee_amount
 
     @defer.inlineCallbacks
-    def get_est_cost_from_name(self, name):
+    def get_est_cost_from_uri(self, uri):
         """
         Resolve a name and return the estimated stream cost
         """
-        metadata = yield self._resolve_name(name)
-        cost = yield self._get_est_cost_from_metadata(metadata, name)
-        defer.returnValue(cost)
+        try:
+            claim_response = yield self.session.wallet.resolve_uri(uri)
+        except Exception:
+            claim_response = None
 
-    def get_est_cost(self, name, size=None):
+        if claim_response and 'claim' in claim_response:
+            cost = yield self._get_est_cost_from_metadata(ClaimDict.load_dict(
+                claim_response['claim']['value']), uri)
+            rounded = round(cost, 5)
+            defer.returnValue(rounded)
+        else:
+            defer.returnValue(None)
+
+    def get_est_cost(self, uri, size=None):
         """Get a cost estimate for a lbry stream, if size is not provided the
         sd blob will be downloaded to determine the stream size
 
         """
 
         if size is not None:
-            return self.get_est_cost_using_known_size(name, size)
-        return self.get_est_cost_from_name(name)
+            return self.get_est_cost_using_known_size(uri, size)
+        return self.get_est_cost_from_uri(uri)
 
     @defer.inlineCallbacks
     def _get_lbry_file_dict(self, lbry_file, full_status=False):
@@ -1634,7 +1646,7 @@ class Daemon(AuthJSONRPCServer):
         return self.jsonrpc_stream_cost_estimate(**kwargs)
 
     @defer.inlineCallbacks
-    def jsonrpc_stream_cost_estimate(self, name, size=None):
+    def jsonrpc_stream_cost_estimate(self, uri, size=None):
         """
         Get estimated cost for a lbry stream
 
@@ -1645,7 +1657,7 @@ class Daemon(AuthJSONRPCServer):
         Returns:
             (float) Estimated cost in lbry credits
         """
-        cost = yield self.get_est_cost(name, size)
+        cost = yield self.get_est_cost(uri, size)
         defer.returnValue(cost)
 
     @AuthJSONRPCServer.auth_required

tests/unit/lbrynet_daemon/test_Daemon.py

@@ -1,10 +1,12 @@
 import mock
+import json
 import requests
 from tests.mocks import BlobAvailabilityTracker as DummyBlobAvailabilityTracker
 from tests import util
 from twisted.internet import defer
 from twisted.internet import reactor
 from twisted.trial import unittest
+from lbryschema.decode import smart_decode
 from lbrynet.lbrynet_daemon import Daemon
 from lbrynet.core import Session, PaymentRateManager, Wallet
 from lbrynet.lbrynet_daemon.Daemon import Daemon as LBRYDaemon
@@ -59,6 +61,7 @@ def get_test_daemon(data_rate=None, generous=True, with_fee=False):
     }
     daemon = LBRYDaemon(None, None)
     daemon.session = mock.Mock(spec=Session.Session)
+    daemon.session.wallet = mock.Mock(spec=Wallet.LBRYumWallet)
     daemon.exchange_rate_manager = ExchangeRateManager.DummyExchangeRateManager(rates)
     base_prm = PaymentRateManager.BasePaymentRateManager(rate=data_rate)
     prm = PaymentRateManager.NegotiatedPaymentRateManager(base_prm, DummyBlobAvailabilityTracker(),
@@ -66,6 +69,7 @@ def get_test_daemon(data_rate=None, generous=True, with_fee=False):
     daemon.session.payment_rate_manager = prm
     metadata = {
         "author": "fake author",
+        "language": "en",
         "content_type": "fake/format",
         "description": "fake description",
         "license": "fake license",
@@ -80,8 +84,9 @@ def get_test_daemon(data_rate=None, generous=True, with_fee=False):
     }
     if with_fee:
         metadata.update(
-            {"fee": {"currency":"USD", "address":"bQ6BGboPV2SpTMEP7wLNiAcnsZiH8ye6eA", "amount": 0.75}})
+            {"fee": {"USD": {"address": "bQ6BGboPV2SpTMEP7wLNiAcnsZiH8ye6eA", "amount": 0.75}}})
     daemon._resolve_name = lambda _: defer.succeed(metadata)
+    daemon.session.wallet.resolve_uri = lambda _: defer.succeed(smart_decode(json.dumps(metadata)))
     return daemon
 
 
@@ -94,6 +99,7 @@ class TestCostEst(unittest.TestCase):
         size = 10000000
         correct_result = 4.5
         daemon = get_test_daemon(generous=True, with_fee=True)
+        print daemon.get_est_cost("test", size)
         self.assertEquals(daemon.get_est_cost("test", size).result, correct_result)
 
     def test_fee_and_ungenerous_data(self):