Merge pull request #6412 from oasisprotocol/peternose/trivial/refactor-code

go/worker/client/committee: Refactor code

Author: peternose

.changelog/6412.trivial.md

@@ -5,6 +5,7 @@ import (
 	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
 	registry "github.com/oasisprotocol/oasis-core/go/registry/api"
 	"github.com/oasisprotocol/oasis-core/go/roothash/api/block"
+	"github.com/oasisprotocol/oasis-core/go/roothash/api/message"
 )
 
 // BlockInfo contains information related to the given runtime block.
@@ -15,6 +16,9 @@ type BlockInfo struct {
 	// ConsensusBlock is the consensus light block the runtime block belongs to.
 	ConsensusBlock *consensus.LightBlock
 
+	// IncomingMessages contains runtime's queued incoming messages.
+	IncomingMessages []*message.IncomingMessage
+
 	// Epoch is the epoch the runtime block belongs to.
 	Epoch beacon.EpochTime
 

go/runtime/api/info.go

@@ -4,28 +4,16 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/runtime/host/protocol"
 )
 
-// txCheckFlags are the flags describing how a transaction should be checked.
-type txCheckFlags uint8
-
-const (
-	// txCheckRecheck is a flag indicating that the transaction already passed checking earlier.
-	txCheckRecheck = 1 << 0
-)
-
-func (f txCheckFlags) isRecheck() bool {
-	return (f * txCheckRecheck) != 0
-}
-
 // PendingCheckTransaction is a transaction pending checks.
 type PendingCheckTransaction struct {
 	*TxQueueMeta
 
-	// flags are the transaction check flags.
-	flags txCheckFlags
 	// local indicates whether the transaction came from our own node.
 	local bool
 	// discard indicates whether the transaction should be discarded after validation.
 	discard bool
+	// checked indicates whether the transaction already passed check.
+	checked bool
 	// notifyCh is a channel for sending back the transaction check result.
 	notifyCh chan *protocol.CheckTxResult
 }

go/runtime/nodes/runtime.go

@@ -263,7 +263,7 @@ func (t *txPool) addToCheckQueue(pct *PendingCheckTransaction) error {
 	t.logger.Debug("queuing transaction for check",
 		"tx", pct.Raw(),
 		"hash", pct.Hash(),
-		"recheck", pct.flags.isRecheck(),
+		"recheck", pct.checked,
 	)
 	if err := t.checkTxQueue.add(pct); err != nil {
 		t.logger.Warn("unable to queue transaction",
@@ -529,7 +529,7 @@ func (t *txPool) checkTxBatch(ctx context.Context) error {
 				"tx", batch[i].Raw(),
 				"hash", batch[i].Hash(),
 				"result", res,
-				"recheck", batch[i].flags.isRecheck(),
+				"recheck", batch[i].checked,
 			)
 
 			// Make sure a failed transaction is removed from the seen cache as the transaction may
@@ -548,7 +548,7 @@ func (t *txPool) checkTxBatch(ctx context.Context) error {
 
 		// For any transactions that are to be queued, we defer notification until queued.
 
-		if !batch[i].flags.isRecheck() {
+		if !batch[i].checked {
 			acceptedTransactions.With(t.getMetricLabels()).Inc()
 			newTxs = append(newTxs, batch[i])
 		}
@@ -605,7 +605,7 @@ func (t *txPool) checkTxBatch(ctx context.Context) error {
 		// Notify submitter of success.
 		notifySubmitter(idx)
 
-		if !pct.flags.isRecheck() {
+		if !pct.checked {
 			// Mark new transactions as never having been published. The republish worker will
 			// publish these immediately.
 			var publishTime time.Time
@@ -831,7 +831,7 @@ func (t *txPool) recheck() {
 		notifyCh := make(chan *protocol.CheckTxResult, 1)
 		pcts = append(pcts, &PendingCheckTransaction{
 			TxQueueMeta: tx,
-			flags:       txCheckRecheck,
+			checked:     true,
 			notifyCh:    notifyCh,
 		})
 		results = append(results, notifyCh)

go/runtime/nodes/runtime_test.go

@@ -172,10 +172,9 @@ func (n *Node) Query(ctx context.Context, round uint64, method string, args []by
 	// Fetch the active descriptor so we can get the current message limits.
 	n.commonNode.CrossNode.Lock()
 	dsc := n.commonNode.CurrentDescriptor
-	blk := n.commonNode.CurrentBlock
 	n.commonNode.CrossNode.Unlock()
 
-	if dsc == nil || blk == nil {
+	if dsc == nil {
 		return nil, api.ErrNoHostedRuntime
 	}
 	maxMessages := dsc.Executor.MaxMessages