Changeset 255 for trunk

Timestamp:

03/30/09 20:34:58 (3 years ago)

Author:

ocjhb

Message:

misusing the spec as a documentation template

Location:

trunk/sandbox/jhb/oc2

Files:

• documentation.py (added)
• issuer.py (modified) (2 diffs)
• test_issuer.py (modified) (1 diff)

trunk/sandbox/jhb/oc2/issuer.py

@@ -46 +46 @@
         return self.storage.masterPrivKey
 
-    def signMintKeys(self,shortCurrencyId,
-                         keys,
+    def signMintKeys(self,keys,
                          cdd=None,
                          notBefore=None,
@@ -72 +71 @@
             self.addMKC(cdd,mkc)
 
-        return self.getCurrentMKC(shortCurrencyId)
+        return self.getCurrentMKCs()
 
     def addMKC(self,cdd,mkc):
 
         if not self.has('mkclist'):
-            self.set('mkclist',{})
+            self.set('mkclist',[])
         mkclist = self.get('mkclist')            
-        versions = mkclist.setdefault(cdd.shortCurrencyId,[])
-        if len(versions) <= cdd.version:
-            versions.append({})
-        versions[cdd.version][mkc.denomination]=mkc    
+        if len(mkclist) <= cdd.version:
+            mkclist.append({})
+        mkclist[cdd.version][mkc.denomination]=mkc    
         
-    def getCurrentMKC(self,shortCurrencyId,version=-1):
-        return self.get('mkclist')[shortCurrencyId][version]
+    def getCurrentMKCs(self,version=-1):
+        return self.get('mkclist')[version]
 

trunk/sandbox/jhb/oc2/test_issuer.py

@@ -18 +18 @@
 >>> mint.setCDD(cdd)
 >>> keys = mint.newMintKeys()
->>> mkcs = issuer.signMintKeys('oca',keys=keys,cdd = cdd)
+>>> mkcs = issuer.signMintKeys(keys=keys,cdd = cdd)
 >>> issuer.getMasterPubKey().verifyContainerSignature(mkcs['20'])
 True