[INDY-1287] fix base58 version 1.0.0 (hyperledger#661)

* INDY-1287: added decode() Changes: - added decode("utf-8") to base58.alphabet - added decode("utf-8") to base58.b58encode() Signed-off-by: toktar <[email protected]> * INDY-1287: increment plenum version Signed-off-by: toktar <[email protected]>
jinpo0720 · Apr 27, 2018 · 93e2a13 · 93e2a13
1 parent b61baa1
commit 93e2a13
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/indy_client/client/client.py b/indy_client/client/client.py
@@ -161,8 +161,8 @@ def doAttrDisclose(self, origin, target, txnId, key):
         op = {
             TARGET_NYM: target,
             TXN_TYPE: DISCLO,
-            NONCE: b58encode(nonce),
-            DATA: b58encode(boxedMsg)
+            NONCE: b58encode(nonce).decode("utf-8"),
+            DATA: b58encode(boxedMsg).decode("utf-8")
         }
         self.submit(op, identifier=origin)
 

diff --git a/indy_client/test/cli/conftest.py b/indy_client/test/cli/conftest.py
@@ -1363,7 +1363,7 @@ def newNodeVals():
         CLIENT_PORT: clientPort,
         ALIAS: randomString(6),
         SERVICES: [VALIDATOR],
-        BLS_KEY: base58.b58encode(randomString(128).encode())
+        BLS_KEY: base58.b58encode(randomString(128).encode()).decode("utf-8")
     }
 
     return {

diff --git a/indy_client/test/cli/test_node.py b/indy_client/test/cli/test_node.py
@@ -47,7 +47,7 @@ def test_add_same_node_with_changed_bls_by_trustee(be, do, trusteeCli,
     '''
     be(trusteeCli)
     node_vals = newNodeVals
-    node_vals['newNodeData'][BLS_KEY] = base58.b58encode(randomString(128).encode())
+    node_vals['newNodeData'][BLS_KEY] = base58.b58encode(randomString(128).encode()).decode("utf-8")
     doSendNodeCmd(do, node_vals,
                   expMsgs=["TRUSTEE not in allowed roles ['STEWARD']"])
     exitFromCli(do)
@@ -108,7 +108,7 @@ def test_update_bls(be, do, newStewardCli,
 
     node_vals = nodeValsEmptyData
     node_vals['newNodeData'][ALIAS] = newNodeVals['newNodeData'][ALIAS]
-    node_vals['newNodeData'][BLS_KEY] = base58.b58encode(randomString(128).encode())
+    node_vals['newNodeData'][BLS_KEY] = base58.b58encode(randomString(128).encode()).decode("utf-8")
 
     doSendNodeCmd(do, node_vals,
                   expMsgs=['Node request completed'])
@@ -125,7 +125,7 @@ def test_update_bls_by_trustee(be, do, trusteeCli,
 
     node_vals = nodeValsEmptyData
     node_vals['newNodeData'][ALIAS] = newNodeVals['newNodeData'][ALIAS]
-    node_vals['newNodeData'][BLS_KEY] = base58.b58encode(randomString(128).encode())
+    node_vals['newNodeData'][BLS_KEY] = base58.b58encode(randomString(128).encode()).decode("utf-8")
 
     doSendNodeCmd(do, node_vals,
                   expMsgs=["TRUSTEE not in allowed roles ['STEWARD']"])

diff --git a/indy_client/test/conftest.py b/indy_client/test/conftest.py
@@ -196,7 +196,7 @@ def client1Signer():
     signer = DidSigner(seed=seed)
     testable_verkey = friendlyToRaw(signer.identifier)
     testable_verkey += friendlyToRaw(signer.verkey[1:])
-    testable_verkey = base58.b58encode(testable_verkey)
+    testable_verkey = base58.b58encode(testable_verkey).decode("utf-8")
     assert testable_verkey == '6JvpZp2haQgisbXEXE9NE6n3Tuv77MZb5HdF9jS5qY8m'
     return signer
 

diff --git a/indy_client/test/test_nym_attrib.py b/indy_client/test/test_nym_attrib.py
@@ -412,8 +412,8 @@ def testTrustAnchorDisclosesEncryptedAttribute(
     op = {
         TARGET_NYM: userSignerA.verstr,
         TXN_TYPE: ATTRIB,
-        NONCE: base58.b58encode(nonce),
-        ENC: base58.b58encode(boxedMsg)
+        NONCE: base58.b58encode(nonce).decode("utf-8"),
+        ENC: base58.b58encode(boxedMsg).decode("utf-8")
     }
     submitAndCheck(looper, trustAnchor, op,
                    identifier=trustAnchorSigner.verstr)

diff --git a/indy_node/test/did/conftest.py b/indy_node/test/did/conftest.py
@@ -36,11 +36,11 @@ def abbrevVerkey(wallet, abbrevIdr):
 
 @pf
 def noKeyIdr(wallet):
-    idr = base58.b58encode(b'1' * 16)
+    idr = base58.b58encode(b'1' * 16).decode("utf-8")
     return wallet.addIdentifier(identifier=idr)[0]
 
 
 @pf
 def fullKeyIdr(wallet):
-    idr = base58.b58encode(b'2' * 16)
+    idr = base58.b58encode(b'2' * 16).decode("utf-8")
     return wallet.addIdentifier(identifier=idr)[0]
diff --git a/indy_node/test/helper.py b/indy_node/test/helper.py
@@ -235,7 +235,7 @@ def buildStewardClient(looper, tdir, stewardWallet):
     return s
 
 
-base58_alphabet = set(base58.alphabet)
+base58_alphabet = set(base58.alphabet.decode("utf-8"))
 
 
 def check_str_is_base58_compatible(str):

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
-    install_requires=['indy-plenum-dev==1.2.339',
+    install_requires=['indy-plenum-dev==1.2.340',
                       'indy-anoncreds-dev==1.0.32',
                       'python-dateutil',
                       'timeout-decorator==0.4.0'],