From 5e66960ab6913e769d04c74b2215e0dab9933dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= Date: Tue, 20 Jul 2021 17:51:09 +0100 Subject: [PATCH] fix merge error. --- itests/deals_concurrent_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/itests/deals_concurrent_test.go b/itests/deals_concurrent_test.go index 81acec809..241c9071d 100644 --- a/itests/deals_concurrent_test.go +++ b/itests/deals_concurrent_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/stretchr/testify/require" datatransfer "github.com/filecoin-project/go-data-transfer" @@ -55,7 +56,7 @@ func TestDealWithMarketAndMinerNode(t *testing.T) { }) } - // this test is expensive because we don't use mock proofs; do a single cycle. + // this test is expensive because we don't use mock proofs; do a single cycle. cycles := []int{4} for _, n := range cycles { n := n @@ -100,7 +101,7 @@ func TestDealCyclesConcurrent(t *testing.T) { }) } - // this test is cheap because we use mock proofs, do various cycles + // this test is cheap because we use mock proofs, do various cycles cycles := []int{2, 4, 8, 16} for _, n := range cycles { n := n