From 25c36346b6fad57f2dc121fa028d2ab108a89954 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Tue, 22 May 2018 17:15:34 -0400 Subject: [PATCH] Revert "WIP: feature/1098/sorted-claim-results" --- CHANGELOG.md | 1 - lbrynet/daemon/Daemon.py | 10 +--- lbrynet/tests/unit/daemon/__init__.py | 0 .../unit/daemon/test_claims_comparator.py | 46 ------------------- 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 lbrynet/tests/unit/daemon/__init__.py delete mode 100644 lbrynet/tests/unit/daemon/test_claims_comparator.py diff --git a/CHANGELOG.md b/CHANGELOG.md index b95a4f1eb..b94d5fd44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,6 @@ at anytime. * download blockchain headers from s3 before starting the wallet when the local height is more than `s3_headers_depth` (a config setting) blocks behind * track successful reflector uploads in sqlite to minimize how many streams are attempted by auto re-reflect * increase the default `auto_re_reflect_interval` to a day - * `claim_list` and `claim_list_mine` in Daemon `return` sorted results ### Added * virtual kademlia network and mock udp transport for dht integration tests diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py index ac497c37c..43c67e0d7 100644 --- a/lbrynet/daemon/Daemon.py +++ b/lbrynet/daemon/Daemon.py @@ -163,12 +163,6 @@ class AlwaysSend(object): return d -def sort_claim_results(claims): - for claim in claims: - claim['result'].sort(key=lambda d: (d['height'], d['name'], d['claim_id'], d['txid'], d['nout'])) - return claims - - class Daemon(AuthJSONRPCServer): """ LBRYnet daemon, a jsonrpc interface to lbry functions @@ -2299,7 +2293,6 @@ class Daemon(AuthJSONRPCServer): """ d = self.session.wallet.get_name_claims() - d.addCallback(sort_claim_results) d.addCallback(lambda claims: self._render_response(claims)) return d @@ -2338,8 +2331,7 @@ class Daemon(AuthJSONRPCServer): """ claims = yield self.session.wallet.get_claims_for_name(name) - result = sort_claim_results(claims) - defer.returnValue(result) + defer.returnValue(claims) @defer.inlineCallbacks def jsonrpc_claim_list_by_channel(self, page=0, page_size=10, uri=None, uris=[]): diff --git a/lbrynet/tests/unit/daemon/__init__.py b/lbrynet/tests/unit/daemon/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/lbrynet/tests/unit/daemon/test_claims_comparator.py b/lbrynet/tests/unit/daemon/test_claims_comparator.py deleted file mode 100644 index 772ecb5e5..000000000 --- a/lbrynet/tests/unit/daemon/test_claims_comparator.py +++ /dev/null @@ -1,46 +0,0 @@ -import unittest - -from lbrynet.daemon.Daemon import sort_claim_results - - -class ClaimsComparatorTest(unittest.TestCase): - def test_sort_claim_results_when_sorted_by_claim_id(self): - results = [{"height": 1, "name": "res", "claim_id": "ccc", "nout": 0, "txid": "fdsafa"}, - {"height": 1, "name": "res", "claim_id": "aaa", "nout": 0, "txid": "w5tv8uorgt"}, - {"height": 1, "name": "res", "claim_id": "bbb", "nout": 0, "txid": "aecfaewcfa"}] - self.run_test(results, 'claim_id', ['aaa', 'bbb', 'ccc']) - - def test_sort_claim_results_when_sorted_by_height(self): - results = [{"height": 1, "name": "res", "claim_id": "ccc", "nout": 0, "txid": "aecfaewcfa"}, - {"height": 3, "name": "res", "claim_id": "ccc", "nout": 0, "txid": "aecfaewcfa"}, - {"height": 2, "name": "res", "claim_id": "ccc", "nout": 0, "txid": "aecfaewcfa"}] - self.run_test(results, 'height', [1, 2, 3]) - - def test_sort_claim_results_when_sorted_by_name(self): - results = [{"height": 1, "name": "res1", "claim_id": "ccc", "nout": 0, "txid": "aecfaewcfa"}, - {"height": 1, "name": "res3", "claim_id": "ccc", "nout": 0, "txid": "aecfaewcfa"}, - {"height": 1, "name": "res2", "claim_id": "ccc", "nout": 0, "txid": "aecfaewcfa"}] - self.run_test(results, 'name', ['res1', 'res2', 'res3']) - - def test_sort_claim_results_when_sorted_by_txid(self): - results = [{"height": 1, "name": "res1", "claim_id": "ccc", "nout": 2, "txid": "111"}, - {"height": 1, "name": "res1", "claim_id": "ccc", "nout": 1, "txid": "222"}, - {"height": 1, "name": "res1", "claim_id": "ccc", "nout": 3, "txid": "333"}] - self.run_test(results, 'txid', ['111', '222', '333']) - - def test_sort_claim_results_when_sorted_by_nout(self): - results = [{"height": 1, "name": "res1", "claim_id": "ccc", "nout": 2, "txid": "aecfaewcfa"}, - {"height": 1, "name": "res1", "claim_id": "ccc", "nout": 1, "txid": "aecfaewcfa"}, - {"height": 1, "name": "res1", "claim_id": "ccc", "nout": 3, "txid": "aecfaewcfa"}] - self.run_test(results, 'nout', [1, 2, 3]) - - def run_test(self, results, field, expected): - data = {'result': results} - claims = sort_claim_results([data]) - claim = claims[0] - actual = claim['result'] - self.assertEqual(expected, [r[field] for r in actual]) - - -if __name__ == '__main__': - unittest.main()