fix: endpoint attrib json object with one top level key "endpoint"

Signed-off-by: Char Howland <[email protected]>
openwallet-foundation · Sep 9, 2022 · 981cc6d · 981cc6d
1 parent 13110bf
commit 981cc6d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/aries_cloudagent/ledger/base.py b/aries_cloudagent/ledger/base.py
@@ -101,12 +101,12 @@ async def _construct_attr_json(
         if all_exist_endpoints:
             all_exist_endpoints[endpoint_type.indy] = endpoint
             all_exist_endpoints["routingKeys"] = routing_keys
-            attr_json = json.dumps(all_exist_endpoints)
+            attr_json = json.dumps({"endpoint": all_exist_endpoints})
 
         else:
             endpoint_dict = {endpoint_type.indy: endpoint}
             endpoint_dict["routingKeys"] = routing_keys
-            attr_json = json.dumps(endpoint_dict)
+            attr_json = json.dumps({"endpoint": endpoint_dict})
 
         return attr_json
 

diff --git a/aries_cloudagent/ledger/tests/test_indy.py b/aries_cloudagent/ledger/tests/test_indy.py
@@ -2312,8 +2312,10 @@ async def test_construct_attr_json_with_routing_keys(self, mock_close, mock_open
             )
         assert attr_json == json.dumps(
             {
-                "endpoint": "https://url",
-                "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                "endpoint": {
+                    "endpoint": "https://url",
+                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                }
             }
         )
 
@@ -2333,9 +2335,11 @@ async def test_construct_attr_json_with_routing_keys_all_exist_endpoints(
             )
         assert attr_json == json.dumps(
             {
-                "profile": "https://endpoint/profile",
-                "endpoint": "https://url",
-                "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                "endpoint": {
+                    "profile": "https://endpoint/profile",
+                    "endpoint": "https://url",
+                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                }
             }
         )
 

diff --git a/aries_cloudagent/ledger/tests/test_indy_vdr.py b/aries_cloudagent/ledger/tests/test_indy_vdr.py
@@ -615,40 +615,48 @@ async def test_update_endpoint_for_did(
                 {"profile": "https://endpoint/profile"},
                 ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 {
-                    "profile": "https://endpoint/profile",
-                    "endpoint": "https://url",
-                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                    "endpoint": {
+                        "profile": "https://endpoint/profile",
+                        "endpoint": "https://url",
+                        "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                    }
                 },
             ),
             (
                 {"profile": "https://endpoint/profile"},
                 None,
                 {
-                    "profile": "https://endpoint/profile",
-                    "endpoint": "https://url",
-                    "routingKeys": [],
+                    "endpoint": {
+                        "profile": "https://endpoint/profile",
+                        "endpoint": "https://url",
+                        "routingKeys": [],
+                    }
                 },
             ),
             (
                 None,
                 ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
                 {
-                    "endpoint": "https://url",
-                    "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                    "endpoint": {
+                        "endpoint": "https://url",
+                        "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                    }
                 },
             ),
-            (None, None, {"endpoint": "https://url", "routingKeys": []}),
+            (None, None, {"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"],
+                    "endpoint": {
+                        "profile": "https://endpoint/profile",
+                        "spec_divergent_endpoint": "https://endpoint",
+                        "endpoint": "https://url",
+                        "routingKeys": ["3YJCx3TqotDWFGv7JMR5erEvrmgu5y4FDqjR7sKWxgXn"],
+                    }
                 },
             ),
         ],