Merge pull request #6403 from filecoin-project/fix/test

chore: disable f3 in integration test

fixtures/networks/integrationtestnet.go

@@ -64,7 +64,7 @@ func IntegrationNet() *NetworkConf {
 			AllowableClockDriftSecs: 1,
 			Eip155ChainID:           314,
 			ActorDebugging:          false,
-			F3Enabled:               true,
+			F3Enabled:               false,
 			F3BootstrapEpoch:        -1,
 			ManifestServerID:        "12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG",
 			F3Consensus:             true,

pkg/vf3/participation_lease.go

@@ -106,7 +106,7 @@ func (l *leaser) getParticipantsByInstance(instance uint64) []uint64 {
 	defer l.mutex.Unlock()
 	var participants []uint64
 	for id, lease := range l.leases {
-		if instance > lease.FromInstance+lease.ValidityTerm {
+		if instance > lease.ToInstance() {
 			// Lazily delete the expired leases.
 			delete(l.leases, id)
 		} else {
@@ -144,7 +144,7 @@ func (l *leaser) validate(currentNetwork gpbft.NetworkName, currentInstance uint
 	// Combine the errors to remove significance of the order by which they are
 	// checked outside if this function.
 	var err error
-	if currentNetwork != lease.Network || currentInstance > lease.FromInstance+lease.ValidityTerm {
+	if currentNetwork != lease.Network || currentInstance > lease.ToInstance() {
 		err = multierr.Append(err, types.ErrF3ParticipationTicketExpired)
 	}
 	if l.issuer != lease.Issuer {

venus-shared/types/api_types.go

@@ -523,6 +523,10 @@ type F3ParticipationLease struct {
 	ValidityTerm uint64
 }
 
+func (l *F3ParticipationLease) ToInstance() uint64 {
+	return l.FromInstance + l.ValidityTerm
+}
+
 var (
 	// ErrF3Disabled signals that F3 consensus process is disabled.
 	ErrF3Disabled = errF3Disabled{}