Skip to content

Commit 1a013be

Browse files
authored
remove: merkle_tree_old (#1161)
1 parent 0cb8a81 commit 1a013be

File tree

15 files changed

+181
-4148
lines changed

15 files changed

+181
-4148
lines changed

.github/workflows/build-go.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
run: make build_halo2_ipa_linux
3636
- name: Build Merkle Tree bindings
3737
run: make build_merkle_tree_linux
38-
- name: Build Old Merkle Tree bindings
39-
run: make build_merkle_tree_linux_old
4038
- name: Build operator
4139
run: go build operator/cmd/main.go
4240
- name: Build aggregator

Makefile

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -562,29 +562,15 @@ build_merkle_tree_macos:
562562
@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree/lib/libmerkle_tree.dylib
563563
@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
564564

565-
build_merkle_tree_macos_old:
566-
@cd operator/merkle_tree_old/lib && cargo build $(RELEASE_FLAG)
567-
@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree_old/lib/libmerkle_tree.dylib
568-
@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree_old/lib/libmerkle_tree.a
569-
570565
build_merkle_tree_linux:
571566
@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
572567
@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree/lib/libmerkle_tree.so
573568
@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
574569

575-
build_merkle_tree_linux_old:
576-
@cd operator/merkle_tree_old/lib && cargo build $(RELEASE_FLAG)
577-
@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree_old/lib/libmerkle_tree.so
578-
@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree_old/lib/libmerkle_tree.a
579-
580570
test_merkle_tree_rust_ffi:
581571
@echo "Testing Merkle Tree Rust FFI source code..."
582572
@cd operator/merkle_tree/lib && RUST_MIN_STACK=83886080 cargo t --release
583573

584-
test_merkle_tree_rust_ffi_old:
585-
@echo "Testing Old Merkle Tree Rust FFI source code..."
586-
@cd operator/merkle_tree_old/lib && RUST_MIN_STACK=83886080 cargo t --release
587-
588574
test_merkle_tree_go_bindings_macos: build_merkle_tree_macos
589575
@echo "Testing Merkle Tree Go bindings..."
590576
go test ./operator/merkle_tree/... -v
@@ -593,14 +579,6 @@ test_merkle_tree_go_bindings_linux: build_merkle_tree_linux
593579
@echo "Testing Merkle Tree Go bindings..."
594580
go test ./operator/merkle_tree/... -v
595581

596-
test_merkle_tree_old_go_bindings_macos: build_merkle_tree_macos_old
597-
@echo "Testing Old Merkle Tree Go bindings..."
598-
go test ./operator/merkle_tree_old/... -v
599-
600-
test_merkle_tree_go_bindings_linux_old: build_merkle_tree_linux_old
601-
@echo "Testing Merkle Tree Go bindings..."
602-
go test ./operator/merkle_tree_old/... -v
603-
604582
__HALO2_KZG_FFI__: ##
605583
build_halo2_kzg_macos:
606584
@cd operator/halo2kzg/lib && cargo build $(RELEASE_FLAG)
@@ -675,7 +653,6 @@ build_all_ffi_macos: ## Build all FFIs for macOS
675653
@$(MAKE) build_sp1_macos
676654
@$(MAKE) build_risc_zero_macos
677655
@$(MAKE) build_merkle_tree_macos
678-
@$(MAKE) build_merkle_tree_macos_old
679656
@$(MAKE) build_halo2_ipa_macos
680657
@$(MAKE) build_halo2_kzg_macos
681658
@echo "All macOS FFIs built successfully."
@@ -685,7 +662,6 @@ build_all_ffi_linux: ## Build all FFIs for Linux
685662
@$(MAKE) build_sp1_linux
686663
@$(MAKE) build_risc_zero_linux
687664
@$(MAKE) build_merkle_tree_linux
688-
@$(MAKE) build_merkle_tree_linux_old
689665
@$(MAKE) build_halo2_ipa_linux
690666
@$(MAKE) build_halo2_kzg_linux
691667
@echo "All Linux FFIs built successfully."

0 commit comments

Comments
 (0)