fix lotus-storage-miner tests.

cmd/lotus-storage-miner/actor_test.go

@@ -10,14 +10,13 @@ import (
 	"testing"
 	"time"
 
-	logging "github.com/ipfs/go-log/v2"
+	"github.com/filecoin-project/go-state-types/network"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 
 	"github.com/filecoin-project/go-state-types/abi"
 
 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/itests/kit"
@@ -32,36 +31,21 @@ func TestWorkerKeyChange(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	_ = logging.SetLogLevel("*", "INFO")
-
-	policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048))
-	policy.SetSupportedProofTypes(abi.RegisteredSealProof_StackedDrg2KiBV1)
-	policy.SetMinVerifiedDealSize(abi.NewStoragePower(256))
-
 	kit.QuietMiningLogs()
 
 	blocktime := 1 * time.Millisecond
-
-	clients, miners := kit.MockMinerBuilder(t,
-		[]kit.FullNodeOpts{kit.FullNodeWithLatestActorsAt(-1), kit.FullNodeWithLatestActorsAt(-1)},
-		kit.OneMiner)
-
-	client1 := clients[0]
-	client2 := clients[1]
-
-	// Connect the nodes.
-	addrinfo, err := client1.NetAddrsListen(ctx)
-	require.NoError(t, err)
-	err = client2.NetConnect(ctx, addrinfo)
-	require.NoError(t, err)
+	client1, client2, miner, ens := kit.EnsembleTwoOne(t, kit.MockProofs(),
+		kit.ConstructorOpts(kit.InstantaneousNetworkVersion(network.Version13)),
+	)
+	ens.InterconnectAll().BeginMining(blocktime)
 
 	output := bytes.NewBuffer(nil)
 	run := func(cmd *cli.Command, args ...string) error {
 		app := cli.NewApp()
 		app.Metadata = map[string]interface{}{
 			"repoType":         repo.StorageMiner,
-			"testnode-full":    clients[0],
-			"testnode-storage": miners[0],
+			"testnode-full":    client1,
+			"testnode-storage": miner,
 		}
 		app.Writer = output
 		api.RunningNodeType = api.NodeMiner
@@ -78,9 +62,6 @@ func TestWorkerKeyChange(t *testing.T) {
 		return cmd.Action(cctx)
 	}
 
-	// start mining
-	kit.ConnectAndStartMining(t, blocktime, miners[0], client1, client2)
-
 	newKey, err := client1.WalletNew(ctx, types.KTBLS)
 	require.NoError(t, err)
 
@@ -105,14 +86,8 @@ func TestWorkerKeyChange(t *testing.T) {
 	require.Error(t, run(actorConfirmChangeWorker, "--really-do-it", newKey.String()))
 	output.Reset()
 
-	for {
-		head, err := client1.ChainHead(ctx)
-		require.NoError(t, err)
-		if head.Height() >= abi.ChainEpoch(targetEpoch) {
-			break
-		}
-		build.Clock.Sleep(10 * blocktime)
-	}
+	client1.WaitTillChain(ctx, kit.HeightAtLeast(abi.ChainEpoch(targetEpoch)))
+
 	require.NoError(t, run(actorConfirmChangeWorker, "--really-do-it", newKey.String()))
 	output.Reset()
 
@@ -121,23 +96,8 @@ func TestWorkerKeyChange(t *testing.T) {
 
 	// Wait for finality (worker key switch).
 	targetHeight := head.Height() + policy.ChainFinality
-	for {
-		head, err := client1.ChainHead(ctx)
-		require.NoError(t, err)
-		if head.Height() >= targetHeight {
-			break
-		}
-		build.Clock.Sleep(10 * blocktime)
-	}
+	client1.WaitTillChain(ctx, kit.HeightAtLeast(targetHeight))
 
 	// Make sure the other node can catch up.
-	for i := 0; i < 20; i++ {
-		head, err := client2.ChainHead(ctx)
-		require.NoError(t, err)
-		if head.Height() >= targetHeight {
-			return
-		}
-		build.Clock.Sleep(10 * blocktime)
-	}
-	t.Fatal("failed to reach target epoch on the second miner")
+	client2.WaitTillChain(ctx, kit.HeightAtLeast(targetHeight))
 }

cmd/lotus-storage-miner/allinfo_test.go

@@ -7,13 +7,9 @@ import (
 	"time"
 
 	"github.com/filecoin-project/lotus/itests/kit"
-	"github.com/filecoin-project/lotus/node/impl"
-	logging "github.com/ipfs/go-log/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 
-	"github.com/filecoin-project/go-state-types/abi"
-
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 	"github.com/filecoin-project/lotus/node/repo"
@@ -24,12 +20,6 @@ func TestMinerAllInfo(t *testing.T) {
 		t.Skip("skipping test in short mode")
 	}
 
-	_ = logging.SetLogLevel("*", "INFO")
-
-	policy.SetConsensusMinerMinPower(abi.NewStoragePower(2048))
-	policy.SetSupportedProofTypes(abi.RegisteredSealProof_StackedDrg2KiBV1)
-	policy.SetMinVerifiedDealSize(abi.NewStoragePower(256))
-
 	_test = true
 
 	kit.QuietMiningLogs()
@@ -40,16 +30,15 @@ func TestMinerAllInfo(t *testing.T) {
 		policy.SetPreCommitChallengeDelay(oldDelay)
 	})
 
-	n, sn := kit.Builder(t, kit.OneFull, kit.OneMiner)
-	client, miner := n[0].FullNode, sn[0]
-	kit.ConnectAndStartMining(t, time.Second, miner, client.(*impl.FullNodeAPI))
+	client, miner, ens := kit.EnsembleMinimal(t)
+	ens.InterconnectAll().BeginMining(time.Second)
 
 	run := func(t *testing.T) {
 		app := cli.NewApp()
 		app.Metadata = map[string]interface{}{
 			"repoType":         repo.StorageMiner,
-			"testnode-full":    n[0],
-			"testnode-storage": sn[0],
+			"testnode-full":    client,
+			"testnode-storage": miner,
 		}
 		api.RunningNodeType = api.NodeMiner
 
@@ -61,7 +50,8 @@ func TestMinerAllInfo(t *testing.T) {
 	t.Run("pre-info-all", run)
 
 	dh := kit.NewDealHarness(t, client, miner)
-	dh.MakeFullDeal(context.Background(), 6, false, false, 0)
-
+	deal, res, inPath := dh.MakeOnlineDeal(context.Background(), 6, false, 0)
+	outPath := dh.PerformRetrieval(context.Background(), deal, res.Root, false)
+	kit.AssertFilesEqual(t, inPath, outPath)
 	t.Run("post-info-all", run)
 }