Changeset de94a0f in trunk

Timestamp:

2019-06-24T18:29:01Z (6 years ago)

Author:

meejah <meejah@…>

Branches:

master

Children:

e5b892d

Parents:

74705ba

Message:

fix util, error crypto imports

File:

• src/allmydata/test/test_introducer.py (modified) (6 diffs)

src/allmydata/test/test_introducer.py ¶

@@ -15 +15 @@
 from foolscap.api import Tub, Referenceable, fireEventually, flushEventualQueue
 from twisted.application import service
-from allmydata import crypto
 from allmydata.crypto import ed25519
+from allmydata.crypto.util import remove_prefix
+from allmydata.crypto.error import BadSignature
 from allmydata.interfaces import InsufficientVersionError
 from allmydata.introducer.client import IntroducerClient
@@ -205 +206 @@
         private_key, public_key = ed25519.create_signing_keypair()
         public_key_str = ed25519.string_from_verifying_key(public_key)
-        pubkey_s = crypto.remove_prefix(public_key_str, "pub-")
+        pubkey_s = remove_prefix(public_key_str, "pub-")
 
         # ann1: ic1, furl1
@@ -762 +763 @@
 
         private_key, public_key = ed25519.create_signing_keypair()
-        public_key_str = crypto.remove_prefix(ed25519.string_from_verifying_key(public_key), "pub-")
+        public_key_str = remove_prefix(ed25519.string_from_verifying_key(public_key), "pub-")
 
         ann_t0 = make_ann_t(client_v2, furl1, private_key, 10)
@@ -801 +802 @@
         ic = c.introducer_clients[0]
         private_key, public_key = ed25519.create_signing_keypair()
-        public_key_str = crypto.remove_prefix(ed25519.string_from_verifying_key(public_key), "pub-")
+        public_key_str = remove_prefix(ed25519.string_from_verifying_key(public_key), "pub-")
         furl1 = "pb://onug64tu@127.0.0.1:123/short" # base32("short")
         ann_t = make_ann_t(ic, furl1, private_key, 1)
@@ -832 +833 @@
         # cache
         private_key2, public_key2 = ed25519.create_signing_keypair()
-        public_key_str2 = crypto.remove_prefix(ed25519.string_from_verifying_key(public_key2), "pub-")
+        public_key_str2 = remove_prefix(ed25519.string_from_verifying_key(public_key2), "pub-")
         furl3 = "pb://onug64tu@127.0.0.1:456/short"
         ann_t3 = make_ann_t(ic, furl3, private_key2, 1)
@@ -1004 +1005 @@
         bad_ann = {"key1": "value2"}
         bad_msg = json.dumps(bad_ann).encode("utf-8")
-        self.failUnlessRaises(crypto.BadSignature,
+        self.failUnlessRaises(BadSignature,
                               unsign_from_foolscap, (bad_msg, sig, key))