From fda66f5bd9b66d2e4d3297652e67f5cd4cb86204 Mon Sep 17 00:00:00 2001
From: Yusef Napora <yusef@napora.org>
Date: Thu, 25 Jun 2020 11:56:12 -0400
Subject: [PATCH] move drand to common_roles & fix mock randomness override

---
 lotus-soup/baseline.go     | 12 ------------
 lotus-soup/common_roles.go | 13 +++++++++++++
 lotus-soup/node.go         |  8 +++++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/lotus-soup/baseline.go b/lotus-soup/baseline.go
index 0a4c93488..6f5cf9678 100644
--- a/lotus-soup/baseline.go
+++ b/lotus-soup/baseline.go
@@ -238,15 +238,3 @@ func extractCarData(ctx context.Context, rdata []byte, rpath string) []byte {
 	return rdata
 }
 
-func runDrandNode(t *TestEnvironment) error {
-	t.RecordMessage("running drand node")
-	_, err := prepareDrandNode(t)
-	if err != nil {
-		return err
-	}
-
-	// TODO add ability to halt / recover on demand
-	ctx := context.Background()
-	t.SyncClient.MustSignalAndWait(ctx, stateDone, t.TestInstanceCount)
-	return nil
-}
diff --git a/lotus-soup/common_roles.go b/lotus-soup/common_roles.go
index 140318807..d488921b6 100644
--- a/lotus-soup/common_roles.go
+++ b/lotus-soup/common_roles.go
@@ -66,3 +66,16 @@ func runMiner(t *TestEnvironment) error {
 	t.SyncClient.MustSignalAndWait(ctx, stateDone, t.TestInstanceCount)
 	return nil
 }
+
+func runDrandNode(t *TestEnvironment) error {
+	t.RecordMessage("running drand node")
+	_, err := prepareDrandNode(t)
+	if err != nil {
+		return err
+	}
+
+	// TODO add ability to halt / recover on demand
+	ctx := context.Background()
+	t.SyncClient.MustSignalAndWait(ctx, stateDone, t.TestInstanceCount)
+	return nil
+}
diff --git a/lotus-soup/node.go b/lotus-soup/node.go
index 20c63af07..a57fb5f82 100644
--- a/lotus-soup/node.go
+++ b/lotus-soup/node.go
@@ -693,7 +693,13 @@ func getDrandConfig(ctx context.Context, t *TestEnvironment) (node.Option, error
 		), nil
 
 	case "mock":
-		return node.Override(new(beacon.RandomBeacon), modtest.RandomBeacon), nil
+		return node.Options(
+			node.Override(new(beacon.RandomBeacon), modtest.RandomBeacon),
+			node.Override(new(dtypes.DrandConfig), dtypes.DrandConfig{
+				ChainInfoJSON: "{\"Hash\":\"wtf\"}",
+			}),
+			node.Override(new(dtypes.DrandBootstrap), dtypes.DrandBootstrap{}),
+		), nil
 
 	default:
 		return nil, fmt.Errorf("unknown random_beacon_type: %s", beaconType)