rename builder fn

Signed-off-by: Paul Harris <[email protected]>

CHANGELOG.md

@@ -9,5 +9,6 @@
 ### Breaking Changes
 
 ### Additions and Improvements
+ - Applied spec change to alter `GOSSIP_MAX_SIZE` to `MAX_PAYLOAD_SIZE`.
 
 ### Bug Fixes

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfig.java

@@ -318,8 +318,8 @@ public Eth1Address getDepositContractAddress() {
   }
 
   @Override
-  public int getGossipMaxSize() {
-    return specConfig.getGossipMaxSize();
+  public int getMaxPayloadSize() {
+    return specConfig.getMaxPayloadSize();
   }
 
   @Override

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/NetworkingSpecConfig.java

@@ -17,7 +17,7 @@
 
 public interface NetworkingSpecConfig {
 
-  int getGossipMaxSize();
+  int getMaxPayloadSize();
 
   int getMaxChunkSize();
 

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigPhase0.java

@@ -102,7 +102,7 @@ public class SpecConfigPhase0 implements SpecConfig {
   private final Eth1Address depositContractAddress;
 
   // Networking
-  private final int gossipMaxSize;
+  private final int maxPayloadSize;
   private final int maxChunkSize;
   private final int maxRequestBlocks;
   private final int epochsPerSubnetSubscription;
@@ -174,7 +174,7 @@ public SpecConfigPhase0(
       final long depositChainId,
       final long depositNetworkId,
       final Eth1Address depositContractAddress,
-      final int gossipMaxSize,
+      final int maxPayloadSize,
       final int maxChunkSize,
       final int maxRequestBlocks,
       final int epochsPerSubnetSubscription,
@@ -244,7 +244,7 @@ public SpecConfigPhase0(
     this.depositNetworkId = depositNetworkId;
     this.depositContractAddress = depositContractAddress;
     this.squareRootSlotsPerEpoch = MathHelpers.integerSquareRoot(slotsPerEpoch);
-    this.gossipMaxSize = gossipMaxSize;
+    this.maxPayloadSize = maxPayloadSize;
     this.maxChunkSize = maxChunkSize;
     this.maxRequestBlocks = maxRequestBlocks;
     this.epochsPerSubnetSubscription = epochsPerSubnetSubscription;
@@ -561,8 +561,8 @@ public Eth1Address getDepositContractAddress() {
   }
 
   @Override
-  public int getGossipMaxSize() {
-    return gossipMaxSize;
+  public int getMaxPayloadSize() {
+    return maxPayloadSize;
   }
 
   @Override
@@ -683,7 +683,7 @@ public boolean equals(final Object o) {
         && proposerScoreBoost == that.proposerScoreBoost
         && depositChainId == that.depositChainId
         && depositNetworkId == that.depositNetworkId
-        && gossipMaxSize == that.gossipMaxSize
+        && maxPayloadSize == that.maxPayloadSize
         && maxChunkSize == that.maxChunkSize
         && maxRequestBlocks == that.maxRequestBlocks
         && epochsPerSubnetSubscription == that.epochsPerSubnetSubscription
@@ -768,7 +768,7 @@ public int hashCode() {
         depositChainId,
         depositNetworkId,
         depositContractAddress,
-        gossipMaxSize,
+            maxPayloadSize,
         maxChunkSize,
         maxRequestBlocks,
         epochsPerSubnetSubscription,

networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/encoding/SnappyPreparedGossipMessage.java

@@ -124,7 +124,7 @@ public DecodedMessageResult getDecodedMessage() {
       if (valueType == null) {
         return DecodedMessageResult.failed();
       } else {
-        final Bytes decodedMessage = uncompressPayload(networkingConfig.getGossipMaxSize());
+        final Bytes decodedMessage = uncompressPayload(networkingConfig.getMaxPayloadSize());
         return DecodedMessageResult.successful(decodedMessage);
       }
     } catch (DecodingException e) {

networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/topics/topichandlers/Eth2TopicHandler.java

@@ -198,7 +198,7 @@ public PreparedGossipMessage prepareMessage(
 
   @Override
   public int getMaxMessageSize() {
-    return networkingConfig.getGossipMaxSize();
+    return networkingConfig.getMaxPayloadSize();
   }
 
   protected MessageT deserialize(final PreparedGossipMessage message) throws DecodingException {

networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/encoding/SnappyPreparedGossipMessageTest.java

@@ -164,7 +164,7 @@ public void getMessageId_generateUniqueIdsBasedOnValidityAndMilestone() {
 
   @Test
   public void getDecodedMessage_ShouldPassGossipMaxSizeToUncompressor() throws DecodingException {
-    final long gossipMaxSize = spec.getNetworkingConfig().getGossipMaxSize();
+    final long gossipMaxSize = spec.getNetworkingConfig().getMaxPayloadSize();
     final Uncompressor uncompressor = mock(Uncompressor.class);
     when(uncompressor.uncompress(any(), any(), anyLong())).thenReturn(Bytes.random(1000));
 

networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/config/LibP2PParamsFactory.java

@@ -68,10 +68,9 @@ private static void addGossipParamsDValues(
 
   private static void addGossipParamsMaxValues(
       final NetworkingSpecConfig networkingSpecConfig, final GossipParamsBuilder builder) {
-    final int gossipMaxSize = networkingSpecConfig.getGossipMaxSize();
-    final int compressedMaxGossipSize = 32 + gossipMaxSize + (gossipMaxSize / 6);
+    final int maxPayloadSize = networkingSpecConfig.getMaxPayloadSize();
     builder
-        .maxGossipMessageSize(compressedMaxGossipSize)
+        .maxGossipMessageSize(maxPayloadSize)
         .maxPublishedMessages(1000)
         .maxTopicsPerPublishedMessage(1)
         .maxSubscriptions(MAX_SUBSCRIPTIONS_PER_MESSAGE)

networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/libp2p/config/LibP2PParamsFactoryTest.java

@@ -50,6 +50,6 @@ public void createGossipParams_setGossipMaxSizeFromNetworkSpecConfig() {
         LibP2PParamsFactory.createGossipParams(gossipConfig, networkingSpecConfig);
 
     assertThat(gossipParams.getMaxGossipMessageSize()).isEqualTo(expectedGossipMaxSize);
-    verify(networkingSpecConfig).getGossipMaxSize();
+    verify(networkingSpecConfig).getMaxPayloadSize();
   }
 }

networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/libp2p/gossip/GossipHandlerTest.java

@@ -41,7 +41,7 @@
 public class GossipHandlerTest {
 
   private final Spec spec = TestSpecFactory.createMinimalPhase0();
-  private final int gossipMaxSize = spec.getNetworkingConfig().getGossipMaxSize();
+  private final int gossipMaxSize = spec.getNetworkingConfig().getMaxPayloadSize();
   private final Topic topic = new Topic("Testing");
   private final PubsubPublisherApi publisher = mock(PubsubPublisherApi.class);
   private final TopicHandler topicHandler = mock(TopicHandler.class);

teku/src/test/java/tech/pegasys/teku/cli/subcommand/RemoteSpecLoaderTest.java

@@ -73,7 +73,7 @@ void shouldDefaultNetworkConfigThatMovedFromConstants() throws IOException {
     final SpecConfig specConfig = SpecConfigLoader.loadRemoteConfig(data).specConfig();
 
     // Check values not assigned, using default values
-    assertThat(specConfig.getGossipMaxSize()).isEqualTo(10485760);
+    assertThat(specConfig.getMaxPayloadSize()).isEqualTo(10485760);
     assertThat(specConfig.getMaxChunkSize()).isEqualTo(10485760);
     assertThat(specConfig.getMaxRequestBlocks()).isEqualTo(1024);
     assertThat(specConfig.getEpochsPerSubnetSubscription()).isEqualTo(256);