Merge and test fixups

beacon_node/beacon_chain/src/migrate.rs

@@ -70,6 +70,11 @@ impl MigratorConfig {
         self.blocking = true;
         self
     }
+
+    pub fn epochs_per_run(mut self, epochs_per_run: u64) -> Self {
+        self.epochs_per_run = epochs_per_run;
+        self
+    }
 }
 
 /// Pruning can be successful, or in rare cases deferred to a later point.

beacon_node/beacon_chain/src/test_utils.rs

@@ -316,6 +316,12 @@ where
         self
     }
 
+    pub fn logger(mut self, log: Logger) -> Self {
+        self.log = log.clone();
+        self.runtime.set_logger(log);
+        self
+    }
+
     /// This mutator will be run before the `store_mutator`.
     pub fn initial_mutator(mut self, mutator: BoxedMutator<E, Hot, Cold>) -> Self {
         assert!(