From 6f4dae49e47d6acf65980bb1f86c19d3f1fbb754 Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 7 Nov 2022 15:29:53 -0600 Subject: [PATCH 1/3] Remove dwn publish manifest code as we will have this functionality in the generic webhooks code --- config/compose.toml | 6 +- config/config.go | 17 ------ config/config.toml | 6 +- pkg/dwn/dwn.go | 56 ----------------- pkg/dwn/dwn_test.go | 59 ------------------ pkg/server/router/dwn.go | 98 ------------------------------ pkg/server/router/dwn_test.go | 55 ----------------- pkg/server/server.go | 15 ----- pkg/server/server_dwn_test.go | 85 -------------------------- pkg/server/server_test.go | 17 +----- pkg/service/dwn/model.go | 11 ---- pkg/service/dwn/service.go | 75 ----------------------- pkg/service/framework/framework.go | 1 - pkg/service/service.go | 11 +--- 14 files changed, 4 insertions(+), 508 deletions(-) delete mode 100644 pkg/dwn/dwn.go delete mode 100644 pkg/dwn/dwn_test.go delete mode 100644 pkg/server/router/dwn.go delete mode 100644 pkg/server/router/dwn_test.go delete mode 100644 pkg/server/server_dwn_test.go delete mode 100644 pkg/service/dwn/model.go delete mode 100644 pkg/service/dwn/service.go diff --git a/config/compose.toml b/config/compose.toml index fd2901dde..a1be04d8f 100644 --- a/config/compose.toml +++ b/config/compose.toml @@ -39,8 +39,4 @@ name = "schema" name = "credential" [services.manifest] -name = "manifest" - -[services.dwn] -name = "dwn" -dwn_endpoint = "http://localhost:4321" \ No newline at end of file +name = "manifest" \ No newline at end of file diff --git a/config/config.go b/config/config.go index 2e2f8dbaa..5d092750a 100644 --- a/config/config.go +++ b/config/config.go @@ -53,7 +53,6 @@ type ServicesConfig struct { SchemaConfig SchemaServiceConfig `toml:"schema,omitempty"` CredentialConfig CredentialServiceConfig `toml:"credential,omitempty"` ManifestConfig ManifestServiceConfig `toml:"manifest,omitempty"` - DWNConfig DWNServiceConfig `toml:"dwn,omitempty"` } // BaseServiceConfig represents configurable properties for a specific component of the SSI Service @@ -123,18 +122,6 @@ func (m *ManifestServiceConfig) IsEmpty() bool { return reflect.DeepEqual(m, &ManifestServiceConfig{}) } -type DWNServiceConfig struct { - *BaseServiceConfig - DWNEndpoint string `toml:"dwn_endpoint"` -} - -func (d *DWNServiceConfig) IsEmpty() bool { - if d == nil { - return true - } - return reflect.DeepEqual(d, &DWNServiceConfig{}) -} - // LoadConfig attempts to load a TOML config file from the given path, and coerce it into our object model. // Before loading, defaults are applied on certain properties, which are overwritten if specified in the TOML file. func LoadConfig(path string) (*SSIServiceConfig, error) { @@ -196,10 +183,6 @@ func LoadConfig(path string) (*SSIServiceConfig, error) { ManifestConfig: ManifestServiceConfig{ BaseServiceConfig: &BaseServiceConfig{Name: "manifest"}, }, - DWNConfig: DWNServiceConfig{ - BaseServiceConfig: &BaseServiceConfig{Name: "dwn"}, - DWNEndpoint: "http://localhost:4321", - }, } } else { // load from TOML file diff --git a/config/config.toml b/config/config.toml index f89ab566f..d1d777d13 100644 --- a/config/config.toml +++ b/config/config.toml @@ -37,8 +37,4 @@ name = "schema" name = "credential" [services.manifest] -name = "manifest" - -[services.dwn] -name = "dwn" -dwn_endpoint = "http://localhost:4321" \ No newline at end of file +name = "manifest" \ No newline at end of file diff --git a/pkg/dwn/dwn.go b/pkg/dwn/dwn.go deleted file mode 100644 index 145a7a36b..000000000 --- a/pkg/dwn/dwn.go +++ /dev/null @@ -1,56 +0,0 @@ -package dwn - -import ( - "bytes" - "github.com/TBD54566975/ssi-sdk/credential/manifest" - "github.com/goccy/go-json" - "github.com/tbd54566975/ssi-service/internal/util" - "io" - "net/http" -) - -type PublishManifestRequest struct { - Manifest manifest.CredentialManifest `json:"manifest" validate:"required"` -} - -type PublishManifestResponse struct { - Status int `json:"status" validate:"required"` - Response string `json:"response" validate:"required"` -} - -// PublishManifest publishes a CredentialManifest to a DWN -func PublishManifest(endpoint string, manifest manifest.CredentialManifest) (*PublishManifestResponse, error) { - - dwnReq := PublishManifestRequest{Manifest: manifest} - postResp, err := Post(endpoint, dwnReq) - - if err != nil { - return nil, util.LoggingErrorMsg(err, "problem with posting to dwn") - } - - defer postResp.Body.Close() - - b, _ := io.ReadAll(postResp.Body) - body := string(b) - - return &PublishManifestResponse{Status: postResp.StatusCode, Response: body}, nil - -} - -// Post does a post request with data to provided endpoint -func Post(endpoint string, data interface{}) (*http.Response, error) { - // convert response payload to json - jsonData, err := json.Marshal(data) - if err != nil { - return nil, err - } - - // #nosec: we are assuming the endpoint is safe. We might want to revisit. - resp, err := http.Post(endpoint, "application/json", bytes.NewBuffer(jsonData)) - - if err != nil { - return nil, err - } - - return resp, nil -} diff --git a/pkg/dwn/dwn_test.go b/pkg/dwn/dwn_test.go deleted file mode 100644 index c5060edd9..000000000 --- a/pkg/dwn/dwn_test.go +++ /dev/null @@ -1,59 +0,0 @@ -package dwn - -import ( - "testing" - - "github.com/TBD54566975/ssi-sdk/credential/exchange" - manifestsdk "github.com/TBD54566975/ssi-sdk/credential/manifest" - "github.com/stretchr/testify/assert" -) - -func TestPublishManifest(t *testing.T) { - t.Run("Test Publish Manifest", func(tt *testing.T) { - - resp, err := PublishManifest("test-endpoint", getValidManifest()) - assert.Nil(tt, resp) - assert.Error(tt, err) - assert.ErrorContains(tt, err, "problem with posting to dwn") - }) -} - -func getValidManifest() manifestsdk.CredentialManifest { - - return manifestsdk.CredentialManifest{ - ID: "WA-DL-CLASS-A", - SpecVersion: manifestsdk.SpecVersion, - Issuer: manifestsdk.Issuer{ - ID: "did:abc:123", - }, - PresentationDefinition: &exchange.PresentationDefinition{ - ID: "pres-def-id", - InputDescriptors: []exchange.InputDescriptor{ - { - ID: "test-id", - Constraints: &exchange.Constraints{ - Fields: []exchange.Field{ - { - Path: []string{".verifiableCredential.id"}, - }, - }, - }, - }, - }, - }, - OutputDescriptors: []manifestsdk.OutputDescriptor{ - { - ID: "id1", - Schema: "https://test.com/schema", - Name: "good ID", - Description: "it's all good", - }, - { - ID: "id2", - Schema: "https://test.com/schema", - Name: "good ID", - Description: "it's all good", - }, - }, - } -} diff --git a/pkg/server/router/dwn.go b/pkg/server/router/dwn.go deleted file mode 100644 index 38013747c..000000000 --- a/pkg/server/router/dwn.go +++ /dev/null @@ -1,98 +0,0 @@ -package router - -import ( - "context" - "fmt" - "net/http" - - "github.com/TBD54566975/ssi-sdk/credential/manifest" - - "github.com/tbd54566975/ssi-service/pkg/service/dwn" - - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - - dwnpkg "github.com/tbd54566975/ssi-service/pkg/dwn" - "github.com/tbd54566975/ssi-service/pkg/server/framework" - svcframework "github.com/tbd54566975/ssi-service/pkg/service/framework" -) - -type DWNRouter struct { - service *dwn.Service -} - -func NewDWNRouter(s svcframework.Service) (*DWNRouter, error) { - if s == nil { - return nil, errors.New("service cannot be nil") - } - dwnService, ok := s.(*dwn.Service) - if !ok { - return nil, fmt.Errorf("could not create dwn router with service type: %s", s.Type()) - } - - return &DWNRouter{ - service: dwnService, - }, nil -} - -type PublishManifestRequest struct { - ManifestID string `json:"manifestId" validate:"required"` -} - -func (req PublishManifestRequest) ToServiceRequest() dwn.PublishManifestRequest { - return dwn.PublishManifestRequest{ - ManifestID: req.ManifestID, - } -} - -type PublishManifestResponse struct { - Manifest manifest.CredentialManifest `json:"manifest" validate:"required"` - DWNResponse dwnpkg.PublishManifestResponse `json:"dwnResponse" validate:"required"` -} - -// PublishManifest godoc -// @Summary Publish Manifest to DWN -// @Description Publish Manifest to DWN -// @Tags DWNAPI -// @Accept json -// @Produce json -// @Param request body PublishManifestRequest true "request body" -// @Success 201 {object} PublishManifestResponse -// @Failure 400 {string} string "Bad request" -// @Failure 500 {string} string "Internal server error" -// @Router /v1/dwn/manifest [put] -func (dwnr DWNRouter) PublishManifest(ctx context.Context, w http.ResponseWriter, r *http.Request) error { - - if dwnr.service.Config().DWNEndpoint == "" { - errMsg := "could not publish manifest to dwn because dwn endpoint is not configured" - logrus.Error(errMsg) - return framework.NewRequestError(errors.New(errMsg), http.StatusInternalServerError) - } - - var request PublishManifestRequest - if err := framework.Decode(r, &request); err != nil { - errMsg := "invalid publish manifest message request" - logrus.WithError(err).Error(errMsg) - return framework.NewRequestError(errors.Wrap(err, errMsg), http.StatusBadRequest) - } - - req := request.ToServiceRequest() - publishManifestResponse, err := dwnr.service.GetManifest(req) - - if err != nil || publishManifestResponse.Manifest.IsEmpty() { - errMsg := "could not retrieve manifest" - logrus.WithError(err).Error(errMsg) - return framework.NewRequestError(errors.Wrap(err, errMsg), http.StatusInternalServerError) - } - - dwnResp, err := dwnpkg.PublishManifest(dwnr.service.Config().DWNEndpoint, publishManifestResponse.Manifest) - - if err != nil { - errMsg := "could not publish manifest to DWN" - logrus.WithError(err).Error(errMsg) - return framework.NewRequestError(errors.Wrap(err, errMsg), http.StatusInternalServerError) - } - - resp := PublishManifestResponse{Manifest: publishManifestResponse.Manifest, DWNResponse: *dwnResp} - return framework.Respond(ctx, w, resp, http.StatusAccepted) -} diff --git a/pkg/server/router/dwn_test.go b/pkg/server/router/dwn_test.go deleted file mode 100644 index 6545897e6..000000000 --- a/pkg/server/router/dwn_test.go +++ /dev/null @@ -1,55 +0,0 @@ -package router - -import ( - "os" - "testing" - - "github.com/stretchr/testify/assert" - - "github.com/tbd54566975/ssi-service/config" - "github.com/tbd54566975/ssi-service/pkg/service/dwn" - "github.com/tbd54566975/ssi-service/pkg/service/framework" - "github.com/tbd54566975/ssi-service/pkg/storage" -) - -func TestDWNRouter(t *testing.T) { - // remove the db file after the test - t.Cleanup(func() { - _ = os.Remove(storage.DBFile) - }) - - t.Run("Nil Service", func(tt *testing.T) { - dwnRouter, err := NewDWNRouter(nil) - assert.Error(tt, err) - assert.Empty(tt, dwnRouter) - assert.Contains(tt, err.Error(), "service cannot be nil") - }) - - t.Run("Bad Service", func(tt *testing.T) { - dwnRouter, err := NewDWNRouter(&testService{}) - assert.Error(tt, err) - assert.Empty(tt, dwnRouter) - assert.Contains(tt, err.Error(), "could not create dwn router with service type: test") - }) - - t.Run("DWN Service Test", func(tt *testing.T) { - bolt, err := storage.NewBoltDB() - assert.NoError(tt, err) - assert.NotEmpty(tt, bolt) - - serviceConfig := config.DWNServiceConfig{BaseServiceConfig: &config.BaseServiceConfig{Name: "dwn"}} - keyStore := testKeyStoreService(t, bolt) - didService := testDIDService(t, bolt, keyStore) - schemaService := testSchemaService(t, bolt, keyStore, didService) - credentialService := testCredentialService(t, bolt, keyStore, didService, schemaService) - manifestService := testManifestService(t, bolt, keyStore, didService, credentialService) - dwnService, err := dwn.NewDWNService(serviceConfig, bolt, keyStore, manifestService) - assert.NoError(tt, err) - assert.NotEmpty(tt, dwnService) - - // check type and status - assert.Equal(tt, framework.DWN, dwnService.Type()) - assert.Equal(tt, framework.StatusReady, dwnService.Status().Status) - }) - -} diff --git a/pkg/server/server.go b/pkg/server/server.go index 222d0a3ab..b10ad5c3b 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -30,7 +30,6 @@ const ( ApplicationsPrefix = "/applications" ResponsesPrefix = "/responses" KeyStorePrefix = "/keys" - DWNPrefix = "/dwn" VerificationPath = "/verification" ) @@ -98,8 +97,6 @@ func (s *SSIServer) instantiateRouter(service svcframework.Service) error { return s.KeyStoreAPI(service) case svcframework.Manifest: return s.ManifestAPI(service) - case svcframework.DWN: - return s.DWNAPI(service) default: return fmt.Errorf("could not instantiate API for service: %s", serviceType) } @@ -193,15 +190,3 @@ func (s *SSIServer) ManifestAPI(service svcframework.Service) (err error) { s.Handle(http.MethodDelete, path.Join(responsesHandlerPath, "/:id"), manifestRouter.DeleteResponse) return } - -func (s *SSIServer) DWNAPI(service svcframework.Service) (err error) { - dwnRouter, err := router.NewDWNRouter(service) - if err != nil { - return util.LoggingErrorMsg(err, "could not create dwn router") - } - - dwnPath := V1Prefix + DWNPrefix + ManifestsPrefix - - s.Handle(http.MethodPut, dwnPath, dwnRouter.PublishManifest) - return -} diff --git a/pkg/server/server_dwn_test.go b/pkg/server/server_dwn_test.go deleted file mode 100644 index 52e4b6069..000000000 --- a/pkg/server/server_dwn_test.go +++ /dev/null @@ -1,85 +0,0 @@ -package server - -import ( - "net/http" - "net/http/httptest" - "os" - "testing" - - "github.com/TBD54566975/ssi-sdk/crypto" - didsdk "github.com/TBD54566975/ssi-sdk/did" - "github.com/goccy/go-json" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/tbd54566975/ssi-service/pkg/server/router" - "github.com/tbd54566975/ssi-service/pkg/service/did" - "github.com/tbd54566975/ssi-service/pkg/service/schema" - "github.com/tbd54566975/ssi-service/pkg/storage" -) - -func TestDWNAPI(t *testing.T) { - t.Run("Test DWN Publish Manifest", func(tt *testing.T) { - bolt, err := storage.NewBoltDB() - require.NoError(tt, err) - - // remove the db file after the test - tt.Cleanup(func() { - _ = bolt.Close() - _ = os.Remove(storage.DBFile) - }) - - keyStoreService := testKeyStoreService(tt, bolt) - didService := testDIDService(tt, bolt, keyStoreService) - schemaService := testSchemaService(tt, bolt, keyStoreService, didService) - credentialService := testCredentialService(tt, bolt, keyStoreService, didService, schemaService) - manifestRouter, manifestService := testManifest(tt, bolt, keyStoreService, didService, credentialService) - dwnService := testDWNRouter(tt, bolt, keyStoreService, manifestService) - - w := httptest.NewRecorder() - - // create an issuer - issuerDID, err := didService.CreateDIDByMethod(did.CreateDIDRequest{ - Method: didsdk.KeyMethod, - KeyType: crypto.Ed25519, - }) - assert.NoError(tt, err) - assert.NotEmpty(tt, issuerDID) - - // create a schema for the creds to be issued against - licenseSchema := map[string]interface{}{ - "type": "object", - "properties": map[string]interface{}{ - "licenseType": map[string]interface{}{ - "type": "string", - }, - }, - "additionalProperties": true, - } - createdSchema, err := schemaService.CreateSchema(schema.CreateSchemaRequest{Author: issuerDID.DID.ID, Name: "license schema", Schema: licenseSchema, Sign: true}) - assert.NoError(tt, err) - assert.NotEmpty(tt, createdSchema) - - // good request - createManifestRequest := getValidManifestRequest(issuerDID.DID.ID, createdSchema.ID) - - requestValue := newRequestValue(tt, createManifestRequest) - req := httptest.NewRequest(http.MethodPut, "https://ssi-service.com/v1/manifests", requestValue) - err = manifestRouter.CreateManifest(newRequestContext(), w, req) - assert.NoError(tt, err) - - var resp router.CreateManifestResponse - err = json.NewDecoder(w.Body).Decode(&resp) - assert.NoError(tt, err) - - w = httptest.NewRecorder() - - dwnRequest := router.PublishManifestRequest{ManifestID: resp.Manifest.ID} - dwnRequestValue := newRequestValue(tt, dwnRequest) - dwnReq := httptest.NewRequest(http.MethodPut, "https://ssi-service.com/v1/dwn/manifests", dwnRequestValue) - err = dwnService.PublishManifest(newRequestContext(), w, dwnReq) - - assert.Error(tt, err) - assert.ErrorContains(tt, err, "unsupported protocol scheme") - }) -} diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index cf6fe0859..0aa39486a 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -12,9 +12,6 @@ import ( "github.com/TBD54566975/ssi-sdk/credential/exchange" - credmodel "github.com/tbd54566975/ssi-service/internal/credential" - "github.com/tbd54566975/ssi-service/pkg/service/dwn" - manifestsdk "github.com/TBD54566975/ssi-sdk/credential/manifest" "github.com/TBD54566975/ssi-sdk/crypto" "github.com/dimfeld/httptreemux/v5" @@ -22,6 +19,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + credmodel "github.com/tbd54566975/ssi-service/internal/credential" "github.com/tbd54566975/ssi-service/config" "github.com/tbd54566975/ssi-service/pkg/server/framework" @@ -286,16 +284,3 @@ func testManifest(t *testing.T, db *storage.BoltDB, keyStore *keystore.Service, return manifestRouter, manifestService } - -func testDWNRouter(t *testing.T, bolt *storage.BoltDB, keyStore *keystore.Service, manifest *manifest.Service) *router.DWNRouter { - dwnService, err := dwn.NewDWNService(config.DWNServiceConfig{BaseServiceConfig: &config.BaseServiceConfig{Name: "test-dwn"}, DWNEndpoint: "test-endpoint"}, bolt, keyStore, manifest) - require.NoError(t, err) - require.NotEmpty(t, dwnService) - - // create router for service - dwnRouter, err := router.NewDWNRouter(dwnService) - require.NoError(t, err) - require.NotEmpty(t, dwnRouter) - - return dwnRouter -} diff --git a/pkg/service/dwn/model.go b/pkg/service/dwn/model.go deleted file mode 100644 index 946d93be3..000000000 --- a/pkg/service/dwn/model.go +++ /dev/null @@ -1,11 +0,0 @@ -package dwn - -import manifestsdk "github.com/TBD54566975/ssi-sdk/credential/manifest" - -type PublishManifestRequest struct { - ManifestID string `json:"manifestId" validate:"required"` -} - -type PublishManifestResponse struct { - Manifest manifestsdk.CredentialManifest `json:"manifest"` -} diff --git a/pkg/service/dwn/service.go b/pkg/service/dwn/service.go deleted file mode 100644 index 6fb91ea36..000000000 --- a/pkg/service/dwn/service.go +++ /dev/null @@ -1,75 +0,0 @@ -package dwn - -import ( - "fmt" - - sdkutil "github.com/TBD54566975/ssi-sdk/util" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - - "github.com/tbd54566975/ssi-service/config" - "github.com/tbd54566975/ssi-service/internal/util" - "github.com/tbd54566975/ssi-service/pkg/service/framework" - "github.com/tbd54566975/ssi-service/pkg/service/keystore" - "github.com/tbd54566975/ssi-service/pkg/service/manifest" - "github.com/tbd54566975/ssi-service/pkg/storage" -) - -type Service struct { - config config.DWNServiceConfig - - // external dependencies - keyStore *keystore.Service - manifest *manifest.Service -} - -func (s Service) Type() framework.Type { - return framework.DWN -} - -func (s Service) Status() framework.Status { - ae := sdkutil.NewAppendError() - if s.keyStore == nil { - ae.AppendString("no key store service configured") - } - if s.manifest == nil { - ae.AppendString("no manifest service configured") - } - if !ae.IsEmpty() { - return framework.Status{ - Status: framework.StatusNotReady, - Message: fmt.Sprintf("dwn service is not ready: %s", ae.Error().Error()), - } - } - return framework.Status{Status: framework.StatusReady} -} - -func (s Service) Config() config.DWNServiceConfig { - return s.config -} - -func NewDWNService(config config.DWNServiceConfig, s storage.ServiceStorage, keyStore *keystore.Service, manifest *manifest.Service) (*Service, error) { - service := Service{ - config: config, - keyStore: keyStore, - manifest: manifest, - } - if !service.Status().IsReady() { - return nil, errors.New(service.Status().Message) - } - return &service, nil -} - -func (s Service) GetManifest(request PublishManifestRequest) (*PublishManifestResponse, error) { - - logrus.Debugf("getting manifest: %s", request.ManifestID) - - gotManifest, err := s.manifest.GetManifest(manifest.GetManifestRequest{ID: request.ManifestID}) - if err != nil { - errMsg := fmt.Sprintf("could not get manifest: %s", request.ManifestID) - return nil, util.LoggingErrorMsg(err, errMsg) - } - - response := PublishManifestResponse{Manifest: gotManifest.Manifest} - return &response, nil -} diff --git a/pkg/service/framework/framework.go b/pkg/service/framework/framework.go index c0df108b7..dec17f273 100644 --- a/pkg/service/framework/framework.go +++ b/pkg/service/framework/framework.go @@ -13,7 +13,6 @@ const ( Credential Type = "credential" KeyStore Type = "keystore" Manifest Type = "manifest" - DWN Type = "DWN" StatusReady StatusState = "ready" StatusNotReady StatusState = "not_ready" diff --git a/pkg/service/service.go b/pkg/service/service.go index 8af79a0eb..29b27f89c 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -7,7 +7,6 @@ import ( "github.com/tbd54566975/ssi-service/internal/util" "github.com/tbd54566975/ssi-service/pkg/service/credential" "github.com/tbd54566975/ssi-service/pkg/service/did" - "github.com/tbd54566975/ssi-service/pkg/service/dwn" "github.com/tbd54566975/ssi-service/pkg/service/framework" "github.com/tbd54566975/ssi-service/pkg/service/keystore" "github.com/tbd54566975/ssi-service/pkg/service/manifest" @@ -52,9 +51,6 @@ func validateServiceConfig(config config.ServicesConfig) error { if config.ManifestConfig.IsEmpty() { return fmt.Errorf("%s no config provided", framework.Manifest) } - if config.DWNConfig.IsEmpty() { - return fmt.Errorf("%s no config provided", framework.DWN) - } return nil } @@ -96,10 +92,5 @@ func instantiateServices(config config.ServicesConfig) ([]framework.Service, err return nil, util.LoggingErrorMsg(err, "could not instantiate the manifest service") } - dwnService, err := dwn.NewDWNService(config.DWNConfig, storageProvider, keyStoreService, manifestService) - if err != nil { - return nil, util.LoggingErrorMsg(err, "could not instantiate the dwn service") - } - - return []framework.Service{keyStoreService, didService, schemaService, credentialService, manifestService, dwnService}, nil + return []framework.Service{keyStoreService, didService, schemaService, credentialService, manifestService}, nil } From 669e838de52747272e05c13ab292e32f9fafb141 Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 7 Nov 2022 15:41:18 -0600 Subject: [PATCH 2/3] fixing lint error --- pkg/server/router/manifest_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/server/router/manifest_test.go b/pkg/server/router/manifest_test.go index dcba706cd..f5fcfd31e 100644 --- a/pkg/server/router/manifest_test.go +++ b/pkg/server/router/manifest_test.go @@ -12,7 +12,6 @@ import ( "github.com/mr-tron/base58" "github.com/stretchr/testify/assert" - "github.com/tbd54566975/ssi-service/config" credmodel "github.com/tbd54566975/ssi-service/internal/credential" "github.com/tbd54566975/ssi-service/internal/keyaccess" "github.com/tbd54566975/ssi-service/pkg/service/credential" @@ -47,13 +46,13 @@ func TestManifestRouter(t *testing.T) { bolt, err := storage.NewBoltDB() assert.NoError(tt, err) assert.NotEmpty(tt, bolt) - - serviceConfig := config.ManifestServiceConfig{BaseServiceConfig: &config.BaseServiceConfig{Name: "manifest"}} + keyStoreService := testKeyStoreService(tt, bolt) didService := testDIDService(tt, bolt, keyStoreService) schemaService := testSchemaService(tt, bolt, keyStoreService, didService) credentialService := testCredentialService(tt, bolt, keyStoreService, didService, schemaService) - manifestService, err := manifest.NewManifestService(serviceConfig, bolt, keyStoreService, didService.GetResolver(), credentialService) + manifestService := testManifestService(tt, bolt, keyStoreService, didService, credentialService) + //manifestService, err := manifest.NewManifestService(serviceConfig, bolt, keyStoreService, didService.GetResolver(), credentialService) assert.NoError(tt, err) assert.NotEmpty(tt, manifestService) From eae7bf6dfa04e397dccaba6d919cd7f741fa13c7 Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 7 Nov 2022 15:59:04 -0600 Subject: [PATCH 3/3] fixing linter --- pkg/server/router/manifest_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/server/router/manifest_test.go b/pkg/server/router/manifest_test.go index f5fcfd31e..b3cb5eb3b 100644 --- a/pkg/server/router/manifest_test.go +++ b/pkg/server/router/manifest_test.go @@ -46,13 +46,12 @@ func TestManifestRouter(t *testing.T) { bolt, err := storage.NewBoltDB() assert.NoError(tt, err) assert.NotEmpty(tt, bolt) - + keyStoreService := testKeyStoreService(tt, bolt) didService := testDIDService(tt, bolt, keyStoreService) schemaService := testSchemaService(tt, bolt, keyStoreService, didService) credentialService := testCredentialService(tt, bolt, keyStoreService, didService, schemaService) manifestService := testManifestService(tt, bolt, keyStoreService, didService, credentialService) - //manifestService, err := manifest.NewManifestService(serviceConfig, bolt, keyStoreService, didService.GetResolver(), credentialService) assert.NoError(tt, err) assert.NotEmpty(tt, manifestService)