wip

vcr/pe/presentation_submission.go

@@ -262,7 +262,7 @@ func resolveCredential(path []string, mapping InputDescriptorMappingObject, valu
 func (s PresentationSubmission) Validate(presentations []vc.VerifiablePresentation, definition PresentationDefinition) (map[string]vc.VerifiableCredential, error) {
 	actualCredentials, err := s.Resolve(presentations)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("resolve credentials from presentation submission: %w", err)
 	}
 
 	// Create a new presentation submission and resolve the credentials using our own copy of the Presentation Definition.

vcr/pe/presentation_submission_test.go

@@ -385,19 +385,6 @@ func TestPresentationSubmission_Resolve(t *testing.T) {
 	})
 }
 
-func credentialToJSONLD(credential vc.VerifiableCredential) vc.VerifiableCredential {
-	bytes, err := credential.MarshalJSON()
-	if err != nil {
-		panic(err)
-	}
-	var result vc.VerifiableCredential
-	err = json.Unmarshal(bytes, &result)
-	if err != nil {
-		panic(err)
-	}
-	return result
-}
-
 func TestPresentationSubmission_Validate(t *testing.T) {
 	vcID := ssi.MustParseURI("did:example:123#first-vc")
 	vp := vc.VerifiablePresentation{
@@ -496,7 +483,7 @@ func TestPresentationSubmission_Validate(t *testing.T) {
 					Path: "$[0]",
 					PathNested: &InputDescriptorMappingObject{
 						Id:     "1",
-						Path:   "$.verifiableCredential[0]",
+						Path:   "$.verifiableCredential",
 						Format: "ldp_vc",
 					},
 				},
@@ -505,7 +492,7 @@ func TestPresentationSubmission_Validate(t *testing.T) {
 					Path: "$[0]",
 					PathNested: &InputDescriptorMappingObject{
 						Id:     "2",
-						Path:   "$.verifiableCredential[0]",
+						Path:   "$.verifiableCredential",
 						Format: "ldp_vc",
 					},
 				},
@@ -552,6 +539,7 @@ func TestPresentationSubmission_Validate(t *testing.T) {
 		definition := PresentationDefinition{
 			SubmissionRequirements: []*SubmissionRequirement{
 				{
+					Name:  "pick",
 					Count: &count,
 					From:  "any",
 					Rule:  "pick",
@@ -594,7 +582,7 @@ func TestPresentationSubmission_Validate(t *testing.T) {
 			DescriptorMap: []InputDescriptorMappingObject{
 				{
 					Id:     "1", // actually maps to input descriptor 2, so should cause an error
-					Path:   "$.verifiableCredential[0]",
+					Path:   "$.verifiableCredential",
 					Format: "ldp_vc",
 				},
 			},