From 7e1f9761e8be41c258f6a43a85cafb80eda90b53 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Mon, 21 Apr 2008 17:51:22 -0700 Subject: [PATCH] mutable: remove some dead code, rearrange use of populate_pubkey --- src/allmydata/mutable/node.py | 6 ------ src/allmydata/mutable/servermap.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/allmydata/mutable/node.py b/src/allmydata/mutable/node.py index 63f83e4f..749b8483 100644 --- a/src/allmydata/mutable/node.py +++ b/src/allmydata/mutable/node.py @@ -137,12 +137,6 @@ class MutableFileNode: privkey = enc.process(enc_privkey) return privkey - def _populate(self, stuff): - # the Retrieval object calls this with values it discovers when - # downloading the slot. This is how a MutableFileNode that was - # created from a URI learns about its full key. - pass - def _populate_pubkey(self, pubkey): self._pubkey = pubkey def _populate_required_shares(self, required_shares): diff --git a/src/allmydata/mutable/servermap.py b/src/allmydata/mutable/servermap.py index 5d90501a..ea9de533 100644 --- a/src/allmydata/mutable/servermap.py +++ b/src/allmydata/mutable/servermap.py @@ -558,13 +558,13 @@ class ServermapUpdater: (seqnum, root_hash, IV, k, N, segsize, datalength, pubkey_s, signature, prefix) = unpack_prefix_and_signature(data) - if not self._node._pubkey: + if not self._node.get_pubkey(): fingerprint = hashutil.ssk_pubkey_fingerprint_hash(pubkey_s) assert len(fingerprint) == 32 if fingerprint != self._node._fingerprint: raise CorruptShareError(peerid, shnum, "pubkey doesn't match fingerprint") - self._node._pubkey = self._deserialize_pubkey(pubkey_s) + self._node._populate_pubkey(self._deserialize_pubkey(pubkey_s)) if self._need_privkey: self._try_to_extract_privkey(data, peerid, shnum) -- 2.45.2