change the DID from indy to key

Signed-off-by: georgi.michev <georgi.michev@vereign.com>

src/main/resources/REST/json/Policy.json

@@ -5,9 +5,12 @@
   "unsuccessful_evaluate": {
     "message": "wrong value!"
   },
-  "didResolve_evaluate": {
+  "didResolve_indy_evaluate": {
     "did":"did:indy:idunion:BDrEcHc8Tb4Lb2VyQZWEDE"
   },
+  "didResolve_evaluate": {
+    "did":"did:key:z6Mkfriq1MqLBoPWecGoDLjguo1sB9brj6wT3qZ5BxkKpuP6"
+  },
   "didResolve_missing_method": {
     "did":"did:idunion:BDrEcHc8Tb4Lb2VyQZWEDE"
   }

src/main/resources/REST/schemas/Policy_EvaluateDID_schema.json

@@ -40,9 +40,6 @@
                         "id": {
                           "type": "string"
                         },
-                        "publicKeyBase58": {
-                          "type": "string"
-                        },
                         "type": {
                           "type": "string"
                         }
@@ -50,7 +47,6 @@
                       "required": [
                         "controller",
                         "id",
-                        "publicKeyBase58",
                         "type"
                       ]
                     }

src/test/resources/features/tsa/policy/policy/{group}/{name}/{version}/evaluation/POST.feature

@@ -37,13 +37,13 @@ Feature: API -TSA - Policy - :group/:name/:version/evaluation POST
     And the response is valid according to the {Policy_Evaluate_schema.json} REST schema
     And the field {result.allow} has the value {true}
 
-  @bug @issue-35
+  @issue-35
   Scenario: TSA - DID resolution - Positive
     Given I load the REST request {Policy.json} with profile {didResolve_evaluate}
     And I execute the policy {/policy/example/resolve/1.0/evaluation}
     Then the status code should be {200}
     And the response is valid according to the {Policy_EvaluateDID_schema.json} REST schema
-    And the field {result.data.didDocument.id} has the value {did:indy:idunion:BDrEcHc8Tb4Lb2VyQZWEDE}
+    And the field {result.data.didDocument.id} has the value {did:key:z6Mkfriq1MqLBoPWecGoDLjguo1sB9brj6wT3qZ5BxkKpuP6}
 
   @negative
   Scenario: TSA - Evaluate policy with incorrect value - Negative
@@ -68,7 +68,7 @@ Feature: API -TSA - Policy - :group/:name/:version/evaluation POST
     And the response is valid according to the {Policy_Evaluate_negative_schema.json} REST schema
     And the field {message} has the value {error evaluating policy}
 
-  @negative @bug @issue-35
+  @negative @issue-35
   Scenario: TSA - DID resolution with incorrect did - Negative
     Then I load the REST request {Policy.json} with profile {didResolve_missing_method}
     And I execute the policy {/policy/example/resolve/1.0/evaluation}

src/test/resources/features/tsa/task/v1/task/{taskName}/GET.feature

@@ -30,7 +30,7 @@ Feature: API -TSA - Task - v1/task GET
   Background:
     Given we are testing the TSA Task Api
 
-  @bug @issue-35
+  @issue-35
   Scenario: TSA - Executing Task with DID resolver and Evaluate the Cache - Positive
     Given I load the REST request {Policy.json} with profile {didResolve_evaluate}
     And I send the current request as POST to endpoint {/v1/task/didResolve}
@@ -40,13 +40,13 @@ Feature: API -TSA - Task - v1/task GET
     Then I get the value of {taskID} from the last response and store it in the DataContainer with key {taskID}
     Then I clear the request body
     And I wait for {2000} mseconds
-    And I send the current request to endpoint {taskResult} with container value{taskID}
+    And I send the current request to endpoint {v1/taskResult} with container value{taskID}
     Then the status code should be {200}
     And the response is valid according to the {Task_ExecuteDID_schema.json} REST schema
-    And the field {result.data.didDocument.id} has the value {did:indy:idunion:BDrEcHc8Tb4Lb2VyQZWEDE}
+    And the field {result.data.didDocument.id} has the value {did:key:z6Mkfriq1MqLBoPWecGoDLjguo1sB9brj6wT3qZ5BxkKpuP6}
     # Test the Cache Service
     Then I load object with key {taskID} from DataContainer into currentRequest HEADER {x-cache-key}
-    And I send the current request as GET to endpoint {http://localhost:8083/v1/cache}
+    And I send the current request as GET to endpoint {https://gaiax.vereign.com/tsa/cache/v1/cache}
     And the status code should be {200}
     And the response is valid according to the {Task_ExecuteDID_schema.json} REST schema
-    And the field {result.data.didDocument.id} has the value {did:indy:idunion:BDrEcHc8Tb4Lb2VyQZWEDE}
\ No newline at end of file
+    And the field {result.data.didDocument.id} has the value {did:key:z6Mkfriq1MqLBoPWecGoDLjguo1sB9brj6wT3qZ5BxkKpuP6}
\ No newline at end of file

src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature

@@ -30,7 +30,7 @@ Feature: API -TSA - Task - v1/task POST
   Background:
     Given we are testing the TSA Task Api
 
-  @bug @issue-35
+  @issue-35
   Scenario: TSA - Executing Task with DID resolver - Positive
     Then I load the REST request {Policy.json} with profile {didResolve_evaluate}
     And I send the current request as POST to endpoint {/v1/task/didResolve}
@@ -39,10 +39,10 @@ Feature: API -TSA - Task - v1/task POST
     Then I get the value of {taskID} from the last response and store it in the DataContainer with key {taskID}
     Then I clear the request body
     And I wait for {2000} mseconds
-    And I send the current request to endpoint {taskResult} with container value{taskID}
+    And I send the current request to endpoint {v1/taskResult} with container value{taskID}
     Then the status code should be {200}
     And the response is valid according to the {Task_ExecuteDID_schema.json} REST schema
-    And the field {result.data.didDocument.id} has the value {did:indy:idunion:BDrEcHc8Tb4Lb2VyQZWEDE}
+    And the field {result.data.didDocument.id} has the value {did:key:z6Mkfriq1MqLBoPWecGoDLjguo1sB9brj6wT3qZ5BxkKpuP6}
 
   @negative
   Scenario: TSA - Executing Task with non existing task template - Negative