refactor: wdpost test to kit2

itests/wdpost_test.go

@@ -7,18 +7,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/filecoin-project/go-state-types/big"
-	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/itests/kit"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/lotus/extern/sector-storage/mock"
+	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/specs-storage/storage"
 
+	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/extern/sector-storage/mock"
+	"github.com/filecoin-project/lotus/itests/kit2"
 	"github.com/filecoin-project/lotus/node/impl"
 )
 
@@ -27,7 +27,7 @@ func TestWindowedPost(t *testing.T) {
 		t.Skip("this takes a few minutes, set LOTUS_TEST_WINDOW_POST=1 to run")
 	}
 
-	kit.QuietMiningLogs()
+	kit2.QuietMiningLogs()
 
 	var (
 		blocktime = 2 * time.Millisecond
@@ -41,50 +41,20 @@ func TestWindowedPost(t *testing.T) {
 	} {
 		height := height // copy to satisfy lints
 		t.Run(fmt.Sprintf("upgrade-%d", height), func(t *testing.T) {
-			testWindowPostUpgrade(t, kit.MockMinerBuilder, blocktime, nSectors, height)
+			testWindowPostUpgrade(t, blocktime, nSectors, height)
 		})
 	}
 }
 
-func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Duration, nSectors int, upgradeHeight abi.ChainEpoch) {
+func testWindowPostUpgrade(t *testing.T, blocktime time.Duration, nSectors int, upgradeHeight abi.ChainEpoch) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	n, sn := b(t, []kit.FullNodeOpts{kit.FullNodeWithLatestActorsAt(upgradeHeight)}, kit.OneMiner)
+	opts := kit2.ConstructorOpts(kit2.LatestActorsAt(upgradeHeight))
+	client, miner, ens := kit2.EnsembleMinimal(t, kit2.MockProofs(), opts)
+	ens.InterconnectAll().BeginMining(blocktime)
 
-	client := n[0].FullNode.(*impl.FullNodeAPI)
+	miner.PledgeSectors(ctx, nSectors, 0, nil)
-	miner := sn[0]
-
-	addrinfo, err := client.NetAddrsListen(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := miner.NetConnect(ctx, addrinfo); err != nil {
-		t.Fatal(err)
-	}
-	build.Clock.Sleep(time.Second)
-
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		for ctx.Err() == nil {
-			build.Clock.Sleep(blocktime)
-			if err := sn[0].MineOne(ctx, kit.MineNext); err != nil {
-				if ctx.Err() != nil {
-					// context was canceled, ignore the error.
-					return
-				}
-				t.Error(err)
-			}
-		}
-	}()
-	defer func() {
-		cancel()
-		<-done
-	}()
-
-	kit.PledgeSectors(t, ctx, miner, nSectors, 0, nil)
 
 	maddr, err := miner.ActorAddress(ctx)
 	require.NoError(t, err)
@@ -95,19 +65,12 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	mid, err := address.IDFromAddress(maddr)
 	require.NoError(t, err)
 
-	fmt.Printf("Running one proving period\n")
+	t.Log("Running one proving period")
-	fmt.Printf("End for head.Height > %d\n", di.PeriodStart+di.WPoStProvingPeriod+2)
+	waitUntil := di.PeriodStart + di.WPoStProvingPeriod + 2
+	t.Logf("End for head.Height > %d", waitUntil)
 
-	for {
+	height := kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil))
-		head, err := client.ChainHead(ctx)
+	t.Logf("Now head.Height = %d", height)
-		require.NoError(t, err)
-
-		if head.Height() > di.PeriodStart+di.WPoStProvingPeriod+2 {
-			fmt.Printf("Now head.Height = %d\n", head.Height())
-			break
-		}
-		build.Clock.Sleep(blocktime)
-	}
 
 	p, err := client.StateMinerPower(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
@@ -116,9 +79,9 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	require.NoError(t, err)
 
 	require.Equal(t, p.MinerPower, p.TotalPower)
-	require.Equal(t, p.MinerPower.RawBytePower, types.NewInt(uint64(ssz)*uint64(nSectors+kit.GenesisPreseals)))
+	require.Equal(t, p.MinerPower.RawBytePower, types.NewInt(uint64(ssz)*uint64(nSectors+kit2.DefaultPresealsPerBootstrapMiner)))
 
-	fmt.Printf("Drop some sectors\n")
+	t.Log("Drop some sectors")
 
 	// Drop 2 sectors from deadline 2 partition 0 (full partition / deadline)
 	{
@@ -162,7 +125,7 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 
 		all, err := secs.All(2)
 		require.NoError(t, err)
-		fmt.Println("the sectors", all)
+		t.Log("the sectors", all)
 
 		s = storage.SectorRef{
 			ID: abi.SectorID{
@@ -178,20 +141,12 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	di, err = client.StateMinerProvingDeadline(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
 
-	fmt.Printf("Go through another PP, wait for sectors to become faulty\n")
+	t.Log("Go through another PP, wait for sectors to become faulty")
-	fmt.Printf("End for head.Height > %d\n", di.PeriodStart+di.WPoStProvingPeriod+2)
+	waitUntil = di.PeriodStart + di.WPoStProvingPeriod + 2
+	t.Logf("End for head.Height > %d", waitUntil)
 
-	for {
+	height = kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil))
-		head, err := client.ChainHead(ctx)
+	t.Logf("Now head.Height = %d", height)
-		require.NoError(t, err)
-
-		if head.Height() > di.PeriodStart+(di.WPoStProvingPeriod)+2 {
-			fmt.Printf("Now head.Height = %d\n", head.Height())
-			break
-		}
-
-		build.Clock.Sleep(blocktime)
-	}
 
 	p, err = client.StateMinerPower(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
@@ -199,9 +154,9 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	require.Equal(t, p.MinerPower, p.TotalPower)
 
 	sectors := p.MinerPower.RawBytePower.Uint64() / uint64(ssz)
-	require.Equal(t, nSectors+kit.GenesisPreseals-3, int(sectors)) // -3 just removed sectors
+	require.Equal(t, nSectors+kit2.DefaultPresealsPerBootstrapMiner-3, int(sectors)) // -3 just removed sectors
 
-	fmt.Printf("Recover one sector\n")
+	t.Log("Recover one sector")
 
 	err = miner.StorageMiner.(*impl.StorageMinerAPI).IStorageMgr.(*mock.SectorMgr).MarkFailed(s, false)
 	require.NoError(t, err)
@@ -209,19 +164,11 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	di, err = client.StateMinerProvingDeadline(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
 
-	fmt.Printf("End for head.Height > %d\n", di.PeriodStart+di.WPoStProvingPeriod+2)
+	waitUntil = di.PeriodStart + di.WPoStProvingPeriod + 2
+	t.Logf("End for head.Height > %d", waitUntil)
 
-	for {
+	height = kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil))
-		head, err := client.ChainHead(ctx)
+	t.Logf("Now head.Height = %d", height)
-		require.NoError(t, err)
-
-		if head.Height() > di.PeriodStart+di.WPoStProvingPeriod+2 {
-			fmt.Printf("Now head.Height = %d\n", head.Height())
-			break
-		}
-
-		build.Clock.Sleep(blocktime)
-	}
 
 	p, err = client.StateMinerPower(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
@@ -229,11 +176,11 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	require.Equal(t, p.MinerPower, p.TotalPower)
 
 	sectors = p.MinerPower.RawBytePower.Uint64() / uint64(ssz)
-	require.Equal(t, nSectors+kit.GenesisPreseals-2, int(sectors)) // -2 not recovered sectors
+	require.Equal(t, nSectors+kit2.DefaultPresealsPerBootstrapMiner-2, int(sectors)) // -2 not recovered sectors
 
 	// pledge a sector after recovery
 
-	kit.PledgeSectors(t, ctx, miner, 1, nSectors, nil)
+	miner.PledgeSectors(ctx, 1, nSectors, nil)
 
 	{
 		// Wait until proven.
@@ -241,17 +188,10 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 		require.NoError(t, err)
 
 		waitUntil := di.PeriodStart + di.WPoStProvingPeriod + 2
-		fmt.Printf("End for head.Height > %d\n", waitUntil)
+		t.Logf("End for head.Height > %d\n", waitUntil)
 
-		for {
+		height = kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil))
-			head, err := client.ChainHead(ctx)
+		t.Logf("Now head.Height = %d", height)
-			require.NoError(t, err)
-
-			if head.Height() > waitUntil {
-				fmt.Printf("Now head.Height = %d\n", head.Height())
-				break
-			}
-		}
 	}
 
 	p, err = client.StateMinerPower(ctx, maddr, types.EmptyTSK)
@@ -260,7 +200,7 @@ func testWindowPostUpgrade(t *testing.T, b kit.APIBuilder, blocktime time.Durati
 	require.Equal(t, p.MinerPower, p.TotalPower)
 
 	sectors = p.MinerPower.RawBytePower.Uint64() / uint64(ssz)
-	require.Equal(t, nSectors+kit.GenesisPreseals-2+1, int(sectors)) // -2 not recovered sectors + 1 just pledged
+	require.Equal(t, nSectors+kit2.DefaultPresealsPerBootstrapMiner-2+1, int(sectors)) // -2 not recovered sectors + 1 just pledged
 }
 
 func TestWindowPostBaseFeeNoBurn(t *testing.T) {
@@ -268,7 +208,7 @@ func TestWindowPostBaseFeeNoBurn(t *testing.T) {
 		t.Skip("this takes a few minutes, set LOTUS_TEST_WINDOW_POST=1 to run")
 	}
 
-	kit.QuietMiningLogs()
+	kit2.QuietMiningLogs()
 
 	var (
 		blocktime = 2 * time.Millisecond
@@ -281,11 +221,8 @@ func TestWindowPostBaseFeeNoBurn(t *testing.T) {
 	och := build.UpgradeClausHeight
 	build.UpgradeClausHeight = 10
 
-	n, sn := kit.MockMinerBuilder(t, kit.DefaultFullOpts(1), kit.OneMiner)
+	client, miner, ens := kit2.EnsembleMinimal(t, kit2.MockProofs())
-	client := n[0].FullNode.(*impl.FullNodeAPI)
+	ens.InterconnectAll().BeginMining(blocktime)
-	miner := sn[0]
-	bm := kit.ConnectAndStartMining(t, blocktime, miner, client)
-	t.Cleanup(bm.Stop)
 
 	maddr, err := miner.ActorAddress(ctx)
 	require.NoError(t, err)
@@ -293,7 +230,7 @@ func TestWindowPostBaseFeeNoBurn(t *testing.T) {
 	mi, err := client.StateMinerInfo(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
 
-	kit.PledgeSectors(t, ctx, miner, nSectors, 0, nil)
+	miner.PledgeSectors(ctx, nSectors, 0, nil)
 	wact, err := client.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
 	require.NoError(t, err)
 	en := wact.Nonce
@@ -327,18 +264,16 @@ func TestWindowPostBaseFeeBurn(t *testing.T) {
 		t.Skip("this takes a few minutes, set LOTUS_TEST_WINDOW_POST=1 to run")
 	}
 
-	kit.QuietMiningLogs()
+	kit2.QuietMiningLogs()
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
 	blocktime := 2 * time.Millisecond
 
-	n, sn := kit.MockMinerBuilder(t, []kit.FullNodeOpts{kit.FullNodeWithLatestActorsAt(-1)}, kit.OneMiner)
+	opts := kit2.ConstructorOpts(kit2.LatestActorsAt(-1))
-	client := n[0].FullNode.(*impl.FullNodeAPI)
+	client, miner, ens := kit2.EnsembleMinimal(t, kit2.MockProofs(), opts)
-	miner := sn[0]
+	ens.InterconnectAll().BeginMining(blocktime)
-	bm := kit.ConnectAndStartMining(t, blocktime, miner, client)
-	t.Cleanup(bm.Stop)
 
 	maddr, err := miner.ActorAddress(ctx)
 	require.NoError(t, err)
@@ -346,7 +281,7 @@ func TestWindowPostBaseFeeBurn(t *testing.T) {
 	mi, err := client.StateMinerInfo(ctx, maddr, types.EmptyTSK)
 	require.NoError(t, err)
 
-	kit.PledgeSectors(t, ctx, miner, 10, 0, nil)
+	miner.PledgeSectors(ctx, 10, 0, nil)
 	wact, err := client.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
 	require.NoError(t, err)
 	en := wact.Nonce