more work on blocks tests

onionr/tests/test_blocks.py

@@ -2,23 +2,32 @@
 import sys, os
 sys.path.append(".")
 import unittest, uuid, hashlib
-import nacl.exceptions
-import nacl.signing, nacl.hash, nacl.encoding
-TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
-print("Test directory:", TEST_DIR)
-os.environ["ONIONR_HOME"] = TEST_DIR
+
 import onionrblocks
 import onionrstorage
 from utils import createdirs
 from onionrutils import bytesconverter
+import onionrcrypto
+import onionrblockapi
+
+def setup_test():
+    TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
+    print("Test directory:", TEST_DIR)
+    os.environ["ONIONR_HOME"] = TEST_DIR
     createdirs.create_dirs()
+
 class OnionrBlockTests(unittest.TestCase):
     def test_plaintext_insert(self):
+        setup_test()
         message = 'hello world'
         bl = onionrblocks.insert(message)
+        self.assertTrue(bl.startswith('0'))
         self.assertIn(bytesconverter.str_to_bytes(message), onionrstorage.getData(bl))
     
-    #def test_encrypted_insert(self):
-    #    key_pair_1 = nacl.signing.SigningKey.generate(encoder=nacl.encoding.base32)
+    def test_encrypted_insert(self):
+        setup_test()
+        message = 'hello world2'
+        bl = onionrblocks.insert(message, asymPeer=onionrcrypto.pub_key)
+        self.assertIn(bytesconverter.str_to_bytes(message), onionrblockapi.Block(bl, decrypt=True).bcontent)
 
 unittest.main()