From d813247da36db9627a315f9c09bd224eebe26b57 Mon Sep 17 00:00:00 2001 From: PeterStrob Date: Thu, 16 Sep 2021 15:00:33 -0700 Subject: [PATCH] fix:did:sov_urls_changed_out_for_github_urls Signed-off-by: PeterStrob --- acapy_plugin_toolbox/credential_definitions.py | 2 +- acapy_plugin_toolbox/dids.py | 2 +- .../holder/v0_1/messages/base.py | 2 +- acapy_plugin_toolbox/issuer.py | 2 +- acapy_plugin_toolbox/schemas.py | 2 +- acapy_plugin_toolbox/static_connections.py | 2 +- int/tests/test_credentialdefinitions.py | 18 +++++++++--------- int/tests/test_holder.py | 12 ++++++------ int/tests/test_schemas.py | 16 ++++++++-------- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/acapy_plugin_toolbox/credential_definitions.py b/acapy_plugin_toolbox/credential_definitions.py index ad12f08b..be8d7e41 100644 --- a/acapy_plugin_toolbox/credential_definitions.py +++ b/acapy_plugin_toolbox/credential_definitions.py @@ -24,7 +24,7 @@ from .schemas import SchemaRecord from .util import admin_only, generate_model_schema -PROTOCOL = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1" +PROTOCOL = "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1" SEND_CRED_DEF = "{}/send-credential-definition".format(PROTOCOL) CRED_DEF_ID = "{}/credential-definition-id".format(PROTOCOL) diff --git a/acapy_plugin_toolbox/dids.py b/acapy_plugin_toolbox/dids.py index 5e9440ab..86123c6d 100644 --- a/acapy_plugin_toolbox/dids.py +++ b/acapy_plugin_toolbox/dids.py @@ -21,7 +21,7 @@ from .util import generate_model_schema, admin_only -PROTOCOL = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-dids/0.1" +PROTOCOL = "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-dids/0.1" GET_LIST_DIDS = "{}/get-list-dids".format(PROTOCOL) LIST_DIDS = "{}/list-dids".format(PROTOCOL) diff --git a/acapy_plugin_toolbox/holder/v0_1/messages/base.py b/acapy_plugin_toolbox/holder/v0_1/messages/base.py index 07c55e11..5f90cb9a 100644 --- a/acapy_plugin_toolbox/holder/v0_1/messages/base.py +++ b/acapy_plugin_toolbox/holder/v0_1/messages/base.py @@ -4,4 +4,4 @@ class AdminHolderMessage(AgentMessage): """Admin Holder Protocol Message Base class.""" - protocol = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1" + protocol = "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1" diff --git a/acapy_plugin_toolbox/issuer.py b/acapy_plugin_toolbox/issuer.py index c8cac67b..eefaa295 100644 --- a/acapy_plugin_toolbox/issuer.py +++ b/acapy_plugin_toolbox/issuer.py @@ -56,7 +56,7 @@ with_generic_init, ) -PROTOCOL = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-issuer/0.1" +PROTOCOL = "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-issuer/0.1" SEND_CREDENTIAL = "{}/send-credential".format(PROTOCOL) REQUEST_PRESENTATION = "{}/request-presentation".format(PROTOCOL) diff --git a/acapy_plugin_toolbox/schemas.py b/acapy_plugin_toolbox/schemas.py index 8df82133..1f022ed7 100644 --- a/acapy_plugin_toolbox/schemas.py +++ b/acapy_plugin_toolbox/schemas.py @@ -21,7 +21,7 @@ from .util import generate_model_schema, admin_only -PROTOCOL = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1" +PROTOCOL = "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1" SEND_SCHEMA = "{}/send-schema".format(PROTOCOL) SCHEMA_ID = "{}/schema-id".format(PROTOCOL) diff --git a/acapy_plugin_toolbox/static_connections.py b/acapy_plugin_toolbox/static_connections.py index fdc33a32..16bf7de9 100644 --- a/acapy_plugin_toolbox/static_connections.py +++ b/acapy_plugin_toolbox/static_connections.py @@ -28,7 +28,7 @@ from .util import generate_model_schema, admin_only -PROTOCOL = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-static-connections/0.1" +PROTOCOL = "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-static-connections/0.1" # Message Types CREATE_STATIC_CONNECTION = "{}/create-static-connection".format(PROTOCOL) diff --git a/int/tests/test_credentialdefinitions.py b/int/tests/test_credentialdefinitions.py index da5c75c4..2702b3c2 100644 --- a/int/tests/test_credentialdefinitions.py +++ b/int/tests/test_credentialdefinitions.py @@ -30,7 +30,7 @@ async def test_send_cred_def(connection, endorser_did, create_schema): schema = await create_schema(version="1.0") send_cred_def = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/send-credential-definition", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/send-credential-definition", "schema_id": schema.sent.schema_id, "~transport": {"return_route": "all"}, }, @@ -38,7 +38,7 @@ async def test_send_cred_def(connection, endorser_did, create_schema): ) assert ( send_cred_def["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/credential-definition-id" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/credential-definition-id" ) @@ -48,7 +48,7 @@ async def test_cred_def_get(connection, endorser_did, create_schema): schema = await create_schema(version="1.1") send_cred_def = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/send-credential-definition", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/send-credential-definition", "schema_id": schema.sent.schema_id, "~transport": {"return_route": "all"}, }, @@ -56,14 +56,14 @@ async def test_cred_def_get(connection, endorser_did, create_schema): ) cred_def_get = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/credential-definition-get", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/credential-definition-get", "cred_def_id": send_cred_def["cred_def_id"], "~transport": {"return_route": "all"}, } ) assert ( cred_def_get["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/credential-definition" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/credential-definition" ) assert schema.sent.schema_id == cred_def_get["schema_id"] assert send_cred_def["cred_def_id"] == cred_def_get["cred_def_id"] @@ -75,7 +75,7 @@ async def test_cred_def_get_list(connection, endorser_did, create_schema): schema1_2 = await create_schema(version="1.2") send_schema1_2 = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/send-credential-definition", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/send-credential-definition", "schema_id": schema1_2.sent.schema_id, "~transport": {"return_route": "all"}, }, @@ -84,7 +84,7 @@ async def test_cred_def_get_list(connection, endorser_did, create_schema): schema1_3 = await create_schema(version="1.3") send_schema1_3 = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/send-credential-definition", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/send-credential-definition", "schema_id": schema1_3.sent.schema_id, "~transport": {"return_route": "all"}, }, @@ -92,13 +92,13 @@ async def test_cred_def_get_list(connection, endorser_did, create_schema): ) cred_def_get_list = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/credential-definition-get-list", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/credential-definition-get-list", "~transport": {"return_route": "all"}, } ) assert ( cred_def_get_list["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/credential-definition-list" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-credential-definitions/0.1/credential-definition-list" ) assert send_schema1_2["cred_def_id"] in [ result["cred_def_id"] for result in cred_def_get_list["results"] diff --git a/int/tests/test_holder.py b/int/tests/test_holder.py index 88a89cf1..3d5cdc90 100644 --- a/int/tests/test_holder.py +++ b/int/tests/test_holder.py @@ -115,12 +115,12 @@ async def test_holder_credential_exchange( timeout=60, ) credential_offer_received = await wait_for_message( - msg_type="did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1/credential-offer-received" + msg_type="https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1/credential-offer-received" ) issue_result = cast(V10CredentialExchange(auto_issue="true"), issue_result) credential_offer_accept = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1/credential-offer-accept", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1/credential-offer-accept", "credential_exchange_id": credential_offer_received[ "credential_exchange_id" ], @@ -128,10 +128,10 @@ async def test_holder_credential_exchange( ) assert ( credential_offer_accept["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1/credential-request-sent" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1/credential-request-sent" ) credential_received = await wait_for_message( - msg_type="did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1/credential-received" + msg_type="https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1/credential-received" ) records = await asyncio.wait_for( get_issue_credential_records.asyncio(client=backchannel), timeout=20 @@ -153,11 +153,11 @@ async def test_credentials_get_list( ): credentials_get_list = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1/credentials-get-list" + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1/credentials-get-list" } ) assert ( credentials_get_list["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1/credentials-list" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-holder/0.1/credentials-list" ) # TODO create fixture for credential issuance to retrieve credentials from get-list protocol diff --git a/int/tests/test_schemas.py b/int/tests/test_schemas.py index a9b9c8fd..e64e18fa 100644 --- a/int/tests/test_schemas.py +++ b/int/tests/test_schemas.py @@ -9,7 +9,7 @@ async def test_send_schema(connection, endorser_did): """Send a schema and verify message type""" schema = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/send-schema", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/send-schema", "schema_name": "Test Schema", "schema_version": "1.0", "attributes": ["attr_1_0", "attr_1_1", "attr_1_2"], @@ -18,7 +18,7 @@ async def test_send_schema(connection, endorser_did): ) assert ( schema["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/schema-id" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/schema-id" ) @@ -27,7 +27,7 @@ async def test_schema_get(connection, endorser_did): """Retrieve a pre-existing schema""" schema = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/send-schema", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/send-schema", "schema_name": "Test Schema", "schema_version": "2.0", "attributes": ["attr_2_0", "attr_2_1", "attr_2_2"], @@ -37,7 +37,7 @@ async def test_schema_get(connection, endorser_did): ) schema_get = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/schema-get", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/schema-get", "schema_id": schema["schema_id"], "@id": schema["@id"], "~transport": {"return_route": "all"}, @@ -45,7 +45,7 @@ async def test_schema_get(connection, endorser_did): ) assert ( schema_get["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/schema" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/schema" ) assert schema["schema_id"] == schema_get["schema_id"] assert schema["@id"] == schema_get["~thread"]["thid"] @@ -57,7 +57,7 @@ async def test_schema_get_list(connection, endorser_did): """Retrieve the list of schemas""" schema = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/send-schema", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/send-schema", "schema_name": "Test Schema", "schema_version": "3.0", "attributes": ["attr_3_0", "attr_3_1", "attr_3_2"], @@ -67,14 +67,14 @@ async def test_schema_get_list(connection, endorser_did): ) schema_get_list = await connection.send_and_await_reply_async( { - "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/schema-get-list", + "@type": "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/schema-get-list", "@id": schema["@id"], "~transport": {"return_route": "all"}, } ) assert ( schema_get_list["@type"] - == "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-schemas/0.1/schema-list" + == "https://github.com/hyperledger/aries-toolbox/tree/master/docs/admin-schemas/0.1/schema-list" ) assert schema["@id"] == schema_get_list["~thread"]["thid"] assert schema["schema_id"] in [