fix path

ethstorage · Nov 30, 2023 · 2e77a42 · 2e77a42
1 parent 3f7b22d
commit 2e77a42
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -28,30 +28,30 @@ jobs:
         run: |
           mkdir ${{ env.BUILD_DIR }}
           mkdir -p ${{ env.BUILD_DIR }}/snarkbuild
-          cp -r ethstorage/prover/snarkjs/* ${{ env.BUILD_DIR }}
+          cp -r ethstorage/prover/snarkjs ${{ env.BUILD_DIR }}
           cp run.sh ${{ env.BUILD_DIR }}
 
       - name: Build
         run: |
           make TARGETOS=linux TARGETARCH=amd64
           mv es-node ${{ env.BUILD_DIR }}
-          tar -czvf es-node.${{github.ref_name}}.linux-amd64.tar.gz ${{ env.BUILD_DIR }}
+          tar -czvf es-node.${{ github.ref_name }}.linux-amd64.tar.gz ${{ env.BUILD_DIR }}
           make TARGETOS=darwin TARGETARCH=amd64
           mv es-node ${{ env.BUILD_DIR }}
-          tar -czvf es-node.${{github.ref_name}}.darwin-amd64.tar.gz ${{ env.BUILD_DIR }}
+          tar -czvf es-node.${{ github.ref_name }}.darwin-amd64.tar.gz ${{ env.BUILD_DIR }}
           make TARGETOS=darwin TARGETARCH=arm64
           mv es-node ${{ env.BUILD_DIR }}
-          tar -czvf es-node.${{github.ref_name}}.darwin-arm64.tar.gz ${{ env.BUILD_DIR }}
+          tar -czvf es-node.${{ github.ref_name }}.darwin-arm64.tar.gz ${{ env.BUILD_DIR }}
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ github.ref }}
-          name: Release ${{github.ref_name}}
+          name: Release ${{ github.ref_name }}
           files: |
-            es-node.${{github.ref_name}}.linux-amd64.tar.gz
-            es-node.${{github.ref_name}}.darwin-amd64.tar.gz
-            es-node.${{github.ref_name}}.darwin-arm64.tar.gz
+            es-node.${{ github.ref_name }}.linux-amd64.tar.gz
+            es-node.${{ github.ref_name }}.darwin-amd64.tar.gz
+            es-node.${{ github.ref_name }}.darwin-arm64.tar.gz
           generate_release_notes: true
 
   build-and-push-image:

diff --git a/ethstorage/miner/cli.go b/ethstorage/miner/cli.go
@@ -78,7 +78,7 @@ func (c CLIConfig) Check() error {
 	info, err := os.Stat(filepath.Join(c.ZKWorkingDir, "snarkjs"))
 	if err != nil {
 		if os.IsNotExist(err) || !info.IsDir() {
-			return fmt.Errorf("snarkjs folder not found in ZKWorkingDir: %v\n", err)
+			return fmt.Errorf("snarkjs folder not found in ZKWorkingDir: %v", err)
 		}
 	}
 	return nil
@@ -89,7 +89,7 @@ func (c CLIConfig) ToMinerConfig() (Config, error) {
 	if !filepath.IsAbs(zkWorkingDir) {
 		dir, err := filepath.Abs(zkWorkingDir)
 		if err != nil {
-			return Config{}, fmt.Errorf("check ZKWorkingDir error: %v\n", err)
+			return Config{}, fmt.Errorf("check ZKWorkingDir error: %v", err)
 		}
 		zkWorkingDir = dir
 	}

diff --git a/ethstorage/miner/config.go b/ethstorage/miner/config.go
@@ -5,7 +5,6 @@ package miner
 
 import (
 	"math/big"
-	"path/filepath"
 	"runtime"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -38,6 +37,6 @@ var DefaultConfig = Config{
 	GasPrice:         nil,
 	PriorityGasPrice: nil,
 	ZKeyFileName:     "blob_poseidon.zkey",
-	ZKWorkingDir:     filepath.Join("ethstorage", "prover"),
+	ZKWorkingDir:     "./",
 	ThreadsPerShard:  uint64(2 * runtime.NumCPU()),
 }