readability: factor out loc + size

a16z · Jan 16, 2025 · 778fbde · 778fbde
1 parent 86b7eae
commit 778fbde
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/halmos/sevm.py b/src/halmos/sevm.py
@@ -483,12 +483,11 @@ def mslice(self, loc: int, size: int) -> ByteVec:
         if not size:
             return ByteVec()
 
-        if loc + size > MAX_MEMORY_SIZE:
-            raise OutOfGasError(
-                f"memory access with {loc=} {size=} exceeds MAX_MEMORY_SIZE"
-            )
+        stop = loc + size
+        if stop > MAX_MEMORY_SIZE:
+            raise OutOfGasError(f"memory read {loc=} {size=} > MAX_MEMORY_SIZE")
 
-        return self.memory.slice(start=loc, stop=loc + size)
+        return self.memory.slice(start=loc, stop=stop)
 
     def set_mslice(self, loc: int, data: ByteVec) -> None:
         """Wraps a memory slice write with a size check."""
@@ -497,12 +496,11 @@ def set_mslice(self, loc: int, data: ByteVec) -> None:
         if not size:
             return
 
-        if loc + size > MAX_MEMORY_SIZE:
-            raise OutOfGasError(
-                f"memory write with {loc=} {size=} exceeds MAX_MEMORY_SIZE"
-            )
+        stop = loc + size
+        if stop > MAX_MEMORY_SIZE:
+            raise OutOfGasError(f"memory write {loc=} {size=} > MAX_MEMORY_SIZE")
 
-        self.memory.set_slice(start=loc, stop=loc + size, value=data)
+        self.memory.set_slice(start=loc, stop=stop, value=data)
 
     def ret(self, subst: dict = None) -> ByteVec:
         loc: int = self.mloc(subst)