From e85af3cba7c9819526d6ce368e3dfc213c125bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= Date: Fri, 18 Jun 2021 16:19:58 +0100 Subject: [PATCH] fix merge error. --- itests/wdpost_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/itests/wdpost_test.go b/itests/wdpost_test.go index 83ddf34e5..608c377ca 100644 --- a/itests/wdpost_test.go +++ b/itests/wdpost_test.go @@ -145,8 +145,8 @@ func testWindowPostUpgrade(t *testing.T, blocktime time.Duration, nSectors int, waitUntil = di.PeriodStart + di.WPoStProvingPeriod + 2 t.Logf("End for head.Height > %d", waitUntil) - height = kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil)) - t.Logf("Now head.Height = %d", height) + ts = client.WaitTillChain(ctx, kit2.HeightAtLeast(waitUntil)) + t.Logf("Now head.Height = %d", ts.Height()) p, err = client.StateMinerPower(ctx, maddr, types.EmptyTSK) require.NoError(t, err) @@ -167,8 +167,8 @@ func testWindowPostUpgrade(t *testing.T, blocktime time.Duration, nSectors int, waitUntil = di.PeriodStart + di.WPoStProvingPeriod + 2 t.Logf("End for head.Height > %d", waitUntil) - height = kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil)) - t.Logf("Now head.Height = %d", height) + ts = client.WaitTillChain(ctx, kit2.HeightAtLeast(waitUntil)) + t.Logf("Now head.Height = %d", ts.Height()) p, err = client.StateMinerPower(ctx, maddr, types.EmptyTSK) require.NoError(t, err) @@ -190,8 +190,8 @@ func testWindowPostUpgrade(t *testing.T, blocktime time.Duration, nSectors int, waitUntil := di.PeriodStart + di.WPoStProvingPeriod + 2 t.Logf("End for head.Height > %d\n", waitUntil) - height = kit2.WaitTillChainHeight(ctx, t, client, blocktime, int(waitUntil)) - t.Logf("Now head.Height = %d", height) + ts := client.WaitTillChain(ctx, kit2.HeightAtLeast(waitUntil)) + t.Logf("Now head.Height = %d", ts.Height()) } p, err = client.StateMinerPower(ctx, maddr, types.EmptyTSK)