From 0f630b06b1535caf5c194b05d6cb78bc61df1017 Mon Sep 17 00:00:00 2001
From: Mike Shultz <mike@mikeshultz.com>
Date: Mon, 27 Nov 2023 16:23:10 -0700
Subject: [PATCH] fix: remove unnecessary Union types

---
 silverback/persistence.py | 6 +++---
 silverback/types.py       | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/silverback/persistence.py b/silverback/persistence.py
index 800b0546..a673d34e 100644
--- a/silverback/persistence.py
+++ b/silverback/persistence.py
@@ -9,7 +9,7 @@
 from taskiq import TaskiqResult
 from typing_extensions import Self  # Introduced 3.11
 
-from .types import IntOrNone, SilverbackIdent
+from .types import SilverbackIdent
 
 _HandlerReturnType = TypeVar("_HandlerReturnType")
 
@@ -37,8 +37,8 @@ def from_taskiq(
         cls,
         ident: SilverbackIdent,
         handler_id: str,
-        block_number: IntOrNone,
-        log_index: IntOrNone,
+        block_number: Optional[int],
+        log_index: Optional[int],
         result: TaskiqResult,
     ) -> Self:
         return cls(
diff --git a/silverback/types.py b/silverback/types.py
index c2435ee4..954e4134 100644
--- a/silverback/types.py
+++ b/silverback/types.py
@@ -1,12 +1,8 @@
-from typing import Optional, Protocol, Union
+from typing import Optional, Protocol
 
 from pydantic import BaseModel
 from typing_extensions import Self  # Introduced 3.11
 
-# NOTE: 'type | None' introduced in 3.10
-StrOrNone = Union[str, None]
-IntOrNone = Union[int, None]
-
 
 class ISilverbackSettings(Protocol):
     """Loose approximation of silverback.settings.Settings.  If you can, use the class as
@@ -40,7 +36,7 @@ def handler_id_block(block_number: Optional[int]) -> str:
     return f"block/{block_number}"
 
 
-def handler_id_event(contract_address: StrOrNone, event_signature: str) -> str:
+def handler_id_event(contract_address: Optional[str], event_signature: str) -> str:
     """Return a unique handler ID string for an event"""
     # TODO: Under what circumstance can address be None?
     return f"event/{contract_address or 'unknown'}/{event_signature}"