Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-1683] Limit the fraction of wire connections initiated by peers #1665

Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6c47fd8
[PAN-1683] Limit the fraction of wire connections initiated by peers
AbdelStark Jul 9, 2019
43eb1ee
Merge remote-tracking branch 'upstream/master' into feature/pan-1683-…
AbdelStark Jul 9, 2019
0ac2ecc
Merge remote-tracking branch 'upstream/master' into feature/pan-1683-…
AbdelStark Jul 10, 2019
a3a9c15
change fraction default value and add tests
AbdelStark Jul 10, 2019
9a12d6b
make fraction of remote wire connections configurable
AbdelStark Jul 10, 2019
3750335
remove unused local variable
AbdelStark Jul 10, 2019
185c8dc
fix RunnerTest
AbdelStark Jul 10, 2019
f60fcc7
set fraction to 1.0 in PantheonFactoryConfigurationBuilder
AbdelStark Jul 10, 2019
55703e0
update test
AbdelStark Jul 10, 2019
ff532c2
Introduce --limit-remote-wire-connections-enabled
AbdelStark Jul 10, 2019
bd7c156
fix unused field
AbdelStark Jul 10, 2019
6e33e61
Merge branch 'master' into feature/pan-1683-limit-fraction-remote-wir…
AbdelStark Jul 11, 2019
e1e0fb2
Merge branch 'master' into feature/pan-1683-limit-fraction-remote-wir…
AbdelStark Jul 11, 2019
b1d5f91
Merge remote-tracking branch 'upstream/master' into feature/pan-1683-…
AbdelStark Jul 11, 2019
66186c8
fix conflict
AbdelStark Jul 11, 2019
554d2aa
Merge branch 'master' into feature/pan-1683-limit-fraction-remote-wir…
AbdelStark Jul 11, 2019
9fd60d4
Merge branch 'master' into feature/pan-1683-limit-fraction-remote-wir…
AbdelStark Jul 11, 2019
1cf8cdf
Merge branch 'master' into feature/pan-1683-limit-fraction-remote-wir…
AbdelStark Jul 11, 2019
3bbafc2
Merge branch 'master' into feature/pan-1683-limit-fraction-remote-wir…
AbdelStark Jul 11, 2019
ca2f91d
Update ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/…
AbdelStark Jul 11, 2019
12bcb88
Update ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/…
AbdelStark Jul 11, 2019
ba4ba63
Update ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/…
AbdelStark Jul 11, 2019
c81109c
fix PR discussion and tests
AbdelStark Jul 11, 2019
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into feature/pan-1683-…
…limit-fraction-remote-wire-connections
  • Loading branch information
AbdelStark committed Jul 11, 2019
commit b1d5f91c5130010ff564406972e053dafd7b8daf
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,8 @@ public void tomlThatConfiguresEverythingExceptPermissioningToml() throws IOExcep
tomlResult.getArray(tomlKey);
} else if (Number.class.isAssignableFrom(optionSpec.type())) {
tomlResult.getLong(tomlKey);
} else if (Fraction.class.isAssignableFrom(optionSpec.type())) {
tomlResult.getDouble(tomlKey);
} else if (Wei.class.isAssignableFrom(optionSpec.type())) {
tomlResult.getLong(tomlKey);
} else {
tomlResult.getString(tomlKey);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.