merge changes.

backend/moonstreamapi/admin/cli.py

@@ -70,7 +70,12 @@ def migrations_run(args: argparse.Namespace) -> None:
     web3_session = yield_web3_provider()
     db_session = SessionLocal()
     try:
-        if args.id == 20211101:
+        if args.id == 20230213:
+            logger.info("Starting update of subscriptions in Brood resource...")
+            checksum_address.checksum_all_subscription_addresses(web3_session)
+            logger.info("Starting update of ethereum_labels in database...")
+            checksum_address.checksum_all_labels_addresses(db_session, web3_session)
+        elif args.id == 20211101:
             logger.info("Starting update of subscriptions in Brood resource...")
             checksum_address.checksum_all_subscription_addresses(web3_session)
             logger.info("Starting update of ethereum_labels in database...")

backend/moonstreamapi/routes/subscriptions.py

@@ -4,6 +4,7 @@ The Moonstream subscriptions HTTP API
 import hashlib
 import json
 import logging
+from pprint import pprint
 from typing import Any, Dict, List, Optional
 
 from bugout.data import BugoutResource, BugoutResources

backend/moonstreamapi/settings.py

@@ -118,13 +118,6 @@ if MOONSTREAM_S3_QUERIES_BUCKET_PREFIX == "":
     )
 
 
-# Entity
+## Moonstream resources types
 
-MOONSTREAM_SUBSCRIPTIONS_COLLECTION = os.environ.get(
-    "MOONSTREAM_SUBSCRIPTIONS_COLLECTION", ""
-)
-
-if MOONSTREAM_SUBSCRIPTIONS_COLLECTION == "":
-    raise ValueError(
-        "MOONSTREAM_SUBSCRIPTIONS_COLLECTION environment variable must be set"
-    )
+BUGOUT_RESOURCE_TYPE_SUBSCRIPTION = "subscription"