Merge pull request #11442 from filecoin-project/fix-sturdy-tests

lp: task test better

provider/builder.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"time"
 
-	logging "github.com/ipfs/go-log/v2"
-
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
 	"github.com/filecoin-project/lotus/node/config"
@@ -19,7 +17,7 @@ import (
 	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
 
-var log = logging.Logger("provider")
+//var log = logging.Logger("provider")
 
 func WindowPostScheduler(ctx context.Context, fc config.LotusProviderFees, pc config.ProvingConfig,
 	api api.FullNode, verif storiface.Verifier, lw *sealer.LocalWorker,

provider/lpmessage/sender.go

@@ -18,10 +18,6 @@ import (
 
 var log = logging.Logger("lpmessage")
 
-type str string // makes ctx value collissions impossible
-
-var CtxTaskID str = "task_id"
-
 type SenderAPI interface {
 	StateAccountKey(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error)
 	GasEstimateMessageGas(ctx context.Context, msg *types.Message, spec *api.MessageSendSpec, tsk types.TipSetKey) (*types.Message, error)
@@ -103,14 +99,6 @@ func (s *Sender) Send(ctx context.Context, msg *types.Message, mss *api.MessageS
 
 	var sigMsg *types.SignedMessage
 
-	var idCount int
-	err = s.db.QueryRow(ctx, `SELECT COUNT(*) FROM harmony_test WHERE task_id=$1`,
-		ctx.Value(CtxTaskID)).Scan(&idCount)
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("reading harmony_test: %w", err)
-	}
-	noSend := idCount == 1
-
 	// start db tx
 	c, err := s.db.BeginTransaction(ctx, func(tx *harmonydb.Tx) (commit bool, err error) {
 		// assign nonce (max(api.MpoolGetNonce, db nonce+1))
@@ -148,18 +136,6 @@ func (s *Sender) Send(ctx context.Context, msg *types.Message, mss *api.MessageS
 			return false, xerrors.Errorf("marshaling message: %w", err)
 		}
 
-		if noSend {
-			log.Errorw("SKIPPED SENDING MESSAGE PER ENVIRONMENT VARIABLE - NOT PRODUCTION SAFE",
-				"from_key", fromA.String(),
-				"nonce", msg.Nonce,
-				"to_addr", msg.To.String(),
-				"signed_data", data,
-				"signed_json", string(jsonBytes),
-				"signed_cid", sigMsg.Cid(),
-				"send_reason", reason,
-			)
-			return true, nil // nothing committed
-		}
 		// write to db
 		c, err := tx.Exec(`insert into message_sends (from_key, nonce, to_addr, signed_data, signed_json, signed_cid, send_reason) values ($1, $2, $3, $4, $5, $6, $7)`,
 			fromA.String(), msg.Nonce, msg.To.String(), data, string(jsonBytes), sigMsg.Cid().String(), reason)
@@ -176,9 +152,6 @@ func (s *Sender) Send(ctx context.Context, msg *types.Message, mss *api.MessageS
 	if err != nil || !c {
 		return cid.Undef, xerrors.Errorf("transaction failed or didn't commit: %w", err)
 	}
-	if noSend {
-		return sigMsg.Cid(), nil
-	}
 
 	// push to mpool
 	_, err = s.api.MpoolPush(ctx, sigMsg)

provider/lpwindow/compute_task.go

@@ -3,6 +3,7 @@ package lpwindow
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"
@@ -161,6 +162,33 @@ func (t *WdPostTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done
 		return false, xerrors.Errorf("marshaling PoSt: %w", err)
 	}
 
+	testTaskIDCt := 0
+	if err = t.db.QueryRow(context.Background(), `SELECT COUNT(*) FROM harmony_test WHERE task_id = $1`, taskID).Scan(&testTaskIDCt); err != nil {
+		return false, xerrors.Errorf("querying for test task: %w", err)
+	}
+	if testTaskIDCt == 1 {
+		// Do not send test tasks to the chain but to harmony_test & stdout.
+
+		data, err := json.MarshalIndent(map[string]any{
+			"sp_id":                spID,
+			"proving_period_start": pps,
+			"deadline":             deadline.Index,
+			"partition":            partIdx,
+			"submit_at_epoch":      deadline.Open,
+			"submit_by_epoch":      deadline.Close,
+			"proof_params":         msgbuf.Bytes(),
+		}, "", "  ")
+		if err != nil {
+			return false, xerrors.Errorf("marshaling message: %w", err)
+		}
+		ctx := context.Background()
+		_, err = t.db.Exec(ctx, `UPDATE harmony_test SET result=$1 WHERE task_id=$2`, string(data), taskID)
+		if err != nil {
+			return false, xerrors.Errorf("updating harmony_test: %w", err)
+		}
+		log.Infof("SKIPPED sending test message to chain. SELECT * FROM harmony_test WHERE task_id= %v", taskID)
+		return true, nil // nothing committed
+	}
 	// Insert into wdpost_proofs table
 	n, err := t.db.Exec(context.Background(),
 		`INSERT INTO wdpost_proofs (
@@ -178,7 +206,8 @@ func (t *WdPostTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done
 		partIdx,
 		deadline.Open,
 		deadline.Close,
-		msgbuf.Bytes())
+		msgbuf.Bytes(),
+	)
 
 	if err != nil {
 		log.Errorf("WdPostTask.Do() failed to insert into wdpost_proofs: %v", err)

provider/lpwindow/submit_task.go

@@ -149,7 +149,7 @@ func (w *WdPostSubmitTask) Do(taskID harmonytask.TaskID, stillOwned func() bool)
 		return false, xerrors.Errorf("preparing proof message: %w", err)
 	}
 
-	ctx := context.WithValue(context.Background(), lpmessage.CtxTaskID, taskID)
+	ctx := context.Background()
 	smsg, err := w.sender.Send(ctx, msg, mss, "wdpost")
 	if err != nil {
 		return false, xerrors.Errorf("sending proof message: %w", err)