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

Jump to bottom

Introduce a cap to reputation score increase #4230

Merged
merged 6 commits into from
Aug 10, 2022
Merged

Introduce a cap to reputation score increase #4230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1ff685
Introduce a cap to reputation score increase
fab-10 Aug 8, 2022
086bfb1
Update CHANGELOG
fab-10 Aug 8, 2022
15c1b4e
Update unit test
fab-10 Aug 8, 2022
89f3ff0
Create peer reputation with an initial score smaller that max score
fab-10 Aug 9, 2022
e0839a5
Merge branch 'main' into peer-reputation-cap
fab-10 Aug 9, 2022
e4b621b
Merge branch 'main' into peer-reputation-cap
fab-10 Aug 10, 2022
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
12 changes: 8 additions & 4 deletions ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*/
package org.hyperledger.besu.ethereum.eth.manager;

import static com.google.common.base.Preconditions.checkArgument;

import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;

import java.util.Map;
Expand All @@ -32,7 +34,8 @@
public class PeerReputation implements Comparable<PeerReputation> {
static final long USELESS_RESPONSE_WINDOW_IN_MILLIS =
TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES);
static final int DEFAULT_MAX_SCORE = 100;
static final int DEFAULT_MAX_SCORE = 150;
static final int DEFAULT_INITIAL_SCORE = 100;
private static final Logger LOG = LoggerFactory.getLogger(PeerReputation.class);
private static final int TIMEOUT_THRESHOLD = 3;
private static final int USELESS_RESPONSE_THRESHOLD = 5;
Expand All @@ -49,12 +52,13 @@ public class PeerReputation implements Comparable<PeerReputation> {
private final int maxScore;

public PeerReputation() {
this(DEFAULT_MAX_SCORE);
this(DEFAULT_INITIAL_SCORE, DEFAULT_MAX_SCORE);
}

public PeerReputation(final int maxScore) {
public PeerReputation(final int initialScore, final int maxScore) {
checkArgument(initialScore <= maxScore, "Inital score must be less than or equal to max score");
this.maxScore = maxScore;
this.score = maxScore;
this.score = initialScore;
}

public Optional<DisconnectReason> recordRequestTimeout(final int requestCode) {
Expand Down
16 changes: 11 additions & 5 deletions ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,14 @@

public class PeerReputationTest {

private static final int INITIAL_SCORE = 25;
private static final int MAX_SCORE = 50;
private final PeerReputation reputation = new PeerReputation(MAX_SCORE);
private final PeerReputation reputation = new PeerReputation(INITIAL_SCORE, MAX_SCORE);

@Test(expected = java.lang.IllegalArgumentException.class)
public void shouldThrowOnInvalidInitialScore() {
new PeerReputation(2, 1);
fab-10 marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void shouldOnlyDisconnectWhenTimeoutLimitReached() {
Expand Down Expand Up @@ -84,15 +90,15 @@ public void shouldDiscardEmptyResponseRecordsAfterTimeWindowElapses() {

@Test
public void shouldIncreaseScore() {
reputation.recordUselessResponse(1001);
final int scoreDecreased = reputation.getScore();
reputation.recordUsefulResponse();
assertThat(reputation.getScore()).isGreaterThan(scoreDecreased);
assertThat(reputation.getScore()).isGreaterThan(INITIAL_SCORE);
}

@Test
public void shouldNotIncreaseScoreOverMax() {
reputation.recordUsefulResponse();
for (int i = 0; i <= MAX_SCORE + 1; i++) {
reputation.recordUsefulResponse();
}
assertThat(reputation.getScore()).isEqualTo(MAX_SCORE);
}
}