fix PR discussion

- add tests

ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockDataGenerator.java

@@ -244,6 +244,18 @@ public BlockBody body(final BlockOptions options) {
  return new BlockBody(options.getTransactions(defaultTxs), ommers);
  }
 
+ public Transaction transaction(BytesValue payload) {
+ return Transaction.builder()
+ .nonce(positiveLong())
+ .gasPrice(Wei.wrap(bytes32()))
+ .gasLimit(positiveLong())
+ .to(address())
+ .value(Wei.wrap(bytes32()))
+ .payload(payload)
+ .chainId(1)
+ .signAndBuild(SECP256K1.KeyPair.generate());
+ }
+
  public Transaction transaction() {
  return Transaction.builder()
  .nonce(positiveLong())

ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessagesTest.java

@@ -17,7 +17,9 @@
 
 import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator;
 import tech.pegasys.pantheon.ethereum.core.Transaction;
+import tech.pegasys.pantheon.util.bytes.BytesValue;
 
+import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Test;
@@ -53,20 +55,18 @@ public void createLimited() {
 
  @Test
  public void createLimitedWithFirstTransactionExceedingLimit() {
- final Set<Transaction> txs = generator.transactions(6000);
+ final Set<Transaction> txs = new HashSet<>();
+ txs.add(generator.transaction(BytesValue.wrap(new byte[LIMIT + 1])));
+ txs.add(generator.transaction());
  final LimitedTransactionsMessages firstMessage = LimitedTransactionsMessages.createLimited(txs);
- assertEquals(5219, firstMessage.getIncludedTransactions().size());
+ assertEquals(1, firstMessage.getIncludedTransactions().size());
  txs.removeAll(firstMessage.getIncludedTransactions());
- assertEquals(781, txs.size());
+ assertEquals(1, txs.size());
  final LimitedTransactionsMessages secondMessage =
  LimitedTransactionsMessages.createLimited(txs);
- assertEquals(781, secondMessage.getIncludedTransactions().size());
+ assertEquals(1, secondMessage.getIncludedTransactions().size());
  txs.removeAll(secondMessage.getIncludedTransactions());
  assertEquals(0, txs.size());
- assertTrue(
- (firstMessage.getTransactionsMessage().getSize()
- + secondMessage.getTransactionsMessage().getSize())
- < 2 * LIMIT);
  }
 
  @Test