remove: merkle_tree_old (#1161)

yetanotherco · Oct 7, 2024 · 1a013be · 1a013be
1 parent 0cb8a81
commit 1a013be
Show file tree

Hide file tree

Showing 15 changed files with 181 additions and 4,148 deletions.
diff --git a/.github/workflows/build-go.yml b/.github/workflows/build-go.yml
@@ -35,8 +35,6 @@ jobs:
         run: make build_halo2_ipa_linux
       - name: Build Merkle Tree bindings
         run: make build_merkle_tree_linux
-      - name: Build Old Merkle Tree bindings
-        run: make build_merkle_tree_linux_old
       - name: Build operator
         run: go build operator/cmd/main.go
       - name: Build aggregator

diff --git a/Makefile b/Makefile
@@ -562,29 +562,15 @@ build_merkle_tree_macos:
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree/lib/libmerkle_tree.dylib
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
 
-build_merkle_tree_macos_old:
-	@cd operator/merkle_tree_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree_old/lib/libmerkle_tree.dylib
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree_old/lib/libmerkle_tree.a
-
 build_merkle_tree_linux:
 	@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree/lib/libmerkle_tree.so
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
 
-build_merkle_tree_linux_old:
-	@cd operator/merkle_tree_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree_old/lib/libmerkle_tree.so
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree_old/lib/libmerkle_tree.a
-
 test_merkle_tree_rust_ffi:
 	@echo "Testing Merkle Tree Rust FFI source code..."
 	@cd operator/merkle_tree/lib && RUST_MIN_STACK=83886080 cargo t --release
 
-test_merkle_tree_rust_ffi_old:
-	@echo "Testing Old Merkle Tree Rust FFI source code..."
-	@cd operator/merkle_tree_old/lib && RUST_MIN_STACK=83886080 cargo t --release
-
 test_merkle_tree_go_bindings_macos: build_merkle_tree_macos
 	@echo "Testing Merkle Tree Go bindings..."
 	go test ./operator/merkle_tree/... -v
@@ -593,14 +579,6 @@ test_merkle_tree_go_bindings_linux: build_merkle_tree_linux
 	@echo "Testing Merkle Tree Go bindings..."
 	go test ./operator/merkle_tree/... -v
 
-test_merkle_tree_old_go_bindings_macos: build_merkle_tree_macos_old
-	@echo "Testing Old Merkle Tree Go bindings..."
-	go test ./operator/merkle_tree_old/... -v
-
-test_merkle_tree_go_bindings_linux_old: build_merkle_tree_linux_old
-	@echo "Testing Merkle Tree Go bindings..."
-	go test ./operator/merkle_tree_old/... -v
-
 __HALO2_KZG_FFI__: ##
 build_halo2_kzg_macos:
 	@cd operator/halo2kzg/lib && cargo build $(RELEASE_FLAG)
@@ -675,7 +653,6 @@ build_all_ffi_macos: ## Build all FFIs for macOS
 	@$(MAKE) build_sp1_macos
 	@$(MAKE) build_risc_zero_macos
 	@$(MAKE) build_merkle_tree_macos
-	@$(MAKE) build_merkle_tree_macos_old
 	@$(MAKE) build_halo2_ipa_macos
 	@$(MAKE) build_halo2_kzg_macos
 	@echo "All macOS FFIs built successfully."
@@ -685,7 +662,6 @@ build_all_ffi_linux: ## Build all FFIs for Linux
 	@$(MAKE) build_sp1_linux
 	@$(MAKE) build_risc_zero_linux
 	@$(MAKE) build_merkle_tree_linux
-	@$(MAKE) build_merkle_tree_linux_old
 	@$(MAKE) build_halo2_ipa_linux
 	@$(MAKE) build_halo2_kzg_linux
 	@echo "All Linux FFIs built successfully."