[minion-cvs] Update TODO plans for 0.1.0; bump version to 0.0.6rc2; ...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv6461/lib/mixminion

Modified Files:
	__init__.py benchmark.py 
Log Message:
Update TODO plans for 0.1.0; bump version to 0.0.6rc2; fix benchmark code

Index: __init__.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/__init__.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- __init__.py	8 Dec 2003 06:45:28 -0000	1.50
+++ __init__.py	12 Dec 2003 22:37:13 -0000	1.51
@@ -7,7 +7,7 @@
    """
 
 # This version string is generated from setup.py; don't edit it.
-__version__ = "0.0.6rc1"
+__version__ = "0.0.6rc2"
 # This 5-tuple encodes the version number for comparison.  Don't edit it.
 # The first 3 numbers are the version number; the 4th is:
 #          0 for alpha
@@ -18,7 +18,7 @@
 # The 4th or 5th number may be a string.  If so, it is not meant to
 #   succeed or precede any other sub-version with the same a.b.c version
 #   number.
-version_info = (0, 0, 6, 99, 1)
+version_info = (0, 0, 6, 99, 2)
 __all__ = [ 'server', 'directory' ]
 
 def version_tuple_to_string(t):

Index: benchmark.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/benchmark.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- benchmark.py	28 Nov 2003 04:14:04 -0000	1.49
+++ benchmark.py	12 Dec 2003 22:37:13 -0000	1.50
@@ -560,13 +560,13 @@
                                   [server, server], [server, server])
 
     print "Server process (no swap, no log)", timeit(
-        lambda sp=sp, m_noswap=m_noswap: sp.processMessage(m_noswap), 100)
+        lambda sp=sp, m_noswap=m_noswap: sp.processPacket(m_noswap), 100)
 
     m_swap = buildForwardPacket(payload, SMTP_TYPE, "f@invalid",
                                  [server], [server, server])
 
     print "Server process (swap, no log)", timeit(
-        lambda sp=sp, m_swap=m_swap: sp.processMessage(m_swap), 100)
+        lambda sp=sp, m_swap=m_swap: sp.processPacket(m_swap), 100)
 
 def encodingTiming():
     print "#=============== END-TO-END ENCODING =================="
@@ -673,7 +673,7 @@
                                   [server, server], [server, server])
 
     sp_ns = timeit_(
-        lambda sp=sp, m_noswap=m_noswap: sp.processMessage(m_noswap), 100)
+        lambda sp=sp, m_noswap=m_noswap: sp.processPacket(m_noswap), 100)
 
     expected = rsa_128b+sha1_hdr+sha1_key*5+aes_2k+lioness_28k+prng_128b
     expected += lioness_2k