Normalized method name

Author: sean-liu55

src/main/java/org/tron/common/zksnark/merkle/IncrementalMerkleTreeContainer.java

@@ -283,11 +283,14 @@ public MerklePath path(Deque<SHA256Compress> filler_hashes) {
   }
 
 
+  public byte[] getMerkleTreeKey() {
+    return getRootArray();
+  }
+
   public byte[] getRootArray() {
     return root().getContent().toByteArray();
   }
 
-
   public IncrementalMerkleWitnessContainer toWitness() {
     return new IncrementalMerkleWitnessContainer(this);
   }

src/main/java/org/tron/common/zksnark/merkle/IncrementalMerkleWitnessContainer.java

@@ -78,6 +78,10 @@ public SHA256Compress root() {
     return witnessCapsule.getTree().toMerkleTreeContainer().root(DEPTH, partial_path());
   }
 
+  public byte[] getMerkleWitnessKey() {
+    return root().getContent().toByteArray();
+  }
+
 
   public byte[] getRootArray() {
     return root().getContent().toByteArray();

src/main/java/org/tron/common/zksnark/merkle/MerkleContainer.java

@@ -38,7 +38,8 @@ public IncrementalMerkleTreeContainer getBestMerkleRoot() {
 
       container.append(a);
 
-      this.manager.getMerkleTreeStore().put(container.getRootArray(), container.getTreeCapsule());
+      this.manager.getMerkleTreeStore()
+          .put(container.getMerkleTreeKey(), container.getTreeCapsule());
       return container;
     }
     return capsule.toMerkleTreeContainer();
@@ -60,49 +61,47 @@ public IncrementalMerkleTreeCapsule getMerkleTree(byte[] rt) {
   }
 
 
-  public IncrementalMerkleTreeContainer saveCmIntoMerkleAndStore(byte[] rt, byte[] cm) {
-    IncrementalMerkleTreeContainer tree = this.manager.getMerkleTreeStore().get(rt)
-        .toMerkleTreeContainer();
+  public IncrementalMerkleTreeContainer saveCmIntoMerkleTree(IncrementalMerkleTreeContainer tree,
+      byte[] cm) {
 
     SHA256CompressCapsule sha256CompressCapsule1 = new SHA256CompressCapsule();
     sha256CompressCapsule1.setContent(ByteString.copyFrom(cm));
     tree.append(sha256CompressCapsule1.getInstance());
 
-    putMerkleTreeIntoStore(tree.getRootArray(), tree.getTreeCapsule());
     return tree;
   }
 
 
-  public IncrementalMerkleTreeContainer saveCmIntoMerkleAndStore(byte[] rt, byte[] cm1,
+  public IncrementalMerkleTreeContainer saveCmIntoMerkleTree(byte[] rt, byte[] cm1,
       byte[] cm2) {
 
-    IncrementalMerkleTreeContainer container1 = saveCmIntoMerkleAndStore(rt,
-        cm1);
+    IncrementalMerkleTreeContainer tree = this.manager.getMerkleTreeStore().get(rt)
+        .toMerkleTreeContainer();
 
-    IncrementalMerkleWitnessContainer witnessContainer1 = container1.toWitness();
+    tree = saveCmIntoMerkleTree(tree, cm1);
 
-    putMerkleWitnessIntoStore(witnessContainer1.getRootArray(),
+    IncrementalMerkleWitnessContainer witnessContainer1 = tree.toWitness();
+    putMerkleWitnessIntoStore(witnessContainer1.getMerkleWitnessKey(),
         witnessContainer1.getWitnessCapsule());
 
-    IncrementalMerkleTreeContainer container2 = saveCmIntoMerkleAndStore(container1.getRootArray(),
-        cm2);
+    tree = saveCmIntoMerkleTree(tree, cm2);
 
-    IncrementalMerkleWitnessContainer witnessContainer2 = saveCmIntoMerkleWitnessAndStore(
-        witnessContainer1.getRootArray(), cm2);
+    IncrementalMerkleWitnessContainer witnessContainer2 = saveCmIntoMerkleWitness(
+        witnessContainer1, cm2);
+    putMerkleWitnessIntoStore(witnessContainer2.getMerkleWitnessKey(),
+        witnessContainer2.getWitnessCapsule());
 
-    return container2;
+    putMerkleTreeIntoStore(tree.getMerkleTreeKey(), tree.getTreeCapsule());
+    return tree;
 
   }
 
-  public IncrementalMerkleWitnessContainer saveCmIntoMerkleWitnessAndStore(byte[] rt, byte[] cm) {
-    IncrementalMerkleWitnessContainer tree = this.manager.getMerkleWitnessStore().get(rt)
-        .toMerkleWitnessContainer();
-
+  public IncrementalMerkleWitnessContainer saveCmIntoMerkleWitness(
+      IncrementalMerkleWitnessContainer tree, byte[] cm) {
     SHA256CompressCapsule sha256CompressCapsule1 = new SHA256CompressCapsule();
     sha256CompressCapsule1.setContent(ByteString.copyFrom(cm));
     tree.append(sha256CompressCapsule1.getInstance());
 
-    putMerkleWitnessIntoStore(tree.getRootArray(), tree.getWitnessCapsule());
     return tree;
   }
 

src/main/java/org/tron/core/actuator/ZkV0TransferActuator.java

@@ -57,7 +57,7 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
     dbManager.getNullfierStore().put(nf1, new BytesCapsule(nf1));
     dbManager.getNullfierStore().put(nf2, new BytesCapsule(nf2));
 
-    dbManager.getMerkleContainer().saveCmIntoMerkleAndStore(zkContract.getRt().toByteArray(),
+    dbManager.getMerkleContainer().saveCmIntoMerkleTree(zkContract.getRt().toByteArray(),
         zkContract.getCm1().toByteArray(), zkContract.getCm2().toByteArray());
     return true;
   }

src/test/java/org/tron/common/zksnark/MerkleContainerTest.java

@@ -73,15 +73,15 @@ public void test() {
     //root
     //todo : need check
     Assert.assertEquals("835ea79627cfa5b773439220b4a8fba947be8b3faab18ffe12dd2343cd669d15",
-        ByteArray.toHexString(tree.getRootArray()));
+        ByteArray.toHexString(tree.getMerkleTreeKey()));
 
     //save
-    merkleContainer.putMerkleTreeIntoStore(tree.getRootArray(), tree.getTreeCapsule());
+    merkleContainer.putMerkleTreeIntoStore(tree.getMerkleTreeKey(), tree.getTreeCapsule());
 
     //get
-    Assert.assertEquals(true, merkleContainer.merkleRootIsExist(tree.getRootArray()));
+    Assert.assertEquals(true, merkleContainer.merkleRootIsExist(tree.getMerkleTreeKey()));
 
-    tree = merkleContainer.getMerkleTree(tree.getRootArray()).toMerkleTreeContainer();
+    tree = merkleContainer.getMerkleTree(tree.getMerkleTreeKey()).toMerkleTreeContainer();
     Assert.assertEquals(3, tree.size());
 
     //other
@@ -90,13 +90,13 @@ public void test() {
     Assert.assertEquals(96, tree.DynamicMemoryUsage());
     tree.wfcheck();
 
-    //saveCmIntoMerkleAndStore
+    //saveCmIntoMerkleTree
     IncrementalMerkleTreeContainer newTree = merkleContainer
-        .saveCmIntoMerkleAndStore(tree.getRootArray(), ByteArray.fromHexString(s1),
+        .saveCmIntoMerkleTree(tree.getMerkleTreeKey(), ByteArray.fromHexString(s1),
             ByteArray.fromHexString(s2));
     //todo : need check
     Assert.assertEquals("18a4aa922c9f3f8aecb5cd469bc92da72297cda82c55c3a50c36e7b2956c8b80",
-        ByteArray.toHexString(newTree.getRootArray()));
+        ByteArray.toHexString(newTree.getMerkleTreeKey()));
 
     Assert.assertEquals(3, tree.size());
     Assert.assertEquals(5, newTree.size());
@@ -122,7 +122,8 @@ public void test() {
     witness.path();
 
     //save
-    merkleContainer.putMerkleWitnessIntoStore(witness.getRootArray(), witness.getWitnessCapsule());
+    merkleContainer
+        .putMerkleWitnessIntoStore(witness.getMerkleWitnessKey(), witness.getWitnessCapsule());
 
     IncrementalMerkleTreeContainer bestMerkleRoot = merkleContainer.getBestMerkleRoot();
     Assert.assertEquals(1, bestMerkleRoot.size());