Small fix for CLI crawler sync command

pull/38/head
kompotkot 2021-08-02 15:38:25 +03:00
rodzic d07d9d043f
commit 39ff5e0b10
1 zmienionych plików z 21 dodań i 9 usunięć

Wyświetl plik

@ -58,19 +58,31 @@ def ethcrawler_blocks_sync_handler(args: argparse.Namespace) -> None:
bottom_block_number, top_block_number = get_latest_blocks( bottom_block_number, top_block_number = get_latest_blocks(
bool(strtobool(args.transactions)) bool(strtobool(args.transactions))
) )
bottom_block_number = bottom_block_number + 1
if bottom_block_number >= top_block_number: if bottom_block_number >= top_block_number:
print( print(
f"Synchronization is unnecessary for blocks {bottom_block_number}-{top_block_number}" f"Synchronization is unnecessary for blocks {bottom_block_number}-{top_block_number - 1}"
) )
break time.sleep(20)
continue
if top_block_number - bottom_block_number >= 10:
for blocks_numbers_list in yield_blocks_numbers_lists( for blocks_numbers_list in yield_blocks_numbers_lists(
f"{bottom_block_number}-{top_block_number}" f"{bottom_block_number}-{top_block_number}"
): ):
print(f"Adding blocks {blocks_numbers_list[0]}-{blocks_numbers_list[-1]}") print(
f"Adding blocks {blocks_numbers_list[-1]}-{blocks_numbers_list[0]}"
)
crawl_blocks_executor( crawl_blocks_executor(
block_numbers_list=blocks_numbers_list, block_numbers_list=blocks_numbers_list,
with_transactions=bool(strtobool(args.transactions)), with_transactions=bool(strtobool(args.transactions)),
) )
else:
blocks_numbers_list = range(bottom_block_number, top_block_number + 1)
print(f"Adding blocks {bottom_block_number}-{top_block_number - 1}")
crawl_blocks(
blocks_numbers=blocks_numbers_list,
with_transactions=bool(strtobool(args.transactions)),
)
print(f"Synchronized blocks from {bottom_block_number} to {top_block_number}") print(f"Synchronized blocks from {bottom_block_number} to {top_block_number}")
time.sleep(10) time.sleep(10)
@ -82,7 +94,7 @@ def ethcrawler_blocks_add_handler(args: argparse.Namespace) -> None:
startTime = time.time() startTime = time.time()
for blocks_numbers_list in yield_blocks_numbers_lists(args.blocks): for blocks_numbers_list in yield_blocks_numbers_lists(args.blocks):
print(f"Adding blocks {blocks_numbers_list[0]}-{blocks_numbers_list[-1]}") print(f"Adding blocks {blocks_numbers_list[-1]}-{blocks_numbers_list[0]}")
crawl_blocks_executor( crawl_blocks_executor(
block_numbers_list=blocks_numbers_list, block_numbers_list=blocks_numbers_list,
with_transactions=bool(strtobool(args.transactions)), with_transactions=bool(strtobool(args.transactions)),