From fef22c31be609f784f3067067ede7e441286c7fe Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 12 Feb 2019 17:00:10 +1100
Subject: [PATCH] Update block_producer to spec v0.2.0

---
 eth2/block_producer/src/lib.rs                 |  7 ++-----
 .../src/test_utils/simulated_beacon_node.rs    | 18 +-----------------
 eth2/block_producer/src/traits.rs              |  5 +----
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/eth2/block_producer/src/lib.rs b/eth2/block_producer/src/lib.rs
index 0dca583b26..20cd50d9c9 100644
--- a/eth2/block_producer/src/lib.rs
+++ b/eth2/block_producer/src/lib.rs
@@ -134,10 +134,8 @@ impl<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> BlockProducer<T, U
     /// slashing.
     fn produce_block(&mut self, slot: Slot) -> Result<PollOutcome, Error> {
         let randao_reveal = {
-            let producer_nonce = self.beacon_node.proposer_nonce(&self.pubkey)?;
-
-            // TODO: add domain, etc to this message.
-            let message = ssz_encode(&producer_nonce);
+            // TODO: add domain, etc to this message. Also ensure result matches `into_to_bytes32`.
+            let message = ssz_encode(&slot.epoch(self.spec.epoch_length));
 
             match self.signer.sign_randao_reveal(&message) {
                 None => return Ok(PollOutcome::SignerRejection(slot)),
@@ -254,7 +252,6 @@ mod tests {
         // Configure responses from the BeaconNode.
         beacon_node.set_next_produce_result(Ok(Some(BeaconBlock::random_for_test(&mut rng))));
         beacon_node.set_next_publish_result(Ok(PublishOutcome::ValidBlock));
-        beacon_node.set_next_nonce_result(Ok(0));
 
         // One slot before production slot...
         slot_clock.set_slot(produce_slot.as_u64() - 1);
diff --git a/eth2/block_producer/src/test_utils/simulated_beacon_node.rs b/eth2/block_producer/src/test_utils/simulated_beacon_node.rs
index 39d03dbe7f..ec2695d566 100644
--- a/eth2/block_producer/src/test_utils/simulated_beacon_node.rs
+++ b/eth2/block_producer/src/test_utils/simulated_beacon_node.rs
@@ -1,6 +1,6 @@
 use crate::traits::{BeaconNode, BeaconNodeError, PublishOutcome};
 use std::sync::RwLock;
-use types::{BeaconBlock, PublicKey, Signature, Slot};
+use types::{BeaconBlock, Signature, Slot};
 
 type NonceResult = Result<u64, BeaconNodeError>;
 type ProduceResult = Result<Option<BeaconBlock>, BeaconNodeError>;
@@ -9,9 +9,6 @@ type PublishResult = Result<PublishOutcome, BeaconNodeError>;
 /// A test-only struct used to simulate a Beacon Node.
 #[derive(Default)]
 pub struct SimulatedBeaconNode {
-    pub nonce_input: RwLock<Option<PublicKey>>,
-    pub nonce_result: RwLock<Option<NonceResult>>,
-
     pub produce_input: RwLock<Option<(Slot, Signature)>>,
     pub produce_result: RwLock<Option<ProduceResult>>,
 
@@ -20,11 +17,6 @@ pub struct SimulatedBeaconNode {
 }
 
 impl SimulatedBeaconNode {
-    /// Set the result to be returned when `produce_beacon_block` is called.
-    pub fn set_next_nonce_result(&self, result: NonceResult) {
-        *self.nonce_result.write().unwrap() = Some(result);
-    }
-
     /// Set the result to be returned when `produce_beacon_block` is called.
     pub fn set_next_produce_result(&self, result: ProduceResult) {
         *self.produce_result.write().unwrap() = Some(result);
@@ -37,14 +29,6 @@ impl SimulatedBeaconNode {
 }
 
 impl BeaconNode for SimulatedBeaconNode {
-    fn proposer_nonce(&self, pubkey: &PublicKey) -> NonceResult {
-        *self.nonce_input.write().unwrap() = Some(pubkey.clone());
-        match *self.nonce_result.read().unwrap() {
-            Some(ref r) => r.clone(),
-            None => panic!("SimulatedBeaconNode: nonce_result == None"),
-        }
-    }
-
     /// Returns the value specified by the `set_next_produce_result`.
     fn produce_beacon_block(&self, slot: Slot, randao_reveal: &Signature) -> ProduceResult {
         *self.produce_input.write().unwrap() = Some((slot, randao_reveal.clone()));
diff --git a/eth2/block_producer/src/traits.rs b/eth2/block_producer/src/traits.rs
index 5467bee879..5eb27bce71 100644
--- a/eth2/block_producer/src/traits.rs
+++ b/eth2/block_producer/src/traits.rs
@@ -1,4 +1,4 @@
-use types::{BeaconBlock, PublicKey, Signature, Slot};
+use types::{BeaconBlock, Signature, Slot};
 
 #[derive(Debug, PartialEq, Clone)]
 pub enum BeaconNodeError {
@@ -14,9 +14,6 @@ pub enum PublishOutcome {
 
 /// Defines the methods required to produce and publish blocks on a Beacon Node.
 pub trait BeaconNode: Send + Sync {
-    /// Requests the proposer nonce (presently named `proposer_slots`).
-    fn proposer_nonce(&self, pubkey: &PublicKey) -> Result<u64, BeaconNodeError>;
-
     /// Request that the node produces a block.
     ///
     /// Returns Ok(None) if the Beacon Node is unable to produce at the given slot.