BM-1900: add VerifierLayeredRouter #1319
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
capossele
requested review from
a team,
Wollac,
austinabell,
ec2,
willemolding and
zeroecco
as code owners
github-actions
bot
changed the title
willpote
reviewed
Dec 1, 2025
Comment on lines
+103
to
+114
| // Expect exactly 2 calls, to verifier A/B with TEST_RECEIPT_x and TEST_MANGLED_RECEIPT_x. | ||
| vm.expectCall(address(verifierMockA), new bytes(0), 2); | ||
| vm.expectCall(address(verifierMockA), abi.encodeCall(IRiscZeroVerifier.verifyIntegrity, TEST_RECEIPT_A), 1); | ||
| vm.expectCall( | ||
| address(verifierMockA), abi.encodeCall(IRiscZeroVerifier.verifyIntegrity, TEST_MANGLED_RECEIPT_A), 1 | ||
| ); | ||
| vm.expectCall(address(verifierMockB), new bytes(0), 2); | ||
| vm.expectCall(address(verifierMockB), abi.encodeCall(IRiscZeroVerifier.verifyIntegrity, TEST_RECEIPT_B), 1); | ||
| vm.expectCall( | ||
| address(verifierMockB), abi.encodeCall(IRiscZeroVerifier.verifyIntegrity, TEST_MANGLED_RECEIPT_B), 1 | ||
| ); | ||
| layeredRouter.verifyIntegrity(TEST_RECEIPT_A); |
Contributor
There was a problem hiding this comment.
I'm finding it hard to follow the expectCall's here and below.
Its hard to map each call to a specific invocation of verifyIntegrity, and it says we expect 2 calls but there are 6 vm.expectCall invocations.
Any way to split the tests or make it clearer somehow?
Contributor
Author
There was a problem hiding this comment.
So that, specifically vm.expectCall(address(verifierMockA), new bytes(0), 2); is a trick to assess how many calls to expect for that address, in this case 2; then, we assert the actual calls. It's kept it as is so to match the RiscZeroVerifierRouter on the risc0-ethereum repo.
willpote
approved these changes
Dec 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds the
VerifierLayeredRoutercontract.It also adds a copy of the
RiscZeroVerifierRouteras we need to add thevirtualproperty to the methods we override. Can be removed once those changes land torisc0-ethereum(risc0/risc0-ethereum#703)