cast to Err in a couple other places

Author: matt-o-how

chia/_tests/core/mempool/test_mempool_manager.py

@@ -431,15 +431,16 @@ def test_conditions(
         conds: SpendBundleConditions,
         expected: Optional[Err],
     ) -> None:
-        assert (
-            check_time_locks(
-                dict(self.REMOVALS),
-                conds,
-                self.PREV_BLOCK_HEIGHT,
-                self.PREV_BLOCK_TIMESTAMP,
-            )
-            == expected
+        res = check_time_locks(
+            dict(self.REMOVALS),
+            conds,
+            self.PREV_BLOCK_HEIGHT,
+            self.PREV_BLOCK_TIMESTAMP,
         )
+        if res is not None:
+            # TODO: remove when Rust errors and Python Errors are the same
+            res = Err(res)
+        assert res == expected
 
 
 def expect(

chia/full_node/mempool_manager.py

@@ -734,18 +734,14 @@ async def validate_spend_bundle(
         # point-of-view of the next block to be farmed. Therefore we pass in the
         # current peak's height and timestamp
         assert self.peak.timestamp is not None
-        try:
-            tl_error: Optional[Err] = check_time_locks(
-                removal_record_dict,
-                conds,
-                self.peak.height,
-                self.peak.timestamp,
-            )
-        except Exception as e:
-            breakpoint()
-
+        tl_error: Optional[Err] = check_time_locks(
+            removal_record_dict,
+            conds,
+            self.peak.height,
+            self.peak.timestamp,
+        )
         if tl_error is not None:
-            breakpoint()
+            tl_error = Err(tl_error)
 
         timelocks: TimelockConditions = compute_assert_height(removal_record_dict, conds)