Propagate ibft newBlock messages after block import (#475)

consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextFactory.java

@@ -44,6 +44,7 @@ import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftRoundFactory;
 import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory;
 import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair;
 import tech.pegasys.pantheon.ethereum.ProtocolContext;
+import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver;
 import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain;
 import tech.pegasys.pantheon.ethereum.core.Address;
 import tech.pegasys.pantheon.ethereum.core.AddressHelpers;
@@ -59,6 +60,7 @@ import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.db.WorldStateArchive;
 import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
+import tech.pegasys.pantheon.util.Subscribers;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 import tech.pegasys.pantheon.util.uint.UInt256;
 
@@ -258,13 +260,16 @@ public class TestContextFactory {
     // Disable Gossiping for integration tests.
     final IbftGossip gossiper = mock(IbftGossip.class);
 
+    final Subscribers<MinedBlockObserver> minedBlockObservers = new Subscribers<>();
+
     final IbftController ibftController =
         new IbftController(
             blockChain,
             finalState,
             new IbftBlockHeightManagerFactory(
                 finalState,
-                new IbftRoundFactory(finalState, protocolContext, protocolSchedule),
+                new IbftRoundFactory(
+                    finalState, protocolContext, protocolSchedule, minedBlockObservers),
                 messageValidatorFactory,
                 protocolContext),
             new HashMap<>(),

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftFinalState.java

@@ -67,8 +67,8 @@ public class IbftFinalState {
     this.blockCreatorFactory = blockCreatorFactory;
     this.messageFactory = messageFactory;
     this.ibftContextBlockHeaderValidator = ibftContextBlockHeaderValidator;
-    this.messageTransmitter = new IbftMessageTransmitter(messageFactory, peers);
     this.clock = clock;
+    this.messageTransmitter = new IbftMessageTransmitter(messageFactory, peers);
   }
 
   public int getQuorumSize() {

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundFactory.java

@@ -24,22 +24,22 @@ import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
 import tech.pegasys.pantheon.util.Subscribers;
 
 public class IbftRoundFactory {
-
   private final IbftFinalState finalState;
-
   private final IbftBlockCreatorFactory blockCreatorFactory;
   private final ProtocolContext<IbftContext> protocolContext;
   private final ProtocolSchedule<IbftContext> protocolSchedule;
-  private final Subscribers<MinedBlockObserver> minedBlockObservers = new Subscribers<>();
+  private final Subscribers<MinedBlockObserver> minedBlockObservers;
 
   public IbftRoundFactory(
       final IbftFinalState finalState,
       final ProtocolContext<IbftContext> protocolContext,
-      final ProtocolSchedule<IbftContext> protocolSchedule) {
+      final ProtocolSchedule<IbftContext> protocolSchedule,
+      final Subscribers<MinedBlockObserver> minedBlockObservers) {
     this.finalState = finalState;
     this.blockCreatorFactory = finalState.getBlockCreatorFactory();
     this.protocolContext = protocolContext;
     this.protocolSchedule = protocolSchedule;
+    this.minedBlockObservers = minedBlockObservers;
   }
 
   public IbftRound createNewRound(final BlockHeader parentHeader, final int round) {

consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundTest.java

@@ -68,14 +68,14 @@ public class IbftRoundTest {
   private final KeyPair localNodeKeys = KeyPair.generate();
   private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 1);
   private final MessageFactory messageFactory = new MessageFactory(localNodeKeys);
+  private final Subscribers<MinedBlockObserver> subscribers = new Subscribers<>();
   private ProtocolContext<IbftContext> protocolContext;
 
   @Mock private MutableBlockchain blockChain;
   @Mock private WorldStateArchive worldStateArchive;
   @Mock private BlockImporter<IbftContext> blockImporter;
-  @Mock private Subscribers<MinedBlockObserver> subscribers;
   @Mock private IbftMessageTransmitter transmitter;
-
+  @Mock private MinedBlockObserver minedBlockObserver;
   @Mock private IbftBlockCreator blockCreator;
   @Mock private MessageValidator messageValidator;
 
@@ -117,6 +117,8 @@ public class IbftRoundTest {
     when(blockCreator.createBlock(anyLong())).thenReturn(proposedBlock);
 
     when(blockImporter.importBlock(any(), any(), any())).thenReturn(true);
+
+    subscribers.subscribe(minedBlockObserver);
   }
 
   @Test
@@ -355,4 +357,21 @@ public class IbftRoundTest {
         messageFactory.createSignedPreparePayload(roundIdentifier, proposedBlock.getHash()));
     assertThat(roundState.isPrepared()).isTrue();
   }
+
+  @Test
+  public void creatingNewBlockNotifiesBlockMiningObservers() {
+    final RoundState roundState = new RoundState(roundIdentifier, 1, messageValidator);
+    final IbftRound round =
+        new IbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            localNodeKeys,
+            messageFactory,
+            transmitter);
+    round.createAndSendProposalMessage(15);
+    verify(minedBlockObserver).blockMined(any());
+  }
 }

pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java

@@ -46,6 +46,7 @@ import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair;
 import tech.pegasys.pantheon.ethereum.ProtocolContext;
 import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator;
 import tech.pegasys.pantheon.ethereum.chain.GenesisState;
+import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver;
 import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain;
 import tech.pegasys.pantheon.ethereum.core.Hash;
 import tech.pegasys.pantheon.ethereum.core.MiningParameters;
@@ -73,6 +74,7 @@ import tech.pegasys.pantheon.ethereum.storage.StorageProvider;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage;
 import tech.pegasys.pantheon.metrics.MetricCategory;
 import tech.pegasys.pantheon.metrics.MetricsSystem;
+import tech.pegasys.pantheon.util.Subscribers;
 
 import java.io.IOException;
 import java.time.Clock;
@@ -204,6 +206,9 @@ public class IbftPantheonController implements PantheonController<IbftContext> {
         IbftBlockHeaderValidationRulesetFactory.ibftProposedBlockValidator(
             ibftConfig.getBlockPeriodSeconds());
 
+    final Subscribers<MinedBlockObserver> minedBlockObservers = new Subscribers<>();
+    minedBlockObservers.subscribe(ethProtocolManager);
+
     final IbftFinalState finalState =
         new IbftFinalState(
             voteTally,
@@ -234,7 +239,8 @@ public class IbftPantheonController implements PantheonController<IbftContext> {
             finalState,
             new IbftBlockHeightManagerFactory(
                 finalState,
-                new IbftRoundFactory(finalState, protocolContext, protocolSchedule),
+                new IbftRoundFactory(
+                    finalState, protocolContext, protocolSchedule, minedBlockObservers),
                 messageValidatorFactory,
                 protocolContext));