refactor: move common constructor code to base class

src/evm_transition_tool/evmone.py

@@ -3,15 +3,14 @@
 """
 import json
 import os
-import shutil
 import subprocess
 import tempfile
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
 from ethereum_test_forks import Fork
 
-from .transition_tool import TransitionTool, TransitionToolNotFoundInPath
+from .transition_tool import TransitionTool
 
 
 def write_json_file(data: Dict[str, Any], file_path: str) -> None:
@@ -38,15 +37,9 @@ def __init__(
         binary: Optional[Path] = None,
         trace: bool = False,
     ):
-        if binary is None:
-            binary = self.default_binary
-        binary = shutil.which(os.path.expanduser(binary))  # type: ignore
-        if not binary:
-            raise TransitionToolNotFoundInPath(binary=binary)
-        self.binary = Path(binary)
-        if trace:
+        super().__init__(binary=binary, trace=trace)
+        if self.trace:
             raise Exception("`evmone-t8n` does not support tracing.")
-        self.trace = trace
 
     @staticmethod
     def matches_binary_path(binary_path: Path) -> bool:

src/evm_transition_tool/geth.py

@@ -4,15 +4,14 @@
 
 import json
 import os
-import shutil
 import subprocess
 import tempfile
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
 from ethereum_test_forks import Fork
 
-from .transition_tool import TransitionTool, TransitionToolNotFoundInPath
+from .transition_tool import TransitionTool
 
 
 class GethTransitionTool(TransitionTool):
@@ -21,7 +20,7 @@ class GethTransitionTool(TransitionTool):
     """
 
     default_binary = Path("evm")
-    binary: Path | None
+    binary: Path
     cached_version: Optional[str] = None
     trace: bool
 
@@ -31,13 +30,7 @@ def __init__(
         binary: Optional[Path] = None,
         trace: bool = False,
     ):
-        if binary is None:
-            binary = self.default_binary
-        binary = shutil.which(os.path.expanduser(binary))  # type: ignore
-        if not binary:
-            raise TransitionToolNotFoundInPath(binary=binary)
-        self.binary = Path(binary)
-        self.trace = trace
+        super().__init__(binary=binary, trace=trace)
         args = [str(self.binary), "t8n", "--help"]
         try:
             result = subprocess.run(args, capture_output=True, text=True)

src/evm_transition_tool/transition_tool.py

@@ -2,6 +2,8 @@
 Transition tool abstract class.
 """
 
+import os
+import shutil
 from abc import abstractmethod
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Type
@@ -34,6 +36,7 @@ class TransitionTool:
 
     registered_tools: List[Type["TransitionTool"]] = []
     default_tool: Optional[Type["TransitionTool"]] = None
+    default_binary: Path | None = None
 
     # Abstract methods that each tool must implement
 
@@ -47,7 +50,14 @@ def __init__(
         """
         Abstract initialization method that all subclasses must implement.
         """
-        pass
+        if binary is None:
+            binary = self.default_binary
+        # expanduser: tilde does not get expanded by shutil.which
+        binary = shutil.which(os.path.expanduser(binary))  # type: ignore
+        if not binary:
+            raise TransitionToolNotFoundInPath(binary=binary)
+        self.binary = Path(binary)
+        self.trace = trace
 
     def __init_subclass__(cls):
         """