From a132496643cc01722ce075c9feb1dd4043d011cb Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 8 Mar 2017 09:31:36 -0500 Subject: [PATCH 1/2] fix filter files by outpoint --- CHANGELOG.md | 2 +- lbrynet/lbryfilemanager/EncryptedFileDownloader.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf4617f3c..723e50403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ at anytime. ### Fixed * Added string comparison to ClaimOutpoint (needed to look things up by outpoint) * Remove unused API commands from daemon - * + * Fix file filter `outpoint` * ## [0.9.0rc12] - 2017-03-06 diff --git a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py b/lbrynet/lbryfilemanager/EncryptedFileDownloader.py index 5f9a9712d..f2776e650 100644 --- a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py +++ b/lbrynet/lbryfilemanager/EncryptedFileDownloader.py @@ -15,6 +15,7 @@ from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileDownloa from lbrynet.lbryfilemanager.EncryptedFileStatusReport import EncryptedFileStatusReport from lbrynet.interfaces import IStreamDownloaderFactory from lbrynet.lbryfile.StreamDescriptor import save_sd_info +from lbrynet.core.Wallet import ClaimOutpoint log = logging.getLogger(__name__) @@ -49,6 +50,7 @@ class ManagedEncryptedFileDownloader(EncryptedFileSaver): self.sd_hash = None self.txid = None self.nout = None + self.outpoint = None self.name = None self.claim_id = None self.rowid = rowid @@ -118,6 +120,7 @@ class ManagedEncryptedFileDownloader(EncryptedFileSaver): self.name = name self.txid = txid self.nout = nout + self.outpoint = ClaimOutpoint(self.txid, self.nout) else: raise NoSuchSDHash(self.sd_hash) self.claim_id = yield self.wallet.get_claimid(self.name, self.txid, self.nout) From a7c2ad470c776916d046b5db26ca91c9e174688f Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 8 Mar 2017 09:36:32 -0500 Subject: [PATCH 2/2] fix tests --- tests/mocks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/mocks.py b/tests/mocks.py index cf8e5cf7a..3a5d1511b 100644 --- a/tests/mocks.py +++ b/tests/mocks.py @@ -88,10 +88,10 @@ class Wallet(object): pass def get_claim_metadata_for_sd_hash(self, sd_hash): - return "fakeuri", "faketxid", "fakenout" + return "fakeuri", "aa04a949348f9f094d503e5816f0cfb57ee68a22f6d08d149217d071243e0377", 1 def get_claimid(self, name, txid=None, nout=None): - return "fake claimid" + return "aa04a949348f9f094d503e5816f0cfb57ee68a22f6d08d149217d071243e0378" class PeerFinder(object):