Apply suggestions from code review

Co-authored-by: danceratopz <[email protected]>

Author: marioevz

src/ethereum_test_base_types/base_types.py

@@ -90,23 +90,8 @@ def __new__(cls, input: NumberConvertible | N):
             assert len(words) <= 2
             value_str = words[0]
             if len(words) > 1:
-                unit = words[1]
-                if unit == "wei":
-                    multiplier = 1
-                elif unit == "kwei":
-                    multiplier = 10**3
-                elif unit == "mwei":
-                    multiplier = 10**6
-                elif unit == "gwei":
-                    multiplier = 10**9
-                elif unit == "szabo":
-                    multiplier = 10**12
-                elif unit == "finney":
-                    multiplier = 10**15
-                elif unit == "ether":
-                    multiplier = 10**18
-                else:
-                    raise ValueError(f"Invalid unit {unit}")
+                unit = words[1].lower()
+                multiplier = cls._get_multiplier(unit)
             value: int
             if "e" in value_str:
                 value = int(float(value_str))
@@ -118,7 +103,28 @@ def __new__(cls, input: NumberConvertible | N):
             return super(Number, cls).__new__(cls, value * multiplier)
         return super(Number, cls).__new__(cls, to_number(input))
 
-
+    @staticmethod
+    def _get_multiplier(unit: str) -> int:
+        """
+        Returns the multiplier for the given unit of wei, handling synonyms.
+        """
+        match unit:
+            case "wei":
+                return 1
+            case "kwei" | "babbage" | "femtoether":
+                return 10**3
+            case "mwei" | "lovelace" | "picoether":
+                return 10**6
+            case "gwei" | "shannon" | "nanoether" | "nano":
+                return 10**9
+            case "szabo" | "microether" | "micro":
+                return 10**12
+            case "finney" | "milliether" | "milli":
+                return 10**15
+            case "ether":
+                return 10**18
+            case _:
+                raise ValueError(f"Invalid unit {unit}")
 class HexNumber(Number):
     """
     Class that helps represent an hexadecimal numbers in tests.

src/ethereum_test_base_types/tests/test_base_types.py

@@ -61,12 +61,29 @@ def test_comparisons(a: Any, b: Any, equal: bool):
         ("10**18", 10**18),
         ("1e18", 10**18),
         ("1 ether", 10**18),
+        ("2 ether", 2*10**18),
+        ("2.1 ether", 2.1*10**18),
+        ("2.1 Ether", 2*10**18),
+        ("2.1 ETHER", 2*10**18),
         ("1 wei", 1),
+        ("10**9 wei", 10**9),
         ("1 gwei", 10**9),
         ("1 szabo", 10**12),
         ("1 finney", 10**15),
         ("1 kwei", 10**3),
         ("1 mwei", 10**6),
+        ("1 babbage", 10**3),
+        ("1 femtoether", 10**3),
+        ("1 Lovelace", 10**6),
+        ("1 Picoether", 10**6),
+        ("1 gwei", 10**9),
+        ("1 shannon", 10**9),
+        ("1 nanoether", 10**9),
+        ("1 nano", 10**9),
+        ("1 microether", 10**12),
+        ("1 micro", 10**12),
+        ("1 milliether", 10**15),
+        ("1 milli", 10**15),
     ],
 )
 def test_wei_parsing(s: str, expected: int):