fix another stream/future ABI spec discrepancy

This fixes another case where we weren't returning the correct status for closed
futures and streams.  Thanks to Luke for the updated test case.

Fixes #161

Co-authored-by: Luke Wagner <mail@lukewagner.name>
Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

crates/misc/component-async-tests/tests/scenario/transmit.rs

@@ -2,7 +2,7 @@ use std::future::Future;
 use std::pin::Pin;
 use std::sync::{Arc, Mutex};
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use futures::{
     future::{self, FutureExt},
     stream::{FuturesUnordered, TryStreamExt},
@@ -17,7 +17,7 @@ use wasmtime_wasi::p2::WasiCtxBuilder;
 
 use component_async_tests::transmit::bindings::exports::local::local::transmit::Control;
 use component_async_tests::util::{compose, config, test_run, test_run_with_count};
-use component_async_tests::{Ctx, sleep, transmit};
+use component_async_tests::{sleep, transmit, Ctx};
 
 use cancel::exports::local::local::cancel::Mode;
 

crates/wasmtime/src/runtime/component/concurrent.rs

@@ -157,17 +157,15 @@ enum Event {
     },
     StreamRead {
         code: ReturnCode,
-        handle: u32,
-        ty: TypeStreamTableIndex,
+        pending: Option<(TypeStreamTableIndex, u32)>,
     },
     StreamWrite {
         code: ReturnCode,
         pending: Option<(TypeStreamTableIndex, u32)>,
     },
     FutureRead {
         code: ReturnCode,
-        handle: u32,
-        ty: TypeFutureTableIndex,
+        pending: Option<(TypeFutureTableIndex, u32)>,
     },
     FutureWrite {
         code: ReturnCode,
@@ -4291,7 +4289,10 @@ impl Waitable {
     /// the state of the stream or future.
     fn on_delivery(&self, instance: &mut ComponentInstance, event: Event) {
         match event {
-            Event::FutureRead { ty, handle, .. }
+            Event::FutureRead {
+                pending: Some((ty, handle)),
+                ..
+            }
             | Event::FutureWrite {
                 pending: Some((ty, handle)),
                 ..
@@ -4313,7 +4314,10 @@ impl Waitable {
                     _ => unreachable!(),
                 };
             }
-            Event::StreamRead { ty, handle, .. }
+            Event::StreamRead {
+                pending: Some((ty, handle)),
+                ..
+            }
             | Event::StreamWrite {
                 pending: Some((ty, handle)),
                 ..