Remove dwn publish manifest code (#166)

* Remove dwn publish manifest code as we will have this functionality in the generic webhooks code * fixing lint error * fixing linter Co-authored-by: Gabe <[email protected]>
TBD54566975 · Nov 7, 2022 · 9caf431 · 9caf431
1 parent 0a78fce
commit 9caf431
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 511 deletions.
diff --git 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"
+name = "manifest"
diff --git 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
@@ -37,8 +37,4 @@ name = "schema"
 name = "credential"
 
 [services.manifest]
-name = "manifest"
-
-[services.dwn]
-name = "dwn"
-dwn_endpoint = "http://localhost:4321"
+name = "manifest"
diff --git a/pkg/dwn/dwn.go b/pkg/dwn/dwn.go
diff --git a/pkg/dwn/dwn_test.go b/pkg/dwn/dwn_test.go
diff --git a/pkg/server/router/dwn.go b/pkg/server/router/dwn.go
diff --git a/pkg/server/router/dwn_test.go b/pkg/server/router/dwn_test.go
diff --git 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"
@@ -48,12 +47,11 @@ func TestManifestRouter(t *testing.T) {
 		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)
 		assert.NoError(tt, err)
 		assert.NotEmpty(tt, manifestService)
 

diff --git 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
-}