proof: update tests and tree to use the new Proof wrapper.

Author: nodech

lib/proof.js

@@ -108,6 +108,17 @@ class WrappedProof {
     return this._proof.verify(root, key, BLAKE2b, HASH_BITS);
   }
 
+  /**
+   * Clear cached values.
+   * @returns {this}
+   */
+
+  refresh() {
+    this._raw = null;
+    this._size = null;
+    return this;
+  }
+
   /**
    * @param {Buffer} data
    * @param {Number} off

lib/tree.js

@@ -766,10 +766,8 @@ class Snapshot {
 
   async prove(key) {
     assert(this.isOpen, ERR_TX_NOT_OPEN);
-    const proof = new Proof();
     const raw = await nurkel.tx_prove(this.tx, key);
-    proof.decode(raw);
-    return proof;
+    return Proof.decode(raw);;
   }
 
   /**
@@ -780,10 +778,8 @@ class Snapshot {
 
   proveSync(key) {
     assert(this.isOpen, ERR_TX_NOT_OPEN);
-    const proof = new Proof();
     const raw = nurkel.tx_prove_sync(this.tx, key);
-    proof.decode(raw);
-    return proof;
+    return Proof.decode(raw);;
   }
 
   /**
@@ -1204,10 +1200,8 @@ class VirtualTransaction {
   async prove(key) {
     await this.maybeFlush();
 
-    const proof = new Proof();
     const raw = await nurkel.tx_prove(this.tx, key);
-    proof.decode(raw);
-    return proof;
+    return Proof.decode(raw);;
   }
 
   /**
@@ -1219,10 +1213,8 @@ class VirtualTransaction {
   proveSync(key) {
     this.maybeFlushSync();
 
-    const proof = new Proof();
     const raw = nurkel.tx_prove_sync(this.tx, key);
-    proof.decode(raw);
-    return proof;
+    return Proof.decode(raw);;
   }
 
   /**

lib/urkel.js

@@ -252,9 +252,10 @@ class WrappedTree {
 
   async prove(key) {
     assert(this.isOpen, ERR_NOT_OPEN);
+    const proof = new Proof();
     const uproof = await this._tree.prove(key);
-    const raw = uproof.encode(this.hash, this.bits);
-    return Proof.decode(raw);
+    proof._proof = uproof;
+    return proof;
   }
 
   /**
@@ -658,8 +659,10 @@ class WrappedSnapshot {
     } catch (e) {
       throw handleMissingError(e);
     }
-    const raw = uproof.encode(this.tree.hash, this.tree.bits);
-    return Proof.decode(raw);
+
+    const proof = new Proof();
+    proof._proof = uproof;
+    return proof;
   }
 
   /**

test/transaction-test.js

@@ -109,11 +109,10 @@ describe(`Urkel Transaction (${name})`, function () {
       const proof = await txn1.prove(key);
 
       assert(Proof.isProof(proof));
-      assert(Buffer.isBuffer(proof.raw));
 
       if (tree.supportsSync) {
         const proofS = txn1.proveSync(key);
-        assert.bufferEqual(proof.raw, proofS.raw);
+        assert.bufferEqual(proof.encode(), proofS.encode());
       }
     }
 

test/tree-test.js

@@ -247,8 +247,8 @@ describe(`Urkel Tree (${name})`, function () {
       const treeProof = treeProofs[i];
 
       if (tree.supportsSync)
-        assert.bufferEqual(treeProofSync.raw, proof.raw);
-      assert.bufferEqual(treeProof.raw, proof.raw);
+        assert.bufferEqual(treeProofSync.encode(), proof.encode());
+      assert.bufferEqual(treeProof.encode(), proof.encode());
 
       if (tree.supportsSync) {
         const [codeSync, valueSync] = Tree.verifySync(

test/vtx-test.js

@@ -119,11 +119,10 @@ describe('Urkel Virtual Transaction', function () {
       const proof = await txn1.prove(key);
 
       assert(Proof.isProof(proof));
-      assert(Buffer.isBuffer(proof.raw));
 
       if (tree.supportsSync) {
         const proofS = txn1.proveSync(key);
-        assert.bufferEqual(proof.raw, proofS.raw);
+        assert.bufferEqual(proof.encode(), proofS.encode());
       }
     }