storage.py: factor out a common compare() routine

diff --git a/src/allmydata/storage.py b/src/allmydata/storage.py
index 1e99fcefbe1ee26f2bad42cf53687cf16bfc8f95..24e584d18b568ebc06eb2b18bcbbb161816f8cef 100644 (file)
--- a/src/allmydata/storage.py
+++ b/src/allmydata/storage.py
@@ -572,7 +572,7 @@ class MutableShareFile:
         f = open(self.home, 'rb+')
         for (offset, length, operator, specimen) in testv:
             data = self._read_share_data(f, offset, length)
-            if not self.compare(data, operator, specimen):
+            if not testv_compare(data, operator, specimen):
                 test_good = False
                 break
         f.close()
@@ -588,21 +588,21 @@ class MutableShareFile:
             f.write(struct.pack(">Q", new_length))
         f.close()
 
-    def compare(self, a, op, b):
-        assert op in ("lt", "le", "eq", "ne", "ge", "gt")
-        if op == "lt":
-            return a < b
-        if op == "le":
-            return a <= b
-        if op == "eq":
-            return a == b
-        if op == "ne":
-            return a != b
-        if op == "ge":
-            return a >= b
-        if op == "gt":
-            return a > b
-        # never reached
+def testv_compare(a, op, b):
+    assert op in ("lt", "le", "eq", "ne", "ge", "gt")
+    if op == "lt":
+        return a < b
+    if op == "le":
+        return a <= b
+    if op == "eq":
+        return a == b
+    if op == "ne":
+        return a != b
+    if op == "ge":
+        return a >= b
+    if op == "gt":
+        return a > b
+    # never reached
 
 class EmptyShare:
 
@@ -610,27 +610,11 @@ class EmptyShare:
         test_good = True
         for (offset, length, operator, specimen) in testv:
             data = ""
-            if not self.compare(data, operator, specimen):
+            if not testv_compare(data, operator, specimen):
                 test_good = False
                 break
         return test_good
 
-    def compare(self, a, op, b):
-        assert op in ("lt", "le", "eq", "ne", "ge", "gt")
-        if op == "lt":
-            return a < b
-        if op == "le":
-            return a <= b
-        if op == "eq":
-            return a == b
-        if op == "ne":
-            return a != b
-        if op == "ge":
-            return a >= b
-        if op == "gt":
-            return a > b
-        # never reached
-
 def create_mutable_sharefile(filename, my_nodeid, write_enabler):
     ms = MutableShareFile(filename)
     ms.create(my_nodeid, write_enabler)