Merge current master

eth2/block_proposer/src/test_utils/epoch_map.rs

@@ -0,0 +1,28 @@
+use crate::{DutiesReader, DutiesReaderError};
+use std::collections::HashMap;
+use types::{Epoch, Slot};
+
+pub struct EpochMap {
+    epoch_length: u64,
+    pub map: HashMap<Epoch, Slot>,
+}
+
+impl EpochMap {
+    pub fn new(epoch_length: u64) -> Self {
+        Self {
+            epoch_length,
+            map: HashMap::new(),
+        }
+    }
+}
+
+impl DutiesReader for EpochMap {
+    fn is_block_production_slot(&self, slot: Slot) -> Result<bool, DutiesReaderError> {
+        let epoch = slot.epoch(self.epoch_length);
+        match self.map.get(&epoch) {
+            Some(s) if *s == slot => Ok(true),
+            Some(s) if *s != slot => Ok(false),
+            _ => Err(DutiesReaderError::UnknownEpoch),
+        }
+    }
+}

eth2/block_proposer/src/test_utils/local_signer.rs

@@ -0,0 +1,35 @@
+use crate::traits::Signer;
+use std::sync::RwLock;
+use types::{Keypair, Signature};
+
+/// A test-only struct used to simulate a Beacon Node.
+pub struct LocalSigner {
+    keypair: Keypair,
+    should_sign: RwLock<bool>,
+}
+
+impl LocalSigner {
+    /// Produce a new LocalSigner with signing enabled by default.
+    pub fn new(keypair: Keypair) -> Self {
+        Self {
+            keypair,
+            should_sign: RwLock::new(true),
+        }
+    }
+
+    /// If set to `false`, the service will refuse to sign all messages. Otherwise, all messages
+    /// will be signed.
+    pub fn enable_signing(&self, enabled: bool) {
+        *self.should_sign.write().unwrap() = enabled;
+    }
+}
+
+impl Signer for LocalSigner {
+    fn sign_block_proposal(&self, message: &[u8], domain: u64) -> Option<Signature> {
+        Some(Signature::new(message, domain, &self.keypair.sk))
+    }
+
+    fn sign_randao_reveal(&self, message: &[u8], domain: u64) -> Option<Signature> {
+        Some(Signature::new(message, domain, &self.keypair.sk))
+    }
+}

eth2/block_proposer/src/test_utils/mod.rs

@@ -0,0 +1,7 @@
+mod epoch_map;
+mod local_signer;
+mod simulated_beacon_node;
+
+pub use self::epoch_map::EpochMap;
+pub use self::local_signer::LocalSigner;
+pub use self::simulated_beacon_node::SimulatedBeaconNode;

eth2/block_proposer/src/test_utils/simulated_beacon_node.rs

@@ -0,0 +1,48 @@
+use crate::traits::{BeaconNode, BeaconNodeError, PublishOutcome};
+use std::sync::RwLock;
+use types::{BeaconBlock, Signature, Slot};
+
+type ProduceResult = Result<Option<BeaconBlock>, BeaconNodeError>;
+type PublishResult = Result<PublishOutcome, BeaconNodeError>;
+
+/// A test-only struct used to simulate a Beacon Node.
+#[derive(Default)]
+pub struct SimulatedBeaconNode {
+    pub produce_input: RwLock<Option<(Slot, Signature)>>,
+    pub produce_result: RwLock<Option<ProduceResult>>,
+
+    pub publish_input: RwLock<Option<BeaconBlock>>,
+    pub publish_result: RwLock<Option<PublishResult>>,
+}
+
+impl SimulatedBeaconNode {
+    /// 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);
+    }
+
+    /// Set the result to be returned when `publish_beacon_block` is called.
+    pub fn set_next_publish_result(&self, result: PublishResult) {
+        *self.publish_result.write().unwrap() = Some(result);
+    }
+}
+
+impl BeaconNode for SimulatedBeaconNode {
+    /// 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()));
+        match *self.produce_result.read().unwrap() {
+            Some(ref r) => r.clone(),
+            None => panic!("SimulatedBeaconNode: produce_result == None"),
+        }
+    }
+
+    /// Returns the value specified by the `set_next_publish_result`.
+    fn publish_beacon_block(&self, block: BeaconBlock) -> PublishResult {
+        *self.publish_input.write().unwrap() = Some(block);
+        match *self.publish_result.read().unwrap() {
+            Some(ref r) => r.clone(),
+            None => panic!("SimulatedBeaconNode: publish_result == None"),
+        }
+    }
+}