Minor overall performance improvements (#206)

Author: droserasprout

CHANGELOG.md

@@ -8,11 +8,16 @@ Please use [this](https://docs.gitlab.com/ee/development/changelog.html) documen
 
 * demos: Tezos Domains and Homebase DAO demos were updated from edo2net to mainnet contracts.
 
+### Performance
+
+* dipdup: Minor overall performance improvements.
+
 ### Other
 
 * ci: Cache virtual environment in GitHub Actions.
 * ci: Detect CI environment and skip tests that fail in GitHub Actions.
 * ci: Execute tests in parallel with `pytest-xdist` when possible.
+* ci: More strict linting rules of `flake8`.
 
 ## 4.0.3 - 2022-01-09
 

poetry.lock

@@ -47,17 +47,21 @@ black = "^20.8b1"
 bump2version = "^1.0.1"
 diff-cover = "^5.0.1"
 flake8 = "3.9.0"
+flake8-return = "^1.1.3"
+flake8-comprehensions = "^3.8.0"
+flake8-bugbear = "^22.1.11"
+flake8-simplify = "^0.14.5"
 flakehell = "^0.9.0"
 isort = "^5.7.0"
 mypy = "^0.900"
 pyperf = "^2.3.0"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"
+pytest-xdist = "^2.5.0"
 testcontainers = "^3.4.1"
 types-pytz = "^2021.1.2"
 types-tabulate = "^0.8.2"
 pprofile = "^2.1.0"
-pytest-xdist = "^2.5.0"
 
 [tool.poetry.extras]
 pytezos = ["pytezos"]
@@ -83,6 +87,7 @@ show_source = true
 pyflakes = ["+*"]
 "flake8-*" = ["+*"]
 flake8-docstrings = ["-*"]
+flake8-simplify = ["-SIM106"]
 
 [build-system]
 requires = ["poetry_core>=1.0.0", "cryptography==3.3.2", "wheel"]

pyproject.toml

@@ -19,5 +19,5 @@ async def on_factory_origination(
     await ctx.add_index(
         name=name,
         template='registry_dao',
-        values=dict(contract=originated_contract),
+        values={'contract': originated_contract},
     )

src/demo_registrydao/handlers/on_factory_origination.py

@@ -14,17 +14,19 @@ async def on_storage_diff(ctx: HandlerContext, storage: NameRegistryStorage) ->
             return
 
         if item.level == "1":
-            await models.TLD.update_or_create(id=record_name, defaults=dict(owner=item.owner))
+            await models.TLD.update_or_create(id=record_name, defaults={'owner': item.owner})
         else:
             if item.level == "2":
                 await models.Domain.update_or_create(
                     id=record_name,
-                    defaults=dict(
-                        tld_id=record_path[-1],
-                        owner=item.owner,
-                        expiry=storage.store.expiry_map.get(item.expiry_key) if item.expiry_key else None,  # type: ignore
-                        token_id=int(item.tzip12_token_id) if item.tzip12_token_id else None,
-                    ),
+                    defaults={
+                        'tld_id': record_path[-1],
+                        'owner': item.owner,
+                        'expiry': storage.store.expiry_map.get(item.expiry_key) if item.expiry_key else None,  # type: ignore
+                        'token_id': int(item.tzip12_token_id) if item.tzip12_token_id else None,
+                    },
                 )
 
-            await models.Record.update_or_create(id=record_name, defaults=dict(domain_id='.'.join(record_path[-2:]), address=item.address))
+            await models.Record.update_or_create(
+                id=record_name, defaults={'domain_id': '.'.join(record_path[-2:]), 'address': item.address}
+            )

src/demo_tezos_domains/handlers/on_storage_diff.py

@@ -18,5 +18,5 @@ async def on_update_expiry_map(
     record_name = bytes.fromhex(store_expiry_map.key.__root__).decode()
     await models.Expiry.update_or_create(
         id=record_name,
-        defaults=dict(timestamp=timestamp),
+        defaults={'timestamp': timestamp},
     )

src/demo_tezos_domains_big_map/handlers/on_update_expiry_map.py

@@ -23,19 +23,19 @@ async def on_update_records(
         return
 
     if store_records.value.level == "1":
-        await models.TLD.update_or_create(id=record_name, defaults=dict(owner=store_records.value.owner))
+        await models.TLD.update_or_create(id=record_name, defaults={'owner': store_records.value.owner})
     else:
         if store_records.value.level == "2":
             await models.Domain.update_or_create(
                 id=record_name,
-                defaults=dict(
-                    tld_id=record_path[-1],
-                    owner=store_records.value.owner,
-                    token_id=int(store_records.value.tzip12_token_id) if store_records.value.tzip12_token_id else None,
-                ),
+                defaults={
+                    'tld_id': record_path[-1],
+                    'owner': store_records.value.owner,
+                    'token_id': int(store_records.value.tzip12_token_id) if store_records.value.tzip12_token_id else None,
+                },
             )
 
         await models.Record.update_or_create(
             id=record_name,
-            defaults=dict(domain_id='.'.join(record_path[-2:]), address=store_records.value.address),
+            defaults={'domain_id': '.'.join(record_path[-2:]), 'address': store_records.value.address},
         )

src/demo_tezos_domains_big_map/handlers/on_update_records.py

@@ -15,12 +15,12 @@ async def on_create_auction(
     token, _ = await models.Token.get_or_create(
         id=create_auction.parameter.token_id,
         address=create_auction.parameter.token_address,
-        defaults=dict(
-            amount=create_auction.parameter.token_amount,
-            holder=holder,
-            level=create_auction.data.level,
-            timestamp=create_auction.data.timestamp,
-        ),
+        defaults={
+            'amount': create_auction.parameter.token_amount,
+            'holder': holder,
+            'level': create_auction.data.level,
+            'timestamp': create_auction.data.timestamp,
+        },
     )
 
     auction = models.Auction(

src/demo_tzcolors/handlers/on_create_auction.py

@@ -117,7 +117,7 @@ def init_sentry(config: DipDupConfig) -> None:
     )
 
 
-@click.group(help='Docs: https://docs.dipdup.net', context_settings=dict(max_content_width=120))
+@click.group(help='Docs: https://docs.dipdup.net', context_settings={'max_content_width': 120})
 @click.version_option(__version__)
 @click.option('--config', '-c', type=str, multiple=True, help='Path to dipdup YAML config', default=['dipdup.yml'])
 @click.option('--env-file', '-e', type=str, multiple=True, help='Path to .env file', default=[])

src/dipdup/cli.py

@@ -43,17 +43,17 @@
 from dipdup.utils import touch
 from dipdup.utils import write
 
-DEFAULT_DOCKER_ENV_FILE_CONTENT = dict(
-    POSTGRES_USER="dipdup",
-    POSTGRES_DB="dipdup",
-    POSTGRES_PASSWORD="changeme",
-    HASURA_GRAPHQL_DATABASE_URL="postgres://dipdup:changeme@db:5432/dipdup",
-    HASURA_GRAPHQL_ENABLE_CONSOLE="true",
-    HASURA_GRAPHQL_ADMIN_INTERNAL_ERRORS="true",
-    HASURA_GRAPHQL_ENABLED_LOG_TYPES="startup, http-log, webhook-log, websocket-log, query-log",
-    HASURA_GRAPHQL_ADMIN_SECRET="changeme",
-    HASURA_GRAPHQL_UNAUTHORIZED_ROLE="user",
-)
+DEFAULT_DOCKER_ENV_FILE_CONTENT = {
+    'POSTGRES_USER': 'dipdup',
+    'POSTGRES_DB': 'dipdup',
+    'POSTGRES_PASSWORD': 'changeme',
+    'HASURA_GRAPHQL_DATABASE_URL': 'postgres://dipdup:changeme@db:5432/dipdup',
+    'HASURA_GRAPHQL_ENABLE_CONSOLE': 'true',
+    'HASURA_GRAPHQL_ADMIN_INTERNAL_ERRORS': 'true',
+    'HASURA_GRAPHQL_ENABLED_LOG_TYPES': 'startup, http-log, webhook-log, websocket-log, query-log',
+    'HASURA_GRAPHQL_ADMIN_SECRET': 'changeme',
+    'HASURA_GRAPHQL_UNAUTHORIZED_ROLE': 'user',
+}
 DEFAULT_DOCKER_IMAGE = 'dipdup/dipdup'
 DEFAULT_DOCKER_TAG = __version__
 DEFAULT_DOCKER_ENV_FILE = 'dipdup.env'