tests, todo

cmd/root_test.go

@@ -163,7 +163,7 @@ func Test_CreateSystem(t *testing.T) {
 	system.VisitEngines(func(engine core.Engine) {
 		numEngines++
 	})
-	assert.Equal(t, 15, numEngines)
+	assert.Equal(t, 16, numEngines)
 }
 
 func Test_ClientCommand_ErrorHandlers(t *testing.T) {

discovery/module.go

@@ -169,10 +169,13 @@ func (m *Module) validateRegistration(definition ServiceDefinition, presentation
 		}
 	}
 	// VP must fulfill the PEX Presentation ServiceDefinition
-	// TODO: Use Validate() once PR is merged
+	// We don't have a PresentationSubmission, so we can't use Validate().
 	creds, _, err := definition.PresentationDefinition.Match(presentation.VerifiableCredential)
-	if err != nil || len(creds) != len(presentation.VerifiableCredential) {
-		return fmt.Errorf("presentation does not fulfill Presentation ServiceDefinition: %w", err)
+	if err != nil {
+		return err
+	}
+	if len(creds) != len(presentation.VerifiableCredential) {
+		return errors.New("presentation does not fulfill Presentation ServiceDefinition")
 	}
 	return nil
 }

vcr/credential/resolver.go

@@ -23,8 +23,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/nuts-foundation/go-did/did"
-	"errors"
-	"github.com/nuts-foundation/go-did/did"
 	"github.com/nuts-foundation/go-did/vc"
 	"github.com/nuts-foundation/nuts-node/vcr/signature/proof"
 )