@@ -87,7 +87,7 @@ KJ_TEST("Test successful construction with valid ReadableStreamSource") {
8787 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
8888 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
8989 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
90- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
90+ env.js , env.context , newReadableSource (kj::mv (fake)));
9191
9292 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
9393 KJ_ASSERT (
@@ -104,7 +104,7 @@ KJ_TEST("Adapter shutdown with no reads") {
104104 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
105105 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
106106 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
107- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
107+ env.js , env.context , newReadableSource (kj::mv (fake)));
108108
109109 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
110110 KJ_ASSERT (
@@ -136,7 +136,7 @@ KJ_TEST("Adapter cancel with no reads") {
136136 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
137137 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
138138 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
139- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
139+ env.js , env.context , newReadableSource (kj::mv (fake)));
140140
141141 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
142142 KJ_ASSERT (
@@ -170,7 +170,7 @@ KJ_TEST("Adapter cancel (kj::Exception) with no reads") {
170170 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
171171 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
172172 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
173- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
173+ env.js , env.context , newReadableSource (kj::mv (fake)));
174174
175175 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
176176 KJ_ASSERT (
@@ -194,7 +194,7 @@ KJ_TEST("Adapter with single read (ArrayBuffer)") {
194194 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
195195 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
196196 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
197- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
197+ env.js , env.context , newReadableSource (kj::mv (fake)));
198198
199199 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
200200 KJ_ASSERT (
@@ -230,7 +230,7 @@ KJ_TEST("Adapter with single read (Uint8Array)") {
230230 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
231231 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
232232 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
233- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
233+ env.js , env.context , newReadableSource (kj::mv (fake)));
234234
235235 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
236236 KJ_ASSERT (
@@ -266,7 +266,7 @@ KJ_TEST("Adapter with single read (Int32Array)") {
266266 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
267267 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
268268 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
269- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
269+ env.js , env.context , newReadableSource (kj::mv (fake)));
270270
271271 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
272272 KJ_ASSERT (
@@ -302,7 +302,7 @@ KJ_TEST("Adapter with single large read (ArrayBuffer)") {
302302 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
303303 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
304304 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
305- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
305+ env.js , env.context , newReadableSource (kj::mv (fake)));
306306
307307 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
308308 KJ_ASSERT (
@@ -337,7 +337,7 @@ KJ_TEST("Adapter with single small read (ArrayBuffer)") {
337337 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
338338 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
339339 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
340- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
340+ env.js , env.context , newReadableSource (kj::mv (fake)));
341341
342342 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
343343 KJ_ASSERT (
@@ -372,7 +372,7 @@ KJ_TEST("Adapter with minimal reads (Uint8Array)") {
372372 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
373373 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
374374 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
375- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
375+ env.js , env.context , newReadableSource (kj::mv (fake)));
376376
377377 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
378378 KJ_ASSERT (
@@ -408,7 +408,7 @@ KJ_TEST("Adapter with minimal reads (Uint32Array)") {
408408 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
409409 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
410410 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
411- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
411+ env.js , env.context , newReadableSource (kj::mv (fake)));
412412
413413 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
414414 KJ_ASSERT (
@@ -444,7 +444,7 @@ KJ_TEST("Adapter with over large min reads (Uint32Array)") {
444444 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
445445 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
446446 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
447- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
447+ env.js , env.context , newReadableSource (kj::mv (fake)));
448448
449449 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
450450 KJ_ASSERT (
@@ -477,7 +477,7 @@ KJ_TEST("Adapter with over large min reads (Uint32Array)") {
477477 TestFixture fixture;
478478
479479 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
480- auto source = newReadableStreamSource (newNullInputStream ());
480+ auto source = newReadableSource (newNullInputStream ());
481481 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(env.js , env.context , kj::mv (source));
482482
483483 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
@@ -510,7 +510,7 @@ KJ_TEST("Adapter with multiple reads (Uint8Array)") {
510510 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
511511 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
512512 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
513- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
513+ env.js , env.context , newReadableSource (kj::mv (fake)));
514514
515515 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
516516 KJ_ASSERT (
@@ -565,7 +565,7 @@ KJ_TEST("Adapter with multiple reads shutdown") {
565565 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
566566 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
567567 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
568- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
568+ env.js , env.context , newReadableSource (kj::mv (fake)));
569569
570570 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
571571 KJ_ASSERT (
@@ -626,7 +626,7 @@ KJ_TEST("Adapter with multiple reads cancel") {
626626 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
627627 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
628628 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
629- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
629+ env.js , env.context , newReadableSource (kj::mv (fake)));
630630
631631 KJ_ASSERT (!adapter->isClosed (), " Adapter should not be closed upon construction" );
632632 KJ_ASSERT (
@@ -697,7 +697,7 @@ KJ_TEST("Adapter close after read") {
697697 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
698698 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
699699 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
700- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
700+ env.js , env.context , newReadableSource (kj::mv (fake)));
701701
702702 auto read = adapter->read (env.js ,
703703 ReadableStreamSourceJsAdapter::ReadOptions{
@@ -727,7 +727,7 @@ KJ_TEST("Adapter close") {
727727 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
728728 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
729729 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
730- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
730+ env.js , env.context , newReadableSource (kj::mv (fake)));
731731 auto closePromise = adapter->close (env.js );
732732
733733 // reads after close should be resoved immediately.
@@ -754,7 +754,7 @@ KJ_TEST("Adapter close superseded by cancel") {
754754 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
755755 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
756756 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
757- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
757+ env.js , env.context , newReadableSource (kj::mv (fake)));
758758
759759 auto closePromise = adapter->close (env.js );
760760
@@ -779,7 +779,7 @@ KJ_TEST("After read BackingStore maintains identity") {
779779 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
780780 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
781781 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
782- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
782+ env.js , env.context , newReadableSource (kj::mv (fake)));
783783
784784 std::unique_ptr<v8::BackingStore> backing =
785785 v8::ArrayBuffer::NewBackingStore (env.js .v8Isolate , 10 );
@@ -813,7 +813,7 @@ KJ_TEST("Read all text") {
813813 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
814814 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
815815 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
816- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
816+ env.js , env.context , newReadableSource (kj::mv (fake)));
817817
818818 return env.context
819819 .awaitJs (env.js ,
@@ -834,7 +834,7 @@ KJ_TEST("Read all bytes") {
834834 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
835835 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
836836 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
837- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
837+ env.js , env.context , newReadableSource (kj::mv (fake)));
838838
839839 return env.context
840840 .awaitJs (env.js ,
@@ -854,7 +854,7 @@ KJ_TEST("Read all text (limit)") {
854854 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
855855 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
856856 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
857- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
857+ env.js , env.context , newReadableSource (kj::mv (fake)));
858858
859859 return env.context
860860 .awaitJs (env.js ,
@@ -875,7 +875,7 @@ KJ_TEST("Read all bytes (limit)") {
875875 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
876876 kj::Own<kj::AsyncInputStream> fake (&source, kj::NullDisposer::instance);
877877 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(
878- env.js , env.context , newReadableStreamSource (kj::mv (fake)));
878+ env.js , env.context , newReadableSource (kj::mv (fake)));
879879
880880 return env.context
881881 .awaitJs (env.js ,
@@ -892,7 +892,7 @@ KJ_TEST("tryGetLength") {
892892 TestFixture fixture;
893893
894894 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
895- auto source = newReadableStreamSource (newNullInputStream ());
895+ auto source = newReadableSource (newNullInputStream ());
896896 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(env.js , env.context , kj::mv (source));
897897 auto length = KJ_ASSERT_NONNULL (adapter->tryGetLength (StreamEncoding::IDENTITY));
898898 KJ_ASSERT (length == 0 , " Length of empty stream should be 0" );
@@ -911,7 +911,7 @@ KJ_TEST("tee successful") {
911911
912912 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
913913 auto dataSource = newMemoryInputStream (" hello world" _kjb);
914- auto source = newReadableStreamSource (kj::mv (dataSource));
914+ auto source = newReadableSource (kj::mv (dataSource));
915915 auto adapter = kj::heap<ReadableStreamSourceJsAdapter>(env.js , env.context , kj::mv (source));
916916
917917 auto [branch1, branch2] = KJ_ASSERT_NONNULL (adapter->tryTee (env.js ));
@@ -1466,7 +1466,7 @@ KJ_TEST("KjAdapter pumpTo") {
14661466 TestFixture fixture ({.featureFlags = flags.asReader ()});
14671467 RecordingSink sink;
14681468 kj::Own<kj::AsyncOutputStream> fakeOwn (&sink, kj::NullDisposer::instance);
1469- auto writableSink = newWritableStreamSink (kj::mv (fakeOwn));
1469+ auto writableSink = newWritableSink (kj::mv (fakeOwn));
14701470
14711471 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
14721472 auto stream = createFiniteBytesReadableStream (env.js , 1024 );
@@ -1498,7 +1498,7 @@ KJ_TEST("KjAdapter pumpTo (no end)") {
14981498 TestFixture fixture ({.featureFlags = flags.asReader ()});
14991499 RecordingSink sink;
15001500 kj::Own<kj::AsyncOutputStream> fakeOwn (&sink, kj::NullDisposer::instance);
1501- auto writableSink = newWritableStreamSink (kj::mv (fakeOwn));
1501+ auto writableSink = newWritableSink (kj::mv (fakeOwn));
15021502
15031503 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
15041504 auto stream = createFiniteBytesReadableStream (env.js , 1024 );
@@ -1530,7 +1530,7 @@ KJ_TEST("KjAdapter pumpTo (errored)") {
15301530 TestFixture fixture ({.featureFlags = flags.asReader ()});
15311531 RecordingSink sink;
15321532 kj::Own<kj::AsyncOutputStream> fakeOwn (&sink, kj::NullDisposer::instance);
1533- auto writableSink = newWritableStreamSink (kj::mv (fakeOwn));
1533+ auto writableSink = newWritableSink (kj::mv (fakeOwn));
15341534
15351535 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
15361536 auto stream = createErroredStream (env.js );
@@ -1551,7 +1551,7 @@ KJ_TEST("KjAdapter pumpTo (error sink)") {
15511551 TestFixture fixture ({.featureFlags = flags.asReader ()});
15521552 ErrorSink sink;
15531553 kj::Own<kj::AsyncOutputStream> fakeOwn (&sink, kj::NullDisposer::instance);
1554- auto writableSink = newWritableStreamSink (kj::mv (fakeOwn));
1554+ auto writableSink = newWritableSink (kj::mv (fakeOwn));
15551555
15561556 fixture.runInIoContext ([&](const TestFixture::Environment& env) {
15571557 auto stream = createFiniteBytesReadableStream (env.js , 1000 );
0 commit comments