From 39ff5e0b10bcc4d6aae39d5dbaaf628d849c0d7f Mon Sep 17 00:00:00 2001
From: kompotkot <zenitsws@gmail.com>
Date: Mon, 2 Aug 2021 15:38:25 +0300
Subject: [PATCH] Small fix for CLI crawler sync command

---
 crawlers/moonstreamcrawlers/cli.py | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/crawlers/moonstreamcrawlers/cli.py b/crawlers/moonstreamcrawlers/cli.py
index ff5de5d0..6ab869f0 100644
--- a/crawlers/moonstreamcrawlers/cli.py
+++ b/crawlers/moonstreamcrawlers/cli.py
@@ -58,17 +58,29 @@ def ethcrawler_blocks_sync_handler(args: argparse.Namespace) -> None:
         bottom_block_number, top_block_number = get_latest_blocks(
             bool(strtobool(args.transactions))
         )
+        bottom_block_number = bottom_block_number + 1
         if bottom_block_number >= top_block_number:
             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
-        for blocks_numbers_list in yield_blocks_numbers_lists(
-            f"{bottom_block_number}-{top_block_number}"
-        ):
-            print(f"Adding blocks {blocks_numbers_list[0]}-{blocks_numbers_list[-1]}")
-            crawl_blocks_executor(
-                block_numbers_list=blocks_numbers_list,
+            time.sleep(20)
+            continue
+        if top_block_number - bottom_block_number >= 10:
+            for blocks_numbers_list in yield_blocks_numbers_lists(
+                f"{bottom_block_number}-{top_block_number}"
+            ):
+                print(
+                    f"Adding blocks {blocks_numbers_list[-1]}-{blocks_numbers_list[0]}"
+                )
+                crawl_blocks_executor(
+                    block_numbers_list=blocks_numbers_list,
+                    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}")
@@ -82,7 +94,7 @@ def ethcrawler_blocks_add_handler(args: argparse.Namespace) -> None:
     startTime = time.time()
 
     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(
             block_numbers_list=blocks_numbers_list,
             with_transactions=bool(strtobool(args.transactions)),