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

7311: Remove code from GetHeadersFromPeerByNumberTask only used in test, update test to use used code #7775

Merged
merged 2 commits into from
Oct 15, 2024
Merged

7311: Remove code from GetHeadersFromPeerByNumberTask only used in test, update test to use used code #7775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36305c1
7311: Remove code only used in test, update test to use code used in …
Matilda-Clerke Oct 15, 2024
739a25b
Merge branch 'main' into remove-GetHeadersFromPeerByNumberTask-code-o…
Matilda-Clerke Oct 15, 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
14 changes: 2 additions & 12 deletions ...n/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,15 @@ public class GetHeadersFromPeerByNumberTask extends AbstractGetHeadersFromPeerTa
this.blockNumber = blockNumber;
}

public static AbstractGetHeadersFromPeerTask startingAtNumber(
final ProtocolSchedule protocolSchedule,
final EthContext ethContext,
final long firstBlockNumber,
final int segmentLength,
final MetricsSystem metricsSystem) {
return new GetHeadersFromPeerByNumberTask(
protocolSchedule, ethContext, firstBlockNumber, segmentLength, 0, false, metricsSystem);
}

public static AbstractGetHeadersFromPeerTask endingAtNumber(
final ProtocolSchedule protocolSchedule,
final EthContext ethContext,
final long lastlockNumber,
final long lastBlockNumber,
final int segmentLength,
final int skip,
final MetricsSystem metricsSystem) {
return new GetHeadersFromPeerByNumberTask(
protocolSchedule, ethContext, lastlockNumber, segmentLength, skip, true, metricsSystem);
protocolSchedule, ethContext, lastBlockNumber, segmentLength, skip, true, metricsSystem);
}

public static AbstractGetHeadersFromPeerTask forSingleNumber(
Expand Down
12 changes: 8 additions & 4 deletions ...va/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected void assertPartialResultMatchesExpectation(
protected List<BlockHeader> generateDataToBeRequested() {
final int count = 3;
final List<BlockHeader> requestedHeaders = new ArrayList<>(count);
for (long i = 0; i < count; i++) {
for (long i = count - 1; i >= 0; i--) {
requestedHeaders.add(blockchain.getBlockHeader(5 + i).get());
}
return requestedHeaders;
Expand All @@ -66,9 +66,13 @@ protected List<BlockHeader> generateDataToBeRequested() {
@Override
protected EthTask<AbstractPeerTask.PeerTaskResult<List<BlockHeader>>> createTask(
final List<BlockHeader> requestedData) {
final BlockHeader firstHeader = requestedData.get(0);
return GetHeadersFromPeerByNumberTask.startingAtNumber(
protocolSchedule, ethContext, firstHeader.getNumber(), requestedData.size(), metricsSystem);
return GetHeadersFromPeerByNumberTask.endingAtNumber(
protocolSchedule,
ethContext,
requestedData.getFirst().getNumber(),
requestedData.size(),
0,
metricsSystem);
}

@Test
Expand Down
Loading