test_wif(): enable python3 and add encoding checks

Author: g1itch

src/tests/test_addresses.py

@@ -1,9 +1,8 @@
 
-import sys
 import unittest
 from binascii import unhexlify
 
-from pybitmessage import addresses, shared
+from pybitmessage import addresses, highlevelcrypto
 
 
 sample_ripe = unhexlify('003cd097eb7f35c87b5dc8b4538c22cb55312a9f')
@@ -42,15 +41,25 @@ def test_encode(self):
         self.assertEqual(
             addresses.encodeAddress(2, 1, sample_ripe), sample_address)
 
-    @unittest.skipIf(
-        sys.hexversion >= 0x3000000, 'emergency exit on python3!')
     def test_wif(self):
         """Decode WIFs of [chan] bitmessage and check the keys"""
         self.assertEqual(
             sample_wif_privsigningkey,
-            shared.decodeWalletImportFormat(
+            highlevelcrypto.decodeWalletImportFormat(
                 b'5K42shDERM5g7Kbi3JT5vsAWpXMqRhWZpX835M2pdSoqQQpJMYm'))
         self.assertEqual(
             sample_wif_privencryptionkey,
-            shared.decodeWalletImportFormat(
+            highlevelcrypto.decodeWalletImportFormat(
                 b'5HwugVWm31gnxtoYcvcK7oywH2ezYTh6Y4tzRxsndAeMi6NHqpA'))
+        self.assertEqual(
+            b'5K42shDERM5g7Kbi3JT5vsAWpXMqRhWZpX835M2pdSoqQQpJMYm',
+            highlevelcrypto.encodeWalletImportFormat(
+                sample_wif_privsigningkey))
+        self.assertEqual(
+            b'5HwugVWm31gnxtoYcvcK7oywH2ezYTh6Y4tzRxsndAeMi6NHqpA',
+            highlevelcrypto.encodeWalletImportFormat(
+                sample_wif_privencryptionkey))
+
+        with self.assertRaises(ValueError):
+            highlevelcrypto.decodeWalletImportFormat(
+                b'5HwugVWm31gnxtoYcvcK7oywH2ezYTh6Y4tzRxsndAeMi6NHq')