ibft controller and future msgs handling

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java

@@ -12,6 +12,8 @@
  */
 package tech.pegasys.pantheon.consensus.ibft;
 
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent;
+
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java

@@ -12,6 +12,8 @@
  */
 package tech.pegasys.pantheon.consensus.ibft;
 
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent;
+
 import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftStateMachine.java

@@ -13,6 +13,7 @@
 package tech.pegasys.pantheon.consensus.ibft;
 
 import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreatorFactory;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent;
 
 /** Stateful evaluator for ibft events */
 public class IbftStateMachine {

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/BlockTimerExpiry.java

@@ -13,8 +13,7 @@
 package tech.pegasys.pantheon.consensus.ibft.ibftevent;
 
 import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier;
-import tech.pegasys.pantheon.consensus.ibft.IbftEvent;
-import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type;
 
 import java.util.Objects;
 

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvent.java → consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvent.java

@@ -10,9 +10,9 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.pantheon.consensus.ibft;
+package tech.pegasys.pantheon.consensus.ibft.ibftevent;
 
-import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type;
 
 /** Category of events that will effect and are interpretable by the Ibft processing mechanism */
 public interface IbftEvent {

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvents.java → consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvents.java

@@ -10,19 +10,20 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.pantheon.consensus.ibft;
+package tech.pegasys.pantheon.consensus.ibft.ibftevent;
 
 import tech.pegasys.pantheon.ethereum.p2p.api.Message;
 
 /** Static helper functions for producing and working with IbftEvent objects */
 public class IbftEvents {
   public static IbftEvent fromMessage(final Message message) {
-    throw new IllegalStateException("No IbftEvents are implemented yet");
+    return new IbftReceivedMessageEvent(message.getData());
   }
 
   public enum Type {
     ROUND_EXPIRY,
     NEW_CHAIN_HEAD,
-    BLOCK_TIMER_EXPIRY
+    BLOCK_TIMER_EXPIRY,
+    MESSAGE
   }
 }

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.pantheon.consensus.ibft.ibftevent;
+
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type;
+import tech.pegasys.pantheon.ethereum.p2p.api.MessageData;
+
+public class IbftReceivedMessageEvent implements IbftEvent {
+
+  private final MessageData messageData;
+
+  public IbftReceivedMessageEvent(final MessageData messageData) {
+    this.messageData = messageData;
+  }
+
+  public MessageData getMessageData() {
+    return messageData;
+  }
+
+  @Override
+  public Type getType() {
+    return Type.MESSAGE;
+  }
+}

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/NewChainHead.java

@@ -12,8 +12,7 @@
  */
 package tech.pegasys.pantheon.consensus.ibft.ibftevent;
 
-import tech.pegasys.pantheon.consensus.ibft.IbftEvent;
-import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type;
 import tech.pegasys.pantheon.ethereum.core.BlockHeader;
 
 import java.util.Objects;

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java

@@ -13,8 +13,7 @@
 package tech.pegasys.pantheon.consensus.ibft.ibftevent;
 
 import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier;
-import tech.pegasys.pantheon.consensus.ibft.IbftEvent;
-import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type;
 
 import java.util.Objects;
 

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java

@@ -12,9 +12,9 @@
  */
 package tech.pegasys.pantheon.consensus.ibft.protocol;
 
-import tech.pegasys.pantheon.consensus.ibft.IbftEvent;
 import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue;
-import tech.pegasys.pantheon.consensus.ibft.IbftEvents;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents;
 import tech.pegasys.pantheon.consensus.ibft.network.IbftNetworkPeers;
 import tech.pegasys.pantheon.ethereum.p2p.api.Message;
 import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection;

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.pantheon.consensus.ibft.statemachine;
+
+import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier;
+import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry;
+import tech.pegasys.pantheon.consensus.ibft.ibftmessagedata.CommitPayload;
+import tech.pegasys.pantheon.consensus.ibft.ibftmessagedata.NewRoundPayload;
+import tech.pegasys.pantheon.consensus.ibft.ibftmessagedata.PreparePayload;
+import tech.pegasys.pantheon.consensus.ibft.ibftmessagedata.ProposalPayload;
+import tech.pegasys.pantheon.consensus.ibft.ibftmessagedata.RoundChangePayload;
+import tech.pegasys.pantheon.consensus.ibft.ibftmessagedata.SignedData;
+
+/** This no-op version will be replaced with an implementation in another PR */
+public class IbftBlockHeightManager {
+
+  public void handleProposalMessage(final SignedData<ProposalPayload> proposalMsg) {}
+
+  public void handlePrepareMessage(final SignedData<PreparePayload> prepareMsg) {}
+
+  public void handleCommitMessage(final SignedData<CommitPayload> commitMsg) {}
+
+  public void handleBlockTimerExpiry(final ConsensusRoundIdentifier roundIndentifier) {}
+
+  public void handleRoundChangeMessage(final SignedData<RoundChangePayload> roundChangeMsg) {}
+
+  public void handleNewRoundMessage(final SignedData<NewRoundPayload> newRoundMsg) {}
+
+  public void start() {}
+
+  public long getChainHeight() {
+    return 0;
+  }
+
+  public void roundExpired(final RoundExpiry expired) {}
+}

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.pantheon.consensus.ibft.statemachine;
+
+import tech.pegasys.pantheon.ethereum.core.BlockHeader;
+
+/** This no-op version will be replaced with an implementation in another PR */
+public class IbftBlockHeightManagerFactory {
+
+  public IbftBlockHeightManager create(final BlockHeader parentHeader) {
+    return new IbftBlockHeightManager();
+  }
+}