remove no-op upgrade, specify offset type

src/herder/test/HerderTests.cpp

@@ -3436,7 +3436,6 @@ TEST_CASE("accept soroban txs after network upgrade", "[soroban][herder]")
                                   15);
     scheduledUpgrades.mProtocolVersion =
         static_cast<uint32_t>(SOROBAN_PROTOCOL_VERSION);
-    // TODO maybe use loadgen for these upgrades
     for (auto const& app : nodes)
     {
         app->getHerder().setUpgrades(scheduledUpgrades);
@@ -4194,12 +4193,6 @@ herderExternalizesValuesWithProtocol(uint32_t version)
         simulation->removeNode(validatorCKey.getPublicKey());
         configC.MAX_SLOTS_TO_REMEMBER += 5;
         auto newC = simulation->addNode(validatorCKey, qset, &configC, false);
-        if (protocolVersionStartsFrom(version, SOROBAN_PROTOCOL_VERSION))
-        {
-            modifySorobanNetworkConfig(*newC, [&](SorobanNetworkConfig& cfg) {
-                cfg.mStateArchivalSettings.bucketListWindowSamplePeriod = 1;
-            });
-        }
         newC->start();
         HerderImpl& newHerderC = *static_cast<HerderImpl*>(&newC->getHerder());
 
@@ -4210,7 +4203,6 @@ herderExternalizesValuesWithProtocol(uint32_t version)
         SECTION("tracking")
         {
             receiveLedger(destinationLedger, newHerderC);
-
             checkHerder(*newC, newHerderC,
                         Herder::State::HERDER_TRACKING_NETWORK_STATE,
                         currentlyTracking);

src/test/TestUtils.cpp

@@ -209,7 +209,7 @@ upgradeSorobanNetworkConfig(std::function<void(SorobanNetworkConfig&)> modifyFn,
         app.getMetrics().NewMeter({"loadgen", "run", "complete"}, "run");
     auto completeCount = complete.count();
     // Only create an account if there are none aleady created.
-    auto offset = 0;
+    uint32_t offset = 0;
     if (app.getMetrics()
             .NewMeter({"loadgen", "account", "created"}, "account")
             .count() == 0)