Retains a pattern of generated proof data

Resolves: OpenST#754
pgev · May 29, 2019 · 93482a1 · 93482a1
1 parent ffff482
commit 93482a1
Show file tree

Hide file tree

Showing 5 changed files with 369 additions and 5 deletions.
diff --git a/test/data/generatedProofData.json b/test/data/generatedProofData.json
diff --git a/tools/fuzzy_proof_generator_tool/generate.ts b/tools/fuzzy_proof_generator_tool/generate.ts
@@ -6,6 +6,7 @@ import ProofData from './src/ProofData';
 import patterns from './patterns';
 
 interface HexProof {
+  pattern: string;
   value: string;
   encodedPath: string;
   rlpParentNodes: string;
@@ -20,6 +21,7 @@ function bufferToHex(buffer: Buffer): string {
 /** Converts a proof to a hex proof. */
 function proofToHexProof(proof: ProofData): HexProof {
   return {
+    pattern: proof.pattern,
     value: bufferToHex(proof.value),
     encodedPath: bufferToHex(proof.encodedPath),
     rlpParentNodes: bufferToHex(proof.rlpParentNodes),

diff --git a/tools/fuzzy_proof_generator_tool/src/FuzzyProofGenerator.ts b/tools/fuzzy_proof_generator_tool/src/FuzzyProofGenerator.ts
@@ -16,8 +16,7 @@
 
 import Nibbles from './Nibbles';
 import NodeBase from './NodeBase';
-import { BranchNode } from './BranchNode';
-import { BranchKeys } from './BranchNode';
+import { BranchNode, BranchKeys } from './BranchNode';
 import ExtensionNode from './ExtensionNode';
 import LeafNode from './LeafNode';
 import ProofData from './ProofData';
@@ -109,6 +108,7 @@ const FuzzyProofGenerator = {
     });
 
     const proofData = {
+      pattern,
       value: (endingWithBranchNode ? rlpValuehash : valueHash),
       encodedPath: path,
       rlpParentNodes: rlp.encode(rlpParentNodesArray),
@@ -152,7 +152,6 @@ const FuzzyProofGenerator = {
   processBranch(pattern: string, index: number): void {
     if (index === pattern.length) {
       if (pattern.length === 1 || pattern[index - 2] !== 'b') {
-
         // The verification library we are using in our project would accept
         // as a valid proof only a path ending with double 'b' (putting aside
         // an ending leaf node, as it's always allowed).

diff --git a/tools/fuzzy_proof_generator_tool/src/ProofData.ts b/tools/fuzzy_proof_generator_tool/src/ProofData.ts
@@ -1,4 +1,5 @@
 export default interface ProofData {
+  pattern: string;
   value: Buffer;
   encodedPath: Buffer;
   rlpParentNodes: Buffer;

diff --git a/tools/fuzzy_proof_generator_tool/test/FuzzyProofGenerator/generateByPattern.js b/tools/fuzzy_proof_generator_tool/test/FuzzyProofGenerator/generateByPattern.js
@@ -42,6 +42,7 @@ async function verifyProof(pattern, pathMaxLength, valueMaxLength, merklePatrici
 
   if (!proofStatus) {
     console.log(
+      proofData.pattern,
       `0x${proofData.value.toString('hex')}`,
       `0x${proofData.encodedPath.toString('hex')}`,
       `0x${proofData.rlpParentNodes.toString('hex')}`,
@@ -55,11 +56,12 @@ async function verifyProof(pattern, pathMaxLength, valueMaxLength, merklePatrici
 async function verifyProofs(pattern, merklePatriciaLib) {
   for (let i = 0; i < TEST_PATH_LENGTHS.length; i += 1) {
     for (let j = 0; j < TEST_VALUE_LENGTHS.length; j += 1) {
+      // eslint-disable-next-line no-await-in-loop
       await verifyProof(
         pattern,
         Math.max(TEST_PATH_LENGTHS[i], Math.ceil(pattern.length / 2)),
         Math.max(TEST_VALUE_LENGTHS[j], Math.ceil(pattern.length / 2)),
-        merklePatriciaLib
+        merklePatriciaLib,
       );
     }
   }