diff --git a/src/FSLibrary/MinBlockTimeTest.fs b/src/FSLibrary/MinBlockTimeTest.fs index 4d09639e..67be1510 100644 --- a/src/FSLibrary/MinBlockTimeTest.fs +++ b/src/FSLibrary/MinBlockTimeTest.fs @@ -22,7 +22,8 @@ let private smallNetworkSize = 10 let private searchThresholdMs = 100 -let private timeoutsFor (targetMs: int) : int = max 500 (targetMs / 5) +// For the purposes of min block test, use high value to avoid noise from SCP timeouts +let private timeout = 2000 let private mixedPregenLedgerMultiplier = 15 @@ -333,8 +334,6 @@ let minBlockTimeTest (context: MissionContext) (baseLoadGen: LoadGen) (setupCfg: // Apply an SCP-timing upgrade for target T; waits for the peer // to observe the new ledger_close_time_ms before returning. let applySCPUpgrade (targetMs: int) = - let t = timeoutsFor targetMs - formation.SetupUpgradeContract allNodes.Head formation.DeployUpgradeEntriesAndArm @@ -342,10 +341,10 @@ let minBlockTimeTest (context: MissionContext) (baseLoadGen: LoadGen) (setupCfg: { LoadGen.GetDefault() with mode = CreateSorobanUpgrade ledgerTargetCloseTimeMilliseconds = Some targetMs - ballotTimeoutInitialMilliseconds = Some t - ballotTimeoutIncrementMilliseconds = Some t - nominationTimeoutInitialMilliseconds = Some t - nominationTimeoutIncrementMilliseconds = Some t } + ballotTimeoutInitialMilliseconds = Some timeout + ballotTimeoutIncrementMilliseconds = Some timeout + nominationTimeoutInitialMilliseconds = Some timeout + nominationTimeoutIncrementMilliseconds = Some timeout } (System.DateTime.UtcNow.AddSeconds(20.0)) let peer = formation.NetworkCfg.GetPeer allNodes.Head 0 diff --git a/src/FSLibrary/StellarCoreCfg.fs b/src/FSLibrary/StellarCoreCfg.fs index 2978bb80..b44fe8f8 100644 --- a/src/FSLibrary/StellarCoreCfg.fs +++ b/src/FSLibrary/StellarCoreCfg.fs @@ -228,6 +228,7 @@ type StellarCoreCfg = if self.network.missionContext.runForMinBlockTime then t.Add("TESTING_IGNORE_LEDGER_TIME_UPGRADE_BOUNDS", true) |> ignore + t.Add("FLOOD_DEMAND_BACKOFF_DELAY_MS", 1000) |> ignore match self.network.missionContext.runForMaxTps with | Some "classic" ->