Merge branch 'master' into wire-circuits

This commit is contained in:
Dmitriy Ryajov 2024-02-12 20:52:53 -06:00 committed by GitHub
commit 6bea069ed2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions

View File

@ -27,7 +27,6 @@ jobs:
name: '${{ matrix.os }}-${{ matrix.cpu }}-${{ matrix.nim_version }}-${{ matrix.tests }}' name: '${{ matrix.os }}-${{ matrix.cpu }}-${{ matrix.nim_version }}-${{ matrix.tests }}'
runs-on: ${{ matrix.builder }} runs-on: ${{ matrix.builder }}
timeout-minutes: 80 timeout-minutes: 80
continue-on-error: true
steps: steps:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v4

View File

@ -88,6 +88,10 @@ proc prove*[H](
var var
backend: ptr CircomCompatCtx backend: ptr CircomCompatCtx
defer:
if backend != nil:
backend.addr.releaseCircomCompat()
if initCircomCompat( if initCircomCompat(
self.backendCfg, self.backendCfg,
addr backend) != ERR_OK or backend == nil: addr backend) != ERR_OK or backend == nil:
@ -169,9 +173,6 @@ proc prove*[H](
if proofPtr != nil: if proofPtr != nil:
proofPtr.addr.releaseProof() proofPtr.addr.releaseProof()
if backend != nil:
backend.addr.releaseCircomCompat()
success proof success proof
proc verify*( proc verify*(

View File

@ -14,8 +14,8 @@ ARG MAKE_PARALLEL
ARG NIMFLAGS ARG NIMFLAGS
RUN apt-get update && apt-get install -y git cmake curl make bash lcov build-essential nim RUN apt-get update && apt-get install -y git cmake curl make bash lcov build-essential nim
RUN echo 'export NIMBLE_DIR="${HOME}/.nimble"' >> "${HOME}/.bash_env" RUN curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
RUN echo 'export PATH="${NIMBLE_DIR}/bin:${PATH}"' >> "${HOME}/.bash_env" ENV PATH="/root/.cargo/bin:${PATH}"
WORKDIR ${BUILD_HOME} WORKDIR ${BUILD_HOME}
COPY . . COPY . .