Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dirty merge 6880 #6905

Merged
merged 2 commits into from
Jun 5, 2024
Merged

fix: dirty merge 6880 #6905

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec9a409
fix-dirty-merge
Maddiaa0 Jun 5, 2024
1050616
Merge branch 'master' into md/06-05-fix-dirty-merge
Maddiaa0 Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions barretenberg/cpp/src/barretenberg/vm/tests/avm_kernel.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,7 @@ TEST_F(AvmKernelOutputPositiveTests, kernelNullifierNonExists)
uint32_t metadata_offset = 420;
auto exists = 0;

ExecutionHints execution_hints = {};
execution_hints.side_effect_hints[0] = exists; // side effect counter -> value
ExecutionHints execution_hints({}, { { 0, exists } }, {}, {}, {}, {});

auto apply_opcodes = [=](AvmTraceBuilder& trace_builder) {
trace_builder.op_set(0, static_cast<uint128_t>(value), value_offset, AvmMemoryTag::FF);
Expand Down
Loading