use merged naming-bikeshedding

Author: rklaehn

Cargo.lock

@@ -38,8 +38,8 @@ pin-project = "1.1.5"
 portable-atomic = { version = "1", optional = true }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
 quinn = { package = "iroh-quinn", version = "0.12", features = ["ring"] }
-quic-rpc = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "naming-bikeshedding", optional = true }
-quic-rpc-derive = { version = "0.14", optional = true }
+quic-rpc = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "map-transports-not-services", optional = true }
+quic-rpc-derive = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "map-transports-not-services", optional = true }
 rand = "0.8"
 range-collections = "0.4.0"
 redb = { version = "2.0.0", optional = true }

Cargo.toml

@@ -32,7 +32,7 @@ use proto::{
     },
     Request, RpcError, RpcResult, RpcService,
 };
-use quic_rpc::server::{RpcChannel, RpcServerError};
+use quic_rpc::server::{ChannelTypes, RpcChannel, RpcServerError};
 
 use crate::{
     export::ExportProgress,
@@ -63,7 +63,7 @@ impl<D: crate::store::Store> Blobs<D> {
         chan: RpcChannel<RpcService, C>,
     ) -> std::result::Result<(), RpcServerError<C>>
     where
-        C: quic_rpc::ListenerTypes<RpcService>,
+        C: ChannelTypes<RpcService>,
     {
         use Request::*;
         match msg {
@@ -79,7 +79,7 @@ impl<D: crate::store::Store> Blobs<D> {
         chan: RpcChannel<proto::RpcService, C>,
     ) -> std::result::Result<(), RpcServerError<C>>
     where
-        C: quic_rpc::ListenerTypes<proto::RpcService>,
+        C: ChannelTypes<proto::RpcService>,
     {
         use proto::tags::Request::*;
         match msg {
@@ -97,7 +97,7 @@ impl<D: crate::store::Store> Blobs<D> {
         chan: RpcChannel<proto::RpcService, C>,
     ) -> std::result::Result<(), RpcServerError<C>>
     where
-        C: quic_rpc::ListenerTypes<proto::RpcService>,
+        C: ChannelTypes<proto::RpcService>,
     {
         use proto::blobs::Request::*;
         match msg {

src/rpc.rs

@@ -1120,8 +1120,7 @@ mod tests {
             let router = router.spawn().await?;
 
             // Setup RPC
-            let (internal_rpc, controller) =
-                quic_rpc::transport::flume::service_connection::<RpcService>(32);
+            let (internal_rpc, controller) = quic_rpc::transport::flume::channel(32);
             let controller = controller.boxed();
             let internal_rpc = internal_rpc.boxed();
             let internal_rpc = quic_rpc::RpcServer::new(internal_rpc);