From e4761d96944d947991dfd31742f38705505cdcf2 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:16:40 +0800
Subject: [PATCH] refactor(roller): reorg directory (#167)

---
 roller/.gitignore                       | 3 +--
 roller/Makefile                         | 6 +++---
 roller/cmd/main.go                      | 4 ++--
 roller/{core => }/prover/mock.go        | 0
 roller/{core => }/prover/prover.go      | 0
 roller/{core => }/prover/prover_test.go | 2 +-
 roller/{core => }/roller.go             | 4 ++--
 7 files changed, 9 insertions(+), 10 deletions(-)
 rename roller/{core => }/prover/mock.go (100%)
 rename roller/{core => }/prover/prover.go (100%)
 rename roller/{core => }/prover/prover_test.go (97%)
 rename roller/{core => }/roller.go (99%)

diff --git a/roller/.gitignore b/roller/.gitignore
index 427373ff4..9cedc99e5 100644
--- a/roller/.gitignore
+++ b/roller/.gitignore
@@ -6,8 +6,7 @@ build/bin/
 # ignore db file
 bbolt_db
 
-# ignore cgo in macOS
-core/prover/lib
+prover/lib
 
 params/
 seed
diff --git a/roller/Makefile b/roller/Makefile
index a1f643c69..30332ee2a 100644
--- a/roller/Makefile
+++ b/roller/Makefile
@@ -11,16 +11,16 @@ endif
 
 libzkp:
 	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.a ../interface/
-	cp -r ../common/libzkp/interface ./core/prover/lib
+	cp -r ../common/libzkp/interface ./prover/lib
 
 roller: ## Build the Roller instance.
 	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.a ../interface/
-	cp -r ../common/libzkp/interface ./core/prover/lib
+	cp -r ../common/libzkp/interface ./prover/lib
 	GOBIN=$(PWD)/build/bin go build -ldflags "-X scroll-tech/common/version.ZK_VERSION=${ZK_VERSION}" -o $(PWD)/build/bin/roller ./cmd
 
 gpu-roller: ## Build the GPU Roller instance.
 	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.a ../interface/
-	cp -r ../common/libzkp/interface ./core/prover/lib
+	cp -r ../common/libzkp/interface ./prover/lib
 	GOBIN=$(PWD)/build/bin go build -ldflags "-X scroll-tech/common/version.ZK_VERSION=${ZK_VERSION}" -tags gpu -o $(PWD)/build/bin/roller ./cmd
 
 mock_roller:
diff --git a/roller/cmd/main.go b/roller/cmd/main.go
index a8c42297b..169aeac8a 100644
--- a/roller/cmd/main.go
+++ b/roller/cmd/main.go
@@ -10,8 +10,8 @@ import (
 	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
+	"scroll-tech/roller"
 	"scroll-tech/roller/config"
-	"scroll-tech/roller/core"
 )
 
 func main() {
@@ -42,7 +42,7 @@ func action(ctx *cli.Context) error {
 	}
 
 	// Create roller
-	r, err := core.NewRoller(cfg)
+	r, err := roller.NewRoller(cfg)
 	if err != nil {
 		return err
 	}
diff --git a/roller/core/prover/mock.go b/roller/prover/mock.go
similarity index 100%
rename from roller/core/prover/mock.go
rename to roller/prover/mock.go
diff --git a/roller/core/prover/prover.go b/roller/prover/prover.go
similarity index 100%
rename from roller/core/prover/prover.go
rename to roller/prover/prover.go
diff --git a/roller/core/prover/prover_test.go b/roller/prover/prover_test.go
similarity index 97%
rename from roller/core/prover/prover_test.go
rename to roller/prover/prover_test.go
index 2d4ea04f1..5f1f820be 100644
--- a/roller/core/prover/prover_test.go
+++ b/roller/prover/prover_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/roller/config"
-	"scroll-tech/roller/core/prover"
+	"scroll-tech/roller/prover"
 )
 
 const (
diff --git a/roller/core/roller.go b/roller/roller.go
similarity index 99%
rename from roller/core/roller.go
rename to roller/roller.go
index 2681ac44a..e9de3c1aa 100644
--- a/roller/core/roller.go
+++ b/roller/roller.go
@@ -1,4 +1,4 @@
-package core
+package roller
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"scroll-tech/coordinator/client"
 
 	"scroll-tech/roller/config"
-	"scroll-tech/roller/core/prover"
+	"scroll-tech/roller/prover"
 	"scroll-tech/roller/store"
 )