From 19e326c1403e57b9936b95b8ce33eafd042248de Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 29 Jan 2019 14:27:46 -0300 Subject: [PATCH] simplify generate_keys --- torba/client/baseaccount.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/torba/client/baseaccount.py b/torba/client/baseaccount.py index bfa8e2637..86d1d0d7d 100644 --- a/torba/client/baseaccount.py +++ b/torba/client/baseaccount.py @@ -134,16 +134,9 @@ class HierarchicalDeterministic(AddressManager): async def _generate_keys(self, start: int, end: int) -> List[str]: if not self.address_generator_lock.locked(): raise RuntimeError('Should not be called outside of address_generator_lock.') - keys_batch, final_keys = [], [] - for index in range(start, end+1): - keys_batch.append((index, self.public_key.child(index))) - if index % 180 == 0 or index == end: - await self.account.ledger.db.add_keys( - self.account, self.chain_number, keys_batch - ) - final_keys.extend(keys_batch) - keys_batch.clear() - return [key[1].address for key in final_keys] + keys = [(index, self.public_key.child(index)) for index in range(start, end+1)] + await self.account.ledger.db.add_keys(self.account, self.chain_number, keys) + return [key[1].address for key in keys] def get_address_records(self, only_usable: bool = False, **constraints): if only_usable: