fixup! Refactor: Streamline actor cache flush transaction usage

src/workerd/io/actor-cache-test.c++

@@ -1036,6 +1036,9 @@ KJ_TEST("ActorCache get-put ordering") {
   auto mockGet2 = mockStorage->expectCall("getMultiple", ws)
       .withParams(CAPNP(keys = ["baz"]), "stream"_kj);
 
+  // No writes will be done until our reads finish!
+  mockStorage->expectNoActivity(ws);
+
   // Let's have the second read complete first.
   kj::mv(mockGet2).useCallback("stream", [&](MockClient stream) {
     stream.call("values", CAPNP(list = [(key = "baz", value = "987")]))
@@ -1052,6 +1055,9 @@ KJ_TEST("ActorCache get-put ordering") {
   KJ_ASSERT(KJ_ASSERT_NONNULL(expectCached(test.get("bar"))) == "456");
   KJ_ASSERT(KJ_ASSERT_NONNULL(expectCached(test.get("baz"))) == "987");
 
+  // Still no writes because the first read is still outstanding.
+  mockStorage->expectNoActivity(ws);
+
   // Finally, have the first read complete.
   kj::mv(mockGet1).useCallback("stream", [&](MockClient stream) {
     stream.call("values", CAPNP(list = [(key = "bar", value = "654"),
@@ -1370,13 +1376,19 @@ KJ_TEST("ActorCache read retry") {
   auto mockGet = mockStorage->expectCall("get", ws)
       .withParams(CAPNP(key = "foo"));
 
+  // No activity because reads are outstanding.
+  mockStorage->expectNoActivity(ws);
+
   // Fail out the read with a disconnect.
   kj::mv(mockGet).thenThrow(KJ_EXCEPTION(DISCONNECTED, "read failed"));
 
   // It will be retried.
   auto mockGet2 = mockStorage->expectCall("get", ws)
       .withParams(CAPNP(key = "foo"));
 
+  // Still no activity because of the read.
+  mockStorage->expectNoActivity(ws);
+
   // Finish it.
   kj::mv(mockGet2).thenReturn(CAPNP(value = "123"));
 
@@ -1447,6 +1459,9 @@ KJ_TEST("ActorCache read hard fail") {
   auto mockGet = mockStorage->expectCall("get", ws)
       .withParams(CAPNP(key = "foo"));
 
+  // We won't write anything until the read completes.
+  mockStorage->expectNoActivity(ws);
+
   // Fail out the read with non-disconnect.
   kj::mv(mockGet).thenThrow(KJ_EXCEPTION(FAILED, "read failed"));
 
@@ -1481,6 +1496,9 @@ KJ_TEST("ActorCache read cancel") {
   auto mockGet = mockStorage->expectCall("get", ws)
       .withParams(CAPNP(key = "foo"));
 
+  // We won't write anything until the read completes.
+  mockStorage->expectNoActivity(ws);
+
   // Cancel the read.
   promise = nullptr;
   mockGet.expectCanceled();
@@ -1918,6 +1936,9 @@ KJ_TEST("ActorCache list() with seemingly-redundant dirty entries") {
   auto listCall = mockStorage->expectCall("list", ws)
       .withParams(CAPNP(start = "aaa", end = "fff"), "stream"_kj);
 
+  // The delete won't do any work until the list completes.
+  mockStorage->expectNoActivity(ws);
+
   // Now write some contradictory values.
   test.put("bbb", "bval");
   KJ_ASSERT(expectCached(test.delete_("ccc")) == 1);
@@ -2917,6 +2938,9 @@ KJ_TEST("ActorCache listReverse() with seemingly-redundant dirty entries") {
   auto listCall = mockStorage->expectCall("list", ws)
       .withParams(CAPNP(start = "aaa", end = "fff", reverse = true), "stream"_kj);
 
+  // We won't do any work while the list is outstanding.
+  mockStorage->expectNoActivity(ws);
+
   // Now write some contradictory values.
   test.put("bbb", "bval");
   KJ_ASSERT(expectCached(test.delete_("ccc")) == 1);