convert modified_on timestamp to int to avoid floating point conflicts when syncing

This commit is contained in:
Lex Berezhny 2020-07-20 14:24:53 -04:00
parent 6ed1614db0
commit ba649d4b94

View file

@ -311,7 +311,7 @@ class Account:
private_key=private_key, private_key=private_key,
public_key=public_key, public_key=public_key,
address_generator=d.get('address_generator', {}), address_generator=d.get('address_generator', {}),
modified_on=d.get('modified_on', time.time()), modified_on=d.get('modified_on', int(time.time())),
channel_keys=d.get('certificates', {}) channel_keys=d.get('certificates', {})
) )
@ -343,7 +343,7 @@ class Account:
def merge(self, d: dict): def merge(self, d: dict):
if d.get('modified_on', 0) > self.modified_on: if d.get('modified_on', 0) > self.modified_on:
self.name = d['name'] self.name = d['name']
self.modified_on = d.get('modified_on', time.time()) self.modified_on = d.get('modified_on', int(time.time()))
assert self.address_generator.name == d['address_generator']['name'] assert self.address_generator.name == d['address_generator']['name']
for chain_name in ('change', 'receiving'): for chain_name in ('change', 'receiving'):
if chain_name in d['address_generator']: if chain_name in d['address_generator']: