fix

api/ssi_types_test.go

@@ -20,7 +20,6 @@ package ssiTypes
 
 import (
 	"encoding/json"
-	vdrTypes "github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
@@ -32,6 +31,7 @@ import (
 	"github.com/nuts-foundation/go-did/vc"
 	"github.com/nuts-foundation/nuts-node/crypto/hash"
 	vcr "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2"
+	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 )
 
 const (
@@ -183,8 +183,8 @@ func createDidDocument() did.Document {
 	}
 }
 
-func createDidDocumentMetadata() vdrTypes.DocumentMetadata {
-	return vdrTypes.DocumentMetadata{
+func createDidDocumentMetadata() resolver.DocumentMetadata {
+	return resolver.DocumentMetadata{
 		Created:     time.Now(),
 		Hash:        hash.RandomHash(),
 		Deactivated: true,

auth/api/iam/api.go

@@ -30,7 +30,7 @@ import (
 	"github.com/nuts-foundation/nuts-node/core"
 	"github.com/nuts-foundation/nuts-node/vcr"
 	"github.com/nuts-foundation/nuts-node/vcr/openid4vci"
-	vdr2 "github.com/nuts-foundation/nuts-node/vdr"
+	"github.com/nuts-foundation/nuts-node/vdr"
 	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"html/template"
 	"net/http"
@@ -49,13 +49,13 @@ var assets embed.FS
 // Wrapper handles OAuth2 flows.
 type Wrapper struct {
 	vcr       vcr.VCR
-	vdr       vdr2.VDR
+	vdr       vdr.VDR
 	auth      auth.AuthenticationServices
 	sessions  *SessionManager
 	templates *template.Template
 }
 
-func New(authInstance auth.AuthenticationServices, vcrInstance vcr.VCR, vdrInstance vdr2.VDR) *Wrapper {
+func New(authInstance auth.AuthenticationServices, vcrInstance vcr.VCR, vdrInstance vdr.VDR) *Wrapper {
 	templates := template.New("oauth2 templates")
 	_, err := templates.ParseFS(assets, "assets/*.html")
 	if err != nil {

auth/api/iam/api_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/nuts-foundation/nuts-node/audit"
 	"github.com/nuts-foundation/nuts-node/auth"
 	"github.com/nuts-foundation/nuts-node/core"
-	vdr2 "github.com/nuts-foundation/nuts-node/vdr"
+	"github.com/nuts-foundation/nuts-node/vdr"
 	"github.com/nuts-foundation/nuts-node/vdr/resolver"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -168,7 +168,7 @@ func statusCodeFrom(err error) int {
 type testCtx struct {
 	client        *Wrapper
 	authnServices *auth.MockAuthenticationServices
-	vdr           *vdr2.MockVDR
+	vdr           *vdr.MockVDR
 	resolver      *resolver.MockDIDResolver
 }
 
@@ -179,7 +179,7 @@ func newTestClient(t testing.TB) *testCtx {
 	authnServices := auth.NewMockAuthenticationServices(ctrl)
 	authnServices.EXPECT().PublicURL().Return(publicURL).AnyTimes()
 	resolver := resolver.NewMockDIDResolver(ctrl)
-	vdr := vdr2.NewMockVDR(ctrl)
+	vdr := vdr.NewMockVDR(ctrl)
 	vdr.EXPECT().Resolver().Return(resolver).AnyTimes()
 	return &testCtx{
 		authnServices: authnServices,