Move storage to new BlobSidecar #7737
Merged
Conversation
This file contains 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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -76,7 +76,7 @@ | |||
| public void handleRequest(RestApiRequest request) throws JsonProcessingException { | |||
| final List<UInt64> indices = request.getQueryParameterList(BLOB_INDICES_PARAMETER); | |||
| final SafeFuture<Optional<List<BlobSidecarOld>>> future = | |||
| chainDataProvider.getBlobSidecars(request.getPathParameter(PARAMETER_BLOCK_ID), indices); | |||
| chainDataProvider.getBlobSidecarsOld(request.getPathParameter(PARAMETER_BLOCK_ID), indices); | |||
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation Note
| @@ -59,7 +59,7 @@ | |||
| void shouldReturnAllBlobSidecarsAtSlot() throws JsonProcessingException { | |||
| final List<BlobSidecarOld> nonCanonicalBlobSidecars = | |||
| dataStructureUtil.randomBlobSidecarsOld(4); | |||
| when(chainDataProvider.getAllBlobSidecarsAtSlot(eq(UInt64.ONE), eq(indices))) | |||
| when(chainDataProvider.getAllBlobSidecarsAtSlotOld(eq(UInt64.ONE), eq(indices))) | |||
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation Note test
tbenr
approved these changes
Nov 21, 2023
| final Eth2Peer peer, final UInt64 from, final UInt64 count) | ||
| throws InterruptedException, ExecutionException, TimeoutException { | ||
| final List<BlobSidecar> blobSidecars = new ArrayList<>(); | ||
| waitFor( | ||
| peer.requestBlobSidecarsByRange(from, count, RpcResponseListener.from(blobSidecars::add))); | ||
| waitFor(() -> assertThat(peer.getOutstandingRequests()).isEqualTo(0)); |
There was a problem hiding this comment.
is it ok to remove this waitFor?
|
@tbenr great catch. Accidentally removed with repack removing, checking other places now. |
|
Looks good now, merging |
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.
PR Description
Part of #7654
Fixed Issue(s)
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog