mirror
/
moonstream
kopia lustrzana https://github.com/bugout-dev/moonstream
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed args after review

pull/45/head
kompotkot 2021-08-03 16:13:32 +03:00
rodzic 68d5c3755a
commit 3c5a2929b7
1 zmienionych plików z 22 dodań i 30 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

52
crawlers/moonstreamcrawlers/cli.py
Wyświetl plik

@ -83,7 +83,7 @@ def ethcrawler_blocks_sync_handler(args: argparse.Namespace) -> None:
starting_block: int = args.start
while True:
bottom_block_number, top_block_number = get_latest_blocks(
bool(args.transactions)
with_transactions=not args.notransactions
)
bottom_block_number = max(bottom_block_number + 1, starting_block)
if bottom_block_number >= top_block_number:
@ -101,7 +101,7 @@ def ethcrawler_blocks_sync_handler(args: argparse.Namespace) -> None:
# TODO(kompotkot): Set num_processes argument based on number of blocks to synchronize.
crawl_blocks_executor(
block_numbers_list=blocks_numbers_list,
with_transactions=bool(args.transactions),
with_transactions=not args.notransactions,
num_processes=args.jobs,
)
print(f"Synchronized blocks from {bottom_block_number} to {top_block_number}")
@ -117,7 +117,7 @@ def ethcrawler_blocks_add_handler(args: argparse.Namespace) -> None:
print(f"Adding blocks {blocks_numbers_list[-1]}-{blocks_numbers_list[0]}")
crawl_blocks_executor(
block_numbers_list=blocks_numbers_list,
with_transactions=bool(args.transactions),
with_transactions=not args.notransactions,
)
print(f"Required {time.time() - startTime} with {MOONSTREAM_CRAWL_WORKERS} workers")
@ -141,18 +141,18 @@ def ethcrawler_blocks_missing_handler(args: argparse.Namespace) -> None:
time.sleep(5)
if (len(missing_blocks_numbers_total)) > 0:
if bool(args.lazy):
if args.lazy:
print("Executed lazy block crawler")
crawl_blocks(
missing_blocks_numbers_total,
with_transactions=bool(args.transactions),
verbose=bool(args.verbose),
with_transactions=not args.notransactions,
verbose=args.verbose,
)
else:
crawl_blocks_executor(
missing_blocks_numbers_total,
with_transactions=bool(args.transactions),
verbose=bool(args.verbose),
with_transactions=not args.notransactions,
verbose=args.verbose,
)
print(
f"Required {time.time() - startTime} with {MOONSTREAM_CRAWL_WORKERS} workers "
@ -206,12 +206,10 @@ def main() -> None:
"synchronize", description="Synchronize to latest ethereum block commands"
)
parser_ethcrawler_blocks_sync.add_argument(
"-t",
"--transactions",
action="store_const",
const=1,
default=1,
help="Add or not block transactions",
"-n",
"--notransactions",
action="store_true",
help="Skip crawling block transactions",
)
parser_ethcrawler_blocks_sync.add_argument(
"-s",
@ -248,12 +246,10 @@ def main() -> None:
help="List of blocks range in format {bottom_block}-{top_block}",
)
parser_ethcrawler_blocks_add.add_argument(
"-t",
"--transactions",
action="store_const",
const=1,
default=1,
help="Add or not block transactions",
"-n",
"--notransactions",
action="store_true",
help="Skip crawling block transactions",
)
parser_ethcrawler_blocks_add.set_defaults(func=ethcrawler_blocks_add_handler)
@ -267,25 +263,21 @@ def main() -> None:
help="List of blocks range in format {bottom_block}-{top_block}",
)
parser_ethcrawler_blocks_missing.add_argument(
"-t",
"--transactions",
action="store_const",
const=1,
default=1,
help="Add or not block transactions",
"-n",
"--notransactions",
action="store_true",
help="Skip crawling block transactions",
)
parser_ethcrawler_blocks_missing.add_argument(
"-l",
"--lazy",
action="store_const",
const=1,
action="store_true",
help="Lazy block adding one by one",
)
parser_ethcrawler_blocks_missing.add_argument(
"-v",
"--verbose",
action="store_const",
const=1,
action="store_true",
help="Print additional information",
)
parser_ethcrawler_blocks_missing.set_defaults(