Remove AddSingularBatch from ChannelOut interface (prefer AddBlock) #12079
+119
−81
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.
Description
Removes the
AddSingularBatch
function from theChannelOut
interface. This was duplicative of theAddBlock
method.There wasn't a case where
AddSingularBatch
was called without callingBlockToSingularBatch
beforehand (apart from in tests), so this PR is a simplification of the exposed interface. It also lets future ChannelOut implementations access theBlock
if needed, as only exposingAddBlock
forces callers to always pass a block.Tests
Existing tests have been updated to the newly exposed interface. There were some tests that were specifically testing
AddSingularBatch
, so a new test-only interface has been added to expose this as an internal methodaddSingularBatch
. Also one of the benchmark tests was updated to callAddBlock
rather thanAddSingularBatch
which required a small helper function to convert from aSinglularBatch
to aBlock
.Additional context
I'd like to access the block (to check for withdrawal logs in the Bloom) in a
ChannelOut
for L3 batch submission. Exposing the alternateAddSingularBatch
was preventing this.