Merge pull request #368 from Toktar/task-2297-get-taa-digest

INDY-2302: Allow multiple active TAAs
sovrin-foundation · Dec 19, 2019 · 2c20b27 · 2c20b27
2 parents 552a9c3 + fef1232
commit 2c20b27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/devops/Makefile b/devops/Makefile
@@ -53,7 +53,7 @@ ifeq ($(SRC_DIR_NAME),sovtoken)
 # 	pypi: indy-plenum
 # 	apt: indy-plenum (stable component)
 
-FPM_P_DEPENDS := indy-node(=1.12.1~dev1163)
+FPM_P_DEPENDS := indy-node(=1.12.1~dev1165)
 FPM_ARGS := --no-python-dependencies $(FPM_ARGS)
 endif
 

diff --git a/sovtoken/setup.py b/sovtoken/setup.py
@@ -38,7 +38,7 @@
              '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']},
     include_package_data=True,
 
-    install_requires=['indy-node==1.12.1.dev1163'],
+    install_requires=['indy-node==1.12.1.dev1165'],
 
     setup_requires=['pytest-runner'],
     extras_require={

diff --git a/sovtoken/sovtoken/test/txn_response.py b/sovtoken/sovtoken/test/txn_response.py
@@ -5,17 +5,16 @@
     TXN_PAYLOAD_METADATA_DIGEST, TXN_METADATA, TXN_SIGNATURE, TXN_VERSION, \
     TXN_PAYLOAD_PROTOCOL_VERSION, TXN_SIGNATURE_FROM, TXN_SIGNATURE_VALUE, \
     TXN_SIGNATURE_VALUES, TXN_SIGNATURE_TYPE, ED25519, TXN_METADATA_TIME, \
-    TXN_METADATA_ID, TXN_METADATA_SEQ_NO
+    TXN_METADATA_ID, TXN_METADATA_SEQ_NO, CURRENT_TXN_VERSIONS
 
 
 def get_sorted_signatures(txn_response):
     signatures = txn_response[TXN_SIGNATURE]
     signatures[TXN_SIGNATURE_VALUES].sort(key=lambda fv: fv[TXN_SIGNATURE_FROM])
     return signatures
 
-class TxnResponse:
 
-    version = 1
+class TxnResponse:
 
     def __init__(self,
                  type,
@@ -41,7 +40,7 @@ def form_response(self):
         data = self._form_data()
 
         response = {
-            TXN_VERSION: self.version,
+            TXN_VERSION: CURRENT_TXN_VERSIONS[self.type],
             TXN_PAYLOAD_PROTOCOL_VERSION: 2,
             TXN_PAYLOAD: {
                 TXN_TYPE: self.type,

diff --git a/sovtokenfees/sovtokenfees/test/taa/fees/test_no_taa_fees.py b/sovtokenfees/sovtokenfees/test/taa/fees/test_no_taa_fees.py
@@ -18,8 +18,7 @@ def test_nym_with_fees_with_taa(helpers,
         fees_set[FEES][NYM_FEES_ALIAS],
         change_address=addresses[0]
     )[0]
-    with pytest.raises(RequestRejectedException):
-        helpers.sdk.sdk_send_and_check([request])
+    helpers.sdk.sdk_send_and_check([request])
 
 
 def test_nym_with_fees_no_taa(helpers,