Move setup-n.txt from src/config to setup, and copy it in dockerfile

0xPolygonHermez · Jul 14, 2024 · 7a55c46 · 7a55c46
1 parent 0b0cff9
commit 7a55c46
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -22,6 +22,7 @@ COPY --from=build /usr/src/app/build/zkProver /usr/local/bin
 
 COPY ./testvectors ./testvectors
 COPY ./config ./config
+COPY ./setup ./setup
 COPY ./src/main_sm/fork_1/scripts/rom.json ./src/main_sm/fork_1/scripts/rom.json
 COPY ./src/main_sm/fork_2/scripts/rom.json ./src/main_sm/fork_2/scripts/rom.json
 COPY ./src/main_sm/fork_3/scripts/rom.json ./src/main_sm/fork_3/scripts/rom.json

diff --git a/Dockerfile-GHA b/Dockerfile-GHA
@@ -24,6 +24,7 @@ FROM ubuntu:22.04 as executor
 WORKDIR /app
 COPY ./testvectors ./testvectors
 COPY ./config ./config
+COPY ./setup ./setup
 COPY ./src/main_sm/fork_1/scripts/rom.json ./src/main_sm/fork_1/scripts/rom.json
 COPY ./src/main_sm/fork_2/scripts/rom.json ./src/main_sm/fork_2/scripts/rom.json
 COPY ./src/main_sm/fork_3/scripts/rom.json ./src/main_sm/fork_3/scripts/rom.json

diff --git a/src/config/setup-10.txt → setup/setup-10.txt b/src/config/setup-10.txt → setup/setup-10.txt
diff --git a/src/config/setup-11.txt → setup/setup-11.txt b/src/config/setup-11.txt → setup/setup-11.txt
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -786,7 +786,7 @@ void checkSetupHash(std::string datFileName) {
     string hashFormatted = hash.substr(2);
     if(hash.size() % 2 != 0) hashFormatted = "0" + hashFormatted;
 
-    std::string setupFile = "src/config/setup-" + to_string(PROVER_FORK_ID) + ".txt";
+    std::string setupFile = "setup/setup-" + to_string(PROVER_FORK_ID) + ".txt";
     std::ifstream file(setupFile);
     if (!file.is_open()) {
         std::cerr << "Error opening file: " << setupFile << std::endl;