fix: remove layer of endpoint nesting

Signed-off-by: Char Howland <char@indicio.tech>

Author: cjhowland

aries_cloudagent/ledger/base.py

@@ -98,17 +98,15 @@ async def _construct_attr_json(
         if not routing_keys:
             routing_keys = []
 
-        endpoint_dict = {"endpoint": endpoint}
-
         if all_exist_endpoints:
-            all_exist_endpoints[endpoint_type.indy] = endpoint_dict
-            endpoint_dict["routingKeys"] = routing_keys
-            attr_json = json.dumps({"endpoint": all_exist_endpoints})
+            all_exist_endpoints[endpoint_type.indy] = endpoint
+            all_exist_endpoints["routingKeys"] = routing_keys
+            attr_json = json.dumps(all_exist_endpoints)
 
         else:
-            endpoint_val = {endpoint_type.indy: endpoint_dict}
+            endpoint_dict = {endpoint_type.indy: endpoint}
             endpoint_dict["routingKeys"] = routing_keys
-            attr_json = json.dumps({"endpoint": endpoint_val})
+            attr_json = json.dumps(endpoint_dict)
 
         return attr_json
 

aries_cloudagent/ledger/tests/test_indy.py

@@ -2308,18 +2308,34 @@ async def test_construct_attr_json_with_routing_keys(self, mock_close, mock_open
             attr_json = await ledger._construct_attr_json(
                 "https://url",
                 EndpointType.ENDPOINT,
-                all_exist_endpoints={"Endpoint": "https://endpoint"},
                 routing_keys=["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
             )
         assert attr_json == json.dumps(
             {
-                "endpoint": {
-                    "Endpoint": "https://endpoint",
-                    "endpoint": {
-                        "endpoint": "https://url",
-                        "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
-                    },
-                }
+                "endpoint": "https://url",
+                "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+            }
+        )
+
+    @async_mock.patch("aries_cloudagent.ledger.indy.IndySdkLedgerPool.context_open")
+    @async_mock.patch("aries_cloudagent.ledger.indy.IndySdkLedgerPool.context_close")
+    @pytest.mark.asyncio
+    async def test_construct_attr_json_with_routing_keys_all_exist_endpoints(
+        self, mock_close, mock_open
+    ):
+        ledger = IndySdkLedger(IndySdkLedgerPool("name", checked=True), self.profile)
+        async with ledger:
+            attr_json = await ledger._construct_attr_json(
+                "https://url",
+                EndpointType.ENDPOINT,
+                all_exist_endpoints={"profile": "https://endpoint/profile"},
+                routing_keys=["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+            )
+        assert attr_json == json.dumps(
+            {
+                "profile": "https://endpoint/profile",
+                "endpoint": "https://url",
+                "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
             }
         )
 

aries_cloudagent/ledger/tests/test_indy_vdr.py

@@ -612,51 +612,43 @@ async def test_update_endpoint_for_did(
         "all_exist_endpoints, routing_keys, result",
         [
             (
-                {"Endpoint": "https://endpoint"},
+                {"profile": "https://endpoint/profile"},
                 ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 {
-                    "endpoint": {
-                        "Endpoint": "https://endpoint",
-                        "endpoint": {
-                            "endpoint": "https://url",
-                            "routingKeys": [
-                                "3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"
-                            ],
-                        },
-                    }
+                    "profile": "https://endpoint/profile",
+                    "endpoint": "https://url",
+                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 },
             ),
             (
-                {"Endpoint": "https://endpoint"},
+                {"profile": "https://endpoint/profile"},
                 None,
                 {
-                    "endpoint": {
-                        "Endpoint": "https://endpoint",
-                        "endpoint": {"endpoint": "https://url", "routingKeys": []},
-                    }
+                    "profile": "https://endpoint/profile",
+                    "endpoint": "https://url",
+                    "routingKeys": [],
                 },
             ),
             (
                 None,
                 ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 {
-                    "endpoint": {
-                        "endpoint": {
-                            "endpoint": "https://url",
-                            "routingKeys": [
-                                "3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"
-                            ],
-                        }
-                    }
+                    "endpoint": "https://url",
+                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 },
             ),
+            (None, None, {"endpoint": "https://url", "routingKeys": []}),
             (
-                None,
-                None,
                 {
-                    "endpoint": {
-                        "endpoint": {"endpoint": "https://url", "routingKeys": []}
-                    }
+                    "profile": "https://endpoint/profile",
+                    "spec_divergent_endpoint": "https://endpoint",
+                },
+                ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                {
+                    "profile": "https://endpoint/profile",
+                    "spec_divergent_endpoint": "https://endpoint",
+                    "endpoint": "https://url",
+                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 },
             ),
         ],