From 02ce3caa927d5e0f4eae6e3534432181b3aa4c80 Mon Sep 17 00:00:00 2001 From: malsomesh9 Date: Tue, 7 Apr 2026 02:03:00 +0530 Subject: [PATCH] test(vdr): route ledger builders through indy-vdr Signed-off-by: malsomesh9 --- indy_node/test/anon_creds/conftest.py | 4 +- indy_node/test/anon_creds/helper.py | 2 +- indy_node/test/api/helper.py | 2 +- indy_node/test/api/test_attrib_reply.py | 2 +- indy_node/test/api/test_claim_def_reply.py | 6 +- indy_node/test/api/test_nym_reply.py | 2 +- .../test/attrib_txn/test_attrib_txn_digest.py | 2 +- .../test/attrib_txn/test_send_get_attr.py | 2 +- .../auth_rule/auth_framework/claim_def.py | 2 +- .../auth_rule/auth_framework/disable_taa.py | 2 +- .../auth_rule/auth_framework/revoc_reg_def.py | 2 +- .../auth_framework/txn_author_agreement.py | 2 +- .../txn_author_agreement_aml.py | 2 +- indy_node/test/claim_def/conftest.py | 2 +- .../test/claim_def/test_send_claim_def.py | 2 +- .../test/claim_def/test_send_get_claim_def.py | 2 +- indy_node/test/did/conftest.py | 2 +- indy_node/test/endorser/helper.py | 2 +- .../test/endorser/test_send_by_endorser.py | 2 +- indy_node/test/helper.py | 2 +- indy_node/test/indy_vdr_ledger.py | 235 ++++++++++++++++++ .../test_create_did_without_endorser.py | 2 +- indy_node/test/nym_txn/test_nym_additional.py | 2 +- indy_node/test/nym_txn/test_nym_resend.py | 2 +- .../test_idr_cache_update_after_catchup.py | 2 +- indy_node/test/pool_config/helper.py | 2 +- .../test/pool_config/test_pool_config.py | 2 +- indy_node/test/pool_restart/helper.py | 3 +- .../test_request_propagates.py | 11 +- indy_node/test/schema/test_send_get_schema.py | 2 +- .../test_state_proof_for_get_requests.py | 6 +- .../test/txn_author_agreement/conftest.py | 2 +- .../txn_author_agreement/test_node_taa.py | 2 +- .../test_send_get_nym_validation.py | 2 +- indy_node/test/upgrade/helper.py | 2 +- indy_node/test/validator_info/helper.py | 4 +- ..._view_change_during_alternating_unstash.py | 2 +- .../test_send_write_permission_no_client.py | 2 +- setup.py | 2 +- 39 files changed, 291 insertions(+), 42 deletions(-) create mode 100644 indy_node/test/indy_vdr_ledger.py diff --git a/indy_node/test/anon_creds/conftest.py b/indy_node/test/anon_creds/conftest.py index ddfeb37dc..f98a0f228 100644 --- a/indy_node/test/anon_creds/conftest.py +++ b/indy_node/test/anon_creds/conftest.py @@ -3,7 +3,7 @@ import json from indy.anoncreds import issuer_create_and_store_credential_def -from indy.ledger import build_cred_def_request +from indy_node.test.indy_vdr_ledger import build_cred_def_request from indy_common.state.domain import make_state_path_for_claim_def from indy_node.test.anon_creds.helper import get_cred_def_id, create_revoc_reg, create_revoc_reg_entry @@ -373,4 +373,4 @@ def send_revoc_reg_entry_by_demand(looper, @pytest.fixture(scope="module") def create_node_and_not_start(create_node_and_not_start): create_node_and_not_start.bootstrapper.upload_states() - return create_node_and_not_start \ No newline at end of file + return create_node_and_not_start diff --git a/indy_node/test/anon_creds/helper.py b/indy_node/test/anon_creds/helper.py index d9f4bcfa5..d5668a41c 100644 --- a/indy_node/test/anon_creds/helper.py +++ b/indy_node/test/anon_creds/helper.py @@ -3,7 +3,7 @@ from indy import blob_storage from indy.anoncreds import issuer_create_and_store_revoc_reg -from indy.ledger import build_revoc_reg_def_request, build_revoc_reg_entry_request +from indy_node.test.indy_vdr_ledger import build_revoc_reg_def_request, build_revoc_reg_entry_request from plenum.common.types import f diff --git a/indy_node/test/api/helper.py b/indy_node/test/api/helper.py index 9d23df191..9663ff082 100644 --- a/indy_node/test/api/helper.py +++ b/indy_node/test/api/helper.py @@ -3,7 +3,7 @@ import base58 from indy.anoncreds import issuer_create_schema -from indy.ledger import build_schema_request +from indy_node.test.indy_vdr_ledger import build_schema_request from indy_common.constants import RS_ID, RS_TYPE, RS_NAME, RS_VERSION, RS_CONTENT from plenum.common.constants import TXN_TYPE diff --git a/indy_node/test/api/test_attrib_reply.py b/indy_node/test/api/test_attrib_reply.py index 1af7ccb09..34f7ac151 100644 --- a/indy_node/test/api/test_attrib_reply.py +++ b/indy_node/test/api/test_attrib_reply.py @@ -1,6 +1,6 @@ import json -from indy.ledger import build_attrib_request +from indy_node.test.indy_vdr_ledger import build_attrib_request from indy_node.test.api.helper import validate_write_reply, validate_attrib_txn from plenum.test.helper import sdk_get_reply, sdk_sign_and_submit_req from hashlib import sha256 diff --git a/indy_node/test/api/test_claim_def_reply.py b/indy_node/test/api/test_claim_def_reply.py index 35153e513..f407226e3 100644 --- a/indy_node/test/api/test_claim_def_reply.py +++ b/indy_node/test/api/test_claim_def_reply.py @@ -1,7 +1,11 @@ import json from indy.anoncreds import issuer_create_and_store_credential_def -from indy.ledger import build_cred_def_request, build_get_schema_request, parse_get_schema_response +from indy_node.test.indy_vdr_ledger import ( + build_cred_def_request, + build_get_schema_request, + parse_get_schema_response, +) from indy_node.test.api.helper import validate_write_reply, validate_claim_def_txn, sdk_write_schema from plenum.test.helper import sdk_get_reply, sdk_sign_and_submit_req diff --git a/indy_node/test/api/test_nym_reply.py b/indy_node/test/api/test_nym_reply.py index b04063b97..8de60c439 100644 --- a/indy_node/test/api/test_nym_reply.py +++ b/indy_node/test/api/test_nym_reply.py @@ -1,4 +1,4 @@ -from indy.ledger import build_nym_request +from indy_node.test.indy_vdr_ledger import build_nym_request from indy_node.test.helper import createHalfKeyIdentifierAndAbbrevVerkey from indy_node.test.api.helper import validate_write_reply, validate_nym_txn from plenum.test.helper import sdk_get_reply, sdk_sign_and_submit_req diff --git a/indy_node/test/attrib_txn/test_attrib_txn_digest.py b/indy_node/test/attrib_txn/test_attrib_txn_digest.py index 7332f499b..09860ee09 100644 --- a/indy_node/test/attrib_txn/test_attrib_txn_digest.py +++ b/indy_node/test/attrib_txn/test_attrib_txn_digest.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_attrib_request, sign_request +from indy_node.test.indy_vdr_ledger import build_attrib_request, sign_request from indy_common.types import Request from plenum.common.request import Request as PRequest diff --git a/indy_node/test/attrib_txn/test_send_get_attr.py b/indy_node/test/attrib_txn/test_send_get_attr.py index 6764189c5..f74c513a2 100644 --- a/indy_node/test/attrib_txn/test_send_get_attr.py +++ b/indy_node/test/attrib_txn/test_send_get_attr.py @@ -4,7 +4,7 @@ import time from typing import Optional -from indy.ledger import build_get_attrib_request +from indy_node.test.indy_vdr_ledger import build_get_attrib_request from libnacl.secret import SecretBox from plenum.common.exceptions import RequestNackedException from plenum.test.helper import sdk_get_and_check_replies diff --git a/indy_node/test/auth_rule/auth_framework/claim_def.py b/indy_node/test/auth_rule/auth_framework/claim_def.py index 7290052d6..9fcd0a107 100644 --- a/indy_node/test/auth_rule/auth_framework/claim_def.py +++ b/indy_node/test/auth_rule/auth_framework/claim_def.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_get_schema_request, parse_get_schema_response +from indy_node.test.indy_vdr_ledger import build_get_schema_request, parse_get_schema_response from indy_common.authorize import auth_map from indy_common.authorize.auth_actions import ADD_PREFIX, EDIT_PREFIX diff --git a/indy_node/test/auth_rule/auth_framework/disable_taa.py b/indy_node/test/auth_rule/auth_framework/disable_taa.py index 55535d207..07841db83 100644 --- a/indy_node/test/auth_rule/auth_framework/disable_taa.py +++ b/indy_node/test/auth_rule/auth_framework/disable_taa.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_node.test.indy_vdr_ledger import build_acceptance_mechanisms_request from indy_common.authorize.auth_actions import ADD_PREFIX from indy_common.authorize.auth_constraints import AuthConstraint, IDENTITY_OWNER diff --git a/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py b/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py index db1586569..087fd7896 100644 --- a/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py +++ b/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_get_schema_request, parse_get_schema_response +from indy_node.test.indy_vdr_ledger import build_get_schema_request, parse_get_schema_response from indy_common.state.domain import make_state_path_for_claim_def from plenum.common.types import OPERATION diff --git a/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py b/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py index 9d82ec49b..c1f2ad03c 100644 --- a/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py +++ b/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py @@ -1,7 +1,7 @@ import pytest import json -from indy.ledger import build_acceptance_mechanisms_request +from indy_node.test.indy_vdr_ledger import build_acceptance_mechanisms_request from plenum.common.util import randomString diff --git a/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py b/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py index be632bd4e..6831be1ec 100644 --- a/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py +++ b/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_node.test.indy_vdr_ledger import build_acceptance_mechanisms_request from plenum.common.util import randomString diff --git a/indy_node/test/claim_def/conftest.py b/indy_node/test/claim_def/conftest.py index 3c33d2590..d703d6491 100644 --- a/indy_node/test/claim_def/conftest.py +++ b/indy_node/test/claim_def/conftest.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import parse_get_schema_response, build_get_schema_request +from indy_node.test.indy_vdr_ledger import parse_get_schema_response, build_get_schema_request from indy_common.config import SCHEMA_ATTRIBUTES_LIMIT from indy_node.test.api.helper import sdk_write_schema diff --git a/indy_node/test/claim_def/test_send_claim_def.py b/indy_node/test/claim_def/test_send_claim_def.py index a6a20514f..9d9687359 100644 --- a/indy_node/test/claim_def/test_send_claim_def.py +++ b/indy_node/test/claim_def/test_send_claim_def.py @@ -2,7 +2,7 @@ import pytest from indy.anoncreds import issuer_create_and_store_credential_def, issuer_create_schema -from indy.ledger import build_cred_def_request, build_schema_request +from indy_node.test.indy_vdr_ledger import build_cred_def_request, build_schema_request from indy_common.constants import REF from indy_node.test.helper import modify_field diff --git a/indy_node/test/claim_def/test_send_get_claim_def.py b/indy_node/test/claim_def/test_send_get_claim_def.py index 792bc7da7..e09a9036c 100644 --- a/indy_node/test/claim_def/test_send_get_claim_def.py +++ b/indy_node/test/claim_def/test_send_get_claim_def.py @@ -2,7 +2,7 @@ import pytest from indy.anoncreds import issuer_create_and_store_credential_def -from indy.ledger import build_get_cred_def_request, build_cred_def_request +from indy_node.test.indy_vdr_ledger import build_get_cred_def_request, build_cred_def_request from plenum.common.exceptions import RequestNackedException from plenum.common.constants import TXN_METADATA, TXN_METADATA_ID diff --git a/indy_node/test/did/conftest.py b/indy_node/test/did/conftest.py index 4658e50f6..f09a88235 100644 --- a/indy_node/test/did/conftest.py +++ b/indy_node/test/did/conftest.py @@ -2,7 +2,7 @@ import json from indy.did import abbreviate_verkey, create_and_store_my_did -from indy.ledger import build_get_nym_request, build_nym_request +from indy_node.test.indy_vdr_ledger import build_get_nym_request, build_nym_request from plenum.common.util import randomString from plenum.test.helper import sdk_get_and_check_replies diff --git a/indy_node/test/endorser/helper.py b/indy_node/test/endorser/helper.py index 5a5579972..a13f832d2 100644 --- a/indy_node/test/endorser/helper.py +++ b/indy_node/test/endorser/helper.py @@ -1,4 +1,4 @@ -from indy.ledger import append_request_endorser +from indy_node.test.indy_vdr_ledger import append_request_endorser from plenum.test.helper import sdk_get_and_check_replies, sdk_send_signed_requests, sdk_multisign_request_object diff --git a/indy_node/test/endorser/test_send_by_endorser.py b/indy_node/test/endorser/test_send_by_endorser.py index 969d82fa6..e4370f3c3 100644 --- a/indy_node/test/endorser/test_send_by_endorser.py +++ b/indy_node/test/endorser/test_send_by_endorser.py @@ -2,7 +2,7 @@ import pytest from indy.did import create_and_store_my_did -from indy.ledger import build_nym_request +from indy_node.test.indy_vdr_ledger import build_nym_request from indy_common.authorize.auth_actions import ADD_PREFIX from indy_common.authorize.auth_constraints import AuthConstraint, IDENTITY_OWNER diff --git a/indy_node/test/helper.py b/indy_node/test/helper.py index a5c1fd2dc..77513a40f 100644 --- a/indy_node/test/helper.py +++ b/indy_node/test/helper.py @@ -3,7 +3,7 @@ import base58 from indy.did import replace_keys_start, replace_keys_apply -from indy.ledger import ( +from indy_node.test.indy_vdr_ledger import ( build_attrib_request, build_get_attrib_request, build_get_auth_rule_request, build_auth_rule_request, build_auth_rules_request) diff --git a/indy_node/test/indy_vdr_ledger.py b/indy_node/test/indy_vdr_ledger.py new file mode 100644 index 000000000..664789133 --- /dev/null +++ b/indy_node/test/indy_vdr_ledger.py @@ -0,0 +1,235 @@ +import json + +from indy.ledger import append_request_endorser, sign_request, submit_request + +try: + from indy_vdr import ledger as vdr_ledger +except ImportError: # pragma: no cover - exercised in environments without indy-vdr + vdr_ledger = None + + +def _require_vdr(): + if vdr_ledger is None: + raise ImportError("indy_vdr is required for ledger request builders") + return vdr_ledger + + +def _request_body(request): + return request.body if hasattr(request, "body") else request + + +async def build_attrib_request(submitter_did, target_did, xhash, raw, enc): + return _request_body( + _require_vdr().build_attrib_request(submitter_did, target_did, xhash, raw, enc) + ) + + +async def build_get_attrib_request( + submitter_did, + target_did, + raw=None, + xhash=None, + enc=None, + seq_no=None, + timestamp=None, +): + return _request_body( + _require_vdr().build_get_attrib_request( + submitter_did, + target_did, + raw=raw, + xhash=xhash, + enc=enc, + seq_no=seq_no, + timestamp=timestamp, + ) + ) + + +async def build_schema_request(submitter_did, data): + return _request_body(_require_vdr().build_schema_request(submitter_did, data)) + + +async def build_get_schema_request(submitter_did, id_): + return _request_body(_require_vdr().build_get_schema_request(submitter_did, id_)) + + +async def parse_get_schema_response(get_schema_response): + response = json.loads(get_schema_response) + result = response.get("result", response) + data = result.get("data") or {} + if isinstance(data, str): + data = json.loads(data) + if "attr_names" in data and "attrNames" not in data: + data["attrNames"] = data.pop("attr_names") + + schema_id = result.get("id") + if not schema_id: + dest = result.get("dest") or result.get("identifier") + name = data.get("name") + version = data.get("version") + if dest and name and version: + schema_id = "{}:2:{}:{}".format(dest, name, version) + + if schema_id: + data.setdefault("id", schema_id) + data.setdefault("ver", "1.0") + return schema_id, json.dumps(data) + + +async def build_cred_def_request(submitter_did, data): + return _request_body(_require_vdr().build_cred_def_request(submitter_did, data)) + + +async def build_get_cred_def_request(submitter_did, cred_def_id): + return _request_body(_require_vdr().build_get_cred_def_request(submitter_did, cred_def_id)) + + +async def build_nym_request(submitter_did, target_did, verkey, alias, role): + return _request_body( + _require_vdr().build_nym_request(submitter_did, target_did, verkey, alias, role) + ) + + +async def build_pool_config_request(submitter_did, writes, force): + return _request_body(_require_vdr().build_pool_config_request(submitter_did, writes, force)) + + +async def build_pool_restart_request(submitter_did, action, datetime=None): + return _request_body( + _require_vdr().build_pool_restart_request(submitter_did, action, datetime) + ) + + +async def build_pool_upgrade_request( + submitter_did, + name, + version, + action, + sha256, + timeout, + schedule, + justification, + reinstall, + force, + package, +): + return _request_body( + _require_vdr().build_pool_upgrade_request( + submitter_did, + name, + version, + action, + sha256, + timeout, + schedule, + justification, + reinstall, + force, + package, + ) + ) + + +async def build_get_validator_info_request(submitter_did): + return _request_body(_require_vdr().build_get_validator_info_request(submitter_did)) + + +async def build_acceptance_mechanisms_request(submitter_did, aml, version, aml_context=None): + return _request_body( + _require_vdr().build_acceptance_mechanisms_request( + submitter_did, aml, version, aml_context + ) + ) + + +async def build_revoc_reg_def_request(submitter_did, data): + return _request_body(_require_vdr().build_revoc_reg_def_request(submitter_did, data)) + + +async def build_revoc_reg_entry_request( + submitter_did, revoc_reg_def_id, revoc_def_type, value +): + return _request_body( + _require_vdr().build_revoc_reg_entry_request( + submitter_did, revoc_reg_def_id, revoc_def_type, value + ) + ) + + +async def build_get_revoc_reg_def_request(submitter_did, revoc_reg_id): + return _request_body( + _require_vdr().build_get_revoc_reg_def_request(submitter_did, revoc_reg_id) + ) + + +async def build_get_revoc_reg_request(submitter_did, revoc_reg_id, timestamp): + return _request_body( + _require_vdr().build_get_revoc_reg_request(submitter_did, revoc_reg_id, timestamp) + ) + + +async def build_get_revoc_reg_delta_request(submitter_did, revoc_reg_id, from_ts, to_ts): + return _request_body( + _require_vdr().build_get_revoc_reg_delta_request( + submitter_did, revoc_reg_id, from_ts, to_ts + ) + ) + + +async def build_auth_rule_request( + submitter_did, + txn_type=None, + action=None, + field=None, + old_value=None, + new_value=None, + constraint=None, + auth_type=None, + auth_action=None, +): + return _request_body( + _require_vdr().build_auth_rule_request( + submitter_did, + auth_type or txn_type, + auth_action or action, + field, + old_value, + new_value, + constraint, + ) + ) + + +async def build_get_auth_rule_request( + submitter_did, + txn_type=None, + action=None, + field=None, + old_value=None, + new_value=None, + auth_type=None, + auth_action=None, +): + return _request_body( + _require_vdr().build_get_auth_rule_request( + submitter_did, + auth_type or txn_type, + auth_action or action, + field, + old_value, + new_value, + ) + ) + + +async def build_auth_rules_request(submitter_did, rules=None, data=None): + return _request_body( + _require_vdr().build_auth_rules_request(submitter_did, rules if rules is not None else data) + ) + + +async def build_get_nym_request(submitter_did, dest, seq_no=None, timestamp=None): + return _request_body( + _require_vdr().build_get_nym_request(submitter_did, dest, seq_no, timestamp) + ) diff --git a/indy_node/test/nym_txn/test_create_did_without_endorser.py b/indy_node/test/nym_txn/test_create_did_without_endorser.py index ceb892b43..e77bb4fbe 100644 --- a/indy_node/test/nym_txn/test_create_did_without_endorser.py +++ b/indy_node/test/nym_txn/test_create_did_without_endorser.py @@ -2,7 +2,7 @@ import pytest from indy.did import create_and_store_my_did -from indy.ledger import build_nym_request +from indy_node.test.indy_vdr_ledger import build_nym_request from indy_common.authorize.auth_actions import ADD_PREFIX from indy_common.authorize.auth_constraints import AuthConstraint, OFF_LEDGER_SIGNATURE, CONSTRAINT_ID diff --git a/indy_node/test/nym_txn/test_nym_additional.py b/indy_node/test/nym_txn/test_nym_additional.py index 612f84b1f..163ae978b 100644 --- a/indy_node/test/nym_txn/test_nym_additional.py +++ b/indy_node/test/nym_txn/test_nym_additional.py @@ -2,7 +2,7 @@ import pytest from indy.did import create_and_store_my_did, replace_keys_start, replace_keys_apply -from indy.ledger import build_get_nym_request +from indy_node.test.indy_vdr_ledger import build_get_nym_request from indy_common.constants import ENDORSER_STRING from indy_node.test.helper import sdk_add_attribute_and_check from plenum.common.exceptions import RequestRejectedException diff --git a/indy_node/test/nym_txn/test_nym_resend.py b/indy_node/test/nym_txn/test_nym_resend.py index 89eb4586b..63045223a 100644 --- a/indy_node/test/nym_txn/test_nym_resend.py +++ b/indy_node/test/nym_txn/test_nym_resend.py @@ -1,7 +1,7 @@ import json from indy_node.test.helper import createHalfKeyIdentifierAndAbbrevVerkey -from indy.ledger import sign_request, submit_request, build_nym_request +from indy_node.test.indy_vdr_ledger import sign_request, submit_request, build_nym_request from plenum.common.constants import REPLY, REJECT diff --git a/indy_node/test/persistence/test_idr_cache_update_after_catchup.py b/indy_node/test/persistence/test_idr_cache_update_after_catchup.py index 9926c13a1..1ec85a702 100644 --- a/indy_node/test/persistence/test_idr_cache_update_after_catchup.py +++ b/indy_node/test/persistence/test_idr_cache_update_after_catchup.py @@ -1,6 +1,6 @@ import json -from indy.ledger import build_nym_request, sign_request, submit_request +from indy_node.test.indy_vdr_ledger import build_nym_request, sign_request, submit_request from indy_common.state import domain from indy_node.test.helper import start_stopped_node, createHalfKeyIdentifierAndAbbrevVerkey diff --git a/indy_node/test/pool_config/helper.py b/indy_node/test/pool_config/helper.py index 55dcce50e..7bb38a464 100644 --- a/indy_node/test/pool_config/helper.py +++ b/indy_node/test/pool_config/helper.py @@ -1,4 +1,4 @@ -from indy.ledger import build_pool_config_request +from indy_node.test.indy_vdr_ledger import build_pool_config_request from plenum.test.helper import sdk_get_and_check_replies, sdk_sign_and_submit_req diff --git a/indy_node/test/pool_config/test_pool_config.py b/indy_node/test/pool_config/test_pool_config.py index 834961a77..a31bf186d 100644 --- a/indy_node/test/pool_config/test_pool_config.py +++ b/indy_node/test/pool_config/test_pool_config.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_pool_config_request +from indy_node.test.indy_vdr_ledger import build_pool_config_request from indy_node.test.nym_txn.test_nym_additional import get_nym from indy_node.test.upgrade.helper import sdk_ensure_upgrade_sent diff --git a/indy_node/test/pool_restart/helper.py b/indy_node/test/pool_restart/helper.py index a14c2c2ba..7ce26f5f0 100644 --- a/indy_node/test/pool_restart/helper.py +++ b/indy_node/test/pool_restart/helper.py @@ -3,7 +3,7 @@ import socket from indy.did import create_and_store_my_did from indy.error import ErrorCode -from indy.ledger import build_pool_restart_request +from indy_node.test.indy_vdr_ledger import build_pool_restart_request from plenum.common.util import randomString from plenum.test.helper import sdk_get_replies, sdk_check_reply @@ -104,4 +104,3 @@ async def prepare_restart_request(wallet, named_seed, action="start", action, restart_time) return restart_request, named_did - diff --git a/indy_node/test/request_propagates/test_request_propagates.py b/indy_node/test/request_propagates/test_request_propagates.py index 3ec8ee224..a5821f4a1 100644 --- a/indy_node/test/request_propagates/test_request_propagates.py +++ b/indy_node/test/request_propagates/test_request_propagates.py @@ -2,8 +2,15 @@ import pytest from indy.anoncreds import issuer_create_schema, issuer_create_and_store_credential_def -from indy.ledger import build_attrib_request, sign_request, build_schema_request, build_cred_def_request, \ - build_nym_request, build_get_schema_request, parse_get_schema_response +from indy_node.test.indy_vdr_ledger import ( + build_attrib_request, + sign_request, + build_schema_request, + build_cred_def_request, + build_nym_request, + build_get_schema_request, + parse_get_schema_response, +) from indy_node.test.helper import createHalfKeyIdentifierAndAbbrevVerkey from indy_common.types import Request diff --git a/indy_node/test/schema/test_send_get_schema.py b/indy_node/test/schema/test_send_get_schema.py index f4f47c85b..2157bbc3e 100644 --- a/indy_node/test/schema/test_send_get_schema.py +++ b/indy_node/test/schema/test_send_get_schema.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_get_schema_request +from indy_node.test.indy_vdr_ledger import build_get_schema_request from plenum.common.exceptions import RequestNackedException from plenum.common.constants import DATA, NAME, VERSION, TXN_METADATA, TXN_METADATA_SEQ_NO diff --git a/indy_node/test/state_proof/test_state_proof_for_get_requests.py b/indy_node/test/state_proof/test_state_proof_for_get_requests.py index e865fcc88..75300cd83 100644 --- a/indy_node/test/state_proof/test_state_proof_for_get_requests.py +++ b/indy_node/test/state_proof/test_state_proof_for_get_requests.py @@ -3,7 +3,11 @@ import time import pytest -from indy.ledger import build_get_revoc_reg_def_request, build_get_revoc_reg_request, build_get_revoc_reg_delta_request +from indy_node.test.indy_vdr_ledger import ( + build_get_revoc_reg_def_request, + build_get_revoc_reg_request, + build_get_revoc_reg_delta_request, +) from common.serializers.serialization import domain_state_serializer from indy_common.authorize.auth_actions import ADD_PREFIX diff --git a/indy_node/test/txn_author_agreement/conftest.py b/indy_node/test/txn_author_agreement/conftest.py index bc96c5ab6..d89a98808 100644 --- a/indy_node/test/txn_author_agreement/conftest.py +++ b/indy_node/test/txn_author_agreement/conftest.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_node.test.indy_vdr_ledger import build_acceptance_mechanisms_request from plenum.common.util import randomString from plenum.test.helper import sdk_get_and_check_replies diff --git a/indy_node/test/txn_author_agreement/test_node_taa.py b/indy_node/test/txn_author_agreement/test_node_taa.py index c32ce20b1..23a7a091c 100644 --- a/indy_node/test/txn_author_agreement/test_node_taa.py +++ b/indy_node/test/txn_author_agreement/test_node_taa.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_node.test.indy_vdr_ledger import build_acceptance_mechanisms_request from plenum.test.helper import sdk_get_and_check_replies from plenum.test.pool_transactions.helper import sdk_sign_and_send_prepared_request diff --git a/indy_node/test/txn_validation/test_send_get_nym_validation.py b/indy_node/test/txn_validation/test_send_get_nym_validation.py index f57306832..ea297628b 100644 --- a/indy_node/test/txn_validation/test_send_get_nym_validation.py +++ b/indy_node/test/txn_validation/test_send_get_nym_validation.py @@ -1,7 +1,7 @@ from binascii import hexlify import pytest -from indy.ledger import build_get_nym_request +from indy_node.test.indy_vdr_ledger import build_get_nym_request from indy_common.constants import ENDORSER_STRING from indy_node.test.helper import check_str_is_base58_compatible, modify_field, \ createUuidIdentifier, createHalfKeyIdentifierAndAbbrevVerkey, createCryptonym diff --git a/indy_node/test/upgrade/helper.py b/indy_node/test/upgrade/helper.py index 2fbf5d4a7..32531bfa2 100644 --- a/indy_node/test/upgrade/helper.py +++ b/indy_node/test/upgrade/helper.py @@ -14,7 +14,7 @@ from plenum.common.keygen_utils import init_bls_keys -from indy.ledger import build_pool_upgrade_request +from indy_node.test.indy_vdr_ledger import build_pool_upgrade_request from plenum.common.constants import DATA, VERSION, FORCE from plenum.common.txn_util import get_type, get_payload_data, get_from from plenum.common.util import randomString, hexToFriendly diff --git a/indy_node/test/validator_info/helper.py b/indy_node/test/validator_info/helper.py index 26df92c21..ebb7f5cf3 100644 --- a/indy_node/test/validator_info/helper.py +++ b/indy_node/test/validator_info/helper.py @@ -1,7 +1,7 @@ import json from indy.did import create_and_store_my_did -from indy.ledger import build_get_validator_info_request +from indy_node.test.indy_vdr_ledger import build_get_validator_info_request from indy_node.test.pool_restart.helper import sdk_get_and_check_multiply_replies from plenum.common.util import randomString @@ -27,4 +27,4 @@ async def prepare_validator_info_request(wallet, named_seed): (named_did, named_verkey) = \ await create_and_store_my_did(wh, json.dumps({'seed': named_seed})) restart_request = await build_get_validator_info_request(submitter_did) - return restart_request, named_did \ No newline at end of file + return restart_request, named_did diff --git a/indy_node/test/view_change/test_view_change_during_alternating_unstash.py b/indy_node/test/view_change/test_view_change_during_alternating_unstash.py index 68d5fbf1d..d7f36c548 100644 --- a/indy_node/test/view_change/test_view_change_during_alternating_unstash.py +++ b/indy_node/test/view_change/test_view_change_during_alternating_unstash.py @@ -3,7 +3,7 @@ from typing import Iterable import pytest -from indy.ledger import build_pool_config_request, build_nym_request +from indy_node.test.indy_vdr_ledger import build_pool_config_request, build_nym_request from plenum.common.messages.node_messages import PrePrepare, Prepare, Commit from plenum.common.request import Request diff --git a/indy_node/test/write_permission/test_send_write_permission_no_client.py b/indy_node/test/write_permission/test_send_write_permission_no_client.py index 4e191bf83..8b3471856 100644 --- a/indy_node/test/write_permission/test_send_write_permission_no_client.py +++ b/indy_node/test/write_permission/test_send_write_permission_no_client.py @@ -15,7 +15,7 @@ from indy_node.test.schema.test_send_get_schema import send_schema_req from indy.anoncreds import issuer_create_schema -from indy.ledger import build_schema_request +from indy_node.test.indy_vdr_ledger import build_schema_request def test_client_cant_send_nym(looper, diff --git a/setup.py b/setup.py index 165ea3ace..98888ce03 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ BASE_DIR = os.path.join(os.path.expanduser("~"), ".indy") tests_require = ['attrs>=20.3.0', 'pytest>=6.2.2', 'pytest-xdist>=2.2.1', 'pytest-forked>=1.3.0', - 'python3-indy==1.16.0.post236', 'pytest-asyncio>=0.14.0'] + 'python3-indy==1.16.0.post236', 'indy_vdr>=0.4.1', 'pytest-asyncio>=0.14.0'] setup( name=metadata['__title__'],