Skip to content
Snippets Groups Projects
Commit 386b8f62 authored by inso's avatar inso
Browse files

Fix tests

parent 28a38191
No related branches found
No related tags found
No related merge requests found
git+https://github.com/Insoleet/quamash.git@master git+https://github.com/Insoleet/quamash.git@master
asynctest asynctest
networkx networkx
attrs attrs<=17.2
duniter-mirage duniter-mirage
duniterpy>=0.40 duniterpy>=0.40
pytest pytest
......
...@@ -294,30 +294,34 @@ class BlockchainProcessor: ...@@ -294,30 +294,34 @@ class BlockchainProcessor:
dt_reeval_block_target = max(blockchain.current_buid.number - int(last_reeval_offset dt_reeval_block_target = max(blockchain.current_buid.number - int(last_reeval_offset
/ blockchain.parameters.avg_gen_time), / blockchain.parameters.avg_gen_time),
0) 0)
last_ud_reeval_block_number = [b for b in blocks_with_ud if b <= dt_reeval_block_target][-1] try:
last_ud_reeval_block_number = [b for b in blocks_with_ud if b <= dt_reeval_block_target][-1]
block_with_ud = await self._bma_connector.get(currency, bma.blockchain.block, except IndexError:
req_args={'number': last_ud_reeval_block_number}) last_ud_reeval_block_number = 0
if block_with_ud:
blockchain.last_members_count = block_with_ud['membersCount'] if last_ud_reeval_block_number:
blockchain.last_ud = block_with_ud['dividend'] block_with_ud = await self._bma_connector.get(currency, bma.blockchain.block,
blockchain.last_ud_base = block_with_ud['unitbase'] req_args={'number': last_ud_reeval_block_number})
blockchain.last_ud_time = block_with_ud['medianTime'] if block_with_ud:
blockchain.last_mass = block_with_ud['monetaryMass'] blockchain.last_members_count = block_with_ud['membersCount']
blockchain.last_ud = block_with_ud['dividend']
self._logger.debug("Requesting previous block with dividend") blockchain.last_ud_base = block_with_ud['unitbase']
dt_reeval_block_target = max(dt_reeval_block_target - int(blockchain.parameters.dt_reeval blockchain.last_ud_time = block_with_ud['medianTime']
/ blockchain.parameters.avg_gen_time), blockchain.last_mass = block_with_ud['monetaryMass']
0)
previous_ud_reeval_block_number = [b for b in blocks_with_ud if b <= dt_reeval_block_target][-1] self._logger.debug("Requesting previous block with dividend")
dt_reeval_block_target = max(dt_reeval_block_target - int(blockchain.parameters.dt_reeval
block_with_ud = await self._bma_connector.get(currency, bma.blockchain.block, / blockchain.parameters.avg_gen_time),
req_args={'number': previous_ud_reeval_block_number}) 0)
blockchain.previous_mass = block_with_ud['monetaryMass'] previous_ud_reeval_block_number = [b for b in blocks_with_ud if b <= dt_reeval_block_target][-1]
blockchain.previous_members_count = block_with_ud['membersCount']
blockchain.previous_ud = block_with_ud['dividend'] block_with_ud = await self._bma_connector.get(currency, bma.blockchain.block,
blockchain.previous_ud_base = block_with_ud['unitbase'] req_args={'number': previous_ud_reeval_block_number})
blockchain.previous_ud_time = block_with_ud['medianTime'] blockchain.previous_mass = block_with_ud['monetaryMass']
blockchain.previous_members_count = block_with_ud['membersCount']
blockchain.previous_ud = block_with_ud['dividend']
blockchain.previous_ud_base = block_with_ud['unitbase']
blockchain.previous_ud_time = block_with_ud['medianTime']
except errors.DuniterError as e: except errors.DuniterError as e:
if e.ucode != errors.NO_CURRENT_BLOCK: if e.ucode != errors.NO_CURRENT_BLOCK:
raise raise
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment