make changes to old merkle tree

yetanotherco · Sep 30, 2024 · 1656efe · 1656efe
1 parent 003f3b9
commit 1656efe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/operator/merkle_tree_old/merkle_tree_old.go b/operator/merkle_tree_old/merkle_tree_old.go
@@ -9,12 +9,12 @@ package merkle_tree_old
 import "C"
 import "unsafe"
 
-func VerifyMerkleTreeBatchOld(batchBuffer []byte, batchLen uint, merkleRootBuffer [32]byte) bool {
+func VerifyMerkleTreeBatchOld(batchBuffer []byte, merkleRootBuffer [32]byte) bool {
 	if len(batchBuffer) == 0 {
 		return false
 	}
 
 	batchPtr := (*C.uchar)(unsafe.Pointer(&batchBuffer[0]))
 	merkleRootPtr := (*C.uchar)(unsafe.Pointer(&merkleRootBuffer[0]))
-	return (bool)(C.verify_merkle_tree_batch_ffi_old(batchPtr, (C.uint)(batchLen), merkleRootPtr))
+	return (bool)(C.verify_merkle_tree_batch_ffi_old(batchPtr, (C.uint)(len(batchBuffer)), merkleRootPtr))
 }
diff --git a/operator/merkle_tree_old/merkle_tree_old_test.go b/operator/merkle_tree_old/merkle_tree_old_test.go
@@ -3,30 +3,23 @@ package merkle_tree_old
 import (
 	"encoding/hex"
 	"fmt"
-	"io"
 	"os"
 	"testing"
 )
 
-func TestVerifyMerkleTreeBatchOld(t *testing.T) {
-	batchFile, err := os.Open("lib/test_files/merkle_tree_batch.bin")
-	if err != nil {
-		t.Fatalf("Error opening batch file: %v", err)
-	}
+const BatchFilePath = "lib/test_files/merkle_tree_batch.bin"
 
-	batchByteValue, err := io.ReadAll(batchFile)
-	if err != nil {
-		t.Fatalf("Error reading batch file: %v", err)
-	}
+const RootFilePath = "lib/test_files/merkle_root.bin"
 
-	rootFile, err := os.Open("lib/test_files/merkle_root.bin")
+func TestVerifyMerkleTreeBatchOld(t *testing.T) {
+	batchByteValue, err := os.ReadFile(BatchFilePath)
 	if err != nil {
 		t.Fatalf("Error opening batch file: %v", err)
 	}
 
-	rootByteValue, err := io.ReadAll(rootFile)
+	rootByteValue, err := os.ReadFile(RootFilePath)
 	if err != nil {
-		t.Fatalf("Error reading batch file: %v", err)
+		t.Fatalf("Error opening batch file: %v", err)
 	}
 
 	merkle_root := make([]byte, hex.DecodedLen(len(rootByteValue)))
@@ -39,7 +32,7 @@ func TestVerifyMerkleTreeBatchOld(t *testing.T) {
 	var merkleRoot [32]byte
 	copy(merkleRoot[:], merkle_root)
 
-	if !VerifyMerkleTreeBatchOld(batchByteValue, uint(len(batchByteValue)), merkleRoot) {
+	if !VerifyMerkleTreeBatchOld(batchByteValue, merkleRoot) {
 		t.Errorf("Batch did not verify Merkle Root")
 	}