Changeset aa3caf8 in trunk for src/allmydata

Timestamp:

2009-12-08T17:26:08Z (15 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

47cba4b5

Parents:

eb18686

Message:

mutable/servermap.py: stop reaching into private MutableFileNode? attributes

Location:

src/allmydata

Files:

• mutable/filenode.py (modified) (2 diffs)
• mutable/servermap.py (modified) (4 diffs)
• test/test_mutable.py (modified) (1 diff)

src/allmydata/mutable/filenode.py ¶

@@ -150 +150 @@
     def _populate_encprivkey(self, encprivkey):
         self._encprivkey = encprivkey
-
+    def _add_to_cache(self, verinfo, shnum, offset, data, timestamp):
+        self._cache.add(verinfo, shnum, offset, data, timestamp)
 
     def get_write_enabler(self, peerid):
@@ -172 +173 @@
     def get_storage_index(self):
         return self._storage_index
+    def get_fingerprint(self):
+        return self._fingerprint
     def get_privkey(self):
         return self._privkey

src/allmydata/mutable/servermap.py ¶

@@ -380 +380 @@
             self._read_size = 1000
         self._need_privkey = False
-        if mode == MODE_WRITE and not self._node._privkey:
+        if mode == MODE_WRITE and not self._node.get_privkey():
             self._need_privkey = True
         # check+repair: repair requires the privkey, so if we didn't happen
@@ -596 +596 @@
                 last_verinfo = verinfo
                 last_shnum = shnum
-                self._node._cache.add(verinfo, shnum, 0, data, now)
+                self._node._add_to_cache(verinfo, shnum, 0, data, now)
             except CorruptShareError, e:
                 # log it and give the other shares a chance to be processed
@@ -658 +658 @@
             fingerprint = hashutil.ssk_pubkey_fingerprint_hash(pubkey_s)
             assert len(fingerprint) == 32
-            if fingerprint != self._node._fingerprint:
+            if fingerprint != self._node.get_fingerprint():
                 raise CorruptShareError(peerid, shnum,
                                         "pubkey doesn't match fingerprint")
@@ -675 +675 @@
         if verinfo not in self._valid_versions:
             # it's a new pair. Verify the signature.
-            valid = self._node._pubkey.verify(prefix, signature)
+            valid = self._node.get_pubkey().verify(prefix, signature)
             if not valid:
                 raise CorruptShareError(peerid, shnum, "signature is invalid")

src/allmydata/test/test_mutable.py ¶

@@ -715 +715 @@
         d.addCallback(lambda sm: self.failUnlessOneRecoverable(sm, 10))
         d.addCallback(lambda res: ms(mode=MODE_READ))
-        # this more stops at k+epsilon, and epsilon=k, so 6 shares
+        # this mode stops at k+epsilon, and epsilon=k, so 6 shares
         d.addCallback(lambda sm: self.failUnlessOneRecoverable(sm, 6))
         d.addCallback(lambda res: ms(mode=MODE_ANYTHING))