update some deprecated references #8314
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
Signed-off-by: Sally MacFarlane <[email protected]>
Signed-off-by: Sally MacFarlane <[email protected]>
macfarla
commented
Feb 17, 2025
| @@ -100,7 +100,7 @@ public Optional<byte[]> get(final SegmentIdentifier segmentId, final byte[] key) | |||
| throwIfClosed(); | |||
|
|
|||
| try (final OperationTimer.TimingContext ignored = metrics.getReadLatency().startTimer()) { | |||
| return Optional.ofNullable(snapTx.get(columnFamilyMapper.apply(segmentId), readOptions, key)); | |||
| return Optional.ofNullable(snapTx.get(readOptions, columnFamilyMapper.apply(segmentId), key)); | |||
There was a problem hiding this comment.
parameter 1 and 2 swapped
| @@ -524,7 +525,7 @@ MessageData constructGetTrieNodesResponse(final MessageData message) { | |||
| var trieNode = optStorage.orElse(Bytes.EMPTY); | |||
| if (!trieNodes.isEmpty() | |||
| && (sumListBytes(trieNodes) + trieNode.size() > maxResponseBytes | |||
| || stopWatch.getTime() | |||
| || stopWatch.getTime(TimeUnit.MILLISECONDS) | |||
There was a problem hiding this comment.
time units passed to method. I think milliseconds is right?
There was a problem hiding this comment.
yeah milliseconds is the right unit
jframe
approved these changes
Feb 18, 2025
| @@ -41,11 +41,12 @@ public void readGenesisFromObjectNode() { | |||
| final var configNode = mapper.createObjectNode(); | |||
| configNode.put("londonBlock", 1); | |||
| final var allocNode = mapper.createObjectNode(); | |||
| allocNode.put(Address.BLS12_G2MULTIEXP.toUnprefixedHexString(), generateAllocation(Wei.ONE)); | |||
| allocNode.putIfAbsent( | |||
There was a problem hiding this comment.
Why the change from put to putIfAbsent? I guess either should be fine since the object node is being created in the test
There was a problem hiding this comment.
put with those args (String, JsonNode) is deprecated. putIfAbsent was an easy fix and yeah - it's a test, and the test still passes, and I didn't think any further about it
| @@ -524,7 +525,7 @@ MessageData constructGetTrieNodesResponse(final MessageData message) { | |||
| var trieNode = optStorage.orElse(Bytes.EMPTY); | |||
| if (!trieNodes.isEmpty() | |||
| && (sumListBytes(trieNodes) + trieNode.size() > maxResponseBytes | |||
| || stopWatch.getTime() | |||
| || stopWatch.getTime(TimeUnit.MILLISECONDS) | |||
There was a problem hiding this comment.
yeah milliseconds is the right unit
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
Update some code to eliminate some deprecated method calls.
The RocksDB one is just a method param order swap, looks benign.
Fixed Issue(s)
Thanks for sending a pull request! Have you done the following?
doc-change-requiredlabel to this PR if updates are required.Locally, you can run these tests to catch failures early:
./gradlew spotlessApply./gradlew build./gradlew acceptanceTest./gradlew integrationTest./gradlew ethereum:referenceTests:referenceTests