Merge pull request #864 from mesg-foundation/ss/marketplace-remove-ha…

…sh-manifest Marketplace remove hash from manifest
mesg-foundation · Apr 19, 2019 · e2bd6cd · e2bd6cd
2 parents 13b856f + 17d62bb
commit e2bd6cd
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/commands/marketplace_publish.go b/commands/marketplace_publish.go
@@ -93,7 +93,6 @@ func (c *marketplacePublishCmd) runE(cmd *cobra.Command, args []string) error {
 	pretty.Progress("Publishing service on the marketplace...", func() {
 		if tx, err = c.e.PreparePublishServiceVersion(provider.MarketplaceManifestServiceData{
 			Definition:  c.service.Definition,
-			Hash:        c.service.Definition.Hash,
 			HashVersion: marketplaceServiceHashVersion,
 			Readme:      readme,
 			Deployment:  deployment,

diff --git a/commands/provider/marketplace_types.go b/commands/provider/marketplace_types.go
@@ -57,7 +57,6 @@ type MarketplaceDeployedSource struct {
 type MarketplaceManifestServiceData struct {
 	Definition  *definition.Service       `json:"definition"`
 	Readme      string                    `json:"readme,omitempty"`
-	Hash        string                    `json:"hash"`
 	HashVersion string                    `json:"hashVersion"`
 	Deployment  MarketplaceDeployedSource `json:"deployment"`
 }

diff --git a/systemservices/marketplace/mesg.yml b/systemservices/marketplace/mesg.yml
@@ -45,8 +45,6 @@ tasks:
                       service: &manifestServiceData	
                         type: Object
                         object:
-                          hash:
-                            type: String
                           hashVersion:
                             type: String
                           deployment:

diff --git a/systemservices/marketplace/src/types/manifest.ts b/systemservices/marketplace/src/types/manifest.ts
@@ -1,13 +1,12 @@
 export interface Manifest {
   version: '1'
   service: {
-    hash: string
     hashVersion: '1'
     deployment: {
       type: 'ipfs'|'http'|'https'
       source: string
     }
-    definition: any,
+    definition: any, // TODO: add ts definition or json schema validation
     readme?: string
   }
 }
diff --git a/systemservices/marketplace/src/types/schema/manifest.json b/systemservices/marketplace/src/types/schema/manifest.json
@@ -25,9 +25,6 @@
                     ],
                     "type": "object"
                 },
-                "hash": {
-                    "type": "string"
-                },
                 "hashVersion": {
                     "enum": [
                         "1"
@@ -41,7 +38,6 @@
             "required": [
                 "definition",
                 "deployment",
-                "hash",
                 "hashVersion"
             ],
             "type": "object"