lowercase service type values

2024-02-02 15:31:51 +01:00 · 2019-08-16 14:12:31 +02:00 · 2019-08-16 14:12:31 +02:00 · b1ff2e7a27
commit b1ff2e7a27
parent 07d17fe32e
16 changed files with 53 additions and 53 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -21,7 +21,7 @@ before_script:
  - ganache-cli --port 18545 > ganache-cli.log &
  - git clone https://github.com/oceanprotocol/barge
  - cd barge
-  - export AQUARIUS_VERSION=v0.3.8
+  - export AQUARIUS_VERSION=v0.4.1
  - export BRIZO_VERSION=v0.4.5
  - export KEEPER_VERSION=v0.12.7
  - export EVENTS_HANDLER_VERSION=v0.1.2
--- a/integration/config.ts
+++ b/integration/config.ts
@ -3,7 +3,7 @@ const HDWalletProvider = require('@truffle/hdwallet-provider')

 const configJson: Config = {
    nodeUri: 'http://localhost:8545',
-    aquariusUri: 'http://172.15.0.15:5000',
+    aquariusUri: 'http://aquarius:5000',
    brizoUri: 'http://localhost:8030',
    secretStoreUri: 'http://localhost:12001',
    brizoAddress: '0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0',
--- a/integration/ocean/AssetOwners.test.ts
+++ b/integration/ocean/AssetOwners.test.ts
@ -79,7 +79,7 @@ describe('Asset Owners', () => {

        await ocean.assets.order(
            ddo.id,
-            ddo.findServiceByType('Access').serviceDefinitionId,
+            ddo.findServiceByType('access').serviceDefinitionId,
            account2
        )
        // Access granted
--- a/integration/ocean/ConsumeAsset.test.ts
+++ b/integration/ocean/ConsumeAsset.test.ts
@ -42,8 +42,8 @@ describe('Consume Asset', () => {
            'Default authentication not added'
        )
        assert.isDefined(
-            ddo.findServiceByType('Access'),
-            "DDO Access service doesn't exist"
+            ddo.findServiceByType('access'),
+            "DDO access service doesn't exist"
        )
    })

@ -64,7 +64,7 @@ describe('Consume Asset', () => {
    })

    it('should sign the service agreement', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        serviceAgreementSignatureResult = await ocean.agreements.prepare(
            ddo.id,
@ -86,7 +86,7 @@ describe('Consume Asset', () => {
    })

    it('should execute the service agreement', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        const success = await ocean.agreements.create(
            ddo.id,
@ -115,7 +115,7 @@ describe('Consume Asset', () => {
    it('should lock the payment by the consumer', async () => {
        const paid = await ocean.agreements.conditions.lockReward(
            serviceAgreementSignatureResult.agreementId,
-            ddo.findServiceByType('Metadata').metadata.main.price,
+            ddo.findServiceByType('metadata').metadata.main.price,
            consumer
        )

@ -156,7 +156,7 @@ describe('Consume Asset', () => {
    })

    it('should consume and store the assets', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        const folder = '/tmp/ocean/squid-js-1'
        const path = await ocean.assets.consume(
@ -183,7 +183,7 @@ describe('Consume Asset', () => {
    })

    it('should consume and store one asset', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        const folder = '/tmp/ocean/squid-js-2'
        const path = await ocean.assets.consume(
--- a/integration/ocean/ConsumeAssetBrizo.test.ts
+++ b/integration/ocean/ConsumeAssetBrizo.test.ts
@ -50,7 +50,7 @@ describe('Consume Asset (Brizo)', () => {
    })

    it('should order the asset', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        try {
            await consumer.requestTokens(
@ -69,7 +69,7 @@ describe('Consume Asset (Brizo)', () => {
    })

    it('should consume and store the assets', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        const folder = '/tmp/ocean/squid-js'
        const path = await ocean.assets.consume(
--- a/integration/ocean/ConsumeBigAsset.test.ts
+++ b/integration/ocean/ConsumeBigAsset.test.ts
@ -48,7 +48,7 @@ xdescribe('Consume Asset (Large size)', () => {
    })

    it('should order the asset', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        try {
            await consumer.requestTokens(
@ -67,7 +67,7 @@ xdescribe('Consume Asset (Large size)', () => {
    })

    it('should consume and store the assets', async () => {
-        const accessService = ddo.findServiceByType('Access')
+        const accessService = ddo.findServiceByType('access')

        const folder = '/tmp/ocean/squid-js'
        const path = await ocean.assets.consume(
--- a/integration/ocean/Signature.test.ts
+++ b/integration/ocean/Signature.test.ts
@ -54,7 +54,7 @@ describe('Signature', () => {
            id: did,
            service: [
                {
-                    type: 'Access',
+                    type: 'access',
                    purchaseEndpoint: undefined,
                    serviceEndpoint: undefined,
                    serviceDefinitionId,
@ -62,7 +62,7 @@ describe('Signature', () => {
                    serviceAgreementTemplate
                } as any,
                {
-                    type: 'Metadata',
+                    type: 'metadata',
                    metadata: {
                        main: {
                            price: 10
--- a/library.json
+++ b/library.json
@ -15,7 +15,7 @@
    },
    {
      "name": "aquarius",
-      "version": "~0.3.8"
+      "version": "~0.4.1"
    },
    {
      "name": "events-handler",
--- a/src/ddo/DDO.ts
+++ b/src/ddo/DDO.ts
@ -101,7 +101,7 @@ export class DDO {
     * @return {string[]} DDO checksum.
     */
    public getChecksum(): string {
-        const { metadata } = this.findServiceByType('Metadata')
+        const { metadata } = this.findServiceByType('metadata')
        const { files, name, author, license } = metadata.main

        const values = [
@ -149,7 +149,7 @@ export class DDO {
     * Generated and adds the checksum.
     */
    public addChecksum(): void {
-        const metadataService = this.findServiceByType('Metadata')
+        const metadataService = this.findServiceByType('metadata')
        if (metadataService.metadata.main.checksum) {
            LoggerInstance.log('Checksum already exists')
            return
--- a/src/ddo/Service.ts
+++ b/src/ddo/Service.ts
@ -3,12 +3,12 @@ import { ServiceAgreementTemplate } from './ServiceAgreementTemplate'
 import { Provider } from './ComputingProvider'

 export type ServiceType =
-    | 'Authorization'
-    | 'Metadata'
-    | 'Access'
-    | 'Compute'
-    | 'Computing'
-    | 'FitchainCompute'
+    | 'authorization'
+    | 'metadata'
+    | 'access'
+    | 'compute'
+    | 'computing'
+    | 'fitchainCompute'

 export interface ServiceCommon {
    type: ServiceType
@ -17,17 +17,17 @@ export interface ServiceCommon {
 }

 export interface ServiceAuthorization extends ServiceCommon {
-    type: 'Authorization'
+    type: 'authorization'
    service: 'SecretStore' | 'None' | 'RSAES-OAEP'
 }

 export interface ServiceMetadata extends ServiceCommon {
-    type: 'Metadata'
+    type: 'metadata'
    metadata: MetaData
 }

 export interface ServiceAccess extends ServiceCommon {
-    type: 'Access'
+    type: 'access'
    name?: string
    description?: string
    creator?: string
@ -37,7 +37,7 @@ export interface ServiceAccess extends ServiceCommon {
 }

 export interface ServiceComputing extends ServiceCommon {
-    type: 'Computing'
+    type: 'computing'
    templateId?: string
    provider?: Provider
    serviceAgreementTemplate?: ServiceAgreementTemplate
@ -49,15 +49,15 @@ export interface ServiceCompute extends ServiceCommon {

 export type Service<
    T extends ServiceType | 'default' = 'default'
-> = T extends 'Authorization'
+> = T extends 'authorization'
    ? ServiceAuthorization
-    : T extends 'Metadata'
+    : T extends 'metadata'
    ? ServiceMetadata
-    : T extends 'Computing'
+    : T extends 'computing'
    ? ServiceComputing
-    : T extends 'Access'
+    : T extends 'access'
    ? ServiceAccess
-    : T extends 'Compute'
+    : T extends 'compute'
    ? ServiceCompute
    : T extends 'default'
    ? ServiceCommon
--- a/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts
+++ b/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts
@ -59,7 +59,7 @@ export class EscrowAccessSecretStoreTemplate extends AgreementTemplate {
    ) {
        return !!(await this.createFullAgreement(
            ddo.shortId(),
-            ddo.findServiceByType('Metadata').metadata.main.price,
+            ddo.findServiceByType('metadata').metadata.main.price,
            consumer,
            from,
            agreementId
@ -79,7 +79,7 @@ export class EscrowAccessSecretStoreTemplate extends AgreementTemplate {
        } = await this.createFullAgreementData(
            agreementId,
            ddo.shortId(),
-            ddo.findServiceByType('Metadata').metadata.main.price,
+            ddo.findServiceByType('metadata').metadata.main.price,
            consumer
        )
        return [
--- a/src/ocean/OceanAgreements.ts
+++ b/src/ocean/OceanAgreements.ts
@ -55,7 +55,7 @@ export class OceanAgreements extends Instantiable {
        const ddo = await this.ocean.aquarius.retrieveDDO(d)
        const agreementId: string = zeroX(generateId())

-        const templateName = ddo.findServiceByType('Access')
+        const templateName = ddo.findServiceByType('access')
            .serviceAgreementTemplate.contractName
        const agreementConditionsIds = await this.ocean.keeper
            .getTemplateByName(templateName)
@ -129,7 +129,7 @@ export class OceanAgreements extends Instantiable {
        const d: DID = DID.parse(did)
        const ddo = await this.ocean.aquarius.retrieveDDO(d)

-        const templateName = ddo.findServiceById<'Access'>(serviceDefinitionId)
+        const templateName = ddo.findServiceById<'access'>(serviceDefinitionId)
            .serviceAgreementTemplate.contractName
        await this.ocean.keeper
            .getTemplateByName(templateName)
--- a/src/ocean/OceanAssets.ts
+++ b/src/ocean/OceanAssets.ts
@ -110,7 +110,7 @@ export class OceanAssets extends Instantiable {
                ],
                service: [
                    {
-                        type: 'Access',
+                        type: 'access',
                        creator: '',
                        purchaseEndpoint: this.ocean.brizo.getPurchaseEndpoint(),
                        serviceEndpoint: this.ocean.brizo.getConsumeEndpoint(),
@ -119,12 +119,12 @@ export class OceanAssets extends Instantiable {
                        serviceAgreementTemplate
                    },
                    {
-                        type: 'Authorization',
+                        type: 'authorization',
                        service: 'SecretStore',
                        serviceEndpoint: secretStoreUri
                    },
                    {
-                        type: 'Metadata',
+                        type: 'metadata',
                        serviceEndpoint,
                        metadata: {
                            // Default values
@ -233,7 +233,7 @@ export class OceanAssets extends Instantiable {
        useSecretStore?: boolean
    ): Promise<string | true> {
        const ddo = await this.resolve(did)
-        const { metadata } = ddo.findServiceByType('Metadata')
+        const { metadata } = ddo.findServiceByType('metadata')

        const accessService = ddo.findServiceById(serviceDefinitionId)

@ -265,9 +265,9 @@ export class OceanAssets extends Instantiable {
        } else {
            const files = await this.ocean.secretStore.decrypt(
                did,
-                ddo.findServiceByType('Metadata').metadata.main.encryptedFiles,
+                ddo.findServiceByType('metadata').metadata.main.encryptedFiles,
                consumerAccount,
-                ddo.findServiceByType('Authorization').serviceEndpoint
+                ddo.findServiceByType('authorization').serviceEndpoint
            )
            const downloads = files
                .filter(({ index: i }) => index === -1 || index === i)
@ -304,7 +304,7 @@ export class OceanAssets extends Instantiable {
            const ddo = await this.resolve(did)

            const { keeper } = this.ocean
-            const templateName = ddo.findServiceByType('Access')
+            const templateName = ddo.findServiceByType('access')
                .serviceAgreementTemplate.contractName
            const template = keeper.getTemplateByName(templateName)
            const accessCondition = keeper.conditions.accessSecretStoreCondition
@ -316,7 +316,7 @@ export class OceanAssets extends Instantiable {
                this.logger.log('Agreement initialized')
                observer.next(OrderProgressStep.AgreementInitialized)

-                const { metadata } = ddo.findServiceByType('Metadata')
+                const { metadata } = ddo.findServiceByType('metadata')

                this.logger.log('Locking payment')

--- a/src/utils/DDOHelpers.ts
+++ b/src/utils/DDOHelpers.ts
@ -13,7 +13,7 @@ function fillParameterWithDDO(
            case 'amount':
            case 'price':
                return String(
-                    ddo.findServiceByType('Metadata').metadata.main.price
+                    ddo.findServiceByType('metadata').metadata.main.price
                )
            case 'assetId':
            case 'documentId':
--- a/test/ddo/DDO.test.ts
+++ b/test/ddo/DDO.test.ts
@ -77,17 +77,17 @@ describe('DDO', () => {
                serviceEndpoint: 'https://bops.example.com/enterprise/'
            },
            {
-                type: 'Consume',
+                type: 'consume',
                serviceEndpoint:
                    'http://mybrizo.org/api/v1/brizo/services/consume?pubKey={pubKey}&serviceId={serviceId}&url={url}'
            },
            {
-                type: 'Compute',
+                type: 'compute',
                serviceEndpoint:
                    'http://mybrizo.org/api/v1/brizo/services/compute?pubKey={pubKey}&serviceId={serviceId}&algo={algo}&container={container}'
            },
            {
-                type: 'Metadata',
+                type: 'metadata',
                serviceEndpoint:
                    'http://myaquarius.org/api/v1/provider/assets/metadata/{did}',
                metadata: {
--- a/test/testdata/ddo.json
+++ b/test/testdata/ddo.json
@ -39,7 +39,7 @@
  },
  "service": [
    {
-      "type": "Access",
+      "type": "access",
      "serviceDefinitionId": "0",
      "serviceEndpoint": "http://mybrizo.org/api/v1/brizo/services/consume?pubKey=${pubKey}&serviceId={serviceId}&url={url}",
      "purchaseEndpoint": "http://mybrizo.org/api/v1/brizo/services/access/purchase?",
@ -144,13 +144,13 @@
      ]
    },
    {
-      "type": "CloudCompute",
+      "type": "compute",
      "serviceDefinitionId": "1",
      "serviceEndpoint": "http://mybrizo.org/api/v1/brizo/services/compute?pubKey=${pubKey}&serviceId={serviceId}&algo={algo}&container={container}",
      "templateId": "044852b2a670ade5407e78fb2863c51000000000000000000000000000000002"
    },
    {
-      "type": "Metadata",
+      "type": "metadata",
      "serviceDefinitionId": "2",
      "serviceEndpoint": "http://myaquarius.org/api/v1/provider/assets/metadata/{did}",
      "metadata": {