sendorder_fixes

neqo-http3/src/connection.rs

@@ -1003,10 +1003,8 @@ impl Http3Connection {
         conn: &mut Connection,
         stream_id: StreamId,
 	sendorder: Option<SendOrder>) -> Res<()> {
-        let send_stream = self.send_streams.get_mut(&stream_id)
-	                .ok_or(Error::InvalidStreamId)?;
-	send_stream.set_sendorder(conn, sendorder);
-	Ok(())
+	Ok(conn.stream_sendorder(stream_id, sendorder)?)
+    }
     }
 
     pub fn cancel_fetch(

neqo-http3/src/features/extended_connect/webtransport_streams.rs

@@ -186,7 +186,7 @@ impl SendStream for WebTransportSendStream {
     }
 
     fn set_sendorder(&mut self, conn: &mut Connection, sendorder: Option<i64>) {
-	conn.stream_sendorder(self.stream_id, sendorder);
+	conn.stream_sendorder(self.stream_id, sendorder).ok();
     }
 
     fn handle_stop_sending(&mut self, close_type: CloseType) {

neqo-transport/src/connection/mod.rs

@@ -2947,13 +2947,14 @@ impl Connection {
 
     /// Set the SendOrder of a stream.  Re-enqueues to keep the ordering correct
     /// # Errors
-    /// None
+    /// Returns InvalidStreamId if the stream id doesn't exist
     pub fn stream_sendorder(
         &mut self,
         stream_id: StreamId,
         sendorder: Option<SendOrder>,
-    ) {
-	self.streams.set_sendorder(stream_id, sendorder);
+    ) -> Res<()> {
+	self.streams.set_sendorder(stream_id, sendorder)
+    }
     }
 
     /// Send data on a stream.

neqo-transport/src/connection/tests/stream.rs

@@ -134,7 +134,7 @@ fn sendorder_test(order_of_sendorder: &[Option<SendOrder>]) {
 	let id = client.stream_create(StreamType::UniDi).unwrap();
 	streams.push(id);
 	ordered.push((id, *sendorder));
-	client.streams.set_sendorder(id, *sendorder);
+	client.streams.set_sendorder(id, *sendorder).ok();
     }
     // Write some data to all the streams
     for stream_id in streams {

neqo-transport/src/send_stream.rs

@@ -1157,7 +1157,7 @@ impl SendStreams {
         }
     }
 
-    pub fn set_sendorder(&mut self, stream_id: StreamId, sendorder: Option<SendOrder>) -> Res<()>{
+    pub fn set_sendorder(&mut self, stream_id: StreamId, sendorder: Option<SendOrder>) -> Res<()> {
 	// don't grab stream here; causes borrow errors
         let old_sendorder = self.map.get(&stream_id).unwrap().sendorder();
 	if old_sendorder != sendorder {

neqo-transport/src/streams.rs

@@ -412,8 +412,8 @@ impl Streams {
         ))
     }
 
-    pub fn set_sendorder(&mut self, stream_id: StreamId, sendorder: Option<SendOrder>) {
-	self.send.set_sendorder(stream_id, sendorder).ok();
+    pub fn set_sendorder(&mut self, stream_id: StreamId, sendorder: Option<SendOrder>) -> Res<()> {
+	self.send.set_sendorder(stream_id, sendorder)
     }
 
     pub fn stream_create(&mut self, st: StreamType) -> Res<StreamId> {