From 75a0de1b2c00f7cf67565fe15b17dceb0c3cd691 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 12 Nov 2019 14:21:29 +0100 Subject: [PATCH] remove ddo.addChecksum --- integration/ocean/ConsumeBigAsset.test.ts | 6 +----- src/ddo/DDO.ts | 15 +-------------- src/ocean/OceanAssets.ts | 1 - test/ddo/DDO.test.ts | 5 ++--- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/integration/ocean/ConsumeBigAsset.test.ts b/integration/ocean/ConsumeBigAsset.test.ts index 3c33bd7..f82a7f5 100644 --- a/integration/ocean/ConsumeBigAsset.test.ts +++ b/integration/ocean/ConsumeBigAsset.test.ts @@ -32,11 +32,7 @@ xdescribe('Consume Asset (Large size)', () => { ...baseMetadata, main: { ...baseMetadata.main, - files: [ - { - url: 'https://speed.hetzner.de/1GB.bin' - } - ] + files: [{ index: 0, contentType: 'hello/hello', url: 'https://speed.hetzner.de/1GB.bin' }] } } }) diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts index ddf2551..4f91528 100644 --- a/src/ddo/DDO.ts +++ b/src/ddo/DDO.ts @@ -1,6 +1,5 @@ import * as Web3 from 'web3' import Web3Provider from '../keeper/Web3Provider' -import LoggerInstance from '../utils/Logger' import { Ocean } from '../ocean/Ocean' import { Authentication } from './Authentication' import { Proof } from './Proof' @@ -129,23 +128,11 @@ export class DDO { } } - /** - * Generated and adds the checksum. - */ - public addChecksum(): void { - const metadataService = this.findServiceByType('metadata') - if (metadataService.attributes.main.checksum) { - LoggerInstance.log('Checksum already exists') - return - } - metadataService.attributes.main.checksum = this.getChecksum() - } - /** * Generates and adds a proof using personal sing on the DDO. * @param {Web3} web3 Web3 instance. * @param {string} publicKey Public key to be used on personal sign. - * @param {string} password Password if it's requirted. + * @param {string} password Password if it's required. * @return {Promise} Proof object. */ public async addProof(web3: Web3, publicKey: string, password?: string): Promise { diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts index 032d2a0..c366700 100644 --- a/src/ocean/OceanAssets.ts +++ b/src/ocean/OceanAssets.ts @@ -159,7 +159,6 @@ export class OceanAssets extends Instantiable { const conditions = fillConditionsWithDDO(rawConditions, ddo) serviceAgreementTemplate.conditions = conditions - ddo.addChecksum() this.logger.log('Generating proof') observer.next(CreateProgressStep.GeneratingProof) await ddo.addProof(this.ocean, publisher.getId(), publisher.getPassword()) diff --git a/test/ddo/DDO.test.ts b/test/ddo/DDO.test.ts index f4a0b31..2e1a0b7 100644 --- a/test/ddo/DDO.test.ts +++ b/test/ddo/DDO.test.ts @@ -96,7 +96,7 @@ describe('DDO', () => { datePublished: '2012-10-10T17:00:000Z', author: 'Met Office', license: 'CC-BY', - price: 10, + price: '10', files: [ { index: 0, @@ -115,8 +115,7 @@ describe('DDO', () => { index: 2, contentType: '' } - ], - checksum: '' + ] }, curation: { rating: 0.93,