From 181d1769a04c86fea5c5b9ca2a465a65ea097bbd Mon Sep 17 00:00:00 2001
From: Yhtyyar Sahatov <yhtiyarsahatow@gmail.com>
Date: Thu, 26 May 2022 15:22:09 +0300
Subject: [PATCH] fixed cli choices, added help messages

---
 crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py  | 5 +----
 crawlers/mooncrawl/mooncrawl/moonworm_crawler/cli.py | 8 +-------
 datasets/nfts/nfts/cli.py                            | 9 +++------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py b/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py
index e8129d3e..eb886c74 100644
--- a/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py
+++ b/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py
@@ -173,10 +173,7 @@ def main():
         "--blockchain_type",
         type=str,
         required=True,
-        choices=[
-            AvailableBlockchainType.ETHEREUM.value,
-            AvailableBlockchainType.POLYGON.value,
-        ],
+        help=f"Available blockchain types: {[member.value for member in AvailableBlockchainType]}",
     )
     crawl_parser.add_argument(
         "--abi",
diff --git a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/cli.py b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/cli.py
index 5174bc0c..07dfec1a 100644
--- a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/cli.py
+++ b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/cli.py
@@ -43,8 +43,6 @@ def handle_crawl(args: argparse.Namespace) -> None:
         f"Initial function call crawl jobs count: {len(initial_function_call_jobs)}"
     )
 
-    # Couldn't figure out how to convert from string to AvailableBlockchainType
-    # AvailableBlockchainType(args.blockchain_type) is not working
     blockchain_type = AvailableBlockchainType(args.blockchain_type)
 
     logger.info(f"Blockchain type: {blockchain_type.value}")
@@ -128,11 +126,7 @@ def main() -> None:
         "--blockchain-type",
         "-b",
         type=str,
-        choices=[
-            AvailableBlockchainType.ETHEREUM.value,
-            AvailableBlockchainType.POLYGON.value,
-        ],
-        required=True,
+        help=f"Available blockchain types: {[member.value for member in AvailableBlockchainType]}",
     )
     crawl_parser.add_argument(
         "--web3",
diff --git a/datasets/nfts/nfts/cli.py b/datasets/nfts/nfts/cli.py
index 5c560706..cb4d3b2e 100644
--- a/datasets/nfts/nfts/cli.py
+++ b/datasets/nfts/nfts/cli.py
@@ -83,9 +83,7 @@ def handle_materialize(args: argparse.Namespace) -> None:
     with yield_db_session_ctx() as db_session, contextlib.closing(
         sqlite3.connect(args.datastore)
     ) as moonstream_datastore:
-        last_saved_block = get_last_saved_block(
-            moonstream_datastore, args.blockchain.value
-        )
+        last_saved_block = get_last_saved_block(moonstream_datastore, args.blockchain)
         logger.info(f"Last saved block: {last_saved_block}")
         if last_saved_block and last_saved_block >= bounds.starting_block:
             logger.info(
@@ -173,9 +171,8 @@ def main() -> None:
 
     parser_materialize.add_argument(
         "--blockchain",
-        type=AvailableBlockchainType,
-        choices=[AvailableBlockchainType.ETHEREUM, AvailableBlockchainType.POLYGON],
-        help="Blockchain to use",
+        type=str,
+        help=f"Available blockchain types: {[member.value for member in AvailableBlockchainType]}",
     )
 
     parser_materialize.set_defaults(func=handle_materialize)