Merge pull request #1208 from tau3/feature/1098/sorted-claim-results

WIP: feature/1098/sorted-claim-results

CHANGELOG.md

@@ -52,6 +52,7 @@ 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

lbrynet/daemon/Daemon.py

@@ -163,6 +163,12 @@ 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
@@ -2293,6 +2299,7 @@ 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
 
@@ -2331,7 +2338,8 @@ class Daemon(AuthJSONRPCServer):
         """
 
         claims = yield self.session.wallet.get_claims_for_name(name)
-        defer.returnValue(claims)
+        result = sort_claim_results(claims)
+        defer.returnValue(result)
 
     @defer.inlineCallbacks
     def jsonrpc_claim_list_by_channel(self, page=0, page_size=10, uri=None, uris=[]):

lbrynet/tests/unit/daemon/test_claims_comparator.py

@@ -0,0 +1,46 @@
+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()