go/worker/common/committee: Simplify node hooks

Author: peternose

go/worker/client/committee/node.go

@@ -79,11 +79,6 @@ func (n *Node) Initialized() <-chan struct{} {
 	return n.initCh
 }
 
-// HandleNewBlockEarlyLocked is guarded by CrossNode.
-func (n *Node) HandleNewBlockEarlyLocked(*runtime.BlockInfo) {
-	// Nothing to do here.
-}
-
 // HandleNewBlockLocked is guarded by CrossNode.
 func (n *Node) HandleNewBlockLocked(*runtime.BlockInfo) {
 	// Nothing to do here.

go/worker/common/committee/node.go

@@ -128,8 +128,6 @@ var (
 // NodeHooks defines a worker's duties at common events.
 // These are called from the runtime's common node's worker.
 type NodeHooks interface {
-	// Guarded by CrossNode.
-	HandleNewBlockEarlyLocked(*runtime.BlockInfo)
 	// Guarded by CrossNode.
 	HandleNewBlockLocked(*runtime.BlockInfo)
 	// Guarded by CrossNode.
@@ -531,17 +529,6 @@ func (n *Node) handleNewBlock(blk *block.Block, height int64) {
 		n.KeyManagerClient.SetKeyManagerID(n.CurrentDescriptor.KeyManager)
 	}
 
-	bi := &runtime.BlockInfo{
-		RuntimeBlock:     n.CurrentBlock,
-		ConsensusBlock:   n.CurrentConsensusBlock,
-		Epoch:            n.CurrentEpoch,
-		ActiveDescriptor: n.CurrentDescriptor,
-	}
-
-	for _, hooks := range n.hooks {
-		hooks.HandleNewBlockEarlyLocked(bi)
-	}
-
 	// Perform actions based on block type.
 	switch header.HeaderType {
 	case block.Normal:
@@ -566,11 +553,18 @@ func (n *Node) handleNewBlock(blk *block.Block, height int64) {
 		n.handleSuspendLocked(height)
 	default:
 		n.logger.Error("invalid block type",
-			"block", bi.RuntimeBlock,
+			"block", blk,
 		)
 		return
 	}
 
+	bi := &runtime.BlockInfo{
+		RuntimeBlock:     n.CurrentBlock,
+		ConsensusBlock:   n.CurrentConsensusBlock,
+		Epoch:            n.CurrentEpoch,
+		ActiveDescriptor: n.CurrentDescriptor,
+	}
+
 	n.TxPool.ProcessBlock(bi)
 
 	// Fetch incoming messages.

go/worker/compute/executor/committee/hooks.go

@@ -1,26 +1,19 @@
 package committee
 
 import (
-	"github.com/oasisprotocol/oasis-core/go/common/crash"
 	runtime "github.com/oasisprotocol/oasis-core/go/runtime/api"
 	"github.com/oasisprotocol/oasis-core/go/worker/common/committee"
 )
 
 // Ensure Node implements NodeHooks.
 var _ committee.NodeHooks = (*Node)(nil)
 
-// HandleNewBlockEarlyLocked implements NodeHooks.
+// HandleNewBlockLocked implements NodeHooks.
 // Guarded by n.commonNode.CrossNode.
-func (n *Node) HandleNewBlockEarlyLocked(*runtime.BlockInfo) {
-	crash.Here(crashPointRoothashReceiveAfter)
-
+func (n *Node) HandleNewBlockLocked(bi *runtime.BlockInfo) {
 	// Update our availability.
 	n.nudgeAvailabilityLocked(false)
-}
 
-// HandleNewBlockLocked implements NodeHooks.
-// Guarded by n.commonNode.CrossNode.
-func (n *Node) HandleNewBlockLocked(bi *runtime.BlockInfo) {
 	// Drop blocks if the worker falls behind.
 	select {
 	case <-n.blockInfoCh:

go/worker/compute/executor/committee/init.go

@@ -11,7 +11,6 @@ const (
 	crashPointBatchProposeBefore       = "worker.executor.batch.propose.before"
 	crashPointBatchProposeAfter        = "worker.executor.batch.propose.after"
 	crashPointDiscrepancyDetectedAfter = "worker.executor.batch.discrepancy_detected.after"
-	crashPointRoothashReceiveAfter     = "worker.executor.batch.roothash.receive.after"
 	crashPointBatchPublishAfter        = "worker.executor.batch.schedule.publish.after"
 )
 
@@ -23,7 +22,6 @@ func init() {
 		crashPointBatchProposeBefore,
 		crashPointBatchProposeAfter,
 		crashPointDiscrepancyDetectedAfter,
-		crashPointRoothashReceiveAfter,
 		crashPointBatchPublishAfter,
 	)
 }

go/worker/storage/committee/worker.go

@@ -330,11 +330,6 @@ func (w *Worker) GetLocalStorage() storageApi.LocalBackend {
 
 // NodeHooks implementation.
 
-// HandleNewBlockEarlyLocked is guarded by CrossNode.
-func (w *Worker) HandleNewBlockEarlyLocked(*runtime.BlockInfo) {
-	// Nothing to do here.
-}
-
 // HandleNewBlockLocked is guarded by CrossNode.
 func (w *Worker) HandleNewBlockLocked(bi *runtime.BlockInfo) {
 	// Notify the state syncer that there is a new block.