From e68c6d8c72ad424388816e31973369d1716b256e Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 13 Oct 2020 06:54:37 -0700
Subject: [PATCH] proof refactor

---
 src/ddo/DDO.ts      | 43 ++-----------------------------------------
 src/ocean/Assets.ts |  2 +-
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts
index 375000cb..cdace66f 100644
--- a/src/ddo/DDO.ts
+++ b/src/ddo/DDO.ts
@@ -117,35 +117,10 @@ export class DDO {
   }
 
   /**
-   * Generates proof using personal sing.
+   * Generates and adds a simple hash proof on publicKey
    * @param  {Ocean}          ocean     Ocean instance.
    * @param  {string}         publicKey Public key to be used on personal sign.
-   * @param  {string}         password  Password if it's required.
-   * @return {Promise<Proof>}           Proof object.
-   */
-  public async generateProof(
-    ocean: Ocean,
-    publicKey: string,
-    password?: string
-  ): Promise<Proof> {
-    const checksum = this.getChecksum()
-
-    const signature = await ocean.utils.signature.signText(checksum, publicKey, password)
-
-    return {
-      created: new Date().toISOString().replace(/\.[0-9]{3}/, ''),
-      creator: publicKey,
-      type: 'DDOIntegritySignature',
-      signatureValue: signature
-    }
-  }
-
-  /**
-   * Generates and adds a proof using personal sing on the DDO.
-   * @param  {Ocean}          ocean     Ocean instance.
-   * @param  {string}         publicKey Public key to be used on personal sign.
-   * @param  {string}         password  Password if it's required.
-   * @return {Promise<Proof>}           Proof object.
+   * @return {Promise<void>}
    */
   public async addProof(
     ocean: Ocean,
@@ -155,20 +130,6 @@ export class DDO {
     if (this.proof) {
       throw new Error('Proof already exists')
     }
-    this.proof = await this.generateProof(ocean, publicKey, password)
-  }
-
-  /**
-   * Generates and adds a simple hash proof
-   * @param  {Ocean}          ocean     Ocean instance.
-   * @param  {string}         publicKey Public key to be used on personal sign.
-   * @return {Promise<Proof>}           Proof object.
-   */
-  public async addSimpleProof(ocean: Ocean, publicKey: string): Promise<void> {
-    if (this.proof) {
-      throw new Error('Proof already exists')
-    }
-
     this.proof = {
       created: new Date().toISOString().replace(/\.[0-9]{3}/, ''),
       creator: publicKey,
diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts
index b90d7bb5..e2231b28 100644
--- a/src/ocean/Assets.ts
+++ b/src/ocean/Assets.ts
@@ -190,7 +190,7 @@ export class Assets extends Instantiable {
       })
       // this.logger.log('Generating proof')
       // observer.next(CreateProgressStep.GeneratingProof)
-      await ddo.addSimpleProof(this.ocean, publisher.getId())
+      await ddo.addProof(this.ocean, publisher.getId())
       // this.logger.log('Proof generated')
       // observer.next(CreateProgressStep.ProofGenerated)
       this.logger.log('Storing DDO')