add test

PegaSysEng · Feb 12, 2019 · 55a5465 · 55a5465
1 parent 1523c18
commit 55a5465
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 5 deletions.
diff --git a/...reum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java b/...reum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java
@@ -57,13 +57,17 @@ public class EthProtocolManager implements ProtocolManager, MinedBlockObserver {
 
   private final Hash genesisHash;
   private final int networkId;
-  private final EthPeers ethPeers;
+  private EthPeers ethPeers;
   private final EthMessages ethMessages;
   private final EthContext ethContext;
   private final boolean fastSyncEnabled;
   private List<Capability> supportedCapabilities;
   private final Blockchain blockchain;
 
+  public void setEthPeers(EthPeers ethPeers) {
+    this.ethPeers = ethPeers;
+  }
+
   EthProtocolManager(
       final Blockchain blockchain,
       final WorldStateArchive worldStateArchive,

diff --git a/...um/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java b/...um/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java
@@ -144,15 +144,14 @@ private void onBlockAdded(final BlockAddedEvent blockAddedEvent, final Blockchai
     }
   }
 
-  private void broadcastBlock(final Block block, final UInt256 difficulty) {
-    final List<EthPeer> availablePeers =
-        ethContext.getEthPeers().availablePeers().collect(Collectors.toList());
+  void broadcastBlock(final Block block, final UInt256 difficulty) {
+    final List<EthPeer> availablePeers = ethContext.getEthPeers().availablePeers().collect(Collectors.toList());
     for (EthPeer ethPeer : availablePeers) {
       ethPeer.propagateBlock(block, difficulty);
     }
   }
 
-  private void handleNewBlockFromNetwork(final EthMessage message) {
+  void handleNewBlockFromNetwork(final EthMessage message) {
     final Blockchain blockchain = protocolContext.getBlockchain();
     final NewBlockMessage newBlockMessage = NewBlockMessage.readFrom(message.getData());
     try {

diff --git a/...th/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java b/...th/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java
@@ -566,4 +566,49 @@ public void shouldNotImportBlocksThatAreAlreadyBeingImported() {
 
     verify(ethScheduler, times(1)).scheduleSyncWorkerTask(any(Supplier.class));
   }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void broadcastBlockTest() {
+        BlockchainSetupUtil blockchainUtil = BlockchainSetupUtil.forTesting();
+
+        MutableBlockchain blockchain = spy(blockchainUtil.getBlockchain());
+        ProtocolSchedule protocolSchedule = blockchainUtil.getProtocolSchedule();
+        ProtocolContext<Void> tempProtocolContext = blockchainUtil.getProtocolContext();
+        ProtocolContext protocolContext = new ProtocolContext<>(blockchain, tempProtocolContext.getWorldStateArchive(), tempProtocolContext.getConsensusState());
+
+        EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(blockchain, blockchainUtil.getWorldArchive());
+
+        SynchronizerConfiguration syncConfig = SynchronizerConfiguration.builder().blockPropagationRange(-3, 5).build().validated(blockchain);
+        SyncState syncState = new SyncState(blockchain, ethProtocolManager.ethContext().getEthPeers());
+        BlockPropagationManager blockPropagationManager = spy(new BlockPropagationManager<>(
+                        syncConfig,
+                        protocolSchedule,
+                        protocolContext,
+                        ethProtocolManager.ethContext(),
+                        syncState,
+                        pendingBlocks,
+                        ethTasksTimer));
+
+        blockchainUtil.importFirstBlocks(2);
+        final Block nextBlock = blockchainUtil.getBlock(2);
+
+        blockPropagationManager.start();
+
+        // Setup peer and messages
+        final RespondingEthPeer peer0 = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+        final RespondingEthPeer peer1 = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+        final RespondingEthPeer peer2 = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+
+        final UInt256 totalDifficulty = fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get();
+        final NewBlockMessage newBlockMessage = NewBlockMessage.create(nextBlock, totalDifficulty);
+
+        // Broadcast message
+        EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer0, newBlockMessage);
+
+        final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
+        peer0.respondWhile(responder, peer0::hasOutstandingRequests);
+
+        verify(blockPropagationManager, times(1)).broadcastBlock(any(), any());
+    }
 }