LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

simplified claims comparison logic; refactored unit tests

Browse source
This commit is contained in:
Sergey Rozhnov 2018-05-17 13:36:32 +04:00
parent 208284a0f8
commit a7a5bb8887
3 changed files with 70 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lbrynet/daemon/claims_comparator.py
View file

@ -1,36 +1,10 @@
_comparison_order = ['height', 'name', 'claim_id'] # TODO outpoint
def arrange_results(claims):
for claim in claims:
results = claim['result']
sorted_results = sorted(results, cmp=_compare_results)
sorted_results = sorted(results, key=lambda d: (d['height'], d['name'], d['claim_id'], _outpoint(d)))
claim['result'] = sorted_results
return claims
def _compare_results(left, right):
"""
:type left: dict
:type right: dict
"""
result = 0
for attribute in _comparison_order:
left_value = left[attribute]
right_value = right[attribute]
sub_result = _cmp(left_value, right_value)
if sub_result is not 0:
result = sub_result
break
return result
def _cmp(left, right):
if left == right:
return 0
elif left < right:
return -1
else:
return 1
def _outpoint(claim):
return '{}:{}'.format(claim['txid'], claim['nout'])

53
lbrynet/tests/unit/daemon/claims_comparator_cases.json Normal file
View file

@ -0,0 +1,53 @@
{
"cases": [
{
"description": "sort by claim_id",
"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"
}
],
"expected": [
{
"height": 1,
"name": "res",
"claim_id": "aaa",
"nout": 0,
"txid": "w5tv8uorgt"
},
{
"height": 1,
"name": "res",
"claim_id": "bbb",
"nout": 0,
"txid": "aecfaewcfa"
},
{
"height": 1,
"name": "res",
"claim_id": "ccc",
"nout": 0,
"txid": "fdsafa"
}
]
}
]
}

49
lbrynet/tests/unit/daemon/test_claims_comparator.py
View file

@ -1,51 +1,26 @@
import json
import unittest
from lbrynet.daemon.claims_comparator import arrange_results
class ClaimsComparatorTest(unittest.TestCase):
def test_arrange_results(self):
results = [
{
'height': 1,
'name': 'res',
'claim_id': 'ccc'
},
{
'height': 1,
'name': 'res',
'claim_id': 'aaa'
},
{
'height': 1,
'name': 'res',
'claim_id': 'bbb'
}
]
data = {'result': results}
def setUp(self):
with open('claims_comparator_cases.json') as f:
document = json.load(f)
self.cases = document['cases']
def test_arrange_results(self):
for case in self.cases:
results = case['results']
data = {'result': results}
expected = case['expected']
expected = [
{
'height': 1,
'name': 'res',
'claim_id': 'aaa'
},
{
'height': 1,
'name': 'res',
'claim_id': 'bbb'
},
{
'height': 1,
'name': 'res',
'claim_id': 'ccc'
}
]
claims = arrange_results([data])
claim = claims[0]
actual = claim['result']
self.assertEqual(expected, actual)
self.assertEqual(expected, actual, case['description'])
if __name__ == '__main__':