Improvements on Status service (#821)

* improve status service usage
* simplify reshare status on status service

core/constants.go

@@ -56,25 +56,3 @@ var DefaultResharingOffset = 30 * time.Second
 
 // PrivateRandLength is the length of expected private randomness buffers
 const PrivateRandLength = 32
-
-type DkgStatus uint32
-
-const (
-	DkgReady DkgStatus = iota
-	DkgInProgress
-	DkgNotStarted
-)
-
-type ReshareStatus uint32
-
-const (
-	ReshareNotInProgress ReshareStatus = iota
-	ReshareInProgress
-)
-
-type BeaconStatus uint32
-
-const (
-	BeaconNotInited BeaconStatus = iota
-	BeaconInited
-)

core/drand_control.go

@@ -586,15 +586,14 @@ func (d *Drand) Status(c context.Context, in *drand.StatusRequest) (*drand.Statu
 	}
 
 	// Reshare status
-	switch {
-	case !d.dkgDone:
+	reshareStatus.Status = uint32(ReshareNotInProgress)
+	if d.dkgDone && d.receiver != nil {
 		reshareStatus.Status = uint32(ReshareInProgress)
-	case d.dkgDone && d.receiver != nil:
-		reshareStatus.Status = uint32(ReshareNotInProgress)
 	}
 
 	// Beacon status
 	beaconStatus.Status = uint32(BeaconNotInited)
+	chainStore.IsEmpty = true
 
 	if d.beacon != nil {
 		beaconStatus.Status = uint32(BeaconInited)
@@ -608,7 +607,7 @@ func (d *Drand) Status(c context.Context, in *drand.StatusRequest) (*drand.Statu
 		lastBeacon, err := d.beacon.Store().Last()
 
 		if err == nil && lastBeacon != nil {
-			chainStore.IsAnyRound = true
+			chainStore.IsEmpty = false
 			chainStore.LastRound = lastBeacon.GetRound()
 			chainStore.Length = uint64(d.beacon.Store().Len())
 		}

core/drand_status.go

@@ -0,0 +1,27 @@
+package core
+
+const UnknownDesc = "Unknown"
+const NotStartedDesc = "Not started"
+const InProgressDesc = "In progress"
+
+type DkgStatus uint32
+
+const (
+	DkgReady DkgStatus = iota
+	DkgInProgress
+	DkgNotStarted
+)
+
+type ReshareStatus uint32
+
+const (
+	ReshareNotInProgress ReshareStatus = iota
+	ReshareInProgress
+)
+
+type BeaconStatus uint32
+
+const (
+	BeaconNotInited BeaconStatus = iota
+	BeaconInited
+)

core/util_test.go

@@ -456,7 +456,7 @@ func (d *DrandTestScenario) WaitUntilRound(t *testing.T, node *MockNode, round u
 		status, err := newClient.Status()
 		require.NoError(t, err)
 
-		if status.ChainStore.IsAnyRound && status.ChainStore.LastRound == round {
+		if !status.ChainStore.IsEmpty && status.ChainStore.LastRound == round {
 			t.Logf("node %s is on expected round (%d)", node.addr, status.ChainStore.LastRound)
 			return nil
 		}

net/control.go

@@ -77,8 +77,8 @@ func (c *ControlClient) Ping() error {
 
 // Status gets the current daemon status
 func (c *ControlClient) Status() (*control.StatusResponse, error) {
-	pong, err := c.client.Status(ctx.Background(), &control.StatusRequest{})
-	return pong, err
+	resp, err := c.client.Status(ctx.Background(), &control.StatusRequest{})
+	return resp, err
 }
 
 // InitReshareLeader sets up the node to be ready for a resharing protocol.

protobuf/drand/control.proto

@@ -172,7 +172,7 @@ message BeaconStatus{
 }
 
 message ChainStoreStatus{
-    bool is_any_round = 1;
+    bool is_empty = 1;
     uint64 last_round = 2;
     uint64 length = 3;
 }