Skip to content

Commit 9a139f9

Browse files
committed
move libzkp to internal
1 parent 74e6060 commit 9a139f9

File tree

13 files changed

+8
-11
lines changed

13 files changed

+8
-11
lines changed

.github/workflows/coordinator.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ jobs:
112112
- name: Test coordinator packages
113113
working-directory: 'coordinator'
114114
run: |
115-
make libzkp
116-
# go test -exec "env LD_LIBRARY_PATH=${PWD}/libzkp/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=coverage.txt -covermode=atomic ./...
117115
go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic -tags mock_verifier ./...
118116
- name: Upload coverage reports to Codecov
119117
uses: codecov/codecov-action@v3

coordinator/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
IMAGE_VERSION=latest
44
REPO_ROOT_DIR=./..
5-
LIBZKP_PATH=libzkp/lib/libzkp.so
5+
LIBZKP_PATH=./internal/logic/libzkp/lib/libzkp.so
66

77
ifeq (4.3,$(firstword $(sort $(MAKE_VERSION) 4.3)))
88
ZKVM_VERSION=$(shell grep -m 1 "zkvm-prover?" ../Cargo.lock | cut -d "#" -f2 | cut -c-7)
@@ -18,10 +18,10 @@ test:
1818
go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 $(PWD)/...
1919

2020
$(LIBZKP_PATH):
21-
$(MAKE) -C libzkp build
21+
$(MAKE) -C ./internal/logic/libzkp build
2222

2323
clean_libzkp:
24-
$(MAKE) -C libzkp clean
24+
$(MAKE) -C ./internal/logic/libzkp clean
2525

2626
libzkp: clean_libzkp $(LIBZKP_PATH)
2727

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

coordinator/internal/logic/provertask/prover_task.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ import (
1313
"github.com/scroll-tech/go-ethereum/params"
1414
"gorm.io/gorm"
1515

16-
"scroll-tech/coordinator/libzkp"
17-
1816
"scroll-tech/common/types/message"
1917

2018
"scroll-tech/coordinator/internal/config"
19+
"scroll-tech/coordinator/internal/logic/libzkp"
2120
"scroll-tech/coordinator/internal/orm"
2221
coordinatorType "scroll-tech/coordinator/internal/types"
2322
)

0 commit comments

Comments
 (0)