Improve quality of soroban metrics test

Author: graydon

src/transactions/test/InvokeHostFunctionTests.cpp

@@ -7647,29 +7647,57 @@ TEST_CASE("soroban metrics published at ledger close", "[soroban]")
     auto const& contract =
         test.deployWasmContract(rust_bridge::get_test_wasm_add_i32());
 
+    auto minBalance = test.getApp().getLedgerManager().getLastMinBalance(1);
+    auto txSourceA = test.getRoot().create("txSourceA", minBalance * 100);
+    auto txSourceB = test.getRoot().create("txSourceB", minBalance * 100);
+    auto txSourceC = test.getRoot().create("txSourceC", minBalance * 100);
+    auto txSourceD = test.getRoot().create("txSourceD", minBalance * 100);
+    std::vector<TestAccount*> txSources = {&txSourceA, &txSourceB, &txSourceC,
+                                           &txSourceD};
+
     auto& metrics = test.getApp().getLedgerManager().getSorobanMetrics();
     auto preSuccess = metrics.mHostFnOpSuccess.count();
     auto preReadEntry = metrics.mHostFnOpReadEntry.count();
+    auto preWriteEntry = metrics.mHostFnOpWriteEntry.count();
     auto preTxSize = metrics.mTxSizeByte.count();
     auto preInvokeTime = metrics.mHostFnOpInvokeTimeNsecs.count();
     auto preExec = metrics.mHostFnOpExec.count();
     auto preTxApply = metrics.mTransactionApply.count();
     auto preOpApply = metrics.mOperationApply.count();
 
-    auto tx =
-        makeAddTx(contract, INVOKE_ADD_UNCACHED_COST_PASS, test.getRoot());
-    REQUIRE(isSuccessResult(test.invokeTx(tx)));
+    constexpr uint32_t ledgerCount = 3;
+    auto const txCountPerLedger = txSources.size();
+    for (uint32_t i = 0; i < ledgerCount; ++i)
+    {
+        std::vector<TransactionFrameBasePtr> txs;
+        for (auto* source : txSources)
+        {
+            txs.emplace_back(
+                makeAddTx(contract, INVOKE_ADD_UNCACHED_COST_PASS, *source));
+        }
+
+        ParallelSorobanOrder order = {{{0, 1}, {2, 3}}};
+        auto r = closeLedger(test.getApp(), txs, order);
+        REQUIRE(r.results.size() == txs.size());
+        checkResults(r, txs.size(), 0);
+    }
+
+    auto const appliedTxCount = ledgerCount * txCountPerLedger;
+    auto const expectedReadEntries = appliedTxCount * contract.getKeys().size();
 
     // Per-op/per-tx metrics recorded during apply are batched per thread and
-    // published by the ledger close that applied the tx, so they must all be
-    // visible here.
-    REQUIRE(metrics.mHostFnOpSuccess.count() == preSuccess + 1);
-    REQUIRE(metrics.mHostFnOpReadEntry.count() > preReadEntry);
-    REQUIRE(metrics.mTxSizeByte.count() == preTxSize + 1);
-    REQUIRE(metrics.mHostFnOpInvokeTimeNsecs.count() == preInvokeTime + 1);
-    REQUIRE(metrics.mHostFnOpExec.count() == preExec + 1);
-    REQUIRE(metrics.mTransactionApply.count() >= preTxApply + 1);
-    REQUIRE(metrics.mOperationApply.count() >= preOpApply + 1);
+    // published by the ledger close that applied the tx, so all samples from
+    // the parallel apply threads must be visible here.
+    REQUIRE(metrics.mHostFnOpSuccess.count() == preSuccess + appliedTxCount);
+    REQUIRE(metrics.mHostFnOpReadEntry.count() ==
+            preReadEntry + expectedReadEntries);
+    REQUIRE(metrics.mHostFnOpWriteEntry.count() == preWriteEntry);
+    REQUIRE(metrics.mTxSizeByte.count() == preTxSize + appliedTxCount);
+    REQUIRE(metrics.mHostFnOpInvokeTimeNsecs.count() ==
+            preInvokeTime + appliedTxCount);
+    REQUIRE(metrics.mHostFnOpExec.count() == preExec + appliedTxCount);
+    REQUIRE(metrics.mTransactionApply.count() == preTxApply + appliedTxCount);
+    REQUIRE(metrics.mOperationApply.count() == preOpApply + appliedTxCount);
 }
 
 TEST_CASE("Module cache across protocol versions", "[tx][soroban][modulecache]")