From 7a55c46f6ada0ef9eef50bc2d89b77447de08830 Mon Sep 17 00:00:00 2001 From: fractasy Date: Sun, 14 Jul 2024 13:43:37 +0000 Subject: [PATCH] Move setup-n.txt from src/config to setup, and copy it in dockerfile --- Dockerfile | 1 + Dockerfile-GHA | 1 + {src/config => setup}/setup-10.txt | 0 {src/config => setup}/setup-11.txt | 0 src/utils/utils.cpp | 2 +- 5 files changed, 3 insertions(+), 1 deletion(-) rename {src/config => setup}/setup-10.txt (100%) rename {src/config => setup}/setup-11.txt (100%) diff --git a/Dockerfile b/Dockerfile index 44cc888be..4fc03d30f 100644 --- 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 index ef484075c..0ba52e02e 100644 --- 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 b/setup/setup-10.txt similarity index 100% rename from src/config/setup-10.txt rename to setup/setup-10.txt diff --git a/src/config/setup-11.txt b/setup/setup-11.txt similarity index 100% rename from src/config/setup-11.txt rename to setup/setup-11.txt diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp index 737e48308..c05c8d61c 100644 --- 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;