ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-22 03:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

encode: clean up some weirdness that was there to make unit tests easier to write

Browse Source
This commit is contained in:
Brian Warner 2007-04-05 22:36:18 -07:00
parent 919ca3e902
commit 8d2def5b04
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/encode.py
View File

@ -229,11 +229,8 @@ class Encoder(object):
return dl
def send_subshare(self, shareid, segment_num, subshare):
return self.send(shareid, "put_block", segment_num, subshare)
def send(self, shareid, methname, *args, **kwargs):
ll = self.landlords[shareid]
return ll.callRemote(methname, *args, **kwargs)
sh = self.landlords[shareid]
return sh.callRemote("put_block", segment_num, subshare)
def send_all_subshare_hash_trees(self):
dl = []
@ -250,7 +247,8 @@ class Encoder(object):
# all_hashes[1] is the left child, == hash(ah[3]+ah[4])
# all_hashes[n] == hash(all_hashes[2*n+1] + all_hashes[2*n+2])
self.share_root_hashes[shareid] = t[0]
return self.send(shareid, "put_block_hashes", all_hashes)
sh = self.landlords[shareid]
return sh.callRemote("put_block_hashes", all_hashes)
def send_all_share_hash_trees(self):
dl = []
@ -272,12 +270,13 @@ class Encoder(object):
return defer.DeferredList(dl)
def send_one_share_hash_tree(self, shareid, needed_hashes):
return self.send(shareid, "put_share_hashes", needed_hashes)
sh = self.landlords[shareid]
return sh.callRemote("put_share_hashes", needed_hashes)
def close_all_shareholders(self):
dl = []
for shareid in range(self.num_shares):
dl.append(self.send(shareid, "close"))
dl.append(self.landlords[shareid].callRemote("close"))
return defer.DeferredList(dl)
def done(self):

8
src/allmydata/test/test_encode.py
View File

@ -7,14 +7,6 @@ from allmydata import encode, download
from allmydata.uri import pack_uri
from cStringIO import StringIO
class MyEncoder(encode.Encoder):
def send(self, share_num, methname, *args, **kwargs):
if False and share_num < 10:
print "send[%d].%s()" % (share_num, methname)
if methname == "put_share_hashes":
print " ", [i for i,h in args[0]]
return defer.succeed(None)
class FakePeer:
def __init__(self, mode="good"):
self.ss = FakeStorageServer(mode)