test(f3): make the f3-enabled test wait for at one lease to expire

itests/f3_test.go

@@ -46,7 +46,7 @@ func TestF3_Enabled(t *testing.T) {
 	blocktime := 100 * time.Millisecond
 	e := setup(t, blocktime)
 
-	e.waitTillF3Instance(3, 25*time.Second)
+	e.waitTillF3Instance(modules.F3LeaseTerm+1, 40*time.Second)
 }
 
 // Test that checks that F3 can be rebootsrapped by changing the manifest

node/modules/storageminer.go

@@ -47,6 +47,9 @@ import (
 	"github.com/filecoin-project/lotus/storage/wdpost"
 )
 
+// F3LeaseTerm The number of instances the miner will attempt to lease from nodes.
+const F3LeaseTerm = 5
+
 type UuidWrapper struct {
 	v1api.FullNode
 }
@@ -546,8 +549,6 @@ func F3Participation(mctx helpers.MetricsCtx, lc fx.Lifecycle, node v1api.FullNo
 		// checkProgressInterval defines the duration between progress checks in normal operation mode.
 		// This interval is used when there are no errors in retrieving the current progress.
 		checkProgressInterval = 10 * time.Second
-		// leaseTerm The number of instances the miner will attempt to lease from nodes.
-		leaseTerm = 5
 	)
 
 	participator := newF3Participator(
@@ -560,7 +561,7 @@ func F3Participation(mctx helpers.MetricsCtx, lc fx.Lifecycle, node v1api.FullNo
 		},
 		checkProgressMaxAttempts,
 		checkProgressInterval,
-		leaseTerm,
+		F3LeaseTerm,
 	)
 
 	ctx, cancel := context.WithCancel(mctx)