Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

fix issue when nodekeeper doesn't have information about a payer node… #4317

Merged
merged 1 commit into from
Jun 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions golem/ethereum/transactionsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ def get_incomes_list(self) -> List[Dict[str, Any]]:
lru_node = functools.lru_cache()(nodeskeeper.get)

def item(o):
node = lru_node(o.sender_node) if o.sender_node else None
return {
"subtask": common.to_unicode(o.subtask),
"payer": common.to_unicode(o.sender_node),
Expand All @@ -407,11 +408,8 @@ def item(o):
"transaction": common.to_unicode(o.transaction),
"created": common.datetime_to_timestamp_utc(o.created_date),
"modified": common.datetime_to_timestamp_utc(o.modified_date),
"node":
lru_node(o.sender_node).to_dict()
if o.sender_node else None,
"node": node.to_dict() if node else None,
}

return [item(income) for income in incomes]

def get_available_eth(self) -> int:
Expand Down
3 changes: 2 additions & 1 deletion tests/factories/model.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import factory

from golem_messages.factories.datastructures import p2p
from golem_messages.factories.helpers import random_eth_pub_key
from golem import model


class Income(factory.Factory):
class Meta:
model = model.Income

sender_node = '00adbeef' + 'deadbeef' * 15
sender_node = factory.LazyFunction(lambda: random_eth_pub_key())
payer_address = '0x' + 40 * '3'
subtask = factory.Faker('uuid4')
value = factory.Faker('random_int', min=1, max=10 << 20)
Expand Down
22 changes: 22 additions & 0 deletions tests/golem/ethereum/test_transactionsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -792,3 +792,25 @@ def test_one(self):
],
self.ets.get_incomes_list(),
)

def test_nodeskeeper_record_not_present(self):
income = model_factory.Income()
self.assertEqual(
income.save(force_insert=True),
1,
)
self.assertEqual(
[
{
'created': ANY,
'modified': ANY,
'node': None,
'payer': income.sender_node,
'status': 'awaiting',
'subtask': income.subtask,
'transaction': None,
'value': str(income.value),
},
],
self.ets.get_incomes_list(),
)