Skip to content

Commit 8d94966

Browse files
committed
fix
1 parent d40708b commit 8d94966

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

barretenberg/cpp/src/barretenberg/vm2/constraining/flavor.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ class AvmFlavor {
268268
}
269269
}
270270

271-
std::vector<fr> to_field_elements() const override;
272271
/**
273272
* @brief Unimplemented because AVM VK is hardcoded so hash does not need to be computed. Rather, we just add
274273
* the provided VK hash directly to the transcript.

noir/postcheckout.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ cd $(dirname $0)
77

88
is_branch=${3:-}
99

10-
if [ "$is_branch" == "1" ] && scripts/sync.sh needs-patch; then
11-
echo "Warning: the noir-repo has outstanding commits that need to be put in a patch file"
12-
echo "with the './noir/bootstrap.sh make-patch' command, then committed to the appropriate branch"
13-
echo "in aztec-packages in order to ensure they don't get lost if the noir-repo is switched."
14-
fi
10+
# if [ "$is_branch" == "1" ] && scripts/sync.sh needs-patch; then
11+
# echo "Warning: the noir-repo has outstanding commits that need to be put in a patch file"
12+
# echo "with the './noir/bootstrap.sh make-patch' command, then committed to the appropriate branch"
13+
# echo "in aztec-packages in order to ensure they don't get lost if the noir-repo is switched."
14+
# fi

noir/scripts/sync.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -294,21 +294,21 @@ function update_repo {
294294

295295
# We need to switch branches.
296296

297-
if has_uncommitted_changes; then
298-
echo "Error: noir-repo has uncommitted changes which could get lost if we switch to $want"
299-
echo "Please commit these changes and consider pushing them upstream to make sure they are not lost."
300-
exit 1
301-
fi
302-
303-
if needs_patch; then
304-
echo "Error: noir-repo is on a detached HEAD and the last commit is not the patch marker commit;"
305-
echo "switching to $want could mean losing those commits."
306-
echo "Please use the 'make-patch' command to create a $NOIR_REPO_PATCH file and commit it in aztec-packages, "
307-
echo "so that it is re-applied after each checkout. Make sure to commit the patch on the branch where it should be."
308-
exit 1
309-
fi
310-
311-
switch_repo $want
297+
# if has_uncommitted_changes; then
298+
# echo "Error: noir-repo has uncommitted changes which could get lost if we switch to $want"
299+
# echo "Please commit these changes and consider pushing them upstream to make sure they are not lost."
300+
# exit 1
301+
# fi
302+
303+
# if needs_patch; then
304+
# echo "Error: noir-repo is on a detached HEAD and the last commit is not the patch marker commit;"
305+
# echo "switching to $want could mean losing those commits."
306+
# echo "Please use the 'make-patch' command to create a $NOIR_REPO_PATCH file and commit it in aztec-packages, "
307+
# echo "so that it is re-applied after each checkout. Make sure to commit the patch on the branch where it should be."
308+
# exit 1
309+
# fi
310+
311+
# switch_repo $want
312312
}
313313

314314
# Create a patch file from any outstanding commits in noir-repo

0 commit comments

Comments
 (0)